From 9fcae9146ba657bff064321f27923b5bc054f33a Mon Sep 17 00:00:00 2001 From: Felix Riemann Date: Fri, 10 Jul 2009 16:46:41 +0200 Subject: [PATCH] [keybindings] Remove libglade dependency from keybindings capplet --- capplets/keybindings/Makefile.am | 8 +- .../keybindings/gnome-keybinding-properties.c | 133 +++--- .../gnome-keybinding-properties.glade | 405 ------------------ .../gnome-keybinding-properties.ui | 301 +++++++++++++ po/POTFILES.in | 2 +- 5 files changed, 390 insertions(+), 459 deletions(-) delete mode 100644 capplets/keybindings/gnome-keybinding-properties.glade create mode 100644 capplets/keybindings/gnome-keybinding-properties.ui diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am index 28703e9d3..b7adfe536 100644 --- a/capplets/keybindings/Makefile.am +++ b/capplets/keybindings/Makefile.am @@ -13,8 +13,8 @@ gnome_keybinding_properties_SOURCES = \ @INTLTOOL_DESKTOP_RULE@ -Gladedir = $(pkgdatadir)/glade -Glade_DATA = gnome-keybinding-properties.glade +uidir = $(pkgdatadir)/ui +ui_DATA = gnome-keybinding-properties.ui desktopdir = $(datadir)/applications Desktop_in_files = keybinding.desktop.in @@ -33,12 +33,12 @@ INCLUDES = \ $(GNOMECC_CAPPLETS_CFLAGS) \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ - -DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \ + -DGNOMECC_UI_DIR="\"$(uidir)\"" \ -DGNOMECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\"" CLEANFILES = \ $(GNOMECC_CAPPLETS_CLEANFILES) \ $(Desktop_in_files) \ $(desktop_DATA) \ $(xml_DATA) -EXTRA_DIST = $(Glade_DATA) $(xml_in_files) gnome-keybindings.pc.in +EXTRA_DIST = $(ui_DATA) $(xml_in_files) gnome-keybindings.pc.in diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index 97ca6c4e0..fb3ba3528 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -4,11 +4,11 @@ #include +#include #include #include #include #include -#include #include #include #include @@ -82,11 +82,27 @@ static GtkWidget *custom_shortcut_dialog = NULL; static GtkWidget *custom_shortcut_name_entry = NULL; static GtkWidget *custom_shortcut_command_entry = NULL; -static GladeXML * -create_dialog (void) +static GtkWidget* +_gtk_builder_get_widget (GtkBuilder *builder, const gchar *name) { - return glade_xml_new (GNOMECC_GLADE_DIR "/gnome-keybinding-properties.glade", - NULL, NULL); + return GTK_WIDGET (gtk_builder_get_object (builder, name)); +} + +static GtkBuilder * +create_builder (void) +{ + GtkBuilder *builder = gtk_builder_new(); + GError *error = NULL; + static const gchar *uifile = GNOMECC_UI_DIR "/gnome-keybinding-properties.ui"; + + if (gtk_builder_add_from_file (builder, uifile, &error) == 0) { + g_warning ("Could not load UI: %s", error->message); + g_error_free (error); + g_object_unref (builder); + builder = NULL; + } + + return builder; } static char* @@ -329,12 +345,13 @@ keyentry_sort_func (GtkTreeModel *model, } static void -clear_old_model (GladeXML *dialog) +clear_old_model (GtkBuilder *builder) { GtkWidget *tree_view; + GtkWidget *actions_swindow; GtkTreeModel *model; - tree_view = WID ("shortcut_treeview"); + tree_view = _gtk_builder_get_widget (builder, "shortcut_treeview"); model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view)); if (model == NULL) @@ -393,9 +410,10 @@ clear_old_model (GladeXML *dialog) g_object_unref (client); } - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (WID ("actions_swindow")), + actions_swindow = _gtk_builder_get_widget (builder, "actions_swindow"); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (actions_swindow), GTK_POLICY_NEVER, GTK_POLICY_NEVER); - gtk_widget_set_size_request (WID ("actions_swindow"), -1, -1); + gtk_widget_set_size_request (actions_swindow, -1, -1); } typedef struct { @@ -482,15 +500,19 @@ count_rows_foreach (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, g } static void -ensure_scrollbar (GladeXML *dialog, int i) +ensure_scrollbar (GtkBuilder *builder, int i) { if (i == MAX_ELEMENTS_BEFORE_SCROLLING) { GtkRequisition rectangle; - gtk_widget_ensure_style (WID ("shortcut_treeview")); - gtk_widget_size_request (WID ("shortcut_treeview"), &rectangle); - gtk_widget_set_size_request (WID ("shortcut_treeview"), -1, rectangle.height); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (WID ("actions_swindow")), + GObject *actions_swindow = gtk_builder_get_object (builder, + "actions_swindow"); + GtkWidget *treeview = _gtk_builder_get_widget (builder, + "shortcut_treeview"); + gtk_widget_ensure_style (treeview); + gtk_widget_size_request (treeview, &rectangle); + gtk_widget_set_size_request (treeview, -1, rectangle.height); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (actions_swindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); } } @@ -530,7 +552,7 @@ find_section (GtkTreeModel *model, } static void -append_keys_to_tree (GladeXML *dialog, +append_keys_to_tree (GtkBuilder *builder, const gchar *title, const KeyListEntry *keys_list) { @@ -541,7 +563,7 @@ append_keys_to_tree (GladeXML *dialog, gint rows_before; client = gconf_client_get_default (); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (WID ("shortcut_treeview"))); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (gtk_builder_get_object (builder, "shortcut_treeview"))); /* Try to find a section parent iter, if it already exists */ find_section (model, &iter, title); @@ -552,7 +574,7 @@ append_keys_to_tree (GladeXML *dialog, /* If the header we just added is the MAX_ELEMENTS_BEFORE_SCROLLING th, * then we need to scroll now */ - ensure_scrollbar (dialog, i - 1); + ensure_scrollbar (builder, i - 1); rows_before = i; for (j = 0; keys_list[j].name != NULL; j++) @@ -658,7 +680,7 @@ append_keys_to_tree (GladeXML *dialog, g_free (key_value); gconf_entry_free (entry); - ensure_scrollbar (dialog, i); + ensure_scrollbar (builder, i); ++i; gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent_iter); @@ -666,7 +688,7 @@ append_keys_to_tree (GladeXML *dialog, gtk_tree_store_set (GTK_TREE_STORE (model), &iter, KEYENTRY_COLUMN, key_entry, -1); - gtk_tree_view_expand_all (GTK_TREE_VIEW (WID ("shortcut_treeview"))); + gtk_tree_view_expand_all (GTK_TREE_VIEW (gtk_builder_get_object (builder, "shortcut_treeview"))); } g_object_unref (client); @@ -676,9 +698,9 @@ append_keys_to_tree (GladeXML *dialog, gtk_tree_store_remove (GTK_TREE_STORE (model), &parent_iter); if (i == 0) - gtk_widget_hide (WID ("shortcuts_vbox")); + gtk_widget_hide (_gtk_builder_get_widget (builder, "shortcuts_vbox")); else - gtk_widget_show (WID ("shortcuts_vbox")); + gtk_widget_show (_gtk_builder_get_widget (builder, "shortcuts_vbox")); } static void @@ -800,7 +822,7 @@ parse_start_tag (GMarkupParseContext *ctx, } static void -append_keys_to_tree_from_file (GladeXML *dialog, +append_keys_to_tree_from_file (GtkBuilder *builder, const char *filename, const char *wm_name) { @@ -871,7 +893,7 @@ append_keys_to_tree_from_file (GladeXML *dialog, title = _(keylist->name); } - append_keys_to_tree (dialog, title, keys); + append_keys_to_tree (builder, title, keys); g_free (keylist->name); g_free (keylist->package); @@ -881,7 +903,7 @@ append_keys_to_tree_from_file (GladeXML *dialog, } static void -append_keys_to_tree_from_gconf (GladeXML *dialog, const gchar *gconf_path) +append_keys_to_tree_from_gconf (GtkBuilder *builder, const gchar *gconf_path) { GConfClient *client; GSList *custom_list, *l; @@ -922,7 +944,7 @@ append_keys_to_tree_from_gconf (GladeXML *dialog, const gchar *gconf_path) g_array_append_val (entries, key); keys = (KeyListEntry *) entries->data; - append_keys_to_tree (dialog, _("Custom Shortcuts"), keys); + append_keys_to_tree (builder, _("Custom Shortcuts"), keys); for (i = 0; i < entries->len; ++i) { g_free (keys[i].name); @@ -934,13 +956,13 @@ append_keys_to_tree_from_gconf (GladeXML *dialog, const gchar *gconf_path) } static void -reload_key_entries (gpointer wm_name, GladeXML *dialog) +reload_key_entries (gpointer wm_name, GtkBuilder *builder) { GDir *dir; const char *name; GList *list, *l; - clear_old_model (dialog); + clear_old_model (builder); dir = g_dir_open (GNOMECC_KEYBINDINGS_DIR, 0, NULL); if (!dir) @@ -962,7 +984,7 @@ reload_key_entries (gpointer wm_name, GladeXML *dialog) gchar *path; path = g_build_filename (GNOMECC_KEYBINDINGS_DIR, l->data, NULL); - append_keys_to_tree_from_file (dialog, path, wm_name); + append_keys_to_tree_from_file (builder, path, wm_name); g_free (l->data); g_free (path); } @@ -973,7 +995,7 @@ reload_key_entries (gpointer wm_name, GladeXML *dialog) * in a file. Loading the custom shortcuts last makes * such keys not show up in the custom section. */ - append_keys_to_tree_from_gconf (dialog, GCONF_BINDING_DIR); + append_keys_to_tree_from_gconf (builder, GCONF_BINDING_DIR); } static void @@ -1716,13 +1738,14 @@ maybe_block_accels (GtkWidget *widget, static void cb_dialog_response (GtkWidget *widget, gint response_id, gpointer data) { - GladeXML *dialog = data; + GtkBuilder *builder = data; GtkTreeView *treeview; GtkTreeModel *model; GtkTreeSelection *selection; GtkTreeIter iter; - treeview = GTK_TREE_VIEW (WID ("shortcut_treeview")); + treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, + "shortcut_treeview")); model = gtk_tree_view_get_model (treeview); if (response_id == GTK_RESPONSE_HELP) @@ -1744,7 +1767,7 @@ cb_dialog_response (GtkWidget *widget, gint response_id, gpointer data) } else { - clear_old_model (dialog); + clear_old_model (builder); gtk_main_quit (); } } @@ -1770,21 +1793,24 @@ selection_changed (GtkTreeSelection *selection, gpointer data) } static void -setup_dialog (GladeXML *dialog) +setup_dialog (GtkBuilder *builder) { GConfClient *client; GtkCellRenderer *renderer; GtkTreeViewColumn *column; GtkWidget *widget; - GtkTreeView *treeview = GTK_TREE_VIEW (WID ("shortcut_treeview")); + GtkTreeView *treeview; gchar *wm_name; GtkTreeSelection *selection; GSList *allowed_keys; + treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, + "shortcut_treeview")); + client = gconf_client_get_default (); g_signal_connect (treeview, "button_press_event", - G_CALLBACK (start_editing_cb), dialog); + G_CALLBACK (start_editing_cb), builder); g_signal_connect (treeview, "row-activated", G_CALLBACK (start_editing_kb_cb), NULL); @@ -1828,23 +1854,24 @@ setup_dialog (GladeXML *dialog) gconf_client_notify_add (client, "/apps/metacity/general/num_workspaces", (GConfClientNotifyFunc) key_entry_controlling_key_changed, - dialog, NULL, NULL); + builder, NULL, NULL); /* set up the dialog */ wm_name = wm_common_get_current_window_manager(); - reload_key_entries (wm_name, dialog); + reload_key_entries (wm_name, builder); g_free (wm_name); - widget = WID ("gnome-keybinding-dialog"); + widget = _gtk_builder_get_widget (builder, "gnome-keybinding-dialog"); capplet_set_icon (widget, "preferences-desktop-keyboard-shortcuts"); gtk_widget_show (widget); g_signal_connect (widget, "key_press_event", G_CALLBACK (maybe_block_accels), NULL); - g_signal_connect (widget, "response", G_CALLBACK (cb_dialog_response), dialog); + g_signal_connect (widget, "response", G_CALLBACK (cb_dialog_response), builder); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); g_signal_connect (selection, "changed", - G_CALLBACK (selection_changed), WID ("remove-button")); + G_CALLBACK (selection_changed), + _gtk_builder_get_widget (builder, "remove-button")); allowed_keys = gconf_client_get_list (client, GCONF_BINDING_DIR "/allowed_keys", @@ -1854,15 +1881,19 @@ setup_dialog (GladeXML *dialog) { g_slist_foreach (allowed_keys, (GFunc)g_free, NULL); g_slist_free (allowed_keys); - gtk_widget_set_sensitive (WID ("add-button"), FALSE); + gtk_widget_set_sensitive (_gtk_builder_get_widget (builder, "add-button"), + FALSE); } g_object_unref (client); /* setup the custom shortcut dialog */ - custom_shortcut_dialog = WID ("custom-shortcut-dialog"); - custom_shortcut_name_entry = WID ("custom-shortcut-name-entry"); - custom_shortcut_command_entry = WID ("custom-shortcut-command-entry"); + custom_shortcut_dialog = _gtk_builder_get_widget (builder, + "custom-shortcut-dialog"); + custom_shortcut_name_entry = _gtk_builder_get_widget (builder, + "custom-shortcut-name-entry"); + custom_shortcut_command_entry = _gtk_builder_get_widget (builder, + "custom-shortcut-command-entry"); gtk_dialog_set_default_response (GTK_DIALOG (custom_shortcut_dialog), GTK_RESPONSE_OK); gtk_window_set_transient_for (GTK_WINDOW (custom_shortcut_dialog), @@ -1872,7 +1903,7 @@ setup_dialog (GladeXML *dialog) int main (int argc, char *argv[]) { - GladeXML *dialog; + GtkBuilder *builder; g_thread_init (NULL); gtk_init (&argc, &argv); @@ -1885,13 +1916,17 @@ main (int argc, char *argv[]) activate_settings_daemon (); - dialog = create_dialog (); - wm_common_register_window_manager_change ((GFunc) reload_key_entries, dialog); - setup_dialog (dialog); + builder = create_builder (); + + if (!builder) /* Warning was already printed to console */ + exit (EXIT_FAILURE); + + wm_common_register_window_manager_change ((GFunc) reload_key_entries, builder); + setup_dialog (builder); gtk_main (); - g_object_unref (dialog); + g_object_unref (builder); return 0; } diff --git a/capplets/keybindings/gnome-keybinding-properties.glade b/capplets/keybindings/gnome-keybinding-properties.glade deleted file mode 100644 index 4bf39b23a..000000000 --- a/capplets/keybindings/gnome-keybinding-properties.glade +++ /dev/null @@ -1,405 +0,0 @@ - - - - - - - 5 - Keyboard Shortcuts - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - True - False - 2 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - True - -11 - - - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - True - False - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - 1 - - - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 5 - True - False - 12 - - - - True - False - 6 - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_NEVER - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - True - False - True - False - False - False - - - - - 0 - True - True - - - - - - 6 - True - False - 12 - - - - True - gtk-dialog-info - 6 - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - To edit a shortcut key, click on the corresponding row and type a new key combination, or press backspace to clear. - False - False - GTK_JUSTIFY_FILL - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - 0 - False - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - Custom Shortcut - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - False - False - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - False - True - gtk-apply - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 5 - True - False - 6 - - - - True - 2 - 2 - False - 6 - 6 - - - - True - _Name: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - custom-shortcut-name-entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - C_ommand: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - custom-shortcut-command-entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - True - • - True - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - True - • - True - - - 1 - 2 - 1 - 2 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - diff --git a/capplets/keybindings/gnome-keybinding-properties.ui b/capplets/keybindings/gnome-keybinding-properties.ui new file mode 100644 index 000000000..75795b40f --- /dev/null +++ b/capplets/keybindings/gnome-keybinding-properties.ui @@ -0,0 +1,301 @@ + + + + + + 5 + Keyboard Shortcuts + dialog + False + + + True + 2 + + + True + 5 + 12 + + + True + 6 + + + True + True + never + never + in + + + True + True + True + + + + + 0 + + + + + True + 6 + 12 + + + True + 0 + gtk-dialog-info + 6 + + + False + False + 0 + + + + + True + 0 + To edit a shortcut key, click on the corresponding row and type a new key combination, or press backspace to clear. + fill + True + + + 1 + + + + + False + 1 + + + + + 0 + + + + + 1 + + + + + True + end + + + gtk-help + True + True + True + False + True + + + False + False + 0 + + + + + gtk-add + True + True + True + False + True + + + False + False + 1 + + + + + gtk-remove + True + False + True + True + False + True + + + False + False + 2 + + + + + gtk-close + True + True + True + False + True + + + False + False + 3 + + + + + False + end + 0 + + + + + + helpbutton1 + add-button + remove-button + button1 + + + + Custom Shortcut + dialog + False + + + True + + + True + 5 + 6 + + + True + 2 + 2 + 6 + 6 + + + True + 0 + _Name: + True + custom-shortcut-name-entry + + + GTK_FILL + + + + + + True + 0 + C_ommand: + True + custom-shortcut-command-entry + + + 1 + 2 + GTK_FILL + + + + + + True + True + • + True + + + 1 + 2 + + + + + + True + True + • + True + + + 1 + 2 + 1 + 2 + + + + + + 0 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + False + True + + + False + False + 0 + + + + + gtk-apply + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + okbutton1 + + + diff --git a/po/POTFILES.in b/po/POTFILES.in index cb2a5f178..ffe47d70b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -45,7 +45,7 @@ capplets/keybindings/00-multimedia-key.xml.in capplets/keybindings/01-desktop-key.xml.in capplets/keybindings/eggcellrendererkeys.c capplets/keybindings/gnome-keybinding-properties.c -capplets/keybindings/gnome-keybinding-properties.glade +[type: gettext/glade]capplets/keybindings/gnome-keybinding-properties.ui capplets/keybindings/keybinding.desktop.in.in capplets/keyboard/gnome-keyboard-properties.c capplets/keyboard/gnome-keyboard-properties.glade