[Xfce4-commits] [xfce/xfdesktop] 26/34: Migrate from stock icons to named icons for desktop menu
noreply at xfce.org
noreply at xfce.org
Sun Apr 16 07:07:00 CEST 2017
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository xfce/xfdesktop.
commit 4f13190b1970a18b4c090317cee4541bed781600
Author: Eric Koegel <eric.koegel at gmail.com>
Date: Fri Apr 14 15:37:42 2017 +0300
Migrate from stock icons to named icons for desktop menu
---
src/xfdesktop-file-icon-manager.c | 17 ++++++++---------
src/xfdesktop-special-file-icon.c | 10 +++-------
src/xfdesktop-volume-icon.c | 18 +++++++-----------
3 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
index 1ee8a4c..fcdaac1 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -1437,8 +1437,7 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
if(!got_custom_menu) {
if(multi_sel) {
- img = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
- gtk_widget_show(img);
+ img = gtk_image_new_from_icon_name("document-open", GTK_ICON_SIZE_MENU);
mi = xfdesktop_menu_create_menu_item_with_mnemonic(_("_Open all"), img);
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
@@ -1451,7 +1450,7 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
} else if(info) {
if(g_file_info_get_file_type(info) == G_FILE_TYPE_DIRECTORY) {
- img = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+ img = gtk_image_new_from_icon_name("document-open", GTK_ICON_SIZE_MENU);
if(file_icon == fmanager->priv->desktop_icon)
mi = xfdesktop_menu_create_menu_item_with_mnemonic(_("_Open in New Window"), img);
else
@@ -1514,7 +1513,7 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
/* create document submenu, 0 disables the sub-menu */
if(fmanager->priv->max_templates > 0) {
- img = gtk_image_new_from_stock(GTK_STOCK_NEW, GTK_ICON_SIZE_MENU);
+ img = gtk_image_new_from_icon_name("document-new", GTK_ICON_SIZE_MENU);
mi = xfdesktop_menu_create_menu_item_with_mnemonic(_("Create _Document"), img);
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
@@ -1554,7 +1553,7 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
gtk_menu_shell_append(GTK_MENU_SHELL(tmpl_menu), mi);
/* add the "Empty File" template option */
- img = gtk_image_new_from_stock(GTK_STOCK_FILE, GTK_ICON_SIZE_MENU);
+ img = gtk_image_new_from_icon_name("text-x-generic", GTK_ICON_SIZE_MENU);
mi = xfdesktop_menu_create_menu_item_with_mnemonic(_("_Empty File"), img);
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(tmpl_menu), mi);
@@ -1569,7 +1568,7 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
}
} else {
if(xfdesktop_file_utils_file_is_executable(info)) {
- img = gtk_image_new_from_stock(GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU);
+ img = gtk_image_new_from_icon_name("system-run", GTK_ICON_SIZE_MENU);
mi = xfdesktop_menu_create_menu_item_with_mnemonic(_("_Execute"), img);
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
@@ -1685,7 +1684,6 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
/* free the app info list */
g_list_free(app_infos);
} else {
- img = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
img = gtk_image_new_from_icon_name("document-open", GTK_ICON_SIZE_MENU);
mi = xfdesktop_menu_create_menu_item_with_mnemonic(_("Open With Other _Application..."), img);
gtk_widget_show(mi);
@@ -1860,7 +1858,7 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
if(file_icon == fmanager->priv->desktop_icon) {
/* Menu on the root desktop window */
/* show arrange desktop icons option */
- img = gtk_image_new_from_stock(GTK_STOCK_SORT_ASCENDING, GTK_ICON_SIZE_MENU);
+ img = gtk_image_new_from_icon_name("view-sort-ascending", GTK_ICON_SIZE_MENU);
mi = xfdesktop_menu_create_menu_item_with_mnemonic(_("Arrange Desktop _Icons"), img);
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
@@ -1869,7 +1867,7 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
fmanager);
/* Desktop settings window */
- img = gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU);
+ img = gtk_image_new_from_icon_name("preferences-desktop-wallpaper", GTK_ICON_SIZE_MENU);
mi = xfdesktop_menu_create_menu_item_with_mnemonic(_("Desktop _Settings..."), img);
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
@@ -1878,6 +1876,7 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
}
/* Properties - applies to desktop window or an icon on the desktop */
+ img = gtk_image_new_from_icon_name("document-properties", GTK_ICON_SIZE_MENU);
mi = xfdesktop_menu_create_menu_item_with_mnemonic(_("P_roperties..."), img);
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
diff --git a/src/xfdesktop-special-file-icon.c b/src/xfdesktop-special-file-icon.c
index b9b9fff..c255665 100644
--- a/src/xfdesktop-special-file-icon.c
+++ b/src/xfdesktop-special-file-icon.c
@@ -544,10 +544,8 @@ xfdesktop_special_file_icon_populate_context_menu(XfdesktopIcon *icon,
if(XFDESKTOP_SPECIAL_FILE_ICON_TRASH != special_file_icon->priv->type)
return FALSE;
- img = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
- gtk_widget_show(img);
- mi = gtk_image_menu_item_new_with_mnemonic(_("_Open"));
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
+ img = gtk_image_new_from_icon_name("document-open", GTK_ICON_SIZE_MENU);
+ mi = xfdesktop_menu_create_menu_item_with_mnemonic(_("_Open"), img);
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
g_signal_connect(G_OBJECT(mi), "activate",
@@ -563,9 +561,7 @@ xfdesktop_special_file_icon_populate_context_menu(XfdesktopIcon *icon,
img = gtk_image_new_from_icon_name("user-trash-full", GTK_ICON_SIZE_MENU);
}
- mi = gtk_image_menu_item_new_with_mnemonic(_("_Empty Trash"));
- if(img)
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
+ mi = xfdesktop_menu_create_menu_item_with_mnemonic(_("_Empty Trash"), img);
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
if(special_file_icon->priv->trash_item_count > 0) {
diff --git a/src/xfdesktop-volume-icon.c b/src/xfdesktop-volume-icon.c
index 7f623d0..72d696e 100644
--- a/src/xfdesktop-volume-icon.c
+++ b/src/xfdesktop-volume-icon.c
@@ -785,9 +785,7 @@ xfdesktop_volume_icon_add_context_menu_option(XfdesktopIcon *icon,
GtkWidget *mi, *img;
img = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_MENU);
- gtk_widget_show(img);
- mi = gtk_image_menu_item_new_with_mnemonic(icon_label);
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
+ mi = xfdesktop_menu_create_menu_item_with_mnemonic(icon_label, img);
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
if(callback != NULL) {
@@ -809,12 +807,10 @@ xfdesktop_volume_icon_populate_context_menu(XfdesktopIcon *icon,
GMount *mount;
const gchar *icon_name, *icon_label;
- icon_name = GTK_STOCK_OPEN;
+ icon_name = "document-open";
- img = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
- gtk_widget_show(img);
- mi = gtk_image_menu_item_new_with_mnemonic(_("_Open"));
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
+ img = gtk_image_new_from_icon_name("document-open", GTK_ICON_SIZE_MENU);
+ mi = xfdesktop_menu_create_menu_item_with_mnemonic(_("_Open"), img);
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
g_signal_connect_swapped(G_OBJECT(mi), "activate",
@@ -834,14 +830,14 @@ xfdesktop_volume_icon_populate_context_menu(XfdesktopIcon *icon,
}
if(mount && g_mount_can_unmount(mount)) {
- icon_name = NULL;
+ icon_name = "drive-removable-media";
icon_label = _("_Unmount Volume");
xfdesktop_volume_icon_add_context_menu_option(icon, icon_name, icon_label,
menu, G_CALLBACK(xfdesktop_volume_icon_menu_unmount));
}
if(!mount && g_volume_can_mount(volume)) {
- icon_name = NULL;
+ icon_name = "drive-removable-media";
icon_label = _("_Mount Volume");
xfdesktop_volume_icon_add_context_menu_option(icon, icon_name, icon_label,
menu, G_CALLBACK(xfdesktop_volume_icon_menu_mount));
@@ -854,7 +850,7 @@ xfdesktop_volume_icon_populate_context_menu(XfdesktopIcon *icon,
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
- icon_name = GTK_STOCK_PROPERTIES;
+ icon_name = "document-properties";
icon_label = _("P_roperties...");
if(!volume_icon->priv->file_info)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list