This is an automated email from the git hooks/post-receive script. a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/xfce4-appfinder.
commit 18d7e16e1f0e4fe67a2d3d1975a07e93ffe92b08 Author: Eduard Roccatello <edu...@xfce.org> Date: Mon Sep 28 21:47:19 2015 +0200 Fix menu icons and mnemonics --- src/appfinder-private.h | 1 + src/appfinder-window.c | 41 +++++++++++++++++++++++++++++++---------- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/appfinder-private.h b/src/appfinder-private.h index a39a132..535a857 100644 --- a/src/appfinder-private.h +++ b/src/appfinder-private.h @@ -52,6 +52,7 @@ void appfinder_refcount_debug_add (GObject *object, #define appfinder_return_val_if_fail(expr,val) G_STMT_START{ (void)0; }G_STMT_END #endif +#define XFCE_APPFINDER_STOCK_BOOKMARK_NEW "bookmark-new" #define XFCE_APPFINDER_STOCK_CLEAR "edit-clear" #define XFCE_APPFINDER_STOCK_CLOSE "window-close" #define XFCE_APPFINDER_STOCK_DELETE "edit-delete" diff --git a/src/appfinder-window.c b/src/appfinder-window.c index e84e18e..df48524 100644 --- a/src/appfinder-window.c +++ b/src/appfinder-window.c @@ -223,9 +223,9 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window) gtk_window_set_icon_name (GTK_WINDOW (window), XFCE_APPFINDER_STOCK_EXECUTE); if (xfconf_channel_get_bool (window->channel, "/always-center", FALSE)) - { - gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); - } + { + gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); + } vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_add (GTK_CONTAINER (window), vbox); @@ -1021,13 +1021,12 @@ xfce_appfinder_window_popup_menu (GtkWidget *view, if (is_bookmark) image = gtk_image_new_from_icon_name (XFCE_APPFINDER_STOCK_REMOVE, GTK_ICON_SIZE_MENU); else - image = gtk_image_new_from_icon_name ("bookmark-new", GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name (XFCE_APPFINDER_STOCK_BOOKMARK_NEW, GTK_ICON_SIZE_MENU); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); label = gtk_label_new (is_bookmark ? _("Remove From Bookmarks") : _("Add to Bookmarks")); gtk_container_add (GTK_CONTAINER (box), image); gtk_container_add (GTK_CONTAINER (box), label); - gtk_container_add (GTK_CONTAINER (mi), box); gtk_widget_show_all (mi); @@ -1035,19 +1034,33 @@ xfce_appfinder_window_popup_menu (GtkWidget *view, gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); gtk_widget_show (mi); - mi = gtk_menu_item_new_with_mnemonic (XFCE_APPFINDER_STOCK_EXECUTE); + mi = gtk_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (xfce_appfinder_window_popup_menu_execute), window); - gtk_widget_show (mi); - mi = gtk_menu_item_new_with_mnemonic (XFCE_APPFINDER_STOCK_EDIT); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + label = gtk_label_new_with_mnemonic (_("La_unch")); + image = gtk_image_new_from_icon_name (XFCE_APPFINDER_STOCK_EXECUTE, GTK_ICON_SIZE_MENU); + gtk_container_add (GTK_CONTAINER (box), image); + gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (mi), box); + gtk_widget_show_all (mi); + + mi = gtk_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (xfce_appfinder_window_popup_menu_edit), window); - gtk_widget_show (mi); - mi = gtk_menu_item_new_with_mnemonic (XFCE_APPFINDER_STOCK_REVERT_TO_SAVED); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + label = gtk_label_new_with_mnemonic (_("_Edit")); + image = gtk_image_new_from_icon_name (XFCE_APPFINDER_STOCK_EDIT, GTK_ICON_SIZE_MENU); + gtk_container_add (GTK_CONTAINER (box), image); + gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (mi), box); + gtk_widget_show_all (mi); + + mi = gtk_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (xfce_appfinder_window_popup_menu_revert), window); @@ -1056,6 +1069,14 @@ xfce_appfinder_window_popup_menu (GtkWidget *view, gtk_widget_show (mi); g_free (path); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + label = gtk_label_new_with_mnemonic (_("_Revert")); + image = gtk_image_new_from_icon_name (XFCE_APPFINDER_STOCK_REVERT_TO_SAVED, GTK_ICON_SIZE_MENU); + gtk_container_add (GTK_CONTAINER (box), image); + gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (mi), box); + gtk_widget_show_all (mi); + mi = gtk_menu_item_new_with_mnemonic (_("_Hide")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); gtk_widget_set_sensitive (mi, uri_is_local); -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits