summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eel/eel-editable-label.c6
-rw-r--r--eel/eel-stock-dialogs.c2
-rw-r--r--libcaja-private/caja-autorun.c4
-rw-r--r--libcaja-private/caja-clipboard.c14
-rw-r--r--libcaja-private/caja-column-chooser.c8
-rw-r--r--libcaja-private/caja-file-conflict-dialog.c6
-rw-r--r--libcaja-private/caja-file-operations.c70
-rw-r--r--libcaja-private/caja-mime-actions.c12
-rw-r--r--libcaja-private/caja-mime-application-chooser.c14
-rw-r--r--libcaja-private/caja-open-with-dialog.c8
-rw-r--r--src/caja-connect-server-dialog.c4
-rw-r--r--src/caja-emblem-sidebar.c20
-rw-r--r--src/caja-location-bar.c2
-rw-r--r--src/caja-location-dialog.c6
-rw-r--r--src/caja-navigation-window-menus.c46
-rw-r--r--src/caja-navigation-window-pane.c2
-rw-r--r--src/caja-places-sidebar.c4
-rw-r--r--src/caja-property-browser.c43
-rw-r--r--src/caja-query-editor.c2
-rw-r--r--src/caja-spatial-window.c22
-rw-r--r--src/caja-window-bookmarks.c2
-rw-r--r--src/caja-window-menus.c50
-rw-r--r--src/file-manager/fm-directory-view.c182
-rw-r--r--src/file-manager/fm-list-view.c2
-rw-r--r--src/file-manager/fm-properties-window.c10
-rw-r--r--src/file-manager/fm-tree-view.c14
26 files changed, 287 insertions, 268 deletions
diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
index 7cdbc491..db01b771 100644
--- a/eel/eel-editable-label.c
+++ b/eel/eel-editable-label.c
@@ -3105,11 +3105,11 @@ popup_targets_received (GtkClipboard *clipboard,
clipboard_contains_text = gtk_selection_data_targets_include_text (data);
- append_action_signal (label, label->popup_menu, GTK_STOCK_CUT, "cut_clipboard",
+ append_action_signal (label, label->popup_menu, "gtk-cut", "cut_clipboard",
have_selection);
- append_action_signal (label, label->popup_menu, GTK_STOCK_COPY, "copy_clipboard",
+ append_action_signal (label, label->popup_menu, "gtk-copy", "copy_clipboard",
have_selection);
- append_action_signal (label, label->popup_menu, GTK_STOCK_PASTE, "paste_clipboard",
+ append_action_signal (label, label->popup_menu, "gtk-paste", "paste_clipboard",
clipboard_contains_text);
menuitem = gtk_menu_item_new_with_label (_("Select All"));
diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c
index 1d6d0802..ba5f20fc 100644
--- a/eel/eel-stock-dialogs.c
+++ b/eel/eel-stock-dialogs.c
@@ -201,7 +201,7 @@ timed_wait_callback (gpointer callback_data)
wait = callback_data;
/* Put up the timed wait window. */
- button = wait->cancel_callback != NULL ? GTK_STOCK_CANCEL : GTK_STOCK_OK;
+ button = wait->cancel_callback != NULL ? "gtk-cancel" : "gtk-ok";
dialog = GTK_DIALOG (gtk_message_dialog_new (wait->parent_window,
0,
GTK_MESSAGE_INFO,
diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c
index 22ed18df..1b85237a 100644
--- a/libcaja-private/caja-autorun.c
+++ b/libcaja-private/caja-autorun.c
@@ -1127,8 +1127,8 @@ show_dialog:
gtk_box_pack_start (GTK_BOX (vbox), always_check_button, TRUE, TRUE, 0);
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-ok", GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/libcaja-private/caja-clipboard.c b/libcaja-private/caja-clipboard.c
index 87d390be..88f2a808 100644
--- a/libcaja-private/caja-clipboard.c
+++ b/libcaja-private/caja-clipboard.c
@@ -451,22 +451,22 @@ target_data_free (TargetCallbackData *target_data)
static const GtkActionEntry clipboard_entries[] =
{
- /* name, stock id */ { "Cut", GTK_STOCK_CUT,
- /* label, accelerator */ NULL, NULL,
+ /* name, icon name */ { "Cut", "edit-cut",
+ /* label, accelerator */ N_("Cu_t"), NULL,
/* tooltip */ N_("Cut the selected text to the clipboard"),
G_CALLBACK (action_cut_callback)
},
- /* name, stock id */ { "Copy", GTK_STOCK_COPY,
- /* label, accelerator */ NULL, NULL,
+ /* name, icon name */ { "Copy", "edit-copy",
+ /* label, accelerator */ N_("_Copy"), NULL,
/* tooltip */ N_("Copy the selected text to the clipboard"),
G_CALLBACK (action_copy_callback)
},
- /* name, stock id */ { "Paste", GTK_STOCK_PASTE,
- /* label, accelerator */ NULL, NULL,
+ /* name, icon name */ { "Paste", "edit-paste",
+ /* label, accelerator */ N_("_Paste"), NULL,
/* tooltip */ N_("Paste the text stored on the clipboard"),
G_CALLBACK (action_paste_callback)
},
- /* name, stock id */ { "Select All", NULL,
+ /* name, icon name */ { "Select All", NULL,
/* label, accelerator */ N_("Select _All"), "<control>A",
/* tooltip */ N_("Select all the text in a text field"),
G_CALLBACK (action_select_all_callback)
diff --git a/libcaja-private/caja-column-chooser.c b/libcaja-private/caja-column-chooser.c
index 6574ae52..0e2520a5 100644
--- a/libcaja-private/caja-column-chooser.c
+++ b/libcaja-private/caja-column-chooser.c
@@ -354,13 +354,13 @@ use_default_clicked_callback (GtkWidget *button, gpointer user_data)
}
static GtkWidget *
-button_new_with_mnemonic (const gchar *stockid, const gchar *str)
+button_new_with_mnemonic (const gchar *icon_name, const gchar *str)
{
GtkWidget *image;
GtkWidget *button;
button = gtk_button_new_with_mnemonic (str);
- image = gtk_image_new_from_stock (stockid, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (button), image);
@@ -376,7 +376,7 @@ add_buttons (CajaColumnChooser *chooser)
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show (box);
- chooser->details->move_up_button = button_new_with_mnemonic (GTK_STOCK_GO_UP,
+ chooser->details->move_up_button = button_new_with_mnemonic ("go-up",
_("Move _Up"));
g_signal_connect (chooser->details->move_up_button,
"clicked", G_CALLBACK (move_up_clicked_callback),
@@ -386,7 +386,7 @@ add_buttons (CajaColumnChooser *chooser)
gtk_box_pack_start (GTK_BOX (box), chooser->details->move_up_button,
FALSE, FALSE, 0);
- chooser->details->move_down_button = button_new_with_mnemonic (GTK_STOCK_GO_DOWN,
+ chooser->details->move_down_button = button_new_with_mnemonic ("go-down",
_("Move Dow_n"));
g_signal_connect (chooser->details->move_down_button,
"clicked", G_CALLBACK (move_down_clicked_callback),
diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c
index 003bcf76..2a231e8f 100644
--- a/libcaja-private/caja-file-conflict-dialog.c
+++ b/libcaja-private/caja-file-conflict-dialog.c
@@ -622,7 +622,7 @@ caja_file_conflict_dialog_init (CajaFileConflictDialog *fcd)
widget = gtk_button_new_with_label (_("Reset"));
gtk_button_set_image (GTK_BUTTON (widget),
- gtk_image_new_from_stock (GTK_STOCK_UNDO,
+ gtk_image_new_from_icon_name ("edit-undo",
GTK_ICON_SIZE_MENU));
gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 6);
g_signal_connect (widget, "clicked",
@@ -633,7 +633,7 @@ caja_file_conflict_dialog_init (CajaFileConflictDialog *fcd)
/* Setup the diff button for text files */
details->diff_button = gtk_button_new_with_label (_("Differences..."));
gtk_button_set_image (GTK_BUTTON (details->diff_button),
- gtk_image_new_from_stock (GTK_STOCK_FIND,
+ gtk_image_new_from_icon_name ("edit-find",
GTK_ICON_SIZE_MENU));
gtk_box_pack_start (GTK_BOX (vbox), details->diff_button, FALSE, FALSE, 6);
g_signal_connect (details->diff_button, "clicked",
@@ -651,7 +651,7 @@ caja_file_conflict_dialog_init (CajaFileConflictDialog *fcd)
/* Add buttons */
gtk_dialog_add_buttons (dialog,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
_("_Skip"),
CONFLICT_RESPONSE_SKIP,
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index d8320339..b1eac871 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -1367,7 +1367,7 @@ confirm_delete_from_trash (CommonJob *job,
f (_("If you delete an item, it will be permanently lost.")),
NULL,
FALSE,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE,
+ "gtk-cancel", "gtk-delete",
NULL);
return (response == 1);
@@ -1391,7 +1391,7 @@ confirm_empty_trash (CommonJob *job)
f(_("All items in the Trash will be permanently deleted.")),
NULL,
FALSE,
- GTK_STOCK_CANCEL, _("Empty _Trash"),
+ "gtk-cancel", _("Empty _Trash"),
NULL);
return (response == 1);
@@ -1433,7 +1433,7 @@ confirm_delete_directly (CommonJob *job,
f (_("If you delete an item, it will be permanently lost.")),
NULL,
FALSE,
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE,
+ "gtk-cancel", "gtk-delete",
NULL);
return response == 1;
@@ -1475,7 +1475,7 @@ confirm_trash (CommonJob *job,
f (_("Items moved to the trash may be recovered until the trash is emptied.")),
NULL,
FALSE,
- GTK_STOCK_CANCEL, _("Move to _Trash"),
+ "gtk-cancel", _("Move to _Trash"),
NULL);
return response == 1;
@@ -1609,7 +1609,7 @@ delete_dir (CommonJob *job, GFile *dir,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, _("_Skip files"),
+ "gtk-cancel", _("_Skip files"),
NULL);
g_error_free (error);
@@ -1642,7 +1642,7 @@ delete_dir (CommonJob *job, GFile *dir,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, SKIP, RETRY,
+ "gtk-cancel", SKIP, RETRY,
NULL);
g_error_free (error);
@@ -1675,7 +1675,7 @@ delete_dir (CommonJob *job, GFile *dir,
secondary,
details,
(source_info->num_files - transfer_info->num_files) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ "gtk-cancel", SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -1752,7 +1752,7 @@ delete_file (CommonJob *job, GFile *file,
secondary,
details,
(source_info->num_files - transfer_info->num_files) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ "gtk-cancel", SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -1895,7 +1895,7 @@ trash_files (CommonJob *job, GList *files, int *files_skipped)
secondary,
details,
(total_files - files_trashed) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP, DELETE_ALL, GTK_STOCK_DELETE,
+ "gtk-cancel", SKIP_ALL, SKIP, DELETE_ALL, "gtk-delete",
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -2316,7 +2316,7 @@ prompt_empty_trash (GtkWindow *parent_window)
"will be permanently lost."));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
_("Do _not Empty Trash"), GTK_RESPONSE_REJECT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
_("Empty _Trash"), GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
gtk_window_set_title (GTK_WINDOW (dialog), ""); /* as per HIG */
@@ -2631,7 +2631,7 @@ scan_dir (GFile *dir,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, RETRY, SKIP,
+ "gtk-cancel", RETRY, SKIP,
NULL);
g_error_free (error);
@@ -2672,7 +2672,7 @@ scan_dir (GFile *dir,
secondary,
details,
TRUE,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP, RETRY,
+ "gtk-cancel", SKIP_ALL, SKIP, RETRY,
NULL);
g_error_free (error);
@@ -2750,7 +2750,7 @@ scan_file (GFile *file,
secondary,
details,
TRUE,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP, RETRY,
+ "gtk-cancel", SKIP_ALL, SKIP, RETRY,
NULL);
g_error_free (error);
@@ -2854,7 +2854,7 @@ verify_destination (CommonJob *job,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, RETRY,
+ "gtk-cancel", RETRY,
NULL);
g_error_free (error);
@@ -2889,7 +2889,7 @@ verify_destination (CommonJob *job,
secondary,
NULL,
FALSE,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
NULL);
abort_job (job);
@@ -2924,7 +2924,7 @@ verify_destination (CommonJob *job,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
COPY_FORCE,
RETRY,
NULL);
@@ -2952,7 +2952,7 @@ verify_destination (CommonJob *job,
secondary,
NULL,
FALSE,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
NULL);
g_error_free (error);
@@ -3472,7 +3472,7 @@ create_dest_dir (CommonJob *job,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, SKIP, RETRY,
+ "gtk-cancel", SKIP, RETRY,
NULL);
g_error_free (error);
@@ -3613,7 +3613,7 @@ copy_move_directory (CopyMoveJob *copy_job,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, _("_Skip files"),
+ "gtk-cancel", _("_Skip files"),
NULL);
g_error_free (error);
@@ -3658,7 +3658,7 @@ copy_move_directory (CopyMoveJob *copy_job,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, SKIP, RETRY,
+ "gtk-cancel", SKIP, RETRY,
NULL);
g_error_free (error);
@@ -3700,7 +3700,7 @@ copy_move_directory (CopyMoveJob *copy_job,
secondary,
details,
(source_info->num_files - transfer_info->num_files) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ "gtk-cancel", SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -3789,7 +3789,7 @@ remove_target_recursively (CommonJob *job,
secondary,
details,
TRUE,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ "gtk-cancel", SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -3830,7 +3830,7 @@ remove_target_recursively (CommonJob *job,
secondary,
details,
TRUE,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ "gtk-cancel", SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -4147,7 +4147,7 @@ copy_move_file (CopyMoveJob *copy_job,
secondary,
NULL,
(source_info->num_files - transfer_info->num_files) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ "gtk-cancel", SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -4180,7 +4180,7 @@ copy_move_file (CopyMoveJob *copy_job,
secondary,
NULL,
(source_info->num_files - transfer_info->num_files) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ "gtk-cancel", SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -4400,7 +4400,7 @@ copy_move_file (CopyMoveJob *copy_job,
secondary,
details,
TRUE,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ "gtk-cancel", SKIP_ALL, SKIP,
NULL);
g_error_free (error);
@@ -4468,7 +4468,7 @@ copy_move_file (CopyMoveJob *copy_job,
secondary,
details,
(source_info->num_files - transfer_info->num_files) > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ "gtk-cancel", SKIP_ALL, SKIP,
NULL);
g_error_free (error);
@@ -4832,7 +4832,7 @@ move_file_prepare (CopyMoveJob *move_job,
secondary,
NULL,
files_left > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ "gtk-cancel", SKIP_ALL, SKIP,
NULL);
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
@@ -4986,7 +4986,7 @@ move_file_prepare (CopyMoveJob *move_job,
secondary,
details,
files_left > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ "gtk-cancel", SKIP_ALL, SKIP,
NULL);
g_error_free (error);
@@ -5432,7 +5432,7 @@ link_file (CopyMoveJob *job,
secondary,
details,
files_left > 1,
- GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+ "gtk-cancel", SKIP_ALL, SKIP,
NULL);
if (error) {
@@ -6190,7 +6190,7 @@ create_job (GIOSchedulerJob *io_job,
secondary,
details,
FALSE,
- GTK_STOCK_CANCEL, SKIP,
+ "gtk-cancel", SKIP,
NULL);
g_error_free (error);
@@ -6513,7 +6513,7 @@ mark_desktop_file_trusted (CommonJob *common,
error->message,
NULL,
FALSE,
- GTK_STOCK_CANCEL, RETRY,
+ "gtk-cancel", RETRY,
NULL);
} else {
response = 0;
@@ -6554,7 +6554,7 @@ mark_desktop_file_trusted (CommonJob *common,
error->message,
NULL,
FALSE,
- GTK_STOCK_CANCEL, RETRY,
+ "gtk-cancel", RETRY,
NULL);
} else {
response = 0;
@@ -6589,7 +6589,7 @@ mark_desktop_file_trusted (CommonJob *common,
error->message,
NULL,
FALSE,
- GTK_STOCK_CANCEL, RETRY,
+ "gtk-cancel", RETRY,
NULL);
} else {
response = 0;
@@ -6624,7 +6624,7 @@ mark_desktop_file_trusted (CommonJob *common,
error->message,
NULL,
FALSE,
- GTK_STOCK_CANCEL, RETRY,
+ "gtk-cancel", RETRY,
NULL);
} else {
response = 0;
diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c
index b52279f7..bb120a9d 100644
--- a/libcaja-private/caja-mime-actions.c
+++ b/libcaja-private/caja-mime-actions.c
@@ -737,11 +737,11 @@ report_broken_symbolic_link (GtkWindow *parent_window, CajaFile *file)
if (caja_file_is_in_trash (file))
{
eel_run_simple_dialog (GTK_WIDGET (parent_window), FALSE, GTK_MESSAGE_WARNING,
- prompt, detail, GTK_STOCK_CANCEL, NULL);
+ prompt, detail, "gtk-cancel", NULL);
goto out;
}
- dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), GTK_STOCK_CANCEL,
+ dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), "gtk-cancel",
parent_window);
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
@@ -814,7 +814,7 @@ get_executable_text_file_action (GtkWindow *parent_window, CajaFile *file)
_("Run in _Terminal"), RESPONSE_RUN_IN_TERMINAL,
_("_Display"), RESPONSE_DISPLAY,
parent_window);
- gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (dialog, "gtk-cancel", GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (dialog, _("_Run"), RESPONSE_RUN);
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
gtk_widget_show (GTK_WIDGET (dialog));
@@ -1179,7 +1179,7 @@ confirm_multiple_windows (GtkWindow *parent_window,
"This will open %d separate windows.", count), count);
}
dialog = eel_show_yes_no_dialog (prompt, detail,
- GTK_STOCK_OK, GTK_STOCK_CANCEL,
+ "gtk-ok", "gtk-cancel",
parent_window);
g_free (detail);
@@ -1361,7 +1361,7 @@ show_unhandled_type_error (ActivateParametersInstall *parameters)
gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Select Application"), GTK_RESPONSE_ACCEPT);
- gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
+ gtk_dialog_add_button (GTK_DIALOG (dialog), "gtk-ok", GTK_RESPONSE_OK);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -1714,7 +1714,7 @@ activate_desktop_file (ActivateParameters *parameters,
_("Mark as _Trusted"), RESPONSE_MARK_TRUSTED);
}
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ "gtk-cancel", GTK_RESPONSE_CANCEL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
g_signal_connect (dialog, "response",
diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c
index 4bd322ac..b36a23c4 100644
--- a/libcaja-private/caja-mime-application-chooser.c
+++ b/libcaja-private/caja-mime-application-chooser.c
@@ -417,7 +417,12 @@ caja_mime_application_chooser_init (CajaMimeApplicationChooser *chooser)
gtk_box_pack_start (GTK_BOX (chooser), box, FALSE, FALSE, 6);
gtk_widget_show (box);
- button = gtk_button_new_from_stock (GTK_STOCK_ADD);
+ button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
+ "label", "gtk-add",
+ "use-stock", TRUE,
+ "use-underline", TRUE,
+ NULL));
+
g_signal_connect (button, "clicked",
G_CALLBACK (add_clicked_cb),
chooser);
@@ -425,7 +430,12 @@ caja_mime_application_chooser_init (CajaMimeApplicationChooser *chooser)
gtk_widget_show (button);
gtk_container_add (GTK_CONTAINER (box), button);
- button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
+ button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
+ "label", "gtk-remove",
+ "use-stock", TRUE,
+ "use-underline", TRUE,
+ NULL));
+
g_signal_connect (button, "clicked",
G_CALLBACK (remove_clicked_cb),
chooser);
diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c
index bbbdcf34..8e45f6f5 100644
--- a/libcaja-private/caja-open-with-dialog.c
+++ b/libcaja-private/caja-open-with-dialog.c
@@ -450,9 +450,9 @@ browse_clicked_cb (GtkWidget *button,
chooser = gtk_file_chooser_dialog_new (_("Select an Application"),
GTK_WINDOW (dialog),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN,
+ "gtk-open",
GTK_RESPONSE_OK,
NULL);
gtk_window_set_destroy_with_parent (GTK_WINDOW (chooser), TRUE);
@@ -932,14 +932,14 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog)
gtk_box_pack_start (GTK_BOX (vbox), dialog->details->checkbox, FALSE, FALSE, 0);
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_REMOVE,
+ "gtk-remove",
RESPONSE_REMOVE);
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
RESPONSE_REMOVE,
FALSE);
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL);
diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c
index 13fc3c58..a515f1e5 100644
--- a/src/caja-connect-server-dialog.c
+++ b/src/caja-connect-server-dialog.c
@@ -1116,10 +1116,10 @@ caja_connect_server_dialog_init (CajaConnectServerDialog *dialog)
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_HELP,
+ "gtk-help",
GTK_RESPONSE_HELP);
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL);
connect_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
_("C_onnect"),
diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c
index 0c5b0056..63e90bb4 100644
--- a/src/caja-emblem-sidebar.c
+++ b/src/caja-emblem-sidebar.c
@@ -284,11 +284,11 @@ create_rename_emblem_dialog (CajaEmblemSidebar *emblem_sidebar,
dialog = gtk_dialog_new_with_buttons (_("Rename Emblem"),
NULL,
0,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
+ "gtk-ok",
GTK_RESPONSE_OK,
- GTK_STOCK_HELP,
+ "gtk-help",
GTK_RESPONSE_HELP,
NULL);
@@ -351,8 +351,8 @@ create_popup_menu (CajaEmblemSidebar *emblem_sidebar)
popup = gtk_menu_new ();
/* add the "rename" menu item */
- menu_image = gtk_image_new_from_stock (GTK_STOCK_PROPERTIES,
- GTK_ICON_SIZE_MENU);
+ menu_image = gtk_image_new_from_icon_name ("document-properties",
+ GTK_ICON_SIZE_MENU);
gtk_widget_show (menu_image);
menu_item = gtk_image_menu_item_new_with_label (_("Rename"));
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
@@ -366,8 +366,8 @@ create_popup_menu (CajaEmblemSidebar *emblem_sidebar)
emblem_sidebar->details->popup_rename = menu_item;
/* add "delete" menu item */
- menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE,
- NULL);
+ menu_item = gtk_image_menu_item_new_from_stock ("gtk-delete",
+ NULL);
g_signal_connect (menu_item, "activate",
G_CALLBACK (caja_emblem_sidebar_delete_cb),
emblem_sidebar);
@@ -537,11 +537,11 @@ create_add_emblems_dialog (CajaEmblemSidebar *emblem_sidebar,
dialog = gtk_dialog_new_with_buttons (_("Add Emblems..."),
NULL,
0,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
+ "gtk-ok",
GTK_RESPONSE_OK,
- GTK_STOCK_HELP,
+ "gtk-help",
GTK_RESPONSE_HELP,
NULL);
diff --git a/src/caja-location-bar.c b/src/caja-location-bar.c
index ad9c423e..601cf33c 100644
--- a/src/caja-location-bar.c
+++ b/src/caja-location-bar.c
@@ -203,7 +203,7 @@ drag_data_received_callback (GtkWidget *widget,
GTK_MESSAGE_QUESTION,
prompt,
detail,
- GTK_STOCK_CANCEL, GTK_STOCK_OK,
+ "gtk-cancel", "gtk-ok",
NULL) != 0 /* MATE_OK */;
g_free (prompt);
diff --git a/src/caja-location-dialog.c b/src/caja-location-dialog.c
index 1e9a0b38..f5354eb9 100644
--- a/src/caja-location-dialog.c
+++ b/src/caja-location-dialog.c
@@ -186,13 +186,13 @@ caja_location_dialog_init (CajaLocationDialog *dialog)
box, FALSE, TRUE, 0);
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_HELP,
+ "gtk-help",
GTK_RESPONSE_HELP);
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_OPEN,
+ "gtk-open",
RESPONSE_OPEN);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
RESPONSE_OPEN);
diff --git a/src/caja-navigation-window-menus.c b/src/caja-navigation-window-menus.c
index 4b40494c..d9da43f3 100644
--- a/src/caja-navigation-window-menus.c
+++ b/src/caja-navigation-window-menus.c
@@ -131,8 +131,8 @@ forget_history_if_confirmed (CajaWindow *window)
dialog = eel_create_question_dialog (_("Are you sure you want to clear the list "
"of locations you have visited?"),
NULL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_CLEAR, RESPONSE_FORGET,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-clear", RESPONSE_FORGET,
GTK_WINDOW (window));
gtk_widget_show (GTK_WIDGET (dialog));
@@ -821,46 +821,46 @@ action_tab_change_action_activate_callback (GtkAction *action, gpointer user_dat
static const GtkActionEntry navigation_entries[] =
{
- /* name, stock id, label */ { "Go", NULL, N_("_Go") },
- /* name, stock id, label */ { "Bookmarks", NULL, N_("_Bookmarks") },
- /* name, stock id, label */ { "Tabs", NULL, N_("_Tabs") },
- /* name, stock id, label */ { "New Window", "window-new", N_("New _Window"),
+ /* name, icon name, label */ { "Go", NULL, N_("_Go") },
+ /* name, icon name, label */ { "Bookmarks", NULL, N_("_Bookmarks") },
+ /* name, icon name, label */ { "Tabs", NULL, N_("_Tabs") },
+ /* name, icon name, label */ { "New Window", "window-new", N_("New _Window"),
"<control>N", N_("Open another Caja window for the displayed location"),
G_CALLBACK (action_new_window_callback)
},
- /* name, stock id, label */ { "New Tab", "tab-new", N_("New _Tab"),
+ /* name, icon name, label */ { "New Tab", "tab-new", N_("New _Tab"),
"<control>T", N_("Open another tab for the displayed location"),
G_CALLBACK (action_new_tab_callback)
},
- /* name, stock id, label */ { "Folder Window", "folder", N_("Open Folder W_indow"),
+ /* name, icon name, label */ { "Folder Window", "folder", N_("Open Folder W_indow"),
NULL, N_("Open a folder window for the displayed location"),
G_CALLBACK (action_folder_window_callback)
},
- /* name, stock id, label */ { "Close All Windows", NULL, N_("Close _All Windows"),
+ /* name, icon name, label */ { "Close All Windows", NULL, N_("Close _All Windows"),
"<control>Q", N_("Close all Navigation windows"),
G_CALLBACK (action_close_all_windows_callback)
},
- /* name, stock id, label */ { "Go to Location", NULL, N_("_Location..."),
+ /* name, icon name, label */ { "Go to Location", NULL, N_("_Location..."),
"<control>L", N_("Specify a location to open"),
G_CALLBACK (action_go_to_location_callback)
},
- /* name, stock id, label */ { "Clear History", NULL, N_("Clea_r History"),
+ /* name, icon name, label */ { "Clear History", NULL, N_("Clea_r History"),
NULL, N_("Clear contents of Go menu and Back/Forward lists"),
G_CALLBACK (action_clear_history_callback)
},
- /* name, stock id, label */ { "SplitViewNextPane", NULL, N_("S_witch to Other Pane"),
+ /* name, icon name, label */ { "SplitViewNextPane", NULL, N_("S_witch to Other Pane"),
"F6", N_("Move focus to the other pane in a split view window"),
G_CALLBACK (action_split_view_switch_next_pane_callback)
},
- /* name, stock id, label */ { "SplitViewSameLocation", NULL, N_("Sa_me Location as Other Pane"),
+ /* name, icon name, label */ { "SplitViewSameLocation", NULL, N_("Sa_me Location as Other Pane"),
NULL, N_("Go to the same location as in the extra pane"),
G_CALLBACK (action_split_view_same_location_callback)
},
- /* name, stock id, label */ { "Add Bookmark", GTK_STOCK_ADD, N_("_Add Bookmark"),
+ /* name, icon name, label */ { "Add Bookmark", "list-add", N_("_Add Bookmark"),
"<control>d", N_("Add a bookmark for the current location to this menu"),
G_CALLBACK (action_add_bookmark_callback)
},
- /* name, stock id, label */ { "Edit Bookmarks", NULL, N_("_Edit Bookmarks..."),
+ /* name, icon name, label */ { "Edit Bookmarks", NULL, N_("_Edit Bookmarks..."),
"<control>b", N_("Display a window that allows editing the bookmarks in this menu"),
G_CALLBACK (action_edit_bookmarks_callback)
},
@@ -893,38 +893,38 @@ static const GtkActionEntry navigation_entries[] =
static const GtkToggleActionEntry navigation_toggle_entries[] =
{
- /* name, stock id */ { "Show Hide Toolbar", NULL,
+ /* name, icon name */ { "Show Hide Toolbar", NULL,
/* label, accelerator */ N_("_Main Toolbar"), NULL,
/* tooltip */ N_("Change the visibility of this window's main toolbar"),
G_CALLBACK (action_show_hide_toolbar_callback),
/* is_active */ TRUE
},
- /* name, stock id */ { "Show Hide Sidebar", NULL,
+ /* name, icon name */ { "Show Hide Sidebar", NULL,
/* label, accelerator */ N_("_Side Pane"), "F9",
/* tooltip */ N_("Change the visibility of this window's side pane"),
G_CALLBACK (action_show_hide_sidebar_callback),
/* is_active */ TRUE
},
- /* name, stock id */ { "Show Hide Location Bar", NULL,
+ /* name, icon name */ { "Show Hide Location Bar", NULL,
/* label, accelerator */ N_("Location _Bar"), NULL,
/* tooltip */ N_("Change the visibility of this window's location bar"),
G_CALLBACK (action_show_hide_location_bar_callback),
/* is_active */ TRUE
},
- /* name, stock id */ { "Show Hide Statusbar", NULL,
+ /* name, icon name */ { "Show Hide Statusbar", NULL,
/* label, accelerator */ N_("St_atusbar"), NULL,
/* tooltip */ N_("Change the visibility of this window's statusbar"),
G_CALLBACK (action_show_hide_statusbar_callback),
/* is_active */ TRUE
},
- /* name, stock id */ { "Search", "gtk-find",
+ /* name, icon name */ { "Search", "gtk-find",
/* label, accelerator */ N_("_Search for Files..."),
/* Accelerator is in ShowSearch */"",
/* tooltip */ N_("Search documents and folders by name"),
G_CALLBACK (action_show_hide_search_callback),
/* is_active */ FALSE
},
- /* name, stock id */ {
+ /* name, icon name */ {
CAJA_ACTION_SHOW_HIDE_EXTRA_PANE, NULL,
/* label, accelerator */ N_("E_xtra Pane"), "F3",
/* tooltip */ N_("Open an extra folder view side-by-side"),
@@ -954,7 +954,7 @@ caja_navigation_window_initialize_actions (CajaNavigationWindow *window)
action = g_object_new (CAJA_TYPE_NAVIGATION_ACTION,
"name", "Back",
"label", _("_Back"),
- "stock_id", GTK_STOCK_GO_BACK,
+ "stock_id", "gtk-go-back",
"tooltip", _("Go to the previous visited location"),
"arrow-tooltip", _("Back history"),
"window", window,
@@ -971,7 +971,7 @@ caja_navigation_window_initialize_actions (CajaNavigationWindow *window)
action = g_object_new (CAJA_TYPE_NAVIGATION_ACTION,
"name", "Forward",
"label", _("_Forward"),
- "stock_id", GTK_STOCK_GO_FORWARD,
+ "stock_id", "gtk-go-forward",
"tooltip", _("Go to the next visited location"),
"arrow-tooltip", _("Forward history"),
"window", window,
diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c
index 62e0f9a2..6f12690b 100644
--- a/src/caja-navigation-window-pane.c
+++ b/src/caja-navigation-window-pane.c
@@ -481,7 +481,7 @@ notebook_popup_menu_show (CajaNavigationWindowPane *pane,
gtk_separator_menu_item_new ());
item = gtk_image_menu_item_new_with_mnemonic (_("_Close Tab"));
- image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
g_signal_connect (item, "activate",
G_CALLBACK (notebook_popup_menu_close_cb), pane);
diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c
index 9d081f6d..990acd0f 100644
--- a/src/caja-places-sidebar.c
+++ b/src/caja-places-sidebar.c
@@ -2655,7 +2655,7 @@ bookmarks_build_popup_menu (CajaPlacesSidebar *sidebar)
item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
- gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_MENU));
g_signal_connect (item, "activate",
G_CALLBACK (open_shortcut_cb), sidebar);
gtk_widget_show (item);
@@ -2679,7 +2679,7 @@ bookmarks_build_popup_menu (CajaPlacesSidebar *sidebar)
item = gtk_image_menu_item_new_with_label (_("Remove"));
sidebar->popup_menu_remove_item = item;
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
- gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_MENU));
g_signal_connect (item, "activate",
G_CALLBACK (remove_shortcut_cb), sidebar);
gtk_widget_show (item);
diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c
index 09233e9c..1125ed90 100644
--- a/src/caja-property-browser.c
+++ b/src/caja-property-browser.c
@@ -387,14 +387,23 @@ caja_property_browser_init (CajaPropertyBrowser *property_browser)
gtk_container_add (GTK_CONTAINER (temp_box), property_browser->details->bottom_box);
/* create the "help" button */
- temp_button = gtk_button_new_from_stock (GTK_STOCK_HELP);
+ temp_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
+ "label", "gtk-help",
+ "use-stock", TRUE,
+ "use-underline", TRUE,
+ NULL));
gtk_widget_show (temp_button);
gtk_box_pack_start (GTK_BOX (property_browser->details->bottom_box), temp_button, FALSE, FALSE, 0);
g_signal_connect_object (temp_button, "clicked", G_CALLBACK (help_button_callback), property_browser, 0);
/* create the "done" button */
- temp_button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
+ temp_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
+ "label", "gtk-close",
+ "use-stock", TRUE,
+ "use-underline", TRUE,
+ NULL));
+
gtk_widget_set_can_default (temp_button, TRUE);
gtk_widget_show (temp_button);
@@ -406,7 +415,7 @@ caja_property_browser_init (CajaPropertyBrowser *property_browser)
/* create the "remove" button */
property_browser->details->remove_button = gtk_button_new_with_mnemonic (_("_Remove..."));
- property_browser->details->remove_button_image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON);
+ property_browser->details->remove_button_image = gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (property_browser->details->remove_button),
property_browser->details->remove_button_image);
gtk_widget_show_all (property_browser->details->remove_button);
@@ -420,7 +429,7 @@ caja_property_browser_init (CajaPropertyBrowser *property_browser)
/* now create the "add new" button */
property_browser->details->add_button = gtk_button_new_with_mnemonic (_("Add new..."));
- property_browser->details->add_button_image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
+ property_browser->details->add_button_image = gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (property_browser->details->add_button),
property_browser->details->add_button_image);
gtk_widget_show_all (property_browser->details->add_button);
@@ -1062,8 +1071,8 @@ icon_button_clicked_cb (GtkButton *b,
dialog = gtk_file_chooser_dialog_new (_("Select an Image File for the New Emblem"),
GTK_WINDOW (browser),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-open", GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
DATADIR "/pixmaps");
@@ -1102,8 +1111,8 @@ caja_emblem_dialog_new (CajaPropertyBrowser *property_browser)
dialog = gtk_dialog_new_with_buttons (_("Create a New Emblem"),
GTK_WINDOW (property_browser), 0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-ok", GTK_RESPONSE_OK,
NULL);
/* install the grid in the dialog */
@@ -1174,8 +1183,8 @@ caja_color_selection_dialog_new (CajaPropertyBrowser *property_browser)
dialog = gtk_dialog_new_with_buttons (_("Create a New Color:"),
GTK_WINDOW (property_browser), 0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-ok", GTK_RESPONSE_OK,
NULL);
/* install the grid in the dialog */
@@ -1303,8 +1312,8 @@ add_new_pattern (CajaPropertyBrowser *property_browser)
gtk_file_chooser_dialog_new (_("Select an Image File to Add as a Pattern"),
GTK_WINDOW (property_browser),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-open", GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
DATADIR "/caja/patterns/");
@@ -2286,15 +2295,15 @@ caja_property_browser_update_contents (CajaPropertyBrowser *property_browser)
else
{
char *label_text;
- char *stock_id;
+ char *icon_name;
if (property_browser->details->remove_mode)
{
- stock_id = GTK_STOCK_CANCEL;
+ icon_name = "process-stop";
text = _("C_ancel Remove");
}
else
{
- stock_id = GTK_STOCK_ADD;
+ icon_name = "list-add";
/* FIXME: Using spaces to add padding is not good design. */
switch (property_browser->details->category_type)
{
@@ -2314,8 +2323,8 @@ caja_property_browser_update_contents (CajaPropertyBrowser *property_browser)
}
/* enable the "add new" button and update it's name and icon */
- gtk_image_set_from_stock (GTK_IMAGE(property_browser->details->add_button_image), stock_id,
- GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name (GTK_IMAGE(property_browser->details->add_button_image), icon_name,
+ GTK_ICON_SIZE_BUTTON);
if (text != NULL)
{
diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c
index f151eccd..f0101ab6 100644
--- a/src/caja-query-editor.c
+++ b/src/caja-query-editor.c
@@ -713,7 +713,7 @@ type_combo_changed (GtkComboBox *combo_box, CajaQueryEditorRow *row)
dialog = gtk_dialog_new_with_buttons (_("Select type"),
GTK_WINDOW (toplevel),
0,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ "gtk-ok", GTK_RESPONSE_OK,
NULL);
gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 600);
diff --git a/src/caja-spatial-window.c b/src/caja-spatial-window.c
index 6d3d0112..1e043b07 100644
--- a/src/caja-spatial-window.c
+++ b/src/caja-spatial-window.c
@@ -590,7 +590,7 @@ got_file_info_for_location_menu_callback (CajaFile *file,
}
else
{
- icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+ icon = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_MENU);
}
if (icon)
@@ -871,8 +871,8 @@ caja_spatial_window_set_location_button (CajaSpatialWindow *window,
}
else
{
- gtk_image_set_from_stock (GTK_IMAGE (window->details->location_icon),
- GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+ gtk_image_set_from_icon_name (GTK_IMAGE (window->details->location_icon),
+ "document-open", GTK_ICON_SIZE_MENU);
}
}
g_object_unref (file);
@@ -937,31 +937,31 @@ action_search_callback (GtkAction *action,
static const GtkActionEntry spatial_entries[] =
{
- /* name, stock id, label */ { SPATIAL_ACTION_PLACES, NULL, N_("_Places") },
- /* name, stock id, label */ {
+ /* name, icon name, label */ { SPATIAL_ACTION_PLACES, NULL, N_("_Places") },
+ /* name, icon name, label */ {
SPATIAL_ACTION_GO_TO_LOCATION, NULL, N_("Open _Location..."),
"<control>L", N_("Specify a location to open"),
G_CALLBACK (action_go_to_location_callback)
},
- /* name, stock id, label */ {
+ /* name, icon name, label */ {
SPATIAL_ACTION_CLOSE_PARENT_FOLDERS, NULL, N_("Close P_arent Folders"),
"<control><shift>W", N_("Close this folder's parents"),
G_CALLBACK (action_close_parent_folders_callback)
},
- /* name, stock id, label */ {
+ /* name, icon name, label */ {
SPATIAL_ACTION_CLOSE_ALL_FOLDERS, NULL, N_("Clos_e All Folders"),
"<control>Q", N_("Close all folder windows"),
G_CALLBACK (action_close_all_folders_callback)
},
- /* name, stock id, label */ { "Add Bookmark", GTK_STOCK_ADD, N_("_Add Bookmark"),
+ /* name, icon name, label */ { "Add Bookmark", "list-add", N_("_Add Bookmark"),
"<control>d", N_("Add a bookmark for the current location to this menu"),
G_CALLBACK (action_add_bookmark_callback)
},
- /* name, stock id, label */ { "Edit Bookmarks", NULL, N_("_Edit Bookmarks..."),
+ /* name, icon name, label */ { "Edit Bookmarks", NULL, N_("_Edit Bookmarks..."),
"<control>b", N_("Display a window that allows editing the bookmarks in this menu"),
G_CALLBACK (action_edit_bookmarks_callback)
},
- /* name, stock id, label */ { "Search", "gtk-find", N_("_Search for Files..."),
+ /* name, icon name, label */ { "Search", "gtk-find", N_("_Search for Files..."),
"<control>F", N_("Locate documents and folders on this computer by name or content"),
G_CALLBACK (action_search_callback)
},
@@ -1032,7 +1032,7 @@ caja_spatial_window_init (CajaSpatialWindow *window)
hbox);
gtk_widget_show (hbox);
- window->details->location_icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+ window->details->location_icon = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_MENU);
gtk_box_pack_start (GTK_BOX (hbox), window->details->location_icon, FALSE, FALSE, 0);
gtk_widget_show (window->details->location_icon);
diff --git a/src/caja-window-bookmarks.c b/src/caja-window-bookmarks.c
index f96b823f..72819139 100644
--- a/src/caja-window-bookmarks.c
+++ b/src/caja-window-bookmarks.c
@@ -84,7 +84,7 @@ show_bogus_bookmark_window (CajaWindow *window,
dialog = eel_show_yes_no_dialog (prompt, detail,
_("Bookmark for Nonexistent Location"),
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_WINDOW (window));
g_signal_connect (dialog, "response",
diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
index 8eefea3e..d425b6d7 100644
--- a/src/caja-window-menus.c
+++ b/src/caja-window-menus.c
@@ -803,11 +803,11 @@ caja_window_initialize_trash_icon_monitor (CajaWindow *window)
static const GtkActionEntry main_entries[] =
{
- /* name, stock id, label */ { "File", NULL, N_("_File") },
- /* name, stock id, label */ { "Edit", NULL, N_("_Edit") },
- /* name, stock id, label */ { "View", NULL, N_("_View") },
- /* name, stock id, label */ { "Help", NULL, N_("_Help") },
- /* name, stock id */ { "Close", GTK_STOCK_CLOSE,
+ /* name, icon name, label */ { "File", NULL, N_("_File") },
+ /* name, icon name, label */ { "Edit", NULL, N_("_Edit") },
+ /* name, icon name, label */ { "View", NULL, N_("_View") },
+ /* name, icon name, label */ { "Help", NULL, N_("_Help") },
+ /* name, icon name */ { "Close", "window-close",
/* label, accelerator */ N_("_Close"), "<control>W",
/* tooltip */ N_("Close this folder"),
G_CALLBACK (action_close_window_slot_callback)
@@ -819,95 +819,95 @@ static const GtkActionEntry main_entries[] =
G_CALLBACK (action_backgrounds_and_emblems_callback)
},
{
- "Preferences", GTK_STOCK_PREFERENCES,
+ "Preferences", "preferences-desktop",
N_("Prefere_nces"),
NULL, N_("Edit Caja preferences"),
G_CALLBACK (action_preferences_callback)
},
- /* name, stock id, label */ { "Up", GTK_STOCK_GO_UP, N_("Open _Parent"),
+ /* name, icon name, label */ { "Up", "go-up", N_("Open _Parent"),
"<alt>Up", N_("Open the parent folder"),
G_CALLBACK (action_up_callback)
},
- /* name, stock id, label */ { "UpAccel", NULL, "UpAccel",
+ /* name, icon name, label */ { "UpAccel", NULL, "UpAccel",
"", NULL,
G_CALLBACK (action_up_callback)
},
- /* name, stock id */ { "Stop", GTK_STOCK_STOP,
+ /* name, icon name */ { "Stop", "process-stop",
/* label, accelerator */ N_("_Stop"), NULL,
/* tooltip */ N_("Stop loading the current location"),
G_CALLBACK (action_stop_callback)
},
- /* name, stock id */ { "Reload", GTK_STOCK_REFRESH,
+ /* name, icon name */ { "Reload", "view-refresh",
/* label, accelerator */ N_("_Reload"), "<control>R",
/* tooltip */ N_("Reload the current location"),
G_CALLBACK (action_reload_callback)
},
- /* name, stock id */ { "Caja Manual", GTK_STOCK_HELP,
+ /* name, icon name */ { "Caja Manual", "help-browser",
/* label, accelerator */ N_("_Contents"), "F1",
/* tooltip */ N_("Display Caja help"),
G_CALLBACK (action_caja_manual_callback)
},
- /* name, stock id */ { "About Caja", GTK_STOCK_ABOUT,
+ /* name, icon name */ { "About Caja", "help-about",
/* label, accelerator */ N_("_About"), NULL,
/* tooltip */ N_("Display credits for the creators of Caja"),
G_CALLBACK (action_about_caja_callback)
},
- /* name, stock id */ { "Zoom In", GTK_STOCK_ZOOM_IN,
+ /* name, icon name */ { "Zoom In", "zoom-in",
/* label, accelerator */ N_("Zoom _In"), "<control>plus",
/* tooltip */ N_("Increase the view size"),
G_CALLBACK (action_zoom_in_callback)
},
- /* name, stock id */ { "ZoomInAccel", NULL,
+ /* name, icon name */ { "ZoomInAccel", NULL,
/* label, accelerator */ "ZoomInAccel", "<control>equal",
/* tooltip */ NULL,
G_CALLBACK (action_zoom_in_callback)
},
- /* name, stock id */ { "ZoomInAccel2", NULL,
+ /* name, icon name */ { "ZoomInAccel2", NULL,
/* label, accelerator */ "ZoomInAccel2", "<control>KP_Add",
/* tooltip */ NULL,
G_CALLBACK (action_zoom_in_callback)
},
- /* name, stock id */ { "Zoom Out", GTK_STOCK_ZOOM_OUT,
+ /* name, icon name */ { "Zoom Out", "zoom-out",
/* label, accelerator */ N_("Zoom _Out"), "<control>minus",
/* tooltip */ N_("Decrease the view size"),
G_CALLBACK (action_zoom_out_callback)
},
- /* name, stock id */ { "ZoomOutAccel", NULL,
+ /* name, icon name */ { "ZoomOutAccel", NULL,
/* label, accelerator */ "ZoomOutAccel", "<control>KP_Subtract",
/* tooltip */ NULL,
G_CALLBACK (action_zoom_out_callback)
},
- /* name, stock id */ { "Zoom Normal", GTK_STOCK_ZOOM_100,
+ /* name, icon name */ { "Zoom Normal", "zoom-original",
/* label, accelerator */ N_("Normal Si_ze"), "<control>0",
/* tooltip */ N_("Use the normal view size"),
G_CALLBACK (action_zoom_normal_callback)
},
- /* name, stock id */ { "Connect to Server", NULL,
+ /* name, icon name */ { "Connect to Server", NULL,
/* label, accelerator */ N_("Connect to _Server..."), NULL,
/* tooltip */ N_("Connect to a remote computer or shared disk"),
G_CALLBACK (action_connect_to_server_callback)
},
- /* name, stock id */ { "Home", CAJA_ICON_HOME,
+ /* name, icon name */ { "Home", CAJA_ICON_HOME,
/* label, accelerator */ N_("_Home Folder"), "<alt>Home",
/* tooltip */ N_("Open your personal folder"),
G_CALLBACK (action_home_callback)
},
- /* name, stock id */ { "Go to Computer", CAJA_ICON_COMPUTER,
+ /* name, icon name */ { "Go to Computer", CAJA_ICON_COMPUTER,
/* label, accelerator */ N_("_Computer"), NULL,
/* tooltip */ N_("Browse all local and remote disks and folders accessible from this computer"),
G_CALLBACK (action_go_to_computer_callback)
},
- /* name, stock id */ { "Go to Network", CAJA_ICON_NETWORK,
+ /* name, icon name */ { "Go to Network", CAJA_ICON_NETWORK,
/* label, accelerator */ N_("_Network"), NULL,
/* tooltip */ N_("Browse bookmarked and local network locations"),
G_CALLBACK (action_go_to_network_callback)
},
- /* name, stock id */ { "Go to Templates", CAJA_ICON_TEMPLATE,
+ /* name, icon name */ { "Go to Templates", CAJA_ICON_TEMPLATE,
/* label, accelerator */ N_("T_emplates"), NULL,
/* tooltip */ N_("Open your personal templates folder"),
G_CALLBACK (action_go_to_templates_callback)
},
- /* name, stock id */ { "Go to Trash", CAJA_ICON_TRASH,
+ /* name, icon name */ { "Go to Trash", CAJA_ICON_TRASH,
/* label, accelerator */ N_("_Trash"), NULL,
/* tooltip */ N_("Open your personal trash folder"),
G_CALLBACK (action_go_to_trash_callback)
@@ -916,7 +916,7 @@ static const GtkActionEntry main_entries[] =
static const GtkToggleActionEntry main_toggle_entries[] =
{
- /* name, stock id */ { "Show Hidden Files", NULL,
+ /* name, icon name */ { "Show Hidden Files", NULL,
/* label, accelerator */ N_("Show _Hidden Files"), "<control>H",
/* tooltip */ N_("Toggle the display of hidden files in the current window"),
G_CALLBACK (action_show_hidden_files_callback),
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 75e42397..63efef81 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -659,7 +659,7 @@ fm_directory_view_confirm_multiple (GtkWindow *parent_window,
"This will open %'d separate windows.", count), count);
}
dialog = eel_show_yes_no_dialog (prompt, detail,
- GTK_STOCK_OK, GTK_STOCK_CANCEL,
+ "gtk-ok", "gtk-cancel",
parent_window);
g_free (detail);
@@ -1197,11 +1197,11 @@ select_pattern (FMDirectoryView *view)
dialog = gtk_dialog_new_with_buttons (_("Select Items Matching"),
fm_directory_view_get_containing_window (view),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_HELP,
+ "gtk-help",
GTK_RESPONSE_HELP,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
+ "gtk-ok",
GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
@@ -1335,10 +1335,10 @@ action_save_search_as_callback (GtkAction *action,
dialog = gtk_dialog_new_with_buttons (_("Save Search as"),
fm_directory_view_get_containing_window (directory_view),
0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
NULL);
save_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_SAVE, GTK_RESPONSE_OK);
+ "gtk-save", GTK_RESPONSE_OK);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_OK);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -6985,7 +6985,7 @@ action_connect_to_server_link_callback (GtkAction *action,
dialog = gtk_dialog_new_with_buttons (title,
fm_directory_view_get_containing_window (view),
0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
_("_Connect"), GTK_RESPONSE_OK,
NULL);
@@ -7239,132 +7239,132 @@ fm_directory_view_init_show_hidden_files (FMDirectoryView *view)
}
static const GtkActionEntry directory_view_entries[] = {
- /* name, stock id, label */ { "New Documents", "document-new", N_("Create _Document") },
- /* name, stock id, label */ { "Open With", NULL, N_("Open Wit_h"),
+ /* name, icon name, label */ { "New Documents", "document-new", N_("Create _Document") },
+ /* name, icon name, label */ { "Open With", NULL, N_("Open Wit_h"),
NULL, N_("Choose a program with which to open the selected item") },
- /* name, stock id */ { "Properties", GTK_STOCK_PROPERTIES,
+ /* name, icon name */ { "Properties", "document-properties",
/* label, accelerator */ N_("_Properties"), "<alt>Return",
/* tooltip */ N_("View or modify the properties of each selected item"),
G_CALLBACK (action_properties_callback) },
- /* name, stock id */ { "PropertiesAccel", NULL,
+ /* name, icon name */ { "PropertiesAccel", NULL,
/* label, accelerator */ "PropertiesAccel", "<control>I",
/* tooltip */ NULL,
G_CALLBACK (action_properties_callback) },
- /* name, stock id */ { "New Folder", "folder-new",
+ /* name, icon name */ { "New Folder", "folder-new",
/* label, accelerator */ N_("Create _Folder"), "<control><shift>N",
/* tooltip */ N_("Create a new empty folder inside this folder"),
G_CALLBACK (action_new_folder_callback) },
- /* name, stock id, label */ { "No Templates", NULL, N_("No templates installed") },
- /* name, stock id */ { "New Empty File", NULL,
+ /* name, icon name, label */ { "No Templates", NULL, N_("No templates installed") },
+ /* name, icon name */ { "New Empty File", NULL,
/* translators: this is used to indicate that a file doesn't contain anything */
/* label, accelerator */ N_("_Empty File"), NULL,
/* tooltip */ N_("Create a new empty file inside this folder"),
G_CALLBACK (action_new_empty_file_callback) },
- /* name, stock id */ { "New Launcher", NULL,
+ /* name, icon name */ { "New Launcher", NULL,
/* label, accelerator */ N_("Create L_auncher..."), NULL,
/* tooltip */ N_("Create a new launcher"),
G_CALLBACK (action_new_launcher_callback) },
- /* name, stock id */ { "Open", NULL,
+ /* name, icon name */ { "Open", NULL,
/* label, accelerator */ N_("_Open"), "<control>o",
/* tooltip */ N_("Open the selected item in this window"),
G_CALLBACK (action_open_callback) },
- /* name, stock id */ { "OpenAccel", NULL,
+ /* name, icon name */ { "OpenAccel", NULL,
/* label, accelerator */ "OpenAccel", "<alt>Down",
/* tooltip */ NULL,
G_CALLBACK (action_open_callback) },
- /* name, stock id */ { "OpenAlternate", NULL,
+ /* name, icon name */ { "OpenAlternate", NULL,
/* label, accelerator */ N_("Open in Navigation Window"), "<control><shift>w",
/* tooltip */ N_("Open each selected item in a navigation window"),
G_CALLBACK (action_open_alternate_callback) },
- /* name, stock id */ { "OpenInNewTab", NULL,
+ /* name, icon name */ { "OpenInNewTab", NULL,
/* label, accelerator */ N_("Open in New _Tab"), "<control><shift>o",
/* tooltip */ N_("Open each selected item in a new tab"),
G_CALLBACK (action_open_new_tab_callback) },
- /* name, stock id */ { "OpenFolderWindow", NULL,
+ /* name, icon name */ { "OpenFolderWindow", NULL,
/* label, accelerator */ N_("Open in _Folder Window"), NULL,
/* tooltip */ N_("Open each selected item in a folder window"),
G_CALLBACK (action_open_folder_window_callback) },
- /* name, stock id */ { "OtherApplication1", NULL,
+ /* name, icon name */ { "OtherApplication1", NULL,
/* label, accelerator */ N_("Other _Application..."), NULL,
/* tooltip */ N_("Choose another application with which to open the selected item"),
G_CALLBACK (action_other_application_callback) },
- /* name, stock id */ { "OtherApplication2", NULL,
+ /* name, icon name */ { "OtherApplication2", NULL,
/* label, accelerator */ N_("Open With Other _Application..."), NULL,
/* tooltip */ N_("Choose another application with which to open the selected item"),
G_CALLBACK (action_other_application_callback) },
- /* name, stock id */ { "Open Scripts Folder", NULL,
+ /* name, icon name */ { "Open Scripts Folder", NULL,
/* label, accelerator */ N_("_Open Scripts Folder"), NULL,
/* tooltip */ N_("Show the folder containing the scripts that appear in this menu"),
G_CALLBACK (action_open_scripts_folder_callback) },
- /* name, stock id */ { "Empty Trash", NULL,
+ /* name, icon name */ { "Empty Trash", NULL,
/* label, accelerator */ N_("E_mpty Trash"), NULL,
/* tooltip */ N_("Delete all items in the Trash"),
G_CALLBACK (action_empty_trash_callback) },
- /* name, stock id */ { "Cut", GTK_STOCK_CUT,
- /* label, accelerator */ NULL, NULL,
+ /* name, icon name */ { "Cut", "edit-cut",
+ /* label, accelerator */ N_("Cu_t"), "<control>X",
/* tooltip */ N_("Prepare the selected files to be moved with a Paste command"),
G_CALLBACK (action_cut_files_callback) },
- /* name, stock id */ { "Copy", GTK_STOCK_COPY,
- /* label, accelerator */ NULL, NULL,
+ /* name, icon name */ { "Copy", "edit-copy",
+ /* label, accelerator */ N_("_Copy"), "<control>C",
/* tooltip */ N_("Prepare the selected files to be copied with a Paste command"),
G_CALLBACK (action_copy_files_callback) },
- /* name, stock id */ { "Paste", GTK_STOCK_PASTE,
- /* label, accelerator */ NULL, NULL,
+ /* name, icon name */ { "Paste", "edit-paste",
+ /* label, accelerator */ N_("_Paste"), "<control>V",
/* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command"),
G_CALLBACK (action_paste_files_callback) },
/* We make accelerator "" instead of null here to not inherit the stock
accelerator for paste */
- /* name, stock id */ { "Paste Files Into", GTK_STOCK_PASTE,
+ /* name, icon name */ { "Paste Files Into", "edit-paste",
/* label, accelerator */ N_("_Paste Into Folder"), "",
/* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command into the selected folder"),
G_CALLBACK (action_paste_files_into_callback) },
- /* name, stock id, label */ { "CopyToMenu", NULL, N_("Cop_y to") },
- /* name, stock id, label */ { "MoveToMenu", NULL, N_("M_ove to") },
- /* name, stock id */ { "Select All", NULL,
+ /* name, icon name, label */ { "CopyToMenu", NULL, N_("Cop_y to") },
+ /* name, icon name, label */ { "MoveToMenu", NULL, N_("M_ove to") },
+ /* name, icon name */ { "Select All", NULL,
/* label, accelerator */ N_("Select _All"), "<control>A",
/* tooltip */ N_("Select all items in this window"),
G_CALLBACK (action_select_all_callback) },
- /* name, stock id */ { "Select Pattern", NULL,
+ /* name, icon name */ { "Select Pattern", NULL,
/* label, accelerator */ N_("Select I_tems Matching..."), "<control>S",
/* tooltip */ N_("Select items in this window matching a given pattern"),
G_CALLBACK (action_select_pattern_callback) },
- /* name, stock id */ { "Invert Selection", NULL,
+ /* name, icon name */ { "Invert Selection", NULL,
/* label, accelerator */ N_("_Invert Selection"), "<control><shift>I",
/* tooltip */ N_("Select all and only the items that are not currently selected"),
G_CALLBACK (action_invert_selection_callback) },
- /* name, stock id */ { "Duplicate", NULL,
+ /* name, icon name */ { "Duplicate", NULL,
/* label, accelerator */ N_("D_uplicate"), NULL,
/* tooltip */ N_("Duplicate each selected item"),
G_CALLBACK (action_duplicate_callback) },
- /* name, stock id */ { "Create Link", NULL,
+ /* name, icon name */ { "Create Link", NULL,
/* label, accelerator */ N_("Ma_ke Link"), "<control>M",
/* tooltip */ N_("Create a symbolic link for each selected item"),
G_CALLBACK (action_create_link_callback) },
- /* name, stock id */ { "Rename", NULL,
+ /* name, icon name */ { "Rename", NULL,
/* label, accelerator */ N_("_Rename..."), "F2",
/* tooltip */ N_("Rename selected item"),
G_CALLBACK (action_rename_callback) },
- /* name, stock id */ { "RenameSelectAll", NULL,
+ /* name, icon name */ { "RenameSelectAll", NULL,
/* label, accelerator */ "RenameSelectAll", "<shift>F2",
/* tooltip */ NULL,
G_CALLBACK (action_rename_select_all_callback) },
- /* name, stock id */ { "Trash", NULL,
+ /* name, icon name */ { "Trash", NULL,
/* label, accelerator */ N_("Mo_ve to Trash"), NULL,
/* tooltip */ N_("Move each selected item to the Trash"),
G_CALLBACK (action_trash_callback) },
- /* name, stock id */ { "Delete", NULL,
+ /* name, icon name */ { "Delete", NULL,
/* label, accelerator */ N_("_Delete"), NULL,
/* tooltip */ N_("Delete each selected item, without moving to the Trash"),
G_CALLBACK (action_delete_callback) },
- /* name, stock id */ { "Restore From Trash", NULL,
+ /* name, icon name */ { "Restore From Trash", NULL,
/* label, accelerator */ N_("_Restore"), NULL,
NULL,
G_CALLBACK (action_restore_from_trash_callback) },
- /* name, stock id */ { FM_ACTION_UNDO, GTK_STOCK_UNDO,
+ /* name, icon name */ { FM_ACTION_UNDO, "edit-undo",
/* label, accelerator */ N_("_Undo"), "<control>Z",
/* tooltip */ N_("Undo the last action"),
G_CALLBACK (action_undo_callback) },
- /* name, stock id */ { FM_ACTION_REDO, GTK_STOCK_REDO,
+ /* name, icon name */ { FM_ACTION_REDO, "edit-redo",
/* label, accelerator */ N_("_Redo"), "<control>Y",
/* tooltip */ N_("Redo the last undone action"),
G_CALLBACK (action_redo_callback) },
@@ -7375,176 +7375,176 @@ static const GtkActionEntry directory_view_entries[] = {
* Since this also resets the "Show hidden files" mode,
* it is a mixture of both ATM.
*/
- /* name, stock id */ { "Reset to Defaults", NULL,
+ /* name, icon name */ { "Reset to Defaults", NULL,
/* label, accelerator */ N_("Reset View to _Defaults"), NULL,
/* tooltip */ N_("Reset sorting order and zoom level to match preferences for this view"),
G_CALLBACK (action_reset_to_defaults_callback) },
- /* name, stock id */ { "Connect To Server Link", NULL,
+ /* name, icon name */ { "Connect To Server Link", NULL,
/* label, accelerator */ N_("Connect To This Server"), NULL,
/* tooltip */ N_("Make a permanent connection to this server"),
G_CALLBACK (action_connect_to_server_link_callback) },
- /* name, stock id */ { "Mount Volume", NULL,
+ /* name, icon name */ { "Mount Volume", NULL,
/* label, accelerator */ N_("_Mount"), NULL,
/* tooltip */ N_("Mount the selected volume"),
G_CALLBACK (action_mount_volume_callback) },
- /* name, stock id */ { "Unmount Volume", NULL,
+ /* name, icon name */ { "Unmount Volume", NULL,
/* label, accelerator */ N_("_Unmount"), NULL,
/* tooltip */ N_("Unmount the selected volume"),
G_CALLBACK (action_unmount_volume_callback) },
- /* name, stock id */ { "Eject Volume", NULL,
+ /* name, icon name */ { "Eject Volume", NULL,
/* label, accelerator */ N_("_Eject"), NULL,
/* tooltip */ N_("Eject the selected volume"),
G_CALLBACK (action_eject_volume_callback) },
- /* name, stock id */ { "Format Volume", NULL,
+ /* name, icon name */ { "Format Volume", NULL,
/* label, accelerator */ N_("_Format"), NULL,
/* tooltip */ N_("Format the selected volume"),
G_CALLBACK (action_format_volume_callback) },
- /* name, stock id */ { "Start Volume", NULL,
+ /* name, icon name */ { "Start Volume", NULL,
/* label, accelerator */ N_("_Start"), NULL,
/* tooltip */ N_("Start the selected volume"),
G_CALLBACK (action_start_volume_callback) },
- /* name, stock id */ { "Stop Volume", NULL,
+ /* name, icon name */ { "Stop Volume", NULL,
/* label, accelerator */ N_("_Stop"), NULL,
/* tooltip */ N_("Stop the selected volume"),
G_CALLBACK (action_stop_volume_callback) },
- /* name, stock id */ { "Poll", NULL,
+ /* name, icon name */ { "Poll", NULL,
/* label, accelerator */ N_("_Detect Media"), NULL,
/* tooltip */ N_("Detect media in the selected drive"),
G_CALLBACK (action_detect_media_callback) },
- /* name, stock id */ { "Self Mount Volume", NULL,
+ /* name, icon name */ { "Self Mount Volume", NULL,
/* label, accelerator */ N_("_Mount"), NULL,
/* tooltip */ N_("Mount the volume associated with the open folder"),
G_CALLBACK (action_self_mount_volume_callback) },
- /* name, stock id */ { "Self Unmount Volume", NULL,
+ /* name, icon name */ { "Self Unmount Volume", NULL,
/* label, accelerator */ N_("_Unmount"), NULL,
/* tooltip */ N_("Unmount the volume associated with the open folder"),
G_CALLBACK (action_self_unmount_volume_callback) },
- /* name, stock id */ { "Self Eject Volume", NULL,
+ /* name, icon name */ { "Self Eject Volume", NULL,
/* label, accelerator */ N_("_Eject"), NULL,
/* tooltip */ N_("Eject the volume associated with the open folder"),
G_CALLBACK (action_self_eject_volume_callback) },
- /* name, stock id */ { "Self Format Volume", NULL,
+ /* name, icon name */ { "Self Format Volume", NULL,
/* label, accelerator */ N_("_Format"), NULL,
/* tooltip */ N_("Format the volume associated with the open folder"),
G_CALLBACK (action_self_format_volume_callback) },
- /* name, stock id */ { "Self Start Volume", NULL,
+ /* name, icon name */ { "Self Start Volume", NULL,
/* label, accelerator */ N_("_Start"), NULL,
/* tooltip */ N_("Start the volume associated with the open folder"),
G_CALLBACK (action_self_start_volume_callback) },
- /* name, stock id */ { "Self Stop Volume", NULL,
+ /* name, icon name */ { "Self Stop Volume", NULL,
/* label, accelerator */ N_("_Stop"), NULL,
/* tooltip */ N_("Stop the volume associated with the open folder"),
G_CALLBACK (action_self_stop_volume_callback) },
- /* name, stock id */ { "Self Poll", NULL,
+ /* name, icon name */ { "Self Poll", NULL,
/* label, accelerator */ N_("_Detect Media"), NULL,
/* tooltip */ N_("Detect media in the selected drive"),
G_CALLBACK (action_self_detect_media_callback) },
- /* name, stock id */ { "OpenCloseParent", NULL,
+ /* name, icon name */ { "OpenCloseParent", NULL,
/* label, accelerator */ N_("Open File and Close window"), "<alt><shift>Down",
/* tooltip */ NULL,
G_CALLBACK (action_open_close_parent_callback) },
- /* name, stock id */ { "Save Search", NULL,
+ /* name, icon name */ { "Save Search", NULL,
/* label, accelerator */ N_("Sa_ve Search"), NULL,
/* tooltip */ N_("Save the edited search"),
G_CALLBACK (action_save_search_callback) },
- /* name, stock id */ { "Save Search As", NULL,
+ /* name, icon name */ { "Save Search As", NULL,
/* label, accelerator */ N_("Sa_ve Search As..."), NULL,
/* tooltip */ N_("Save the current search as a file"),
G_CALLBACK (action_save_search_as_callback) },
/* Location-specific actions */
- /* name, stock id */ { FM_ACTION_LOCATION_OPEN_ALTERNATE, NULL,
+ /* name, icon name */ { FM_ACTION_LOCATION_OPEN_ALTERNATE, NULL,
/* label, accelerator */ N_("Open in Navigation Window"), "",
/* tooltip */ N_("Open this folder in a navigation window"),
G_CALLBACK (action_location_open_alternate_callback) },
- /* name, stock id */ { FM_ACTION_LOCATION_OPEN_IN_NEW_TAB, NULL,
+ /* name, icon name */ { FM_ACTION_LOCATION_OPEN_IN_NEW_TAB, NULL,
/* label, accelerator */ N_("Open in New _Tab"), "",
/* tooltip */ N_("Open this folder in a new tab"),
G_CALLBACK (action_location_open_in_new_tab_callback) },
- /* name, stock id */ { FM_ACTION_LOCATION_OPEN_FOLDER_WINDOW, NULL,
+ /* name, icon name */ { FM_ACTION_LOCATION_OPEN_FOLDER_WINDOW, NULL,
/* label, accelerator */ N_("Open in _Folder Window"), "",
/* tooltip */ N_("Open this folder in a folder window"),
G_CALLBACK (action_location_open_folder_window_callback) },
- /* name, stock id */ { FM_ACTION_LOCATION_CUT, GTK_STOCK_CUT,
- /* label, accelerator */ NULL, "",
+ /* name, icon name */ { FM_ACTION_LOCATION_CUT, "edit-cut",
+ /* label, accelerator */ N_("Cu_t"), "",
/* tooltip */ N_("Prepare this folder to be moved with a Paste command"),
G_CALLBACK (action_location_cut_callback) },
- /* name, stock id */ { FM_ACTION_LOCATION_COPY, GTK_STOCK_COPY,
- /* label, accelerator */ NULL, "",
+ /* name, icon name */ { FM_ACTION_LOCATION_COPY, "edit-copy",
+ /* label, accelerator */ N_("_Copy"), "",
/* tooltip */ N_("Prepare this folder to be copied with a Paste command"),
G_CALLBACK (action_location_copy_callback) },
- /* name, stock id */ { FM_ACTION_LOCATION_PASTE_FILES_INTO, GTK_STOCK_PASTE,
+ /* name, icon name */ { FM_ACTION_LOCATION_PASTE_FILES_INTO, "edit-paste",
/* label, accelerator */ N_("_Paste Into Folder"), "",
/* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command into this folder"),
G_CALLBACK (action_location_paste_files_into_callback) },
- /* name, stock id */ { FM_ACTION_LOCATION_TRASH, NULL,
+ /* name, icon name */ { FM_ACTION_LOCATION_TRASH, NULL,
/* label, accelerator */ N_("Mo_ve to Trash"), "",
/* tooltip */ N_("Move this folder to the Trash"),
G_CALLBACK (action_location_trash_callback) },
- /* name, stock id */ { FM_ACTION_LOCATION_DELETE, CAJA_ICON_DELETE,
+ /* name, icon name */ { FM_ACTION_LOCATION_DELETE, CAJA_ICON_DELETE,
/* label, accelerator */ N_("_Delete"), "",
/* tooltip */ N_("Delete this folder, without moving to the Trash"),
G_CALLBACK (action_location_delete_callback) },
- /* name, stock id */ { FM_ACTION_LOCATION_RESTORE_FROM_TRASH, NULL,
+ /* name, icon name */ { FM_ACTION_LOCATION_RESTORE_FROM_TRASH, NULL,
/* label, accelerator */ N_("_Restore"), NULL, NULL,
G_CALLBACK (action_location_restore_from_trash_callback) },
- /* name, stock id */ { "Location Mount Volume", NULL,
+ /* name, icon name */ { "Location Mount Volume", NULL,
/* label, accelerator */ N_("_Mount"), NULL,
/* tooltip */ N_("Mount the volume associated with this folder"),
G_CALLBACK (action_location_mount_volume_callback) },
- /* name, stock id */ { "Location Unmount Volume", NULL,
+ /* name, icon name */ { "Location Unmount Volume", NULL,
/* label, accelerator */ N_("_Unmount"), NULL,
/* tooltip */ N_("Unmount the volume associated with this folder"),
G_CALLBACK (action_location_unmount_volume_callback) },
- /* name, stock id */ { "Location Eject Volume", NULL,
+ /* name, icon name */ { "Location Eject Volume", NULL,
/* label, accelerator */ N_("_Eject"), NULL,
/* tooltip */ N_("Eject the volume associated with this folder"),
G_CALLBACK (action_location_eject_volume_callback) },
- /* name, stock id */ { "Location Format Volume", NULL,
+ /* name, icon name */ { "Location Format Volume", NULL,
/* label, accelerator */ N_("_Format"), NULL,
/* tooltip */ N_("Format the volume associated with this folder"),
G_CALLBACK (action_location_format_volume_callback) },
- /* name, stock id */ { "Location Start Volume", NULL,
+ /* name, icon name */ { "Location Start Volume", NULL,
/* label, accelerator */ N_("_Start"), NULL,
/* tooltip */ N_("Start the volume associated with this folder"),
G_CALLBACK (action_location_start_volume_callback) },
- /* name, stock id */ { "Location Stop Volume", NULL,
+ /* name, icon name */ { "Location Stop Volume", NULL,
/* label, accelerator */ N_("_Stop"), NULL,
/* tooltip */ N_("Stop the volume associated with this folder"),
G_CALLBACK (action_location_stop_volume_callback) },
- /* name, stock id */ { "Location Poll", NULL,
+ /* name, icon name */ { "Location Poll", NULL,
/* label, accelerator */ N_("_Detect Media"), NULL,
/* tooltip */ N_("Detect media in the selected drive"),
G_CALLBACK (action_location_detect_media_callback) },
- /* name, stock id */ { "LocationProperties", GTK_STOCK_PROPERTIES,
+ /* name, icon name */ { "LocationProperties", "document-properties",
/* label, accelerator */ N_("_Properties"), NULL,
/* tooltip */ N_("View or modify the properties of this folder"),
G_CALLBACK (action_location_properties_callback) },
- /* name, stock id, label */ {FM_ACTION_COPY_TO_NEXT_PANE, NULL, N_("_Other pane"),
+ /* name, icon name, label */ {FM_ACTION_COPY_TO_NEXT_PANE, NULL, N_("_Other pane"),
NULL, N_("Copy the current selection to the other pane in the window"),
G_CALLBACK (action_copy_to_next_pane_callback) },
- /* name, stock id, label */ {FM_ACTION_MOVE_TO_NEXT_PANE, NULL, N_("_Other pane"),
+ /* name, icon name, label */ {FM_ACTION_MOVE_TO_NEXT_PANE, NULL, N_("_Other pane"),
NULL, N_("Move the current selection to the other pane in the window"),
G_CALLBACK (action_move_to_next_pane_callback) },
- /* name, stock id, label */ {FM_ACTION_COPY_TO_HOME, CAJA_ICON_HOME,
+ /* name, icon name, label */ {FM_ACTION_COPY_TO_HOME, CAJA_ICON_HOME,
N_("_Home Folder"), NULL,
N_("Copy the current selection to the home folder"),
G_CALLBACK (action_copy_to_home_callback) },
- /* name, stock id, label */ {FM_ACTION_MOVE_TO_HOME, CAJA_ICON_HOME,
+ /* name, icon name, label */ {FM_ACTION_MOVE_TO_HOME, CAJA_ICON_HOME,
N_("_Home Folder"), NULL,
N_("Move the current selection to the home folder"),
G_CALLBACK (action_move_to_home_callback) },
- /* name, stock id, label */ {FM_ACTION_COPY_TO_DESKTOP, CAJA_ICON_DESKTOP,
+ /* name, icon name, label */ {FM_ACTION_COPY_TO_DESKTOP, CAJA_ICON_DESKTOP,
N_("_Desktop"), NULL,
N_("Copy the current selection to the desktop"),
G_CALLBACK (action_copy_to_desktop_callback) },
- /* name, stock id, label */ {FM_ACTION_MOVE_TO_DESKTOP, CAJA_ICON_DESKTOP,
+ /* name, icon name, label */ {FM_ACTION_MOVE_TO_DESKTOP, CAJA_ICON_DESKTOP,
N_("_Desktop"), NULL,
N_("Move the current selection to the desktop"),
G_CALLBACK (action_move_to_desktop_callback) },
@@ -8794,7 +8794,7 @@ real_update_menus (FMDirectoryView *view)
GTK_IMAGE_MENU_ITEM (menuitem), app_icon != NULL);
if (app_icon == NULL) {
- app_icon = g_themed_icon_new (GTK_STOCK_OPEN);
+ app_icon = g_themed_icon_new ("gtk-open");
}
gtk_action_set_gicon (action, app_icon);
@@ -10270,7 +10270,7 @@ ask_link_action (FMDirectoryView *view)
gtk_dialog_add_button (GTK_DIALOG (dialog),
_("Make a _Link"), 0);
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, 1);
+ "gtk-cancel", 1);
gtk_dialog_add_button (GTK_DIALOG (dialog),
_("_Download"), 2);
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 32d965a1..48d783e5 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -2534,7 +2534,7 @@ create_column_editor (FMListView *view)
window = gtk_dialog_new_with_buttons (str,
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ "gtk-close", GTK_RESPONSE_CLOSE,
NULL);
g_free (str);
g_signal_connect (window, "response",
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 7bfa219b..acea165a 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -5169,8 +5169,8 @@ create_properties_window (StartupData *startup_data)
append_extension_pages (window);
gtk_dialog_add_buttons (GTK_DIALOG (window),
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ "gtk-help", GTK_RESPONSE_HELP,
+ "gtk-close", GTK_RESPONSE_CLOSE,
NULL);
/* FIXME - HIGificiation, should be done inside GTK+ */
@@ -5670,9 +5670,9 @@ select_image_button_callback (GtkWidget *widget,
if (dialog == NULL) {
dialog = gtk_file_chooser_dialog_new (_("Select Custom Icon"), GTK_WINDOW (window),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_REVERT_TO_SAVED, GTK_RESPONSE_NO,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ "gtk-revert-to-saved", GTK_RESPONSE_NO,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-open", GTK_RESPONSE_OK,
NULL);
gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), "/usr/share/icons", NULL);
gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), "/usr/share/pixmaps", NULL);
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index 643ae185..b29c97c7 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -1261,8 +1261,8 @@ create_popup_menu (FMTreeView *view)
/* add the "open" menu item */
- menu_image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
- GTK_ICON_SIZE_MENU);
+ menu_image = gtk_image_new_from_icon_name ("document-open",
+ GTK_ICON_SIZE_MENU);
gtk_widget_show (menu_image);
menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
@@ -1306,7 +1306,7 @@ create_popup_menu (FMTreeView *view)
eel_gtk_menu_append_separator (GTK_MENU (popup));
/* add the "cut folder" menu item */
- menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CUT, NULL);
+ menu_item = gtk_image_menu_item_new_from_stock ("gtk-cut", NULL);
g_signal_connect (menu_item, "activate",
G_CALLBACK (fm_tree_view_cut_cb),
view);
@@ -1315,7 +1315,7 @@ create_popup_menu (FMTreeView *view)
view->details->popup_cut = menu_item;
/* add the "copy folder" menu item */
- menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL);
+ menu_item = gtk_image_menu_item_new_from_stock ("gtk-copy", NULL);
g_signal_connect (menu_item, "activate",
G_CALLBACK (fm_tree_view_copy_cb),
view);
@@ -1324,8 +1324,8 @@ create_popup_menu (FMTreeView *view)
view->details->popup_copy = menu_item;
/* add the "paste files into folder" menu item */
- menu_image = gtk_image_new_from_stock (GTK_STOCK_PASTE,
- GTK_ICON_SIZE_MENU);
+ menu_image = gtk_image_new_from_icon_name ("edit-paste",
+ GTK_ICON_SIZE_MENU);
gtk_widget_show (menu_image);
menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Paste Into Folder"));
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
@@ -1392,7 +1392,7 @@ create_popup_menu (FMTreeView *view)
GTK_WIDGET (eel_gtk_menu_append_separator (GTK_MENU (popup)));
/* add the "properties" menu item */
- menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PROPERTIES, NULL);
+ menu_item = gtk_image_menu_item_new_from_stock ("gtk-properties", NULL);
g_signal_connect (menu_item, "activate",
G_CALLBACK (fm_tree_view_properties_cb),
view);