Changeset fbc1bb5aa1c5c5843d8d30554c781d2163ca933f for gui/main.c

Timestamp:

02/07/10 19:37:23 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

5fc59ea3ed28f1be73a7cb5389d15579864ac852

Parents:

dd24a9cc657e65acdeed036306f95416c36e35f8

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-02-07T19:37:23Z+0200

Message:

gladish: switch from libglade to GtkBuilder?

GTK 2.16 is required now.
Warnings during conversion:
[main_win:main_vbox:menubar:view_menu_item:view_menu:menu_item_view_arrange] Property 'Tooltip' of object class 'Widget' is only supported in libglade format
[main_win:main_vbox:toolbar:toolitem28:alignment2:hbox4:buffer_size_combo] Property 'Tooltip' of object class 'Widget' is only supported in libglade format
[main_win:main_vbox:toolbar:toolitem28:alignment2:hbox4:buffer_size_combo] Property 'Items' of object class 'Combo Box' is only supported in libglade format
[main_win:main_vbox:toolbar:clear_load_button] Property 'Tooltip' of object class 'Widget' is only supported in libglade format
[main_win:main_vbox:toolbar:toolitem30:alignment3:xrun_progress_bar] Property 'Tooltip' of object class 'Widget' is only supported in libglade format

Files:

• gui/main.c (modified) (14 diffs)

gui/main.c

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2008, 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2008, 2009, 2010 Nedko Arnaudov <nedko@arnaudov.name>
  * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
  *
@@ -38 +38 @@
 #include <unistd.h>
 
-#include "glade.h"
+#include "gtk_builder.h"
 #include "canvas.h"
 #include "graph_canvas.h"
@@ -150 +150 @@
 static void buffer_size_clear()
 {
-  gtk_entry_set_text(GTK_ENTRY(get_glade_widget("comboboxentry")), "");
+  gtk_entry_set_text(GTK_ENTRY(get_gtk_builder_widget("comboboxentry")), "");
 }
 
@@ -218 +218 @@
   guint result;
   bool ok;
-  GtkEntry * entry = GTK_ENTRY(get_glade_widget("name_entry"));
+  GtkEntry * entry = GTK_ENTRY(get_gtk_builder_widget("name_entry"));
 
   gtk_window_set_title(GTK_WINDOW(g_app_dialog), title);
@@ -224 +224 @@
   gtk_widget_show(g_name_dialog);
 
-  gtk_label_set_text(GTK_LABEL(get_glade_widget("name_label")), object);
+  gtk_label_set_text(GTK_LABEL(get_gtk_builder_widget("name_label")), object);
   gtk_entry_set_text(entry, old_name);
   gtk_editable_select_region(GTK_EDITABLE(entry), 0, -1);
@@ -248 +248 @@
 {
   GtkWidget * dialog;
-  dialog = get_glade_widget("error_dialog");
+  dialog = get_gtk_builder_widget("error_dialog");
   gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), "<b><big>Error</big></b>");
   gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(dialog), "%s", failed_operation);
@@ -259 +259 @@
 {
   guint result;
-  GtkEntry * command_entry = GTK_ENTRY(get_glade_widget("app_command_entry"));
-  GtkEntry * name_entry = GTK_ENTRY(get_glade_widget("app_name_entry"));
-  GtkToggleButton * terminal_button = GTK_TOGGLE_BUTTON(get_glade_widget("app_terminal_check_button"));
-  GtkToggleButton * level0_button = GTK_TOGGLE_BUTTON(get_glade_widget("app_level0"));
-  GtkToggleButton * level1_button = GTK_TOGGLE_BUTTON(get_glade_widget("app_level1"));
-  GtkToggleButton * level2_button = GTK_TOGGLE_BUTTON(get_glade_widget("app_level2"));
-  GtkToggleButton * level3_button = GTK_TOGGLE_BUTTON(get_glade_widget("app_level3"));
+  GtkEntry * command_entry = GTK_ENTRY(get_gtk_builder_widget("app_command_entry"));
+  GtkEntry * name_entry = GTK_ENTRY(get_gtk_builder_widget("app_name_entry"));
+  GtkToggleButton * terminal_button = GTK_TOGGLE_BUTTON(get_gtk_builder_widget("app_terminal_check_button"));
+  GtkToggleButton * level0_button = GTK_TOGGLE_BUTTON(get_gtk_builder_widget("app_level0"));
+  GtkToggleButton * level1_button = GTK_TOGGLE_BUTTON(get_gtk_builder_widget("app_level1"));
+  GtkToggleButton * level2_button = GTK_TOGGLE_BUTTON(get_gtk_builder_widget("app_level2"));
+  GtkToggleButton * level3_button = GTK_TOGGLE_BUTTON(get_gtk_builder_widget("app_level3"));
   uint8_t level;
 
@@ -365 +365 @@
         &error_ptr))
   {
-    dialog = get_glade_widget("error_dialog");
+    dialog = get_gtk_builder_widget("error_dialog");
     gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), "<b><big>Error executing ladiconf.\nAre LADI Tools installed?</big></b>");
     gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(dialog), "%s", error_ptr->message);
