[Xfce4-commits] [xfce/xfce4-panel] 01/01: Replace GtkStock with icon names and standard strings
noreply at xfce.org
noreply at xfce.org
Mon Apr 10 23:01:12 CEST 2017
This is an automated email from the git hooks/post-receive script.
ochosi pushed a commit to branch master
in repository xfce/xfce4-panel.
commit ece74ef127fec731842b8a203ed17c3c8eced219
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Mon Apr 10 22:59:49 2017 +0200
Replace GtkStock with icon names and standard strings
References:
* https://developer.gnome.org/gtk3/stable/gtk3-Stock-Items.html
* https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html#names
---
libxfce4panel/xfce-panel-plugin.c | 10 ++--
panel/panel-item-dialog.c | 15 +++--
panel/panel-preferences-dialog.glade | 10 ++--
panel/panel-window.c | 8 +--
plugins/actions/actions-dialog.glade | 8 +--
.../applicationsmenu/applicationsmenu-dialog.glade | 8 +--
plugins/applicationsmenu/applicationsmenu.c | 4 +-
plugins/clock/clock-dialog.glade | 8 +--
plugins/directorymenu/directorymenu-dialog.glade | 8 +--
plugins/directorymenu/directorymenu.c | 6 +-
plugins/launcher/launcher-dialog.c | 2 +-
plugins/launcher/launcher-dialog.glade | 68 +++++++++++++---------
plugins/pager/pager-dialog.glade | 8 +--
plugins/separator/separator-dialog.glade | 8 +--
plugins/systray/systray-dialog.glade | 10 ++--
plugins/tasklist/tasklist-dialog.glade | 8 +--
plugins/tasklist/tasklist-widget.c | 6 +-
plugins/windowmenu/windowmenu-dialog.glade | 8 +--
plugins/windowmenu/windowmenu.c | 6 +-
19 files changed, 111 insertions(+), 98 deletions(-)
diff --git a/libxfce4panel/xfce-panel-plugin.c b/libxfce4panel/xfce-panel-plugin.c
index e5ba399..5bbbd3b 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -1031,8 +1031,8 @@ xfce_panel_plugin_menu_remove (XfcePanelPlugin *plugin)
gtk_widget_get_screen (GTK_WIDGET (plugin)));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("If you remove the item from the panel, it is permanently lost."));
- gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL,
- GTK_RESPONSE_NO, GTK_STOCK_REMOVE, GTK_RESPONSE_YES, NULL);
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("Cancel"),
+ GTK_RESPONSE_NO, _("Remove"), GTK_RESPONSE_YES, NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_NO);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
@@ -1196,7 +1196,7 @@ xfce_panel_plugin_menu_get (XfcePanelPlugin *plugin)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
- image = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
@@ -1238,7 +1238,7 @@ xfce_panel_plugin_menu_get (XfcePanelPlugin *plugin)
gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
gtk_widget_show (item);
- image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
@@ -1249,7 +1249,7 @@ xfce_panel_plugin_menu_get (XfcePanelPlugin *plugin)
gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
gtk_widget_show (item);
- image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("preferences-system", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
diff --git a/panel/panel-item-dialog.c b/panel/panel-item-dialog.c
index 7e70ab1..d5cb6d4 100644
--- a/panel/panel-item-dialog.c
+++ b/panel/panel-item-dialog.c
@@ -167,6 +167,7 @@ panel_item_dialog_init (PanelItemDialog *dialog)
GtkWidget *entry;
GtkWidget *scroll;
GtkWidget *treeview;
+ GtkWidget *icon;
GtkTreeModel *filter;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
@@ -189,16 +190,18 @@ panel_item_dialog_init (PanelItemDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Add New Items"));
xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog),
_("Add new plugins to the panel"));
- gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_ADD);
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "list-add");
gtk_window_set_default_size (GTK_WINDOW (dialog), 350, 450);
gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_NORMAL);
- dialog->add_button = gtk_button_new_from_stock (GTK_STOCK_ADD);
- gtk_widget_show (dialog->add_button);
+ icon = gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_BUTTON);
+ dialog->add_button = gtk_button_new_with_mnemonic ("_Add");
+ gtk_button_set_image (dialog->add_button, GTK_IMAGE (icon));
+ gtk_widget_show_all (dialog->add_button);
- gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_HELP, GTK_RESPONSE_HELP);
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("Help"), GTK_RESPONSE_HELP);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), dialog->add_button, GTK_RESPONSE_OK);
- gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("Close"), GTK_RESPONSE_CLOSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BORDER * 2);
@@ -514,7 +517,7 @@ panel_item_dialog_drag_begin (GtkWidget *treeview,
else
{
/* plugin is not usable */
- gtk_drag_set_icon_name (context, GTK_STOCK_CANCEL, 0, 0);
+ gtk_drag_set_icon_name (context, "window-close", 0, 0);
}
g_object_unref (G_OBJECT (module));
diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.glade
index da9896d..803d80a 100644
--- a/panel/panel-preferences-dialog.glade
+++ b/panel/panel-preferences-dialog.glade
@@ -127,11 +127,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button-close">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -141,11 +141,11 @@
</child>
<child>
<object class="GtkButton" id="button-help">
- <property name="label">gtk-help</property>
+ <property name="label">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -909,7 +909,7 @@
<object class="GtkImage" id="image9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-info</property>
+ <property name="icon_name">dialog-information</property>
<property name="icon_size">5</property>
</object>
<packing>
diff --git a/panel/panel-window.c b/panel/panel-window.c
index 81231e8..e719048 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -2722,7 +2722,7 @@ panel_window_menu_popup (PanelWindow *window,
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
- image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
@@ -2733,7 +2733,7 @@ panel_window_menu_popup (PanelWindow *window,
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
- image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("preferences-system", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
@@ -2770,14 +2770,14 @@ panel_window_menu_popup (PanelWindow *window,
gtk_widget_show (item);
/* help item */
- item = gtk_image_menu_item_new_from_stock (GTK_STOCK_HELP, NULL);
+ item = gtk_image_menu_item_new_with_mnemonic ("_Help");
g_signal_connect (G_OBJECT (item), "activate",
G_CALLBACK (panel_window_menu_help), NULL);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
/* about item */
- item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ABOUT, NULL);
+ item = gtk_image_menu_item_new_with_mnemonic ("_About");
g_signal_connect (G_OBJECT (item), "activate",
G_CALLBACK (panel_dialogs_show_about), NULL);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
diff --git a/plugins/actions/actions-dialog.glade b/plugins/actions/actions-dialog.glade
index aee151d..0c889a5 100644
--- a/plugins/actions/actions-dialog.glade
+++ b/plugins/actions/actions-dialog.glade
@@ -49,11 +49,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close-button">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -63,11 +63,11 @@
</child>
<child>
<object class="GtkButton" id="help-button">
- <property name="label">gtk-help</property>
+ <property name="label">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/plugins/applicationsmenu/applicationsmenu-dialog.glade b/plugins/applicationsmenu/applicationsmenu-dialog.glade
index 1016e1c..14b6efc 100644
--- a/plugins/applicationsmenu/applicationsmenu-dialog.glade
+++ b/plugins/applicationsmenu/applicationsmenu-dialog.glade
@@ -26,11 +26,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="help-button">
- <property name="label">gtk-help</property>
+ <property name="label">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -41,11 +41,11 @@
</child>
<child>
<object class="GtkButton" id="close-button">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/plugins/applicationsmenu/applicationsmenu.c b/plugins/applicationsmenu/applicationsmenu.c
index c717b59..00e22b4 100644
--- a/plugins/applicationsmenu/applicationsmenu.c
+++ b/plugins/applicationsmenu/applicationsmenu.c
@@ -535,8 +535,8 @@ applications_menu_plugin_configure_plugin_icon_chooser (GtkWidget *
chooser = exo_icon_chooser_dialog_new (_("Select An Icon"),
GTK_WINDOW (gtk_widget_get_toplevel (button)),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ _("Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (chooser),
diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade
index 6cdb0a6..cf1a3aa 100644
--- a/plugins/clock/clock-dialog.glade
+++ b/plugins/clock/clock-dialog.glade
@@ -55,11 +55,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close-button">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -69,11 +69,11 @@
</child>
<child>
<object class="GtkButton" id="help-button">
- <property name="label">gtk-help</property>
+ <property name="label">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/plugins/directorymenu/directorymenu-dialog.glade b/plugins/directorymenu/directorymenu-dialog.glade
index ce32ec9..43ce446 100644
--- a/plugins/directorymenu/directorymenu-dialog.glade
+++ b/plugins/directorymenu/directorymenu-dialog.glade
@@ -21,11 +21,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close-button">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -35,11 +35,11 @@
</child>
<child>
<object class="GtkButton" id="help-button">
- <property name="label">gtk-help</property>
+ <property name="label">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/plugins/directorymenu/directorymenu.c b/plugins/directorymenu/directorymenu.c
index 3564f69..8d4c5a5 100644
--- a/plugins/directorymenu/directorymenu.c
+++ b/plugins/directorymenu/directorymenu.c
@@ -396,8 +396,8 @@ directory_menu_plugin_configure_plugin_icon_chooser (GtkWidget *button
chooser = exo_icon_chooser_dialog_new (_("Select An Icon"),
GTK_WINDOW (gtk_widget_get_toplevel (button)),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ _("Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (chooser),
@@ -814,7 +814,7 @@ directory_menu_plugin_menu_load (GtkWidget *menu,
g_object_ref (dir), (GClosureNotify) g_object_unref, 0);
gtk_widget_show (mi);
- image = gtk_image_new_from_stock (GTK_STOCK_OPEN, menu_icon_size);
+ image = gtk_image_new_from_icon_name ("folder-open", menu_icon_size);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image);
gtk_widget_show (image);
diff --git a/plugins/launcher/launcher-dialog.c b/plugins/launcher/launcher-dialog.c
index 9a68bbc..fc4e6f6 100644
--- a/plugins/launcher/launcher-dialog.c
+++ b/plugins/launcher/launcher-dialog.c
@@ -844,7 +844,7 @@ launcher_dialog_item_button_clicked (GtkWidget *button,
/* ask the user */
toplevel = gtk_widget_get_toplevel (button);
- if (xfce_dialog_confirm (GTK_WINDOW (toplevel), GTK_STOCK_DELETE, NULL,
+ if (xfce_dialog_confirm (GTK_WINDOW (toplevel), "edit-delete", NULL,
_("If you delete an item, it will be permanently removed"),
_("Are you sure you want to remove \"%s\"?"),
panel_str_is_empty (display_name) ? _("Unnamed item") : display_name))
diff --git a/plugins/launcher/launcher-dialog.glade b/plugins/launcher/launcher-dialog.glade
index 10f5e80..c0e71c2 100644
--- a/plugins/launcher/launcher-dialog.glade
+++ b/plugins/launcher/launcher-dialog.glade
@@ -43,12 +43,12 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button-add">
- <property name="label">gtk-add</property>
+ <property name="label">_Add</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -58,11 +58,11 @@
</child>
<child>
<object class="GtkButton" id="button5">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -209,20 +209,20 @@
<object class="GtkImage" id="image11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-edit</property>
+ <property name="icon_name">gtk-edit</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-delete</property>
<property name="icon_size">1</property>
+ <property name="icon_name">edit-delete</property>
</object>
<object class="GtkImage" id="image13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-new</property>
<property name="icon_size">1</property>
+ <property name="icon_name">document-new</property>
</object>
<object class="GtkImage" id="image14">
<property name="visible">True</property>
@@ -233,28 +233,38 @@
<object class="GtkImage" id="image15">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-add</property>
<property name="icon_size">1</property>
+ <property name="icon_name">list-add</property>
+ </object>
+ <object class="GtkImage" id="image16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_size">1</property>
+ <property name="icon_name">go-up</property>
+ </object>
+ <object class="GtkImage" id="image18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_size">1</property>
+ <property name="icon_name">go-down</property>
</object>
<object class="GtkMenu" id="popup-menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="mi-move-up">
- <property name="label">gtk-go-up</property>
+ <property name="label">Up</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
+ <property name="image">image16</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="mi-move-down">
- <property name="label">gtk-go-down</property>
+ <property name="label">Down</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
+ <property name="image">image18</property>
</object>
</child>
<child>
@@ -270,7 +280,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image11</property>
- <property name="use_stock">False</property>
</object>
</child>
<child>
@@ -280,7 +289,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image12</property>
- <property name="use_stock">False</property>
</object>
</child>
<child>
@@ -296,7 +304,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image15</property>
- <property name="use_stock">False</property>
</object>
</child>
<child>
@@ -312,7 +319,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image13</property>
- <property name="use_stock">False</property>
</object>
</child>
<child>
@@ -322,10 +328,14 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image14</property>
- <property name="use_stock">False</property>
</object>
</child>
</object>
+ <object class="GtkImage" id="image17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">go-up</property>
+ </object>
<object class="GtkListStore" id="item-store">
<columns>
<!-- column-name icon -->
@@ -359,11 +369,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="help-button">
- <property name="label">gtk-help</property>
+ <property name="label">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -374,11 +384,11 @@
</child>
<child>
<object class="GtkButton" id="button2">
- <property name="label">gtk-close</property>
+ <property name="label">Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -473,7 +483,7 @@
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-go-up</property>
+ <property name="icon_name">go-up</property>
</object>
</child>
</object>
@@ -493,7 +503,7 @@
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-go-down</property>
+ <property name="icon_name">go-down</property>
</object>
</child>
</object>
@@ -513,7 +523,7 @@
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-add</property>
+ <property name="icon_name">list-add</property>
</object>
</child>
</object>
@@ -533,7 +543,7 @@
<object class="GtkImage" id="image10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-new</property>
+ <property name="icon_name">document-new</property>
</object>
</child>
</object>
@@ -553,7 +563,7 @@
<object class="GtkImage" id="image9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-delete</property>
+ <property name="icon_name">edit-delete</property>
</object>
</child>
</object>
@@ -573,7 +583,7 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-edit</property>
+ <property name="icon_name">gtk-edit</property>
</object>
</child>
</object>
diff --git a/plugins/pager/pager-dialog.glade b/plugins/pager/pager-dialog.glade
index dd0a35a..f1c459d 100644
--- a/plugins/pager/pager-dialog.glade
+++ b/plugins/pager/pager-dialog.glade
@@ -170,11 +170,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close-button">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -184,11 +184,11 @@
</child>
<child>
<object class="GtkButton" id="help-button">
- <property name="label">gtk-help</property>
+ <property name="label">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/plugins/separator/separator-dialog.glade b/plugins/separator/separator-dialog.glade
index 56f8985..c710bb0 100644
--- a/plugins/separator/separator-dialog.glade
+++ b/plugins/separator/separator-dialog.glade
@@ -41,11 +41,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close-button">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -55,11 +55,11 @@
</child>
<child>
<object class="GtkButton" id="help-button">
- <property name="label">gtk-help</property>
+ <property name="label">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/plugins/systray/systray-dialog.glade b/plugins/systray/systray-dialog.glade
index f6120d6..05854a2 100644
--- a/plugins/systray/systray-dialog.glade
+++ b/plugins/systray/systray-dialog.glade
@@ -18,7 +18,7 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-clear</property>
+ <property name="icon_name">edit-clear</property>
</object>
<object class="GtkAdjustment" id="size-adjustment">
<property name="lower">12</property>
@@ -47,11 +47,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close-button">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -61,11 +61,11 @@
</child>
<child>
<object class="GtkButton" id="help-button">
- <property name="label">gtk-help</property>
+ <property name="label">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/plugins/tasklist/tasklist-dialog.glade b/plugins/tasklist/tasklist-dialog.glade
index f1367ed..204bcb9 100644
--- a/plugins/tasklist/tasklist-dialog.glade
+++ b/plugins/tasklist/tasklist-dialog.glade
@@ -78,12 +78,12 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close-button">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -93,12 +93,12 @@
</child>
<child>
<object class="GtkButton" id="help-button">
- <property name="label">gtk-help</property>
+ <property name="label">_Help</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c
index de782a0..e412468 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -3416,7 +3416,7 @@ xfce_tasklist_group_button_menu (XfceTasklistChild *group_child,
g_signal_connect_swapped (G_OBJECT (mi), "activate",
G_CALLBACK (xfce_tasklist_group_button_menu_minimize_all), group_child);
gtk_widget_show (mi);
- image = gtk_image_new_from_stock ("wnck-stock-minimize", GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("wnck-stock-minimize", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image);
gtk_widget_show (image);
@@ -3431,7 +3431,7 @@ xfce_tasklist_group_button_menu (XfceTasklistChild *group_child,
g_signal_connect_swapped (G_OBJECT (mi), "activate",
G_CALLBACK (xfce_tasklist_group_button_menu_maximize_all), group_child);
gtk_widget_show (mi);
- image = gtk_image_new_from_stock ("wnck-stock-maximize", GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("wnck-stock-maximize", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image);
gtk_widget_show (image);
@@ -3451,7 +3451,7 @@ xfce_tasklist_group_button_menu (XfceTasklistChild *group_child,
G_CALLBACK (xfce_tasklist_group_button_menu_close_all), group_child);
gtk_widget_show (mi);
- image = gtk_image_new_from_stock ("wnck-stock-delete", GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("wnck-stock-delete", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image);
gtk_widget_show (image);
}
diff --git a/plugins/windowmenu/windowmenu-dialog.glade b/plugins/windowmenu/windowmenu-dialog.glade
index 8cb5cbd..2c89452 100644
--- a/plugins/windowmenu/windowmenu-dialog.glade
+++ b/plugins/windowmenu/windowmenu-dialog.glade
@@ -35,11 +35,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close-button">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -49,11 +49,11 @@
</child>
<child>
<object class="GtkButton" id="help-button">
- <property name="label">gtk-help</property>
+ <property name="label">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
index 0c7f327..da3375f 100644
--- a/plugins/windowmenu/windowmenu.c
+++ b/plugins/windowmenu/windowmenu.c
@@ -659,7 +659,7 @@ window_menu_plugin_active_window_changed (WnckScreen *screen,
if (G_LIKELY (pixbuf != NULL))
gtk_image_set_from_pixbuf (icon, pixbuf);
else {
- gtk_image_set_from_icon_name (icon, GTK_STOCK_MISSING_IMAGE, icon_size);
+ gtk_image_set_from_icon_name (icon, "image-missing", icon_size);
gtk_image_set_pixel_size (icon, icon_size);
}
}
@@ -1326,7 +1326,7 @@ window_menu_plugin_menu_new (WindowMenuPlugin *plugin)
G_CALLBACK (window_menu_plugin_workspace_add), plugin);
gtk_widget_show (mi);
- image = gtk_image_new_from_stock (GTK_STOCK_ADD, menu_icon_size);
+ image = gtk_image_new_from_icon_name ("list-add", menu_icon_size);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image);
gtk_widget_show (mi);
@@ -1354,7 +1354,7 @@ window_menu_plugin_menu_new (WindowMenuPlugin *plugin)
g_free (label);
g_free (utf8);
- image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, menu_icon_size);
+ image = gtk_image_new_from_icon_name ("list-remove", menu_icon_size);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image);
gtk_widget_show (mi);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list