From c8b29025447e9f896c43786426201e9aba42cfd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20K=C3=BCmmerlin?= <rgcjonas@gmail.com>
Date: Mon, 10 Aug 2015 14:23:20 +0200
Subject: [PATCH] Get rid of GTK_STOCK_*
While we're at it, also remove some instances of GtkImageMenuItem
and introduce symbolic icons in the places we're messing with.
---
plugins/thunar-sendto-email/main.c | 6 +--
plugins/thunar-uca/thunar-uca-chooser.c | 22 ++++-----
plugins/thunar-uca/thunar-uca-editor.c | 18 +++----
thunar/thunar-application.c | 6 +--
thunar/thunar-chooser-dialog.c | 19 +++----
thunar/thunar-column-editor.c | 10 ++--
thunar/thunar-create-dialog.c | 2 +-
thunar/thunar-dialogs.c | 8 +--
thunar/thunar-dnd.c | 2 +-
thunar/thunar-history-action.c | 14 +++---
thunar/thunar-history-action.h | 2 +-
thunar/thunar-history.c | 4 +-
thunar/thunar-launcher.c | 8 +--
thunar/thunar-location-buttons.c | 6 +--
thunar/thunar-location-dialog.c | 4 +-
thunar/thunar-location-entry.c | 2 +-
thunar/thunar-path-entry.c | 2 +-
thunar/thunar-permissions-chooser.c | 18 +++----
thunar/thunar-preferences-dialog.c | 4 +-
thunar/thunar-progress-view.c | 4 --
thunar/thunar-properties-dialog.c | 8 +--
thunar/thunar-renamer-dialog.c | 22 ++++-----
thunar/thunar-renamer-progress.c | 6 +--
thunar/thunar-standard-view.c | 14 +++---
thunar/thunar-templates-action.c | 6 +--
thunar/thunar-tree-view.c | 66 ++++++-------------------
thunar/thunar-window.c | 10 ++--
27 files changed, 123 insertions(+), 170 deletions(-)
diff --git a/plugins/thunar-sendto-email/main.c b/plugins/thunar-sendto-email/main.c
index 7c56c3049..3aed4c297 100644
--- a/plugins/thunar-sendto-email/main.c
+++ b/plugins/thunar-sendto-email/main.c
@@ -195,7 +195,7 @@ tse_ask_compress (GList *infos)
message = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
_("Send \"%s\" as compressed archive?"),
g_file_info_get_display_name (tse_data->info));
- gtk_dialog_add_button (GTK_DIALOG (message), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (message), _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (message), _("Send _directly"), TSE_RESPONSE_PLAIN);
gtk_dialog_add_button (GTK_DIALOG (message), _("Send com_pressed"), TSE_RESPONSE_COMPRESS);
gtk_dialog_set_default_response (GTK_DIALOG (message), TSE_RESPONSE_COMPRESS);
@@ -214,7 +214,7 @@ tse_ask_compress (GList *infos)
"Send %d files as compressed archive?",
n_infos),
n_infos);
- gtk_dialog_add_button (GTK_DIALOG (message), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (message), _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (message), _("Send _directly"), TSE_RESPONSE_PLAIN);
gtk_dialog_add_button (GTK_DIALOG (message), _("Send as _archive"), TSE_RESPONSE_COMPRESS);
gtk_dialog_set_default_response (GTK_DIALOG (message), TSE_RESPONSE_COMPRESS);
@@ -269,7 +269,7 @@ tse_progress (const gchar *working_directory,
/* allocate the progress dialog */
dialog = gtk_dialog_new_with_buttons (_("Compressing files..."),
NULL, 0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
gtk_window_set_default_size (GTK_WINDOW (dialog), 300, -1);
diff --git a/plugins/thunar-uca/thunar-uca-chooser.c b/plugins/thunar-uca/thunar-uca-chooser.c
index e3731a6bf..0e16ae573 100644
--- a/plugins/thunar-uca/thunar-uca-chooser.c
+++ b/plugins/thunar-uca/thunar-uca-chooser.c
@@ -107,8 +107,8 @@ thunar_uca_chooser_init (ThunarUcaChooser *uca_chooser)
GtkWidget *vbox;
/* configure the dialog window */
- gtk_dialog_add_button (GTK_DIALOG (uca_chooser), GTK_STOCK_HELP, GTK_RESPONSE_HELP);
- gtk_dialog_add_button (GTK_DIALOG (uca_chooser), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ gtk_dialog_add_button (GTK_DIALOG (uca_chooser), _("_Help"), GTK_RESPONSE_HELP);
+ gtk_dialog_add_button (GTK_DIALOG (uca_chooser), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_dialog_set_default_response (GTK_DIALOG (uca_chooser), GTK_RESPONSE_CLOSE);
gtk_window_set_default_size (GTK_WINDOW (uca_chooser), 500, 350);
gtk_window_set_destroy_with_parent (GTK_WINDOW (uca_chooser), TRUE);
@@ -119,7 +119,7 @@ thunar_uca_chooser_init (ThunarUcaChooser *uca_chooser)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (uca_chooser))), hbox, FALSE, TRUE, 0);
gtk_widget_show (hbox);
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DND);
+ image = gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_DND);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
@@ -174,7 +174,7 @@ thunar_uca_chooser_init (ThunarUcaChooser *uca_chooser)
g_signal_connect_swapped (G_OBJECT (uca_chooser->add_button), "clicked", G_CALLBACK (thunar_uca_chooser_add_clicked), uca_chooser);
gtk_widget_show (uca_chooser->add_button);
- image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (uca_chooser->add_button), image);
gtk_widget_show (image);
@@ -184,7 +184,7 @@ thunar_uca_chooser_init (ThunarUcaChooser *uca_chooser)
g_signal_connect_swapped (G_OBJECT (uca_chooser->edit_button), "clicked", G_CALLBACK (thunar_uca_chooser_edit_clicked), uca_chooser);
gtk_widget_show (uca_chooser->edit_button);
- image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("emblem-system-symbolic", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (uca_chooser->edit_button), image);
gtk_widget_show (image);
@@ -194,7 +194,7 @@ thunar_uca_chooser_init (ThunarUcaChooser *uca_chooser)
g_signal_connect_swapped (G_OBJECT (uca_chooser->delete_button), "clicked", G_CALLBACK (thunar_uca_chooser_delete_clicked), uca_chooser);
gtk_widget_show (uca_chooser->delete_button);
- image = gtk_image_new_from_stock (GTK_STOCK_DELETE, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (uca_chooser->delete_button), image);
gtk_widget_show (image);
@@ -204,7 +204,7 @@ thunar_uca_chooser_init (ThunarUcaChooser *uca_chooser)
g_signal_connect_swapped (G_OBJECT (uca_chooser->up_button), "clicked", G_CALLBACK (thunar_uca_chooser_up_clicked), uca_chooser);
gtk_widget_show (uca_chooser->up_button);
- image = gtk_image_new_from_stock (GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("go-up-symbolic", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (uca_chooser->up_button), image);
gtk_widget_show (image);
@@ -214,7 +214,7 @@ thunar_uca_chooser_init (ThunarUcaChooser *uca_chooser)
g_signal_connect_swapped (G_OBJECT (uca_chooser->down_button), "clicked", G_CALLBACK (thunar_uca_chooser_down_clicked), uca_chooser);
gtk_widget_show (uca_chooser->down_button);
- image = gtk_image_new_from_stock (GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("go-down-symbolic", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (uca_chooser->down_button), image);
gtk_widget_show (image);
@@ -232,7 +232,7 @@ thunar_uca_chooser_key_press_event (GtkWidget *widget,
GdkEventKey *event)
{
/* close chooser window on Esc key press */
- if (G_UNLIKELY (event->keyval == GDK_Escape))
+ if (G_UNLIKELY (event->keyval == GDK_KEY_Escape))
{
gtk_dialog_response (GTK_DIALOG (widget), GTK_RESPONSE_CLOSE);
return TRUE;
@@ -434,8 +434,8 @@ thunar_uca_chooser_delete_clicked (ThunarUcaChooser *uca_chooser)
GTK_BUTTONS_NONE,
_("Are you sure that you want to delete\naction \"%s\"?"), name);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("If you delete a custom action, it is permanently lost."));
- gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_DELETE, GTK_RESPONSE_YES, NULL);
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Delete"), GTK_RESPONSE_YES, NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
g_free (name);
response = gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/plugins/thunar-uca/thunar-uca-editor.c b/plugins/thunar-uca/thunar-uca-editor.c
index 1ee01177d..2ca7ead06 100644
--- a/plugins/thunar-uca/thunar-uca-editor.c
+++ b/plugins/thunar-uca/thunar-uca-editor.c
@@ -104,8 +104,8 @@ thunar_uca_editor_init (ThunarUcaEditor *uca_editor)
GtkWidget *vbox;
/* configure the dialog properties */
- gtk_dialog_add_button (GTK_DIALOG (uca_editor), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- gtk_dialog_add_button (GTK_DIALOG (uca_editor), GTK_STOCK_OK, GTK_RESPONSE_OK);
+ gtk_dialog_add_button (GTK_DIALOG (uca_editor), _("_Cancel"), GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (uca_editor), _("_OK"), GTK_RESPONSE_OK);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (uca_editor), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (uca_editor), GTK_RESPONSE_OK);
gtk_window_set_destroy_with_parent (GTK_WINDOW (uca_editor), TRUE);
@@ -189,7 +189,7 @@ thunar_uca_editor_init (ThunarUcaEditor *uca_editor)
g_signal_connect_swapped (G_OBJECT (button), "clicked", G_CALLBACK (thunar_uca_editor_command_clicked), uca_editor);
gtk_widget_show (button);
- image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
@@ -238,7 +238,7 @@ thunar_uca_editor_init (ThunarUcaEditor *uca_editor)
gtk_table_attach (GTK_TABLE (table), hbox, 0, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (hbox);
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DND);
+ image = gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_DND);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
@@ -437,7 +437,7 @@ thunar_uca_editor_init (ThunarUcaEditor *uca_editor)
gtk_table_attach (GTK_TABLE (table), hbox, 0, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (hbox);
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DND);
+ image = gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_DND);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
@@ -473,8 +473,8 @@ thunar_uca_editor_command_clicked (ThunarUcaEditor *uca_editor)
chooser = gtk_file_chooser_dialog_new (_("Select an Application"),
GTK_WINDOW (uca_editor),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), TRUE);
@@ -607,8 +607,8 @@ thunar_uca_editor_icon_clicked (ThunarUcaEditor *uca_editor)
/* allocate the chooser dialog */
title = g_strdup_printf (_("Select an Icon for \"%s\""), name);
chooser = exo_icon_chooser_dialog_new (title, GTK_WINDOW (uca_editor),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 8ce6683c7..b4d585951 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -1825,8 +1825,8 @@ thunar_application_unlink_files (ThunarApplication *application,
if (G_UNLIKELY (window == NULL && screen != NULL))
gtk_window_set_screen (GTK_WINDOW (dialog), screen);
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_DELETE, GTK_RESPONSE_YES,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Delete"), GTK_RESPONSE_YES,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
@@ -2004,7 +2004,7 @@ thunar_application_empty_trash (ThunarApplication *application,
gtk_window_set_screen (GTK_WINDOW (dialog), screen);
gtk_window_set_startup_id (GTK_WINDOW (dialog), startup_id);
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Empty Trash"), GTK_RESPONSE_YES,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
diff --git a/thunar/thunar-chooser-dialog.c b/thunar/thunar-chooser-dialog.c
index 6389b7a94..45eedf5f3 100644
--- a/thunar/thunar-chooser-dialog.c
+++ b/thunar/thunar-chooser-dialog.c
@@ -287,10 +287,10 @@ thunar_chooser_dialog_init (ThunarChooserDialog *dialog)
gtk_widget_show (dialog->default_button);
/* add the "Cancel" button */
- dialog->cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ dialog->cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
/* add the "Ok"/"Open" button */
- dialog->accept_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
+ dialog->accept_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_OK"), GTK_RESPONSE_ACCEPT);
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
@@ -571,15 +571,12 @@ thunar_chooser_dialog_context_menu (ThunarChooserDialog *dialog,
menu = gtk_menu_new ();
/* append the "Remove Launcher" item */
- item = gtk_image_menu_item_new_with_mnemonic (_("_Remove Launcher"));
+ item = gtk_menu_item_new_with_mnemonic (_("_Remove Launcher"));
gtk_widget_set_sensitive (item, g_app_info_can_delete (app_info));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_chooser_dialog_action_remove), dialog);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
- image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-
/* run the menu on the dialog's screen (takes over the floating of menu) */
thunar_gtk_menu_run (GTK_MENU (menu), GTK_WIDGET (dialog), NULL, NULL, button, timestamp);
@@ -716,8 +713,8 @@ thunar_chooser_dialog_action_remove (ThunarChooserDialog *dialog)
GTK_BUTTONS_NONE,
_("Are you sure that you want to remove \"%s\"?"), name);
gtk_dialog_add_buttons (GTK_DIALOG (message),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_REMOVE, GTK_RESPONSE_YES,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Remove"), GTK_RESPONSE_YES,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (message), GTK_RESPONSE_YES);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), _("This will remove the application launcher that appears in the file "
@@ -764,8 +761,8 @@ thunar_chooser_dialog_browse_clicked (GtkWidget *button,
chooser = gtk_file_chooser_dialog_new (_("Select an Application"),
GTK_WINDOW (dialog),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), TRUE);
@@ -1166,7 +1163,7 @@ thunar_chooser_dialog_set_open (ThunarChooserDialog *dialog,
dialog->open = open;
/* change the accept button label text */
- gtk_button_set_label (GTK_BUTTON (dialog->accept_button), open ? GTK_STOCK_OPEN : GTK_STOCK_OK);
+ gtk_button_set_label (GTK_BUTTON (dialog->accept_button), open ? _("_Open") : _("_OK"));
/* notify listeners */
g_object_notify (G_OBJECT (dialog), "open");
diff --git a/thunar/thunar-column-editor.c b/thunar/thunar-column-editor.c
index 64df763bb..58fe6f4bc 100644
--- a/thunar/thunar-column-editor.c
+++ b/thunar/thunar-column-editor.c
@@ -115,13 +115,13 @@ thunar_column_editor_init (ThunarColumnEditor *column_editor)
column_editor, NULL, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
/* setup the dialog */
- gtk_dialog_add_button (GTK_DIALOG (column_editor), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ gtk_dialog_add_button (GTK_DIALOG (column_editor), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_dialog_set_default_response (GTK_DIALOG (column_editor), GTK_RESPONSE_CLOSE);
gtk_window_set_resizable (GTK_WINDOW (column_editor), FALSE);
gtk_window_set_title (GTK_WINDOW (column_editor), _("Configure Columns in the Detailed List View"));
/* add the "Help" button */
- button = gtk_button_new_from_stock (GTK_STOCK_HELP);
+ button = gtk_button_new_with_mnemonic (_("_Help"));
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (thunar_column_editor_help_clicked), column_editor);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (column_editor))), button, FALSE, FALSE, 0);
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (column_editor))), button, TRUE);
@@ -195,7 +195,8 @@ thunar_column_editor_init (ThunarColumnEditor *column_editor)
gtk_table_attach (GTK_TABLE (table), column_editor->up_button, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
gtk_widget_show (column_editor->up_button);
- image = gtk_image_new_from_stock (GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("go-up-symbolic", GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_always_show_image (GTK_BUTTON (column_editor->up_button), TRUE);
gtk_button_set_image (GTK_BUTTON (column_editor->up_button), image);
gtk_widget_show (image);
@@ -205,7 +206,8 @@ thunar_column_editor_init (ThunarColumnEditor *column_editor)
gtk_table_attach (GTK_TABLE (table), column_editor->down_button, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
gtk_widget_show (column_editor->down_button);
- image = gtk_image_new_from_stock (GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("go-down-symbolic", GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_always_show_image (GTK_BUTTON (column_editor->down_button), TRUE);
gtk_button_set_image (GTK_BUTTON (column_editor->down_button), image);
gtk_widget_show (image);
diff --git a/thunar/thunar-create-dialog.c b/thunar/thunar-create-dialog.c
index 3d5edc851..88e9f2589 100644
--- a/thunar/thunar-create-dialog.c
+++ b/thunar/thunar-create-dialog.c
@@ -138,7 +138,7 @@ thunar_create_dialog_init (ThunarCreateDialog *dialog)
/* configure the dialog itself */
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
_("C_reate"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
index 90824605d..408fcdcac 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -95,7 +95,7 @@ thunar_dialogs_show_rename_file (gpointer parent,
window,
GTK_DIALOG_MODAL
| GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Rename"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -539,7 +539,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
parent,
GTK_DIALOG_MODAL
| GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
_("S_kip All"), THUNAR_JOB_RESPONSE_NO_ALL,
_("_Skip"), THUNAR_JOB_RESPONSE_NO,
_("Replace _All"), THUNAR_JOB_RESPONSE_YES_ALL,
@@ -726,7 +726,7 @@ thunar_dialogs_show_job_error (GtkWindow *parent,
"%s", primary->str);
if (G_LIKELY (*secondary->str != '\0'))
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), "%s", secondary->str);
- gtk_dialog_add_button (GTK_DIALOG (message), GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (message), _("_Close"), GTK_RESPONSE_CANCEL);
gtk_dialog_run (GTK_DIALOG (message));
gtk_widget_destroy (message);
@@ -781,7 +781,7 @@ thunar_dialogs_show_insecure_program (gpointer parent,
gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Launch Anyway"), GTK_RESPONSE_OK);
if (thunar_file_is_chmodable (file))
gtk_dialog_add_button (GTK_DIALOG (dialog), _("Mark _Executable"), GTK_RESPONSE_APPLY);
- gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
if (screen != NULL && window == NULL)
gtk_window_set_screen (GTK_WINDOW (dialog), screen);
diff --git a/thunar/thunar-dnd.c b/thunar/thunar-dnd.c
index dbbbe41a7..aa8e173b3 100644
--- a/thunar/thunar-dnd.c
+++ b/thunar/thunar-dnd.c
@@ -170,7 +170,7 @@ thunar_dnd_ask (GtkWidget *widget,
}
/* append the cancel item */
- item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CANCEL, NULL);
+ item = gtk_menu_item_new_with_mnemonic (_("_Cancel"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
diff --git a/thunar/thunar-history-action.c b/thunar/thunar-history-action.c
index 5dc9a4013..18c3a57b6 100644
--- a/thunar/thunar-history-action.c
+++ b/thunar/thunar-history-action.c
@@ -233,9 +233,9 @@ thunar_history_action_toolbar_configured (GtkWidget *tool_item,
icon = gtk_bin_get_child (GTK_BIN (toggle_button));
action = g_object_get_data (G_OBJECT (toggle_button), I_("thunar-history-action"));
- gtk_image_set_from_stock (GTK_IMAGE (icon),
- gtk_action_get_stock_id (action),
- gtk_tool_item_get_icon_size (GTK_TOOL_ITEM (tool_item)));
+ gtk_image_set_from_icon_name (GTK_IMAGE (icon),
+ gtk_action_get_icon_name (action),
+ gtk_tool_item_get_icon_size (GTK_TOOL_ITEM (tool_item)));
}
@@ -260,7 +260,7 @@ thunar_history_action_create_tool_item (GtkAction *action)
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
gtk_widget_show (button);
- icon = gtk_image_new_from_stock (gtk_action_get_stock_id (action),
+ icon = gtk_image_new_from_icon_name (gtk_action_get_icon_name (action),
gtk_tool_item_get_icon_size (GTK_TOOL_ITEM (tool_item)));
gtk_container_add (GTK_CONTAINER (button), icon);
gtk_widget_show (icon);
@@ -350,7 +350,7 @@ thunar_history_action_show_menu (GtkWidget *toggle_button,
* @name : the name for the action.
* @label : the label for the action.
* @tooltip : the tooltip for the action.
- * @stock_id : the stock-id for the action.
+ * @iconname : the icon name for the action.
*
* Allocates a new #ThunarHistoryAction with the specified
* parameters.
@@ -361,7 +361,7 @@ GtkAction*
thunar_history_action_new (const gchar *name,
const gchar *label,
const gchar *tooltip,
- const gchar *stock_id)
+ const gchar *iconname)
{
gchar *fulltip;
GtkAction *action;
@@ -375,7 +375,7 @@ thunar_history_action_new (const gchar *name,
"name", name,
"label", label,
"tooltip", fulltip,
- "stock-id", stock_id,
+ "icon-name", iconname,
NULL);
g_free (fulltip);
diff --git a/thunar/thunar-history-action.h b/thunar/thunar-history-action.h
index 982d0175e..dc069e03a 100644
--- a/thunar/thunar-history-action.h
+++ b/thunar/thunar-history-action.h
@@ -39,7 +39,7 @@ GType thunar_history_action_get_type (void) G_GNUC_CONST;
GtkAction *thunar_history_action_new (const gchar *name,
const gchar *label,
const gchar *tooltip,
- const gchar *stock_id) G_GNUC_MALLOC;
+ const gchar *icon_name) G_GNUC_MALLOC;
G_END_DECLS;
diff --git a/thunar/thunar-history.c b/thunar/thunar-history.c
index df7d0cfcd..f9effc7ae 100644
--- a/thunar/thunar-history.c
+++ b/thunar/thunar-history.c
@@ -160,13 +160,13 @@ static void
thunar_history_init (ThunarHistory *history)
{
/* create the "back" action */
- history->action_back = thunar_history_action_new ("back", _("Back"), _("Go to the previous visited folder"), GTK_STOCK_GO_BACK);
+ history->action_back = thunar_history_action_new ("back", _("Back"), _("Go to the previous visited folder"), "go-previous-symbolic");
g_signal_connect (G_OBJECT (history->action_back), "activate", G_CALLBACK (thunar_history_action_back), history);
g_signal_connect (G_OBJECT (history->action_back), "show-menu", G_CALLBACK (thunar_history_show_menu), history);
gtk_action_set_sensitive (history->action_back, FALSE);
/* create the "forward" action */
- history->action_forward = thunar_history_action_new ("forward", _("Forward"), _("Go to the next visited folder"), GTK_STOCK_GO_FORWARD);
+ history->action_forward = thunar_history_action_new ("forward", _("Forward"), _("Go to the next visited folder"), "go-next-symbolic");
g_signal_connect (G_OBJECT (history->action_forward), "activate", G_CALLBACK (thunar_history_action_forward), history);
g_signal_connect (G_OBJECT (history->action_forward), "show-menu", G_CALLBACK (thunar_history_show_menu), history);
gtk_action_set_sensitive (history->action_forward, FALSE);
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index b1eff7a32..8ad88d4b2 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -174,7 +174,7 @@ struct _ThunarLauncherPokeData
static const GtkActionEntry action_entries[] =
{
- { "open", GTK_STOCK_OPEN, N_ ("_Open"), "<control>O", NULL, G_CALLBACK (thunar_launcher_action_open), },
+ { "open", "document-open", N_ ("_Open"), "<control>O", NULL, G_CALLBACK (thunar_launcher_action_open), },
{ "open-in-new-tab", NULL, N_ ("Open in New _Tab"), "<control><shift>P", NULL, G_CALLBACK (thunar_launcher_action_open_in_new_tab), },
{ "open-in-new-window", NULL, N_ ("Open in New _Window"), "<control><shift>O", NULL, G_CALLBACK (thunar_launcher_action_open_in_new_window), },
{ "open-with-other", NULL, N_ ("Open With Other _Application..."), NULL, N_ ("Choose another application with which to open the selected file"), G_CALLBACK (thunar_launcher_action_open_with_other), },
@@ -725,7 +725,7 @@ thunar_launcher_open_windows (ThunarLauncher *launcher,
n),
n);
label = g_strdup_printf (ngettext ("Open %d New Window", "Open %d New Windows", n), n);
- gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (dialog), label, GTK_RESPONSE_YES);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
response = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -817,7 +817,7 @@ thunar_launcher_update_idle (gpointer data)
/* Prepare "Open" label and icon */
gtk_action_set_label (launcher->action_open, _("_Open"));
- gtk_action_set_stock_id (launcher->action_open, GTK_STOCK_OPEN);
+ gtk_action_set_icon_name (launcher->action_open, "document-open");
if (n_selected_files == n_directories && n_directories >= 1)
{
@@ -929,7 +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,
+ "icon-name", "system-run",
"tooltip", ngettext ("Execute the selected file", "Execute the selected files", n_selected_files),
NULL);
}
diff --git a/thunar/thunar-location-buttons.c b/thunar/thunar-location-buttons.c
index 7074ccff3..057b91afa 100644
--- a/thunar/thunar-location-buttons.c
+++ b/thunar/thunar-location-buttons.c
@@ -176,13 +176,13 @@ static const GtkActionEntry action_entries[] =
{
{ "location-buttons-down-folder", NULL, "Down Folder", "<alt>Down", NULL, G_CALLBACK (thunar_location_buttons_action_down_folder), },
{ "location-buttons-context-menu", NULL, "Context Menu", NULL, "", NULL, },
- { "location-buttons-open", GTK_STOCK_OPEN, N_("_Open"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open), },
+ { "location-buttons-open", "document-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", "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), },
+ { "location-buttons-paste-into-folder", "edit-paste", N_("Paste Into Folder"), "", NULL, G_CALLBACK (thunar_location_buttons_action_paste_into_folder), },
+ { "location-buttons-properties", "document-properties", N_("_Properties..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_properties), },
};
diff --git a/thunar/thunar-location-dialog.c b/thunar/thunar-location-dialog.c
index 1651b11c4..c8d96c425 100644
--- a/thunar/thunar-location-dialog.c
+++ b/thunar/thunar-location-dialog.c
@@ -64,9 +64,9 @@ thunar_location_dialog_init (ThunarLocationDialog *location_dialog)
gtk_window_set_default_size (GTK_WINDOW (location_dialog), 350, -1);
gtk_window_set_title (GTK_WINDOW (location_dialog), _("Open Location"));
- gtk_dialog_add_button (GTK_DIALOG (location_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (location_dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
- open_button = gtk_dialog_add_button (GTK_DIALOG (location_dialog), GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT);
+ open_button = gtk_dialog_add_button (GTK_DIALOG (location_dialog), _("_Open"), GTK_RESPONSE_ACCEPT);
gtk_window_set_default (GTK_WINDOW (location_dialog), open_button);
hbox = g_object_new (GTK_TYPE_HBOX,
diff --git a/thunar/thunar-location-entry.c b/thunar/thunar-location-entry.c
index 20202d346..06f5f14d9 100644
--- a/thunar/thunar-location-entry.c
+++ b/thunar/thunar-location-entry.c
@@ -189,7 +189,7 @@ thunar_location_entry_init (ThunarLocationEntry *location_entry)
/* put reload button in entry */
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (location_entry->path_entry),
- GTK_ENTRY_ICON_SECONDARY, "view-refresh");
+ GTK_ENTRY_ICON_SECONDARY, "view-refresh-symbolic");
gtk_entry_set_icon_tooltip_text (GTK_ENTRY (location_entry->path_entry),
GTK_ENTRY_ICON_SECONDARY, _("Reload the current folder"));
g_signal_connect (G_OBJECT (location_entry->path_entry), "icon-release",
diff --git a/thunar/thunar-path-entry.c b/thunar/thunar-path-entry.c
index 5955dc118..d6277995c 100644
--- a/thunar/thunar-path-entry.c
+++ b/thunar/thunar-path-entry.c
@@ -703,7 +703,7 @@ thunar_path_entry_update_icon (ThunarPathEntry *path_entry)
{
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (path_entry),
GTK_ENTRY_ICON_PRIMARY,
- GTK_STOCK_DIALOG_ERROR);
+ "dialog-error-symbolic");
}
}
diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c
index fe2c88e8e..801821ff4 100644
--- a/thunar/thunar-permissions-chooser.c
+++ b/thunar/thunar-permissions-chooser.c
@@ -347,7 +347,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_table_attach (GTK_TABLE (chooser->table), hbox, 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (hbox);
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_LARGE_TOOLBAR);
+ image = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
@@ -362,7 +362,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_table_attach (GTK_TABLE (chooser->table), hbox, 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (hbox);
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_LARGE_TOOLBAR);
+ image = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
@@ -400,10 +400,6 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
g_signal_connect_swapped (G_OBJECT (button), "clicked", G_CALLBACK (thunar_permissions_chooser_job_cancel), chooser);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
-
- image = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU);
- gtk_container_add (GTK_CONTAINER (button), image);
- gtk_widget_show (image);
}
@@ -516,9 +512,9 @@ thunar_permissions_chooser_ask_recursive (ThunarPermissionsChooser *chooser)
dialog = gtk_dialog_new_with_buttons (_("Question"), GTK_WINDOW (toplevel),
GTK_DIALOG_DESTROY_WITH_PARENT
| GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_NO, GTK_RESPONSE_NO,
- GTK_STOCK_YES, GTK_RESPONSE_YES,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_No"), GTK_RESPONSE_NO,
+ _("_Yes"), GTK_RESPONSE_YES,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
@@ -527,7 +523,7 @@ thunar_permissions_chooser_ask_recursive (ThunarPermissionsChooser *chooser)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
@@ -1128,7 +1124,7 @@ thunar_permissions_chooser_fixperm_clicked (ThunarPermissionsChooser *chooser,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
_("Correct folder permissions automatically?"));
- gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (dialog), _("Correct _folder permissions"), GTK_RESPONSE_OK);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("The folder permissions will be reset to a consistent state. Only users "
diff --git a/thunar/thunar-preferences-dialog.c b/thunar/thunar-preferences-dialog.c
index 3017104ce..6a4825a4c 100644
--- a/thunar/thunar-preferences-dialog.c
+++ b/thunar/thunar-preferences-dialog.c
@@ -227,8 +227,8 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
/* add "Help" and "Close" buttons */
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ _("_Close"), GTK_RESPONSE_CLOSE,
+ _("_Help"), GTK_RESPONSE_HELP,
NULL);
notebook = gtk_notebook_new ();
diff --git a/thunar/thunar-progress-view.c b/thunar/thunar-progress-view.c
index e4fec53b9..7fd626194 100644
--- a/thunar/thunar-progress-view.c
+++ b/thunar/thunar-progress-view.c
@@ -231,10 +231,6 @@ thunar_progress_view_init (ThunarProgressView *view)
gtk_widget_set_can_focus (button, FALSE);
gtk_widget_show (button);
- image = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON);
- gtk_container_add (GTK_CONTAINER (button), image);
- gtk_widget_show (image);
-
/* connect the view title to the action label */
exo_binding_new (G_OBJECT (view), "title", G_OBJECT (label), "label");
}
diff --git a/thunar/thunar-properties-dialog.c b/thunar/thunar-properties-dialog.c
index aca67e873..441d1ecbe 100644
--- a/thunar/thunar-properties-dialog.c
+++ b/thunar/thunar-properties-dialog.c
@@ -250,8 +250,8 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
dialog->provider_factory = thunarx_provider_factory_get_default ();
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Help"), GTK_RESPONSE_HELP,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 550);
@@ -801,8 +801,8 @@ thunar_properties_dialog_icon_button_clicked (GtkWidget *button,
/* allocate the icon chooser */
title = g_strdup_printf (_("Select an Icon for \"%s\""), thunar_file_get_display_name (file));
chooser = exo_icon_chooser_dialog_new (title, GTK_WINDOW (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_OK"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
diff --git a/thunar/thunar-renamer-dialog.c b/thunar/thunar-renamer-dialog.c
index a4d4bd08a..76596b82e 100644
--- a/thunar/thunar-renamer-dialog.c
+++ b/thunar/thunar-renamer-dialog.c
@@ -190,11 +190,11 @@ static const GtkActionEntry action_entries[] =
{ "file-menu", NULL, N_ ("_File"), NULL, },
{ "sendto-menu", NULL, N_ ("_Send To"), NULL, },
{ "file-context-menu", NULL, N_ ("File Context Menu"), NULL, },
- { "add-files", GTK_STOCK_ADD, N_ ("_Add Files..."), NULL, N_ ("Include additional files in the list of files to be renamed"), G_CALLBACK (thunar_renamer_dialog_action_add_files), },
- { "remove-files", GTK_STOCK_REMOVE, NULL, NULL, NULL, G_CALLBACK (thunar_renamer_dialog_action_remove_files), },
- { "clear", GTK_STOCK_CLEAR, N_ ("Clear"), NULL, N_ ("Clear the file list below"), G_CALLBACK (thunar_renamer_dialog_action_clear), },
- { "about", GTK_STOCK_ABOUT, N_ ("_About"), NULL, N_ ("Display information about Thunar Bulk Rename"), G_CALLBACK (thunar_renamer_dialog_action_about), },
- { "properties", GTK_STOCK_PROPERTIES, N_ ("_Properties..."), "<alt>Return", N_ ("View the properties of the selected file"), G_CALLBACK (thunar_renamer_dialog_action_properties), },
+ { "add-files", "list-add", N_ ("_Add Files..."), NULL, N_ ("Include additional files in the list of files to be renamed"), G_CALLBACK (thunar_renamer_dialog_action_add_files), },
+ { "remove-files", "list-remove", NULL, NULL, NULL, G_CALLBACK (thunar_renamer_dialog_action_remove_files), },
+ { "clear", "edit-clear", N_ ("Clear"), NULL, N_ ("Clear the file list below"), G_CALLBACK (thunar_renamer_dialog_action_clear), },
+ { "about", "help-about", N_ ("_About"), NULL, N_ ("Display information about Thunar Bulk Rename"), G_CALLBACK (thunar_renamer_dialog_action_about), },
+ { "properties", "document-properties", N_ ("_Properties..."), "<alt>Return", N_ ("View the properties of the selected file"), G_CALLBACK (thunar_renamer_dialog_action_properties), },
};
/* Target types for dropping to the tree view */
@@ -352,8 +352,8 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
gtk_window_set_title (GTK_WINDOW (renamer_dialog), _("Rename Multiple Files"));
/* add the Cancel/Close buttons */
- renamer_dialog->cancel_button = gtk_dialog_add_button (GTK_DIALOG (renamer_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- renamer_dialog->close_button = gtk_dialog_add_button (GTK_DIALOG (renamer_dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_DELETE_EVENT);
+ renamer_dialog->cancel_button = gtk_dialog_add_button (GTK_DIALOG (renamer_dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
+ renamer_dialog->close_button = gtk_dialog_add_button (GTK_DIALOG (renamer_dialog), _("_Close"), GTK_RESPONSE_DELETE_EVENT);
gtk_widget_hide (renamer_dialog->close_button);
/* add the "Rename Files" button */
@@ -503,7 +503,7 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
gtk_box_pack_start (GTK_BOX (rbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
- image = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("help-browser", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
@@ -601,7 +601,7 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_widget_show (hbox);
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("dialog-error", GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
@@ -1057,8 +1057,8 @@ thunar_renamer_dialog_action_add_files (GtkAction *action,
chooser = gtk_file_chooser_dialog_new (_("Select files to rename"),
GTK_WINDOW (renamer_dialog),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), TRUE);
gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE);
diff --git a/thunar/thunar-renamer-progress.c b/thunar/thunar-renamer-progress.c
index 8ea805c12..9ebff4292 100644
--- a/thunar/thunar-renamer-progress.c
+++ b/thunar/thunar-renamer-progress.c
@@ -193,7 +193,7 @@ thunar_renamer_progress_next_idle (gpointer user_data)
"remaining files, or revert the previously renamed files to their "
"previous names, or cancel the operation without reverting previous "
"changes."));
- gtk_dialog_add_button (GTK_DIALOG (message), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (message), _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (message), _("_Revert Changes"), GTK_RESPONSE_REJECT);
gtk_dialog_add_button (GTK_DIALOG (message), _("_Skip This File"), GTK_RESPONSE_ACCEPT);
gtk_dialog_set_default_response (GTK_DIALOG (message), GTK_RESPONSE_ACCEPT);
@@ -203,14 +203,14 @@ thunar_renamer_progress_next_idle (gpointer user_data)
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
_("Do you want to skip this file and continue to rename the "
"remaining files?"));
- gtk_dialog_add_button (GTK_DIALOG (message), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (message), _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (message), _("_Skip This File"), GTK_RESPONSE_ACCEPT);
gtk_dialog_set_default_response (GTK_DIALOG (message), GTK_RESPONSE_ACCEPT);
}
else
{
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), "%s.", error->message);
- gtk_dialog_add_button (GTK_DIALOG (message), GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (message), _("_Close"), GTK_RESPONSE_CANCEL);
}
/* run the dialog */
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 79e449849..275a19870 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -402,13 +402,13 @@ 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", "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), },
- { "paste", GTK_STOCK_PASTE, N_ ("_Paste"), NULL, N_ ("Move or copy files previously selected by a Cut or Copy command"), G_CALLBACK (thunar_standard_view_action_paste), },
+ { "properties", "document-properties", N_ ("_Properties..."), "<alt>Return", N_ ("View the properties of the selected file"), G_CALLBACK (thunar_standard_view_action_properties), },
+ { "cut", "edit-cut", N_ ("Cu_t"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_cut), },
+ { "copy", "edit-copy", N_ ("_Copy"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_copy), },
+ { "paste", "edit-paste", N_ ("_Paste"), NULL, N_ ("Move or copy files previously selected by a Cut or Copy command"), G_CALLBACK (thunar_standard_view_action_paste), },
{ "move-to-trash", THUNAR_STOCK_TRASH_FULL, N_ ("Mo_ve to Trash"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_move_to_trash), },
- { "delete", GTK_STOCK_DELETE, N_ ("_Delete"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_delete), },
- { "paste-into-folder", GTK_STOCK_PASTE, N_ ("Paste Into Folder"), NULL, N_ ("Move or copy files previously selected by a Cut or Copy command into the selected folder"), G_CALLBACK (thunar_standard_view_action_paste_into_folder), },
+ { "delete", "edit-delete", N_ ("_Delete"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_delete), },
+ { "paste-into-folder", "edit-paste", N_ ("Paste Into Folder"), NULL, N_ ("Move or copy files previously selected by a Cut or Copy command into the selected folder"), G_CALLBACK (thunar_standard_view_action_paste_into_folder), },
{ "select-all-files", NULL, N_ ("Select _all Files"), NULL, N_ ("Select all files in this window"), G_CALLBACK (thunar_standard_view_action_select_all_files), },
{ "select-by-pattern", NULL, N_ ("Select _by Pattern..."), "<control>S", N_ ("Select all files that match a certain pattern"), G_CALLBACK (thunar_standard_view_action_select_by_pattern), },
{ "invert-selection", NULL, N_ ("_Invert Selection"), NULL, N_ ("Select all and only the items that are not currently selected"), G_CALLBACK (thunar_standard_view_action_selection_invert), },
@@ -2617,7 +2617,7 @@ thunar_standard_view_action_select_by_pattern (GtkAction *action,
GTK_WINDOW (window),
GTK_DIALOG_MODAL
| GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Select"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/thunar/thunar-templates-action.c b/thunar/thunar-templates-action.c
index a2e399279..f03d0f501 100644
--- a/thunar/thunar-templates-action.c
+++ b/thunar/thunar-templates-action.c
@@ -486,15 +486,11 @@ thunar_templates_action_load_finished (ThunarJob *job,
gtk_widget_show (item);
/* add the "Empty File" item */
- item = gtk_image_menu_item_new_with_mnemonic (_("_Empty File"));
+ item = gtk_menu_item_new_with_mnemonic (_("_Empty File"));
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (item_activated),
templates_action);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
-
- /* add the icon for the emtpy file item */
- 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);
}
g_signal_handlers_disconnect_matched (job, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL,
diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
index 3b46b8526..ff8e1876a 100644
--- a/thunar/thunar-tree-view.c
+++ b/thunar/thunar-tree-view.c
@@ -1280,25 +1280,21 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
menu = gtk_menu_new ();
/* append the "Open" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
+ item = gtk_menu_item_new_with_mnemonic (_("_Open"));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_open), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, (file != NULL || device != NULL));
gtk_widget_show (item);
-
- /* set the stock icon */
- image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
/* append the "Open in New Tab" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("Open in New _Tab"));
+ item = gtk_menu_item_new_with_mnemonic (_("Open in New _Tab"));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_open_in_new_tab), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, (file != NULL || device != NULL));
gtk_widget_show (item);
/* append the "Open in New Window" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("Open in New _Window"));
+ item = gtk_menu_item_new_with_mnemonic (_("Open in New _Window"));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_open_in_new_window), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, (file != NULL || device != NULL));
@@ -1314,19 +1310,19 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
if (thunar_device_get_kind (device) == THUNAR_DEVICE_KIND_VOLUME)
{
/* append the "Mount" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("_Mount"));
+ item = gtk_menu_item_new_with_mnemonic (_("_Mount"));
gtk_widget_set_visible (item, thunar_device_can_mount (device));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_mount), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
/* append the "Unmount" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("_Unmount"));
+ item = gtk_menu_item_new_with_mnemonic (_("_Unmount"));
gtk_widget_set_visible (item, thunar_device_can_unmount (device));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_unmount), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
/* append the "Eject" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("_Eject"));
+ item = gtk_menu_item_new_with_mnemonic (_("_Eject"));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_eject), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, thunar_device_can_eject (device));
@@ -1335,7 +1331,7 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
else
{
/* append the "Mount Volume" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("Disconn_ect"));
+ item = gtk_menu_item_new_with_mnemonic (_("Disconn_ect"));
gtk_widget_set_sensitive (item, thunar_device_can_eject (device));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_eject), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
@@ -1350,7 +1346,7 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
else if (G_UNLIKELY (file != NULL && thunar_file_is_trashed (file) && thunar_file_is_root (file)))
{
/* append the "Empty Trash" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("_Empty Trash"));
+ item = gtk_menu_item_new_with_mnemonic (_("_Empty Trash"));
gtk_widget_set_sensitive (item, (thunar_file_get_item_count (file) > 0));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_empty_trash), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
@@ -1366,18 +1362,12 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
if (G_LIKELY (file != NULL && !thunar_file_is_trashed (file)))
{
/* append the "Create Folder" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("Create _Folder..."));
+ item = gtk_menu_item_new_with_mnemonic (_("Create _Folder..."));
gtk_widget_set_sensitive (item, thunar_file_is_writable (file));
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 ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
@@ -1393,43 +1383,31 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
parent_file = thunar_file_get_parent (file, NULL);
/* append the "Cut" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("Cu_t"));
+ item = gtk_menu_item_new_with_mnemonic (_("Cu_t"));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_cut), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, (parent_file != NULL && thunar_file_is_writable (parent_file)));
gtk_widget_show (item);
- /* set the stock icon */
- image = gtk_image_new_from_stock (GTK_STOCK_CUT, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-
/* append the "Copy" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("_Copy"));
+ item = gtk_menu_item_new_with_mnemonic (_("_Copy"));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_copy), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, (parent_file != NULL));
gtk_widget_show (item);
- /* set the stock icon */
- image = gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-
/* cleanup */
if (G_LIKELY (parent_file != NULL))
g_object_unref (G_OBJECT (parent_file));
}
/* append the "Paste Into Folder" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("_Paste Into Folder"));
+ item = gtk_menu_item_new_with_mnemonic (_("_Paste Into Folder"));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_paste_into_folder), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, (thunar_file_is_writable (file) && thunar_clipboard_manager_get_can_paste (view->clipboard)));
gtk_widget_show (item);
- /* set the stock icon */
- image = gtk_image_new_from_stock (GTK_STOCK_PASTE, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-
/* "Delete" and "Rename" don't make much sense for devices */
if (G_LIKELY (device == NULL))
{
@@ -1445,28 +1423,20 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
&& thunar_file_can_be_trashed (file))
{
/* append the "Move to Tash" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("Mo_ve to Trash"));
+ item = gtk_menu_item_new_with_mnemonic (_("Mo_ve to Trash"));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_move_to_trash), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, (parent_file != NULL && thunar_file_is_writable (parent_file)));
gtk_widget_show (item);
-
- /* set the stock icon */
- image = gtk_image_new_from_stock (THUNAR_STOCK_TRASH_FULL, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
}
/* append the "Delete" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("_Delete"));
+ item = gtk_menu_item_new_with_mnemonic (_("_Delete"));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_delete), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, (parent_file != NULL && thunar_file_is_writable (parent_file)));
gtk_widget_show (item);
- /* set the stock icon */
- image = gtk_image_new_from_stock (GTK_STOCK_DELETE, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-
/* cleanup */
if (G_LIKELY (parent_file != NULL))
g_object_unref (G_OBJECT (parent_file));
@@ -1480,7 +1450,7 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
gtk_widget_show (item);
/* append the "Rename" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("_Rename..."));
+ item = gtk_menu_item_new_with_mnemonic (_("_Rename..."));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_rename), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, thunar_file_is_writable (file));
@@ -1539,16 +1509,12 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
}
/* append the "Properties" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("P_roperties..."));
+ item = gtk_menu_item_new_with_mnemonic (_("P_roperties..."));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_properties), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, (file != NULL));
gtk_widget_show (item);
- /* set the stock icon */
- image = gtk_image_new_from_stock (GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-
/* run the menu on the view's screen (taking over the floating reference on the menu) */
thunar_gtk_menu_run (GTK_MENU (menu), GTK_WIDGET (view), NULL, NULL, (event != NULL) ? event->button : 0,
(event != NULL) ? event->time : gtk_get_current_event_time ());
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 80e6a48dd..577d2c552 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -366,8 +366,8 @@ static GtkActionEntry action_entries[] =
{ "zoom-out", "zoom-out", N_ ("Zoom _Out"), "<control>minus", N_ ("Show the contents in less detail"), G_CALLBACK (thunar_window_action_zoom_out), },
{ "zoom-reset", "zoom-original", N_ ("Normal Si_ze"), "<control>0", N_ ("Show the contents at the normal size"), G_CALLBACK (thunar_window_action_zoom_reset), },
{ "go-menu", NULL, N_ ("_Go"), NULL, },
- { "open-parent", "go-up", N_ ("Open _Parent"), "<alt>Up", N_ ("Open the parent folder"), G_CALLBACK (thunar_window_action_go_up), },
- { "open-home", "go-home", N_ ("_Home"), "<alt>Home", N_ ("Go to the home folder"), G_CALLBACK (thunar_window_action_open_home), },
+ { "open-parent", "go-up-symbolic", N_ ("Open _Parent"), "<alt>Up", N_ ("Open the parent folder"), G_CALLBACK (thunar_window_action_go_up), },
+ { "open-home", "go-home-symbolic", N_ ("_Home"), "<alt>Home", N_ ("Go to the home folder"), G_CALLBACK (thunar_window_action_open_home), },
{ "open-desktop", THUNAR_STOCK_DESKTOP, N_ ("Desktop"), NULL, N_ ("Go to the desktop folder"), G_CALLBACK (thunar_window_action_open_desktop), },
{ "open-file-system", "drive-harddisk", N_ ("File System"), NULL, N_ ("Browse the file system"), G_CALLBACK (thunar_window_action_open_file_system), },
{ "open-network", "network-workgroup", N_("B_rowse Network"), NULL, N_ ("Browse local network connections"), G_CALLBACK (thunar_window_action_open_network), },
@@ -1770,7 +1770,7 @@ thunar_window_notebook_insert (ThunarWindow *window,
gtk_widget_modify_style (button, style);
g_object_unref (G_OBJECT (style));
- icon = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+ icon = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), icon);
gtk_widget_show (icon);
@@ -3023,7 +3023,7 @@ thunar_window_action_open_templates (GtkAction *action,
/* display the "About Templates" dialog */
dialog = gtk_dialog_new_with_buttons (_("About Templates"), GTK_WINDOW (window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -3033,7 +3033,7 @@ thunar_window_action_open_templates (GtkAction *action,
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
--
GitLab