summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2018-02-07 22:01:52 +0100
committerraveit65 <[email protected]>2018-02-09 18:00:22 +0100
commit2e9c1a1d447ddc1c54b94d1dcc6b99437b7f601f (patch)
treeb43ee75fcfe5eb192f0a552ed1b93a7b4c92c123
parentb5651bbf352124f52c8bda943042b04a571a9a84 (diff)
downloadengrampa-2e9c1a1d447ddc1c54b94d1dcc6b99437b7f601f.tar.bz2
engrampa-2e9c1a1d447ddc1c54b94d1dcc6b99437b7f601f.tar.xz
avoid deprecated GtkStock
-rw-r--r--src/actions.c4
-rw-r--r--src/dlg-add-files.c4
-rw-r--r--src/dlg-add-folder.c8
-rw-r--r--src/dlg-batch-add.c12
-rw-r--r--src/dlg-extract.c12
-rw-r--r--src/fr-window.c50
-rw-r--r--src/gtk-utils.c26
-rw-r--r--src/gtk-utils.h2
-rw-r--r--src/ui.h102
9 files changed, 110 insertions, 110 deletions
diff --git a/src/actions.c b/src/actions.c
index c0f54af..4201c08 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -382,8 +382,8 @@ activate_action_open (GtkAction *action,
file_sel = gtk_file_chooser_dialog_new (_("Open"),
GTK_WINDOW (window),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-open", GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (file_sel), GTK_RESPONSE_OK);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (file_sel), FALSE);
diff --git a/src/dlg-add-files.c b/src/dlg-add-files.c
index 0bc8880..c6f81ea 100644
--- a/src/dlg-add-files.c
+++ b/src/dlg-add-files.c
@@ -152,9 +152,9 @@ add_files_cb (GtkWidget *widget,
gtk_file_chooser_dialog_new (_("Add Files"),
GTK_WINDOW (data->window),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
FR_STOCK_ADD_FILES, GTK_RESPONSE_OK,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ "gtk-help", GTK_RESPONSE_HELP,
NULL);
gtk_window_set_default_size (GTK_WINDOW (data->dialog), 530, 450);
diff --git a/src/dlg-add-folder.c b/src/dlg-add-folder.c
index b214061..721e85f 100644
--- a/src/dlg-add-folder.c
+++ b/src/dlg-add-folder.c
@@ -223,9 +223,9 @@ add_folder_cb (GtkWidget *widget,
gtk_file_chooser_dialog_new (_("Add a Folder"),
GTK_WINDOW (data->window),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
FR_STOCK_ADD_FOLDER, GTK_RESPONSE_OK,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ "gtk-help", GTK_RESPONSE_HELP,
NULL);
gtk_window_set_default_size (GTK_WINDOW (data->dialog), 530, 510);
@@ -878,8 +878,8 @@ save_options_cb (GtkWidget *w,
_("_Options Name:"),
(data->last_options != NULL) ? data->last_options : "",
1024,
- GTK_STOCK_CANCEL,
- GTK_STOCK_SAVE);
+ "gtk-cancel",
+ "gtk-save");
if (opt_filename == NULL)
return;
diff --git a/src/dlg-batch-add.c b/src/dlg-batch-add.c
index 55d3b42..d3dac4a 100644
--- a/src/dlg-batch-add.c
+++ b/src/dlg-batch-add.c
@@ -228,10 +228,10 @@ add_clicked_cb (GtkWidget *widget,
d = _gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("dialog")),
GTK_DIALOG_MODAL,
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
msg,
NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
_("Create _Folder"), GTK_RESPONSE_YES,
NULL);
@@ -267,10 +267,10 @@ add_clicked_cb (GtkWidget *widget,
d = _gtk_message_dialog_new (GTK_WINDOW (window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_DIALOG_WARNING,
+ "dialog-warning",
_("Archive not created"),
NULL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ "gtk-ok", GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);
gtk_dialog_run (GTK_DIALOG (d));
@@ -315,10 +315,10 @@ add_clicked_cb (GtkWidget *widget,
d = _gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("dialog")),
GTK_DIALOG_MODAL,
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
_("The archive is already present. Do you want to overwrite it?"),
NULL,
- GTK_STOCK_NO, GTK_RESPONSE_NO,
+ "gtk-no", GTK_RESPONSE_NO,
_("_Overwrite"), GTK_RESPONSE_YES,
NULL);
diff --git a/src/dlg-extract.c b/src/dlg-extract.c
index 2067c15..87c3688 100644
--- a/src/dlg-extract.c
+++ b/src/dlg-extract.c
@@ -106,10 +106,10 @@ extract_cb (GtkWidget *w,
d = _gtk_message_dialog_new (GTK_WINDOW (data->dialog),
GTK_DIALOG_MODAL,
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
msg,
NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
_("Create _Folder"), GTK_RESPONSE_YES,
NULL);
@@ -146,10 +146,10 @@ extract_cb (GtkWidget *w,
d = _gtk_message_dialog_new (GTK_WINDOW (window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_DIALOG_WARNING,
+ "dialog-warning",
_("Extraction not performed"),
NULL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ "gtk-ok", GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);
gtk_dialog_run (GTK_DIALOG (d));
@@ -423,9 +423,9 @@ dlg_extract__common (FrWindow *window,
gtk_file_chooser_dialog_new (_("Extract"),
GTK_WINDOW (data->window),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
FR_STOCK_EXTRACT, GTK_RESPONSE_OK,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ "gtk-help", GTK_RESPONSE_HELP,
NULL);
gtk_window_set_default_size (GTK_WINDOW (file_sel), 530, 510);
diff --git a/src/fr-window.c b/src/fr-window.c
index 3c14824..16c757a 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -2525,12 +2525,12 @@ create_the_progress_dialog (FrWindow *window)
NULL,
NULL);
- window->priv->pd_quit_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), GTK_STOCK_QUIT, DIALOG_RESPONSE_QUIT);
+ window->priv->pd_quit_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), "gtk-quit", DIALOG_RESPONSE_QUIT);
window->priv->pd_open_archive_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), _("_Open the Archive"), DIALOG_RESPONSE_OPEN_ARCHIVE);
window->priv->pd_open_destination_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), _("_Show the Files"), DIALOG_RESPONSE_OPEN_DESTINATION_FOLDER);
window->priv->pd_open_destination_and_quit_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), _("Show the _Files and Quit"), DIALOG_RESPONSE_OPEN_DESTINATION_FOLDER_AND_QUIT);
- window->priv->pd_close_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
- window->priv->pd_cancel_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ window->priv->pd_close_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), "gtk-close", GTK_RESPONSE_CLOSE);
+ window->priv->pd_cancel_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), "gtk-cancel", GTK_RESPONSE_CANCEL);
d = GTK_DIALOG (window->priv->progress_dialog);
gtk_window_set_resizable (GTK_WINDOW (d), TRUE);
@@ -4135,12 +4135,12 @@ fr_window_drag_data_received (GtkWidget *widget,
d = _gtk_message_dialog_new (GTK_WINDOW (window),
GTK_DIALOG_MODAL,
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
_("Do you want to add this file to the current archive or open it as a new archive?"),
NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_ADD, 0,
- GTK_STOCK_OPEN, 1,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-add", 0,
+ "gtk-open", 1,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (d), 2);
@@ -4165,10 +4165,10 @@ fr_window_drag_data_received (GtkWidget *widget,
d = _gtk_message_dialog_new (GTK_WINDOW (window),
GTK_DIALOG_MODAL,
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
_("Do you want to create a new archive with these files?"),
NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
_("Create _Archive"), GTK_RESPONSE_YES,
NULL);
@@ -5871,7 +5871,7 @@ fr_window_construct (FrWindow *window)
/* Translators: this is the label for the "open recent file" sub-menu. */
"label", _("Open _Recent"),
"tooltip", _("Open a recently used archive"),
- "stock-id", GTK_STOCK_OPEN,
+ "stock-id", "gtk-open",
NULL);
fr_window_init_recent_chooser (window, GTK_RECENT_CHOOSER (action));
gtk_action_group_add_action (actions, action);
@@ -5883,7 +5883,7 @@ fr_window_construct (FrWindow *window)
"name", "OpenRecent_Toolbar",
"label", _("Open"),
"tooltip", _("Open a recently used archive"),
- "stock-id", GTK_STOCK_OPEN,
+ "stock-id", "gtk-open",
"is-important", TRUE,
NULL);
fr_window_init_recent_chooser (window, GTK_RECENT_CHOOSER (action));
@@ -6813,10 +6813,10 @@ _fr_window_ask_overwrite_dialog (OverwriteData *odata)
details = g_strdup_printf (_("Another file with the same name already exists in \"%s\"."), parent_name);
d = _gtk_message_dialog_new (GTK_WINDOW (odata->window),
GTK_DIALOG_MODAL,
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
msg,
details,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
_("Replace _All"), _FR_RESPONSE_OVERWRITE_YES_ALL,
_("_Skip"), _FR_RESPONSE_OVERWRITE_NO,
_("_Replace"), _FR_RESPONSE_OVERWRITE_YES,
@@ -6858,10 +6858,10 @@ _fr_window_ask_overwrite_dialog (OverwriteData *odata)
d = _gtk_message_dialog_new (GTK_WINDOW (odata->window),
0,
- GTK_STOCK_DIALOG_WARNING,
+ "dialog-warning",
_("Extraction not performed"),
NULL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ "gtk-ok", GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);
fr_window_show_error_dialog (odata->window, d, GTK_WINDOW (odata->window), _("Extraction not performed"));
@@ -6923,10 +6923,10 @@ fr_window_archive_extract (FrWindow *window,
d = _gtk_message_dialog_new (GTK_WINDOW (window),
GTK_DIALOG_MODAL,
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
msg,
NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
_("Create _Folder"), GTK_RESPONSE_YES,
NULL);
@@ -6966,10 +6966,10 @@ fr_window_archive_extract (FrWindow *window,
d = _gtk_message_dialog_new (GTK_WINDOW (window),
0,
- GTK_STOCK_DIALOG_WARNING,
+ "dialog-warning",
_("Extraction not performed"),
NULL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ "gtk-ok", GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);
fr_window_show_error_dialog (window, d, GTK_WINDOW (window), _("Extraction not performed"));
@@ -7354,7 +7354,7 @@ fr_window_view_last_output (FrWindow *window,
dialog = gtk_dialog_new_with_buttons (title,
GTK_WINDOW (window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ "gtk-close", GTK_RESPONSE_CLOSE,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
@@ -7776,7 +7776,7 @@ fr_window_rename_selection (FrWindow *window,
(renaming_dir ? _("_New folder name:") : _("_New file name:")),
utf8_old_name,
1024,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
_("_Rename"));
g_free (utf8_old_name);
@@ -7812,10 +7812,10 @@ fr_window_rename_selection (FrWindow *window,
dlg = _gtk_message_dialog_new (GTK_WINDOW (window),
GTK_DIALOG_MODAL,
- GTK_STOCK_DIALOG_QUESTION,
+ "dialog-question",
(renaming_dir ? _("Could not rename the folder") : _("Could not rename the file")),
reason,
- GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
+ "gtk-close", GTK_RESPONSE_OK,
NULL);
gtk_dialog_run (GTK_DIALOG (dlg));
gtk_widget_destroy (dlg);
@@ -8217,8 +8217,8 @@ fr_window_paste_selection (FrWindow *window,
_("_Destination folder:"),
utf8_old_path,
1024,
- GTK_STOCK_CANCEL,
- GTK_STOCK_PASTE);
+ "gtk-cancel",
+ "gtk-paste");
g_free (utf8_old_path);
if (utf8_path == NULL)
return;
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index 6c3428b..533a335 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -54,7 +54,7 @@ _gtk_count_selected (GtkTreeSelection *selection)
GtkWidget*
_gtk_message_dialog_new (GtkWindow *parent,
GtkDialogFlags flags,
- const char *stock_id,
+ const char *icon_name,
const char *message,
const char *secondary_message,
const gchar *first_button_text,
@@ -72,15 +72,15 @@ _gtk_message_dialog_new (GtkWindow *parent,
g_return_val_if_fail ((message != NULL) || (secondary_message != NULL), NULL);
- if (stock_id == NULL)
- stock_id = GTK_STOCK_DIALOG_INFO;
+ if (icon_name == NULL)
+ icon_name = "dialog-information";
dialog = gtk_dialog_new_with_buttons ("", parent, flags, NULL, NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
/* Add label and image */
- image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_DIALOG);
gtk_widget_set_valign (image, GTK_ALIGN_START);
label = gtk_label_new ("");
@@ -244,12 +244,12 @@ _gtk_request_dialog_run (GtkWindow *parent,
/* Add buttons */
- button = create_button (GTK_STOCK_CANCEL, no_button_text);
+ button = create_button ("gtk-cancel", no_button_text);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog),
button,
GTK_RESPONSE_CANCEL);
- button = create_button (GTK_STOCK_OK, yes_button_text);
+ button = create_button ("gtk-ok", yes_button_text);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog),
button,
GTK_RESPONSE_YES);
@@ -316,14 +316,14 @@ _gtk_yesno_dialog_new (GtkWindow *parent,
/* Add buttons */
- button = create_button (GTK_STOCK_CANCEL, no_button_text);
+ button = create_button ("gtk-cancel", no_button_text);
gtk_dialog_add_action_widget (GTK_DIALOG (d),
button,
GTK_RESPONSE_CANCEL);
/**/
- button = create_button (GTK_STOCK_OK, yes_button_text);
+ button = create_button ("gtk-ok", yes_button_text);
gtk_dialog_add_action_widget (GTK_DIALOG (d),
button,
GTK_RESPONSE_YES);
@@ -364,7 +364,7 @@ _gtk_error_dialog_new (GtkWindow *parent,
dialog = gtk_dialog_new_with_buttons ("",
parent,
flags,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ "gtk-ok", GTK_RESPONSE_OK,
NULL);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -494,10 +494,10 @@ _gtk_error_dialog_run (GtkWindow *parent,
d = _gtk_message_dialog_new (parent,
GTK_DIALOG_MODAL,
- GTK_STOCK_DIALOG_ERROR,
+ "dialog-error",
main_message,
message,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
+ "gtk-close", GTK_RESPONSE_CANCEL,
NULL);
g_free (message);
@@ -736,10 +736,10 @@ show_help_dialog (GtkWindow *parent,
dialog = _gtk_message_dialog_new (parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_DIALOG_ERROR,
+ "dialog-error",
_("Could not display help"),
error->message,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ "gtk-ok", GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/src/gtk-utils.h b/src/gtk-utils.h
index 1ec56e8..1b4d74a 100644
--- a/src/gtk-utils.h
+++ b/src/gtk-utils.h
@@ -30,7 +30,7 @@
int _gtk_count_selected (GtkTreeSelection *selection);
GtkWidget* _gtk_message_dialog_new (GtkWindow *parent,
GtkDialogFlags flags,
- const char *stock_id,
+ const char *icon_name,
const char *message,
const char *secondary_message,
const char *first_button_text,
diff --git a/src/ui.h b/src/ui.h
index 01656ae..aab5adf 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -35,8 +35,8 @@ static GtkActionEntry action_entries[] = {
{ "HelpMenu", NULL, N_("_Help") },
{ "ArrangeFilesMenu", NULL, N_("_Arrange Files") },
- { "About", GTK_STOCK_ABOUT,
- NULL, NULL,
+ { "About", "help-about",
+ N_("_About"), NULL,
N_("Information about the program"),
G_CALLBACK (activate_action_about) },
{ "AddFiles", FR_STOCK_ADD_FILES,
@@ -55,54 +55,54 @@ static GtkActionEntry action_entries[] = {
N_("Add Folder"), NULL,
N_("Add a folder to the archive"),
G_CALLBACK (activate_action_add_folder) },
- { "Close", GTK_STOCK_CLOSE,
- NULL, NULL,
+ { "Close", "window-close",
+ N_("_Close"), "<control>W",
N_("Close the current archive"),
G_CALLBACK (activate_action_close) },
- { "Contents", GTK_STOCK_HELP,
+ { "Contents", "help-browser",
N_("Contents"), "F1",
N_("Display the Engrampa Manual"),
G_CALLBACK (activate_action_manual) },
- { "Copy", GTK_STOCK_COPY,
- NULL, NULL,
+ { "Copy", "edit-copy",
+ N_("_Copy"), "<control>C",
N_("Copy the selection"),
G_CALLBACK (activate_action_copy) },
- { "Cut", GTK_STOCK_CUT,
- NULL, NULL,
+ { "Cut", "edit-cut",
+ N_("Cu_t"), "<control>X",
N_("Cut the selection"),
G_CALLBACK (activate_action_cut) },
- { "Paste", GTK_STOCK_PASTE,
- NULL, NULL,
+ { "Paste", "edit-paste",
+ N_("_Paste"), "<control>V",
N_("Paste the clipboard"),
G_CALLBACK (activate_action_paste) },
{ "Rename", NULL,
N_("_Rename…"), "F2",
N_("Rename the selection"),
G_CALLBACK (activate_action_rename) },
- { "Delete", GTK_STOCK_DELETE,
- NULL, "Delete",
+ { "Delete", "edit-delete",
+ N_("_Delete"), "Delete",
N_("Delete the selection from the archive"),
G_CALLBACK (activate_action_delete) },
- { "CopyFolderFromSidebar", GTK_STOCK_COPY,
- NULL, NULL,
+ { "CopyFolderFromSidebar", "edit-copy",
+ N_("_Copy"), "<control>C",
N_("Copy the selection"),
G_CALLBACK (activate_action_copy_folder_from_sidebar) },
- { "CutFolderFromSidebar", GTK_STOCK_CUT,
- NULL, NULL,
+ { "CutFolderFromSidebar", "edit-cut",
+ N_("Cu_t"), "<control>X",
N_("Cut the selection"),
G_CALLBACK (activate_action_cut_folder_from_sidebar) },
- { "PasteFolderFromSidebar", GTK_STOCK_PASTE,
- NULL, NULL,
+ { "PasteFolderFromSidebar", "edit-paste",
+ N_("_Paste"), "<control>V",
N_("Paste the clipboard"),
G_CALLBACK (activate_action_paste_folder_from_sidebar) },
{ "RenameFolderFromSidebar", NULL,
N_("_Rename…"), "F2",
N_("Rename the selection"),
G_CALLBACK (activate_action_rename_folder_from_sidebar) },
- { "DeleteFolderFromSidebar", GTK_STOCK_DELETE,
- NULL, NULL,
+ { "DeleteFolderFromSidebar", "edit-delete",
+ N_("_Delete"), "Delete",
N_("Delete the selection from the archive"),
G_CALLBACK (activate_action_delete_folder_from_sidebar) },
@@ -122,8 +122,8 @@ static GtkActionEntry action_entries[] = {
N_("Extract"), NULL,
N_("Extract files from the archive"),
G_CALLBACK (activate_action_extract) },
- { "Find", GTK_STOCK_FIND,
- N_("Find…"), NULL,
+ { "Find", "edit-find",
+ N_("Find…"), "<control>F",
NULL,
G_CALLBACK (activate_action_find) },
@@ -131,16 +131,16 @@ static GtkActionEntry action_entries[] = {
N_("_Last Output"), NULL,
N_("View the output produced by the last executed command"),
G_CALLBACK (activate_action_last_output) },
- { "New", GTK_STOCK_NEW,
- N_("New…"), NULL,
+ { "New", "document-new",
+ N_("New…"), "<control>N",
N_("Create a new archive"),
G_CALLBACK (activate_action_new) },
- { "Open", GTK_STOCK_OPEN,
- N_("Open…"), NULL,
+ { "Open", "document-open",
+ N_("Open…"), "<control>O",
N_("Open archive"),
G_CALLBACK (activate_action_open) },
- { "Open_Toolbar", GTK_STOCK_OPEN,
- NULL, NULL,
+ { "Open_Toolbar", "document-open",
+ N_("_Open"), "<control>O",
N_("Open archive"),
G_CALLBACK (activate_action_open) },
{ "OpenSelection", NULL,
@@ -151,60 +151,60 @@ static GtkActionEntry action_entries[] = {
N_("Pass_word…"), NULL,
N_("Specify a password for this archive"),
G_CALLBACK (activate_action_password) },
- { "Properties", GTK_STOCK_PROPERTIES,
- NULL, "<alt>Return",
+ { "Properties", "document-properties",
+ N_("_Properties"), "<alt>Return",
N_("Show archive properties"),
G_CALLBACK (activate_action_properties) },
- { "Reload", GTK_STOCK_REFRESH,
- NULL, "<control>R",
+ { "Reload", "view-refresh",
+ N_("_Refresh"), "<control>R",
N_("Reload current archive"),
G_CALLBACK (activate_action_reload) },
- { "SaveAs", GTK_STOCK_SAVE_AS,
+ { "SaveAs", "document-save-as",
N_("Save As…"), NULL,
N_("Save the current archive with a different name"),
G_CALLBACK (activate_action_save_as) },
- { "SelectAll", GTK_STOCK_SELECT_ALL,
- NULL, "<control>A",
+ { "SelectAll", "edit-select-all",
+ N_("Select _All"), "<control>A",
N_("Select all files"),
G_CALLBACK (activate_action_select_all) },
- { "Stop", GTK_STOCK_STOP,
- NULL, "Escape",
+ { "Stop", "process-stop",
+ N_("_Stop"), "Escape",
N_("Stop current operation"),
G_CALLBACK (activate_action_stop) },
{ "TestArchive", NULL,
N_("_Test Integrity"), NULL,
N_("Test whether the archive contains errors"),
G_CALLBACK (activate_action_test_archive) },
- { "ViewSelection", GTK_STOCK_OPEN,
- NULL, NULL,
+ { "ViewSelection", "document-open",
+ N_("_Open"), "<control>O",
N_("Open the selected file"),
G_CALLBACK (activate_action_view_or_open) },
- { "ViewSelection_Toolbar", GTK_STOCK_OPEN,
- NULL, NULL,
+ { "ViewSelection_Toolbar", "document-open",
+ N_("_Open"), "<control>O",
N_("Open the selected file"),
G_CALLBACK (activate_action_view_or_open) },
- { "OpenFolder", GTK_STOCK_OPEN,
- NULL, NULL,
+ { "OpenFolder", "document-open",
+ N_("_Open"), "<control>O",
N_("Open the selected folder"),
G_CALLBACK (activate_action_open_folder) },
- { "OpenFolderFromSidebar", GTK_STOCK_OPEN,
- NULL, NULL,
+ { "OpenFolderFromSidebar", "document-open",
+ N_("_Open"), "<control>O",
N_("Open the selected folder"),
G_CALLBACK (activate_action_open_folder_from_sidebar) },
- { "GoBack", GTK_STOCK_GO_BACK,
- NULL, NULL,
+ { "GoBack", "go-previous",
+ "Back", NULL,
N_("Go to the previous visited location"),
G_CALLBACK (activate_action_go_back) },
- { "GoForward", GTK_STOCK_GO_FORWARD,
+ { "GoForward", "go-next",
NULL, NULL,
N_("Go to the next visited location"),
G_CALLBACK (activate_action_go_forward) },
- { "GoUp", GTK_STOCK_GO_UP,
+ { "GoUp", "go-up",
NULL, NULL,
N_("Go up one level"),
G_CALLBACK (activate_action_go_up) },
- { "GoHome", GTK_STOCK_HOME,
+ { "GoHome", "go-home",
NULL, NULL,
/* Translators: the home location is the home folder. */
N_("Go to the home location"),