@@ -893 +893 @@
 {
   studio_list_ptr->count = 0;
-  studio_list_ptr->menu_item = get_glade_widget(menu_item);
-  studio_list_ptr->menu = get_glade_widget(menu);
+  studio_list_ptr->menu_item = get_gtk_builder_widget(menu_item);
+  studio_list_ptr->menu = get_gtk_builder_widget(menu);
   studio_list_ptr->item_activate_callback = item_activate_callback;
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(studio_list_ptr->menu_item), studio_list_ptr->menu);
@@ -969 +969 @@
   license = read_file_contents(DATA_DIR "/COPYING");
 
-  dialog = get_glade_widget("about_win");
+  dialog = get_gtk_builder_widget("about_win");
   gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), PACKAGE_VERSION);
 
@@ -1031 +1031 @@
   }
 
-  if (!init_glade())
+  if (!init_gtk_builder())
   {
     return 1;
   }
 
-  g_main_win = get_glade_widget("main_win");
-  g_clear_load_button = get_glade_widget("clear_load_button");
-  g_xrun_progress_bar = get_glade_widget("xrun_progress_bar");
-  g_buffer_size_combo = get_glade_widget("buffer_size_combo");
-  g_menu_item_new_studio = get_glade_widget("menu_item_new_studio");
-  g_menu_item_start_app = get_glade_widget("menu_item_start_app");
-  g_menu_item_start_studio = get_glade_widget("menu_item_start_studio");
-  g_menu_item_stop_studio = get_glade_widget("menu_item_stop_studio");
-  g_menu_item_save_studio = get_glade_widget("menu_item_save_studio");
-  g_menu_item_save_as_studio = get_glade_widget("menu_item_save_as_studio");
-  g_menu_item_unload_studio = get_glade_widget("menu_item_unload_studio");
-  g_menu_item_rename_studio = get_glade_widget("menu_item_rename_studio");
-  g_menu_item_create_room = get_glade_widget("menu_item_create_room");
-  g_menu_item_destroy_room = get_glade_widget("menu_item_destroy_room");
-  g_menu_item_load_project = get_glade_widget("menu_item_load_project");
-  g_menu_item_daemon_exit = get_glade_widget("menu_item_daemon_exit");
-  g_menu_item_jack_configure = get_glade_widget("menu_item_jack_configure");
-  g_studio_status_label = get_glade_widget("studio_status_label");
-  g_menu_item_view_toolbar = get_glade_widget("menu_item_view_toolbar");
-  g_toolbar = get_glade_widget("toolbar");
-  g_status_image = get_glade_widget("startstop");
-  g_status_tool_item = get_glade_widget("startstop_item");
-
-  g_name_dialog = get_glade_widget("name_dialog");
-  g_app_dialog = get_glade_widget("app_dialog");
+  g_main_win = get_gtk_builder_widget("main_win");
+  g_clear_load_button = get_gtk_builder_widget("clear_load_button");
+  g_xrun_progress_bar = get_gtk_builder_widget("xrun_progress_bar");
+  g_buffer_size_combo = get_gtk_builder_widget("buffer_size_combo");
+  g_menu_item_new_studio = get_gtk_builder_widget("menu_item_new_studio");
+  g_menu_item_start_app = get_gtk_builder_widget("menu_item_start_app");
+  g_menu_item_start_studio = get_gtk_builder_widget("menu_item_start_studio");
+  g_menu_item_stop_studio = get_gtk_builder_widget("menu_item_stop_studio");
+  g_menu_item_save_studio = get_gtk_builder_widget("menu_item_save_studio");
+  g_menu_item_save_as_studio = get_gtk_builder_widget("menu_item_save_as_studio");
+  g_menu_item_unload_studio = get_gtk_builder_widget("menu_item_unload_studio");
+  g_menu_item_rename_studio = get_gtk_builder_widget("menu_item_rename_studio");
+  g_menu_item_create_room = get_gtk_builder_widget("menu_item_create_room");
+  g_menu_item_destroy_room = get_gtk_builder_widget("menu_item_destroy_room");
+  g_menu_item_load_project = get_gtk_builder_widget("menu_item_load_project");
+  g_menu_item_daemon_exit = get_gtk_builder_widget("menu_item_daemon_exit");
+  g_menu_item_jack_configure = get_gtk_builder_widget("menu_item_jack_configure");
+  g_studio_status_label = get_gtk_builder_widget("studio_status_label");
+  g_menu_item_view_toolbar = get_gtk_builder_widget("menu_item_view_toolbar");
+  g_toolbar = get_gtk_builder_widget("toolbar");
+  g_status_image = get_gtk_builder_widget("startstop");
+  g_status_tool_item = get_gtk_builder_widget("startstop_item");
+
+  g_name_dialog = get_gtk_builder_widget("name_dialog");
+  g_app_dialog = get_gtk_builder_widget("app_dialog");
 
   init_studio_list(&g_load_studio_list, "menu_item_load_studio", "load_studio_menu", on_load_studio);
