[Xfce4-commits] [xfce/thunar] 01/01: Right click context menu with wrong icon (bug #10652)
noreply at xfce.org
noreply at xfce.org
Sun Jan 4 23:29:41 CET 2015
This is an automated email from the git hooks/post-receive script.
andrzejr pushed a commit to branch master
in repository xfce/thunar.
commit da6e0addf2c5fdbf458cbdb3f3dc025945e03458
Author: Andrzej <ndrwrdck at gmail.com>
Date: Sun Jan 4 22:29:32 2015 +0000
Right click context menu with wrong icon (bug #10652)
Author: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10652
Bug-Ubuntu: https://launchpad.net/bugs/1271861
Description: Add or change various menu icons:
- Open With DEFAULT Application
- New Tab/Window
- Create Folder/Document
- Empty File
---
thunar/thunar-launcher.c | 8 +++++++-
thunar/thunar-location-buttons.c | 2 +-
thunar/thunar-standard-view.c | 2 +-
thunar/thunar-templates-action.c | 3 ++-
thunar/thunar-tree-view.c | 7 +++++++
thunar/thunar-window.c | 4 ++--
6 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index 5132575..6761817 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -815,8 +815,9 @@ thunar_launcher_update_idle (gpointer data)
** - "Open", "Open in n New Windows" and "Open in n New Tabs" actions
**/
- /* Prepare "Open" label */
+ /* Prepare "Open" label and icon */
gtk_action_set_label (launcher->action_open, _("_Open"));
+ gtk_action_set_stock_id (launcher->action_open, GTK_STOCK_OPEN);
if (n_selected_files == n_directories && n_directories >= 1)
{
@@ -928,6 +929,7 @@ thunar_launcher_update_idle (gpointer data)
/* turn the "Open" action into "Execute" */
g_object_set (G_OBJECT (launcher->action_open),
"label", _("_Execute"),
+ "stock-id", GTK_STOCK_EXECUTE,
"tooltip", ngettext ("Execute the selected file", "Execute the selected files", n_selected_files),
NULL);
}
@@ -945,6 +947,10 @@ thunar_launcher_update_idle (gpointer data)
g_free (tooltip);
g_free (label);
+ /* load default application icon */
+ gtk_action_set_stock_id (launcher->action_open, NULL);
+ gtk_action_set_gicon (launcher->action_open, g_app_info_get_icon (applications->data));
+
/* remember the default application for the "Open" action */
g_object_set_qdata_full (G_OBJECT (launcher->action_open), thunar_launcher_handler_quark, applications->data, g_object_unref);
diff --git a/thunar/thunar-location-buttons.c b/thunar/thunar-location-buttons.c
index 62325e8..e4890e9 100644
--- a/thunar/thunar-location-buttons.c
+++ b/thunar/thunar-location-buttons.c
@@ -175,7 +175,7 @@ static const GtkActionEntry action_entries[] =
{ "location-buttons-open", GTK_STOCK_OPEN, N_("_Open"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open), },
{ "location-buttons-open-in-new-tab", NULL, N_("Open in New Tab"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open_in_new_tab), },
{ "location-buttons-open-in-new-window", NULL, N_("Open in New Window"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open_in_new_window), },
- { "location-buttons-create-folder", NULL, N_("Create _Folder..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_create_folder), },
+ { "location-buttons-create-folder", "folder-new", N_("Create _Folder..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_create_folder), },
{ "location-buttons-empty-trash", NULL, N_("_Empty Trash"), "", N_("Delete all files and folders in the Trash"), G_CALLBACK (thunar_location_buttons_action_empty_trash), },
{ "location-buttons-paste-into-folder", GTK_STOCK_PASTE, N_("Paste Into Folder"), "", NULL, G_CALLBACK (thunar_location_buttons_action_paste_into_folder), },
{ "location-buttons-properties", GTK_STOCK_PROPERTIES, N_("_Properties..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_properties), },
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index f428e3d..02ab304 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -393,7 +393,7 @@ static const GtkActionEntry action_entries[] =
{
{ "file-context-menu", NULL, N_ ("File Context Menu"), NULL, NULL, NULL, },
{ "folder-context-menu", NULL, N_ ("Folder Context Menu"), NULL, NULL, NULL, },
- { "create-folder", NULL, N_ ("Create _Folder..."), "<control><shift>N", N_ ("Create an empty folder within the current folder"), G_CALLBACK (thunar_standard_view_action_create_folder), },
+ { "create-folder", "folder-new", N_ ("Create _Folder..."), "<control><shift>N", N_ ("Create an empty folder within the current folder"), G_CALLBACK (thunar_standard_view_action_create_folder), },
{ "properties", GTK_STOCK_PROPERTIES, N_ ("_Properties..."), "<alt>Return", N_ ("View the properties of the selected file"), G_CALLBACK (thunar_standard_view_action_properties), },
{ "cut", GTK_STOCK_CUT, N_ ("Cu_t"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_cut), },
{ "copy", GTK_STOCK_COPY, N_ ("_Copy"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_copy), },
diff --git a/thunar/thunar-templates-action.c b/thunar/thunar-templates-action.c
index 7ea185a..5b33290 100644
--- a/thunar/thunar-templates-action.c
+++ b/thunar/thunar-templates-action.c
@@ -477,7 +477,7 @@ thunar_templates_action_load_finished (ThunarJob *job,
gtk_widget_show (item);
/* add the icon for the emtpy file item */
- image = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
}
@@ -542,6 +542,7 @@ thunar_templates_action_new (const gchar *name,
"hide-if-empty", FALSE,
"label", label,
"name", name,
+ "icon-name", "document-new",
NULL);
}
diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
index c5b124e..e4661b0 100644
--- a/thunar/thunar-tree-view.c
+++ b/thunar/thunar-tree-view.c
@@ -1093,6 +1093,7 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
GtkWidget *menu;
GtkWidget *item;
GtkWidget *window;
+ GIcon *icon;
GList *providers, *lp;
GList *actions = NULL, *tmp;
@@ -1201,6 +1202,12 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_create_folder), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
+
+ /* set the stock icon */
+ icon = g_themed_icon_new ("folder-new");
+ image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+ g_object_unref (icon);
/* append a separator item */
item = gtk_separator_menu_item_new ();
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 7db14fb..94a566f 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -345,8 +345,8 @@ struct _ThunarWindow
static GtkActionEntry action_entries[] =
{
{ "file-menu", NULL, N_ ("_File"), NULL, },
- { "new-tab", NULL, N_ ("New _Tab"), "<control>T", N_ ("Open a new tab for the displayed location"), G_CALLBACK (thunar_window_action_open_new_tab), },
- { "new-window", NULL, N_ ("New _Window"), "<control>N", N_ ("Open a new Thunar window for the displayed location"), G_CALLBACK (thunar_window_action_open_new_window), },
+ { "new-tab", "tab-new", N_ ("New _Tab"), "<control>T", N_ ("Open a new tab for the displayed location"), G_CALLBACK (thunar_window_action_open_new_tab), },
+ { "new-window", "window-new", N_ ("New _Window"), "<control>N", N_ ("Open a new Thunar window for the displayed location"), G_CALLBACK (thunar_window_action_open_new_window), },
{ "sendto-menu", NULL, N_ ("_Send To"), NULL, },
{ "empty-trash", NULL, N_ ("_Empty Trash"), NULL, N_ ("Delete all files and folders in the Trash"), G_CALLBACK (thunar_window_action_empty_trash), },
{ "detach-tab", NULL, N_ ("Detac_h Tab"), NULL, N_ ("Open current folder in a new window"), G_CALLBACK (thunar_window_action_detach_tab), },
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list