@@ -1092 +1092 @@
 
   g_signal_connect(G_OBJECT(g_main_win), "destroy", G_CALLBACK(gtk_main_quit), NULL);
-  g_signal_connect(G_OBJECT(get_glade_widget("menu_item_quit")), "activate", G_CALLBACK(gtk_main_quit), NULL);
+  g_signal_connect(G_OBJECT(get_gtk_builder_widget("menu_item_quit")), "activate", G_CALLBACK(gtk_main_quit), NULL);
   g_signal_connect(G_OBJECT(g_buffer_size_combo), "changed", G_CALLBACK(buffer_size_change_request), NULL);
   g_signal_connect(G_OBJECT(g_clear_load_button), "clicked", G_CALLBACK(clear_load), NULL);
-  g_signal_connect(G_OBJECT(get_glade_widget("menu_item_view_arrange")), "activate", G_CALLBACK(arrange), NULL);
+  g_signal_connect(G_OBJECT(get_gtk_builder_widget("menu_item_view_arrange")), "activate", G_CALLBACK(arrange), NULL);
   g_signal_connect(G_OBJECT(g_menu_item_view_toolbar), "activate", G_CALLBACK(toggle_toolbar), NULL);
   g_signal_connect(G_OBJECT(g_menu_item_new_studio), "activate", G_CALLBACK(new_studio), NULL);
@@ -1106 +1106 @@
   g_signal_connect(G_OBJECT(g_menu_item_daemon_exit), "activate", G_CALLBACK(daemon_exit), NULL);
   g_signal_connect(G_OBJECT(g_menu_item_jack_configure), "activate", G_CALLBACK(jack_configure), NULL);
-  g_signal_connect(G_OBJECT(get_glade_widget("menu_item_help_about")), "activate", G_CALLBACK(show_about), NULL);
+  g_signal_connect(G_OBJECT(get_gtk_builder_widget("menu_item_help_about")), "activate", G_CALLBACK(show_about), NULL);
   g_signal_connect(G_OBJECT(g_menu_item_start_app), "activate", G_CALLBACK(start_app), NULL);
 
@@ -1118 +1118 @@
   control_proxy_uninit();
   dbus_uninit();
-  uninit_glade();
+  uninit_gtk_builder();
 
   return 0;