summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2018-02-15 01:45:55 +0100
committerraveit65 <[email protected]>2018-02-16 17:22:20 +0100
commit7a91219f5b255783690be32fe6426b8a6c640398 (patch)
treed63211014ecdc0dbbeb8e315b4d6067f9e1e62ac
parented3b7f0015cf629a2d7e69f60b166978d6859305 (diff)
downloadatril-7a91219f5b255783690be32fe6426b8a6c640398.tar.bz2
atril-7a91219f5b255783690be32fe6426b8a6c640398.tar.xz
avoid deprecated GtkStock
-rw-r--r--cut-n-paste/toolbar-editor/egg-editable-toolbar.c4
-rw-r--r--cut-n-paste/toolbar-editor/egg-toolbar-editor.c4
-rw-r--r--libview/ev-stock-icons.h2
-rw-r--r--previewer/ev-previewer-window.c32
-rw-r--r--shell/ev-annotation-properties-dialog.c4
-rw-r--r--shell/ev-open-recent-action.c2
-rw-r--r--shell/ev-password-view.c2
-rw-r--r--shell/ev-properties-dialog.c2
-rw-r--r--shell/ev-sidebar-bookmarks.c10
-rw-r--r--shell/ev-sidebar-links.c2
-rw-r--r--shell/ev-window.c136
11 files changed, 102 insertions, 98 deletions
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
index ad9c1755..c115b20d 100644
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
@@ -1464,9 +1464,9 @@ egg_editable_toolbar_set_ui_manager (EggEditableToolbar *etoolbar,
static const GtkActionEntry actions[] = {
{ "MoveToolItem", STOCK_DRAG_MODE, N_("_Move on Toolbar"), NULL,
N_("Move the selected item on the toolbar"), G_CALLBACK (move_item_cb) },
- { "RemoveToolItem", GTK_STOCK_REMOVE, N_("_Remove from Toolbar"), NULL,
+ { "RemoveToolItem", "list-remove", N_("_Remove from Toolbar"), NULL,
N_("Remove the selected item from the toolbar"), G_CALLBACK (remove_item_cb) },
- { "RemoveToolbar", GTK_STOCK_DELETE, N_("_Delete Toolbar"), NULL,
+ { "RemoveToolbar", "edit-delete", N_("_Delete Toolbar"), NULL,
N_("Remove the selected toolbar"), G_CALLBACK (remove_toolbar_cb) },
};
diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
index f9e3f22f..a52255b5 100644
--- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
+++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
@@ -509,8 +509,8 @@ editor_create_item_from_name (EggToolbarEditor *editor,
icon = gtk_image_new_from_icon_name (icon_name,
GTK_ICON_SIZE_LARGE_TOOLBAR);
else
- icon = gtk_image_new_from_stock (stock_id ? stock_id : GTK_STOCK_DND,
- GTK_ICON_SIZE_LARGE_TOOLBAR);
+ icon = gtk_image_new_from_icon_name (stock_id ? stock_id : "gtk-dnd",
+ GTK_ICON_SIZE_LARGE_TOOLBAR);
item_name = g_strdup (name);
collate_key = g_utf8_collate_key (short_label, -1);
diff --git a/libview/ev-stock-icons.h b/libview/ev-stock-icons.h
index 3a55b11b..ab9671e1 100644
--- a/libview/ev-stock-icons.h
+++ b/libview/ev-stock-icons.h
@@ -45,7 +45,7 @@ G_BEGIN_DECLS
#define EV_STOCK_RESIZE_SE "resize-se"
#define EV_STOCK_RESIZE_SW "resize-sw"
#define EV_STOCK_CLOSE "close"
-#define EV_STOCK_INVERTED_COLORS "inverted"
+#define EV_STOCK_INVERTED_COLORS "stock_filters-invert"
#define EV_STOCK_ATTACHMENT "mail-attachment"
#define EV_STOCK_SEND_TO "document-send"
diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c
index 8d9852f2..1979d954 100644
--- a/previewer/ev-previewer-window.c
+++ b/previewer/ev-previewer-window.c
@@ -269,49 +269,49 @@ ev_previewer_window_print (GtkAction *action,
#endif
static const GtkActionEntry action_entries[] = {
- { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",
+ { "FileCloseWindow", "window-close", N_("_Close"), "<control>W",
NULL,
G_CALLBACK (ev_previewer_window_close) },
- { "GoPreviousPage", GTK_STOCK_GO_UP, N_("_Previous Page"), "<control>Page_Up",
+ { "GoPreviousPage", "go-up", N_("_Previous Page"), "<control>Page_Up",
N_("Go to the previous page"),
G_CALLBACK (ev_previewer_window_previous_page) },
- { "GoNextPage", GTK_STOCK_GO_DOWN, N_("_Next Page"), "<control>Page_Down",
+ { "GoNextPage", "go-down", N_("_Next Page"), "<control>Page_Down",
N_("Go to the next page"),
G_CALLBACK (ev_previewer_window_next_page) },
- { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus",
+ { "ViewZoomIn", "zoom-in", N_("Zoom _In"), "<control>plus",
N_("Enlarge the document"),
G_CALLBACK (ev_previewer_window_zoom_in) },
- { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus",
+ { "ViewZoomOut", "zoom-out", N_("Zoom _Out"), "<control>minus",
N_("Shrink the document"),
G_CALLBACK (ev_previewer_window_zoom_out) },
#if GTKUNIXPRINT_ENABLED
/* translators: Print document currently shown in the Print Preview window */
- { "PreviewPrint", GTK_STOCK_PRINT, N_("Print"), NULL,
+ { "PreviewPrint", "document-print", N_("Print"), NULL,
N_("Print this document"),
G_CALLBACK (ev_previewer_window_print) }
#endif
};
static const GtkActionEntry accel_entries[] = {
- { "p", GTK_STOCK_GO_UP, "", "p", NULL,
+ { "p", "go-up", "", "p", NULL,
G_CALLBACK (ev_previewer_window_previous_page) },
- { "n", GTK_STOCK_GO_DOWN, "", "n", NULL,
+ { "n", "go-down", "", "n", NULL,
G_CALLBACK (ev_previewer_window_next_page) },
- { "Plus", GTK_STOCK_ZOOM_IN, NULL, "plus", NULL,
+ { "Plus", "zoom-in", NULL, "plus", NULL,
G_CALLBACK (ev_previewer_window_zoom_in) },
- { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "<control>equal", NULL,
+ { "CtrlEqual", "zoom-in", NULL, "<control>equal", NULL,
G_CALLBACK (ev_previewer_window_zoom_in) },
- { "Equal", GTK_STOCK_ZOOM_IN, NULL, "equal", NULL,
+ { "Equal", "zoom-in", NULL, "equal", NULL,
G_CALLBACK (ev_previewer_window_zoom_in) },
- { "Minus", GTK_STOCK_ZOOM_OUT, NULL, "minus", NULL,
+ { "Minus", "zoom-out", NULL, "minus", NULL,
G_CALLBACK (ev_previewer_window_zoom_out) },
- { "KpPlus", GTK_STOCK_ZOOM_IN, NULL, "KP_Add", NULL,
+ { "KpPlus", "zoom-in", NULL, "KP_Add", NULL,
G_CALLBACK (ev_previewer_window_zoom_in) },
- { "KpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract", NULL,
+ { "KpMinus", "zoom-out", NULL, "KP_Subtract", NULL,
G_CALLBACK (ev_previewer_window_zoom_out) },
- { "CtrlKpPlus", GTK_STOCK_ZOOM_IN, NULL, "<control>KP_Add", NULL,
+ { "CtrlKpPlus", "zoom-in", NULL, "<control>KP_Add", NULL,
G_CALLBACK (ev_previewer_window_zoom_in) },
- { "CtrlKpMinus", GTK_STOCK_ZOOM_OUT, NULL, "<control>KP_Subtract", NULL,
+ { "CtrlKpMinus", "zoom-out", NULL, "<control>KP_Subtract", NULL,
G_CALLBACK (ev_previewer_window_zoom_out) },
{ "FocusPageSelector", NULL, "", "<control>l", NULL,
G_CALLBACK (ev_previewer_window_focus_page_selector) }
diff --git a/shell/ev-annotation-properties-dialog.c b/shell/ev-annotation-properties-dialog.c
index dc51feea..9406131d 100644
--- a/shell/ev-annotation-properties-dialog.c
+++ b/shell/ev-annotation-properties-dialog.c
@@ -137,8 +137,8 @@ ev_annotation_properties_dialog_init (EvAnnotationPropertiesDialog *annot_dialog
gtk_window_set_destroy_with_parent (GTK_WINDOW (annot_dialog), TRUE);
gtk_container_set_border_width (GTK_CONTAINER (annot_dialog), 5);
gtk_dialog_add_buttons (dialog,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
- GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
+ "gtk-close", GTK_RESPONSE_CLOSE,
+ "gtk-apply", GTK_RESPONSE_APPLY,
NULL);
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_APPLY);
diff --git a/shell/ev-open-recent-action.c b/shell/ev-open-recent-action.c
index e3aabca6..47da1d53 100644
--- a/shell/ev-open-recent-action.c
+++ b/shell/ev-open-recent-action.c
@@ -67,7 +67,7 @@ ev_open_recent_action_create_tool_item (GtkAction *action)
gtk_recent_filter_add_application (filter, g_get_application_name ());
gtk_recent_chooser_set_filter (GTK_RECENT_CHOOSER (toolbar_recent_menu), filter);
- tool_item = GTK_WIDGET (gtk_menu_tool_button_new_from_stock (GTK_STOCK_OPEN));
+ tool_item = GTK_WIDGET (gtk_menu_tool_button_new_from_stock ("gtk-open"));
gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (tool_item),
_("Open a recently used document"));
gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item),
diff --git a/shell/ev-password-view.c b/shell/ev-password-view.c
index eada87a7..0bf8ea90 100644
--- a/shell/ev-password-view.c
+++ b/shell/ev-password-view.c
@@ -261,7 +261,7 @@ ev_password_view_ask_password (EvPasswordView *password_view)
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
gtk_dialog_add_buttons (dialog,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
_("_Unlock Document"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
diff --git a/shell/ev-properties-dialog.c b/shell/ev-properties-dialog.c
index 03430759..4ad1220b 100644
--- a/shell/ev-properties-dialog.c
+++ b/shell/ev-properties-dialog.c
@@ -64,7 +64,7 @@ ev_properties_dialog_init (EvPropertiesDialog *properties)
gtk_container_set_border_width (GTK_CONTAINER (properties), 5);
gtk_box_set_spacing (content_area, 2);
- gtk_dialog_add_button (GTK_DIALOG (properties), GTK_STOCK_CLOSE,
+ gtk_dialog_add_button (GTK_DIALOG (properties), "gtk-close",
GTK_RESPONSE_CANCEL);
gtk_dialog_set_default_response (GTK_DIALOG (properties),
GTK_RESPONSE_CANCEL);
diff --git a/shell/ev-sidebar-bookmarks.c b/shell/ev-sidebar-bookmarks.c
index 2823328a..dc3752fb 100644
--- a/shell/ev-sidebar-bookmarks.c
+++ b/shell/ev-sidebar-bookmarks.c
@@ -151,7 +151,7 @@ ev_bookmarks_popup_cmd_remove_bookmark (GtkAction *action,
}
static const GtkActionEntry popup_entries[] = {
- { "OpenBookmark", GTK_STOCK_OPEN, N_("_Open Bookmark"), NULL,
+ { "OpenBookmark", "document-open", N_("_Open Bookmark"), NULL,
NULL, G_CALLBACK (ev_bookmarks_popup_cmd_open_bookmark) },
{ "RenameBookmark", NULL, N_("_Rename Bookmark"), NULL,
NULL, G_CALLBACK (ev_bookmarks_popup_cmd_rename_bookmark) },
@@ -473,7 +473,9 @@ ev_sidebar_bookmarks_init (EvSidebarBookmarks *sidebar_bookmarks)
hbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- priv->add_button = gtk_button_new_from_stock (GTK_STOCK_ADD);
+ priv->add_button = gtk_button_new_with_mnemonic (_("_Add"));
+ gtk_button_set_image (GTK_BUTTON (priv->add_button), gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_BUTTON));
+
g_signal_connect (priv->add_button, "clicked",
G_CALLBACK (ev_sidebar_bookmarks_add_clicked),
sidebar_bookmarks);
@@ -481,7 +483,9 @@ ev_sidebar_bookmarks_init (EvSidebarBookmarks *sidebar_bookmarks)
gtk_box_pack_start (GTK_BOX (hbox), priv->add_button, TRUE, TRUE, 6);
gtk_widget_show (priv->add_button);
- priv->del_button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
+ priv->del_button = gtk_button_new_with_mnemonic (_("_Remove"));
+ gtk_button_set_image (GTK_BUTTON (priv->del_button), gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_BUTTON));
+
g_signal_connect (priv->del_button, "clicked",
G_CALLBACK (ev_sidebar_bookmarks_del_clicked),
sidebar_bookmarks);
diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c
index 79f5fe66..b252fbb2 100644
--- a/shell/ev-sidebar-links.c
+++ b/shell/ev-sidebar-links.c
@@ -332,7 +332,7 @@ build_popup_menu (EvSidebarLinks *sidebar)
GtkWidget *item;
menu = gtk_menu_new ();
- item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PRINT, NULL);
+ item = gtk_image_menu_item_new_from_stock ("gtk-print", NULL);
gtk_label_set_label (GTK_LABEL (gtk_bin_get_child (GTK_BIN (item))), _("Print…"));
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 112cbadb..a8f485dc 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -820,7 +820,7 @@ ev_window_error_message (EvWindow *window,
area = ev_message_area_new (GTK_MESSAGE_ERROR,
msg,
- GTK_STOCK_CLOSE,
+ "gtk-close",
GTK_RESPONSE_CLOSE,
NULL);
g_free (msg);
@@ -852,7 +852,7 @@ ev_window_warning_message (EvWindow *window,
area = ev_message_area_new (GTK_MESSAGE_WARNING,
msg,
- GTK_STOCK_CLOSE,
+ "gtk-close",
GTK_RESPONSE_CLOSE,
NULL);
g_free (msg);
@@ -2061,11 +2061,11 @@ show_loading_progress (EvWindow *ev_window)
text = g_strdup_printf (_("Loading document from “%s”"),
display_name);
- area = ev_progress_message_area_new (GTK_STOCK_OPEN,
+ area = ev_progress_message_area_new ("gtk-open",
text,
- GTK_STOCK_CLOSE,
+ "gtk-close",
GTK_RESPONSE_CLOSE,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
NULL);
g_signal_connect (area, "response",
@@ -2439,11 +2439,11 @@ show_reloading_progress (EvWindow *ev_window)
text = g_strdup_printf (_("Reloading document from %s"),
ev_window->priv->uri);
- area = ev_progress_message_area_new (GTK_STOCK_REFRESH,
+ area = ev_progress_message_area_new ("gtk-refresh",
text,
- GTK_STOCK_CLOSE,
+ "gtk-close",
GTK_RESPONSE_CLOSE,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
NULL);
g_signal_connect (area, "response",
@@ -2686,9 +2686,9 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
chooser = gtk_file_chooser_dialog_new (_("Open Document"),
GTK_WINDOW (window),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ "gtk-open", GTK_RESPONSE_OK,
NULL);
ev_document_factory_add_filters (chooser, NULL);
@@ -2971,11 +2971,11 @@ show_saving_progress (GFile *dst)
g_assert_not_reached ();
}
g_free (uri);
- area = ev_progress_message_area_new (GTK_STOCK_SAVE,
+ area = ev_progress_message_area_new ("gtk-save",
text,
- GTK_STOCK_CLOSE,
+ "gtk-close",
GTK_RESPONSE_CLOSE,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
NULL);
g_signal_connect (area, "response",
@@ -3162,8 +3162,8 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
fc = gtk_file_chooser_dialog_new (
_("Save a Copy"),
GTK_WINDOW (ev_window), GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-save", GTK_RESPONSE_OK,
NULL);
ev_document_factory_add_filters (fc, ev_window->priv->document);
@@ -3586,11 +3586,11 @@ ev_window_print_operation_status_changed (EvPrintOperation *op,
job_name = ev_print_operation_get_job_name (op);
text = g_strdup_printf (_("Printing job “%s”"), job_name);
- area = ev_progress_message_area_new (GTK_STOCK_PRINT,
+ area = ev_progress_message_area_new ("gtk-print",
text,
- GTK_STOCK_CLOSE,
+ "gtk-close",
GTK_RESPONSE_CLOSE,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
NULL);
ev_window_print_update_pending_jobs_message (ev_window, 1);
@@ -3793,7 +3793,7 @@ ev_window_check_document_modified (EvWindow *ev_window)
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
_("Close _without Saving"),
GTK_RESPONSE_NO,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
_("Save a _Copy"),
GTK_RESPONSE_YES,
@@ -3891,7 +3891,7 @@ ev_window_check_print_queue (EvWindow *ev_window)
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
_("Cancel _print and Close"),
GTK_RESPONSE_NO,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
_("Close _after Printing"),
GTK_RESPONSE_YES,
@@ -4627,7 +4627,7 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
dialog = gtk_dialog_new_with_buttons (_("Toolbar Editor"),
GTK_WINDOW (ev_window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLOSE,
+ "gtk-close",
GTK_RESPONSE_CLOSE,
NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
@@ -5910,7 +5910,7 @@ ev_window_cmd_view_toggle_caret_navigation (GtkAction *action,
message_area = ev_message_area_new (GTK_MESSAGE_QUESTION,
_("Enable caret navigation?"),
- GTK_STOCK_NO, GTK_RESPONSE_NO,
+ "gtk-no", GTK_RESPONSE_NO,
_("_Enable"), GTK_RESPONSE_YES,
NULL);
ev_message_area_set_secondary_text (EV_MESSAGE_AREA (message_area),
@@ -6251,32 +6251,32 @@ static const GtkActionEntry entries[] = {
{ "Help", NULL, N_("_Help") },
/* File menu */
- { "FileOpen", GTK_STOCK_OPEN, N_("_Open…"), "<control>O",
+ { "FileOpen", "document-open", N_("_Open…"), "<control>O",
N_("Open an existing document"),
G_CALLBACK (ev_window_cmd_file_open) },
{ "FileOpenCopy", NULL, N_("Op_en a Copy"), "<control>N",
N_("Open a copy of the current document in a new window"),
G_CALLBACK (ev_window_cmd_file_open_copy) },
- { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy…"), "<control>S",
+ { "FileSaveAs", "document-save-as", N_("_Save a Copy…"), "<control>S",
N_("Save a copy of the current document"),
G_CALLBACK (ev_window_cmd_save_as) },
{ "FileSendTo", EV_STOCK_SEND_TO, N_("Send _To..."), NULL,
N_("Send current document by mail, instant message..."),
G_CALLBACK (ev_window_cmd_send_to) },
- { "FilePrint", GTK_STOCK_PRINT, N_("_Print…"), "<control>P",
+ { "FilePrint", "document-print", N_("_Print…"), "<control>P",
N_("Print this document"),
G_CALLBACK (ev_window_cmd_file_print) },
- { "FileProperties", GTK_STOCK_PROPERTIES, N_("P_roperties"), "<alt>Return", NULL,
+ { "FileProperties", "document-properties", N_("P_roperties"), "<alt>Return", NULL,
G_CALLBACK (ev_window_cmd_file_properties) },
- { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W", NULL,
+ { "FileCloseWindow", "window-close", N_("_Close"), "<control>W", NULL,
G_CALLBACK (ev_window_cmd_file_close_window) },
/* Edit menu */
- { "EditCopy", GTK_STOCK_COPY, NULL, "<control>C", NULL,
+ { "EditCopy", "edit-copy", N_("_Copy"), "<control>C", NULL,
G_CALLBACK (ev_window_cmd_edit_copy) },
- { "EditSelectAll", GTK_STOCK_SELECT_ALL, N_("Select _All"), "<control>A", NULL,
+ { "EditSelectAll", "edit-select-all", N_("Select _All"), "<control>A", NULL,
G_CALLBACK (ev_window_cmd_edit_select_all) },
- { "EditFind", GTK_STOCK_FIND, N_("_Find…"), "<control>F",
+ { "EditFind", "edit-find", N_("_Find…"), "<control>F",
N_("Find a word or phrase in the document"),
G_CALLBACK (ev_window_cmd_edit_find) },
{ "EditFindNext", NULL, N_("Find Ne_xt"), "<control>G", NULL,
@@ -6294,50 +6294,50 @@ static const GtkActionEntry entries[] = {
/* View menu */
- { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus",
+ { "ViewZoomIn", "zoom-in", N_("Zoom _In"), "<control>plus",
N_("Enlarge the document"),
G_CALLBACK (ev_window_cmd_view_zoom_in) },
- { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus",
+ { "ViewZoomOut", "zoom-out", N_("Zoom _Out"), "<control>minus",
N_("Shrink the document"),
G_CALLBACK (ev_window_cmd_view_zoom_out) },
- { "ViewReload", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R",
+ { "ViewReload", "view-refresh", N_("_Reload"), "<control>R",
N_("Reload the document"),
G_CALLBACK (ev_window_cmd_view_reload) },
- { "ViewExpandWindow", GTK_STOCK_ZOOM_FIT, N_("_Expand Window to Fit"), "<control>e",
+ { "ViewExpandWindow", "zoom-fit-best", N_("_Expand Window to Fit"), "<control>e",
N_("Expand Window to Fit"),
G_CALLBACK (ev_window_cmd_view_expand_window) },
- { "ViewAutoscroll", GTK_STOCK_MEDIA_PLAY, N_("Auto_scroll"), NULL, NULL,
+ { "ViewAutoscroll", "media-playback-start", N_("Auto_scroll"), NULL, NULL,
G_CALLBACK (ev_window_cmd_view_autoscroll) },
/* Go menu */
- { "GoPreviousPage", GTK_STOCK_GO_UP, N_("_Previous Page"), "<control>Page_Up",
+ { "GoPreviousPage", "go-up", N_("_Previous Page"), "<control>Page_Up",
N_("Go to the previous page"),
G_CALLBACK (ev_window_cmd_go_previous_page) },
- { "GoNextPage", GTK_STOCK_GO_DOWN, N_("_Next Page"), "<control>Page_Down",
+ { "GoNextPage", "go-down", N_("_Next Page"), "<control>Page_Down",
N_("Go to the next page"),
G_CALLBACK (ev_window_cmd_go_next_page) },
- { "GoFirstPage", GTK_STOCK_GOTO_TOP, N_("_First Page"), "<control>Home",
+ { "GoFirstPage", "go-top", N_("_First Page"), "<control>Home",
N_("Go to the first page"),
G_CALLBACK (ev_window_cmd_go_first_page) },
- { "GoLastPage", GTK_STOCK_GOTO_BOTTOM, N_("_Last Page"), "<control>End",
+ { "GoLastPage", "go-bottom", N_("_Last Page"), "<control>End",
N_("Go to the last page"),
G_CALLBACK (ev_window_cmd_go_last_page) },
/* Bookmarks menu */
- { "BookmarksAdd", GTK_STOCK_ADD, N_("_Add Bookmark"), "<control>D",
+ { "BookmarksAdd", "list-add", N_("_Add Bookmark"), "<control>D",
N_("Add a bookmark for the current page"),
G_CALLBACK (ev_window_cmd_bookmarks_add) },
/* Help menu */
- { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL,
+ { "HelpContents", "help-browser", N_("_Contents"), "F1", NULL,
G_CALLBACK (ev_window_cmd_help_contents) },
- { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL,
+ { "HelpAbout", "help-about", N_("_About"), NULL, NULL,
G_CALLBACK (ev_window_cmd_help_about) },
/* Toolbar-only */
- { "LeaveFullscreen", GTK_STOCK_LEAVE_FULLSCREEN, N_("Leave Fullscreen"), NULL,
+ { "LeaveFullscreen", "view-restore", N_("Leave Fullscreen"), NULL,
N_("Leave fullscreen mode"),
G_CALLBACK (ev_window_cmd_leave_fullscreen) },
{ "StartPresentation", EV_STOCK_RUN_PRESENTATION, N_("Start Presentation"), NULL,
@@ -6347,7 +6347,7 @@ static const GtkActionEntry entries[] = {
/* Accellerators */
{ "Escape", NULL, "", "Escape", "",
G_CALLBACK (ev_window_cmd_escape) },
- { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL,
+ { "Slash", "edit-find", NULL, "slash", NULL,
G_CALLBACK (ev_window_cmd_edit_find) },
{ "F3", NULL, "", "F3", NULL,
G_CALLBACK (ev_window_cmd_edit_find_next) },
@@ -6355,17 +6355,17 @@ static const GtkActionEntry entries[] = {
G_CALLBACK (ev_window_cmd_scroll_forward) },
{ "PageUp", NULL, "", "Page_Up", NULL,
G_CALLBACK (ev_window_cmd_scroll_backward) },
- { "p", GTK_STOCK_GO_UP, "", "p", NULL,
+ { "p", "go-up", "", "p", NULL,
G_CALLBACK (ev_window_cmd_go_previous_page) },
- { "n", GTK_STOCK_GO_DOWN, "", "n", NULL,
+ { "n", "go-down", "", "n", NULL,
G_CALLBACK (ev_window_cmd_go_next_page) },
- { "Plus", GTK_STOCK_ZOOM_IN, NULL, "plus", NULL,
+ { "Plus", "zoom-in", NULL, "plus", NULL,
G_CALLBACK (ev_window_cmd_view_zoom_in) },
- { "CtrlEqual", GTK_STOCK_ZOOM_IN, NULL, "<control>equal", NULL,
+ { "CtrlEqual", "zoom-in", NULL, "<control>equal", NULL,
G_CALLBACK (ev_window_cmd_view_zoom_in) },
- { "Equal", GTK_STOCK_ZOOM_IN, NULL, "equal", NULL,
+ { "Equal", "zoom-in", NULL, "equal", NULL,
G_CALLBACK (ev_window_cmd_view_zoom_in) },
- { "Minus", GTK_STOCK_ZOOM_OUT, NULL, "minus", NULL,
+ { "Minus", "zoom-out", NULL, "minus", NULL,
G_CALLBACK (ev_window_cmd_view_zoom_out) },
{ "FocusPageSelector", NULL, "", "<control>l", NULL,
G_CALLBACK (ev_window_cmd_focus_page_selector) },
@@ -6373,15 +6373,15 @@ static const GtkActionEntry entries[] = {
G_CALLBACK (ev_window_cmd_go_backward) },
{ "GoForwardFast", NULL, "", "<shift>Page_Down", NULL,
G_CALLBACK (ev_window_cmd_go_forward) },
- { "KpPlus", GTK_STOCK_ZOOM_IN, NULL, "KP_Add", NULL,
+ { "KpPlus", "zoom-in", NULL, "KP_Add", NULL,
G_CALLBACK (ev_window_cmd_view_zoom_in) },
- { "KpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract", NULL,
+ { "KpMinus", "zoom-out", NULL, "KP_Subtract", NULL,
G_CALLBACK (ev_window_cmd_view_zoom_out) },
- { "CtrlKpPlus", GTK_STOCK_ZOOM_IN, NULL, "<control>KP_Add", NULL,
+ { "CtrlKpPlus", "zoom-in", NULL, "<control>KP_Add", NULL,
G_CALLBACK (ev_window_cmd_view_zoom_in) },
- { "CtrlKpMinus", GTK_STOCK_ZOOM_OUT, NULL, "<control>KP_Subtract", NULL,
+ { "CtrlKpMinus", "zoom-out", NULL, "<control>KP_Subtract", NULL,
G_CALLBACK (ev_window_cmd_view_zoom_out) },
- { "CtrlInsert", GTK_STOCK_COPY, NULL, "<control>Insert", NULL,
+ { "CtrlInsert", "edit-copy", NULL, "<control>Insert", NULL,
G_CALLBACK (ev_window_cmd_edit_copy) },
{ "FitPage", EV_STOCK_ZOOM_PAGE, NULL, "f", NULL,
G_CALLBACK (ev_window_cmd_fit_page) },
@@ -6397,7 +6397,7 @@ static const GtkToggleActionEntry toggle_entries[] = {
{ "ViewToolbar", NULL, N_("_Toolbar"), NULL,
N_("Show or hide the toolbar"),
G_CALLBACK (ev_window_view_toolbar_cb), TRUE },
- { "ViewSidebar", GTK_STOCK_INDEX, N_("Side _Pane"), "F9",
+ { "ViewSidebar", "gtk-index", N_("Side _Pane"), "F9",
N_("Show or hide the side pane"),
G_CALLBACK (ev_window_view_sidebar_cb), TRUE },
{ "ViewContinuous", EV_STOCK_VIEW_CONTINUOUS, N_("_Continuous"), "c",
@@ -6409,7 +6409,7 @@ static const GtkToggleActionEntry toggle_entries[] = {
{ "ViewDualOddLeft", NULL, N_("_Odd pages left"), NULL,
N_("Show odd pages on the left in dual mode"),
G_CALLBACK (ev_window_cmd_dual_odd_pages_left), FALSE },
- { "ViewFullscreen", GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), "F11",
+ { "ViewFullscreen", "view-fullscreen", N_("_Fullscreen"), "F11",
N_("Expand the window to fill the screen"),
G_CALLBACK (ev_window_cmd_view_fullscreen) },
{ "ViewPresentation", EV_STOCK_RUN_PRESENTATION, N_("Pre_sentation"), "F5",
@@ -6424,7 +6424,7 @@ static const GtkToggleActionEntry toggle_entries[] = {
{ "ViewInvertedColors", EV_STOCK_INVERTED_COLORS, N_("_Inverted Colors"), "<control>I",
N_("Show page contents with the colors inverted"),
G_CALLBACK (ev_window_cmd_view_inverted_colors) },
- { "ViewCaretNavigation", GTK_STOCK_INDEX, N_("Caret _Navigation"), "F7",
+ { "ViewCaretNavigation", "gtk-index", N_("Caret _Navigation"), "F7",
N_("Activate or disable caret-navigation"),
G_CALLBACK (ev_window_cmd_view_toggle_caret_navigation) },
@@ -6433,9 +6433,9 @@ static const GtkToggleActionEntry toggle_entries[] = {
/* Popups specific items */
static const GtkActionEntry view_popup_entries [] = {
/* Links */
- { "OpenLink", GTK_STOCK_OPEN, N_("_Open Link"), NULL,
+ { "OpenLink", "document-open", N_("_Open Link"), NULL,
NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
- { "GoLink", GTK_STOCK_GO_FORWARD, N_("_Go To"), NULL,
+ { "GoLink", "go-next", N_("_Go To"), NULL,
NULL, G_CALLBACK (ev_view_popup_cmd_open_link) },
{ "OpenLinkNewWindow", NULL, N_("Open in New _Window"), NULL,
NULL, G_CALLBACK (ev_view_popup_cmd_open_link_new_window) },
@@ -6452,9 +6452,9 @@ static const GtkActionEntry view_popup_entries [] = {
};
static const GtkActionEntry attachment_popup_entries [] = {
- { "OpenAttachment", GTK_STOCK_OPEN, N_("_Open Attachment"), NULL,
+ { "OpenAttachment", "document-open", N_("_Open Attachment"), NULL,
NULL, G_CALLBACK (ev_attachment_popup_cmd_open_attachment) },
- { "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save Attachment As…"), NULL,
+ { "SaveAttachmentAs", "document-save-as", N_("_Save Attachment As…"), NULL,
NULL, G_CALLBACK (ev_attachment_popup_cmd_save_attachment_as) },
};
@@ -6601,7 +6601,7 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
"label", _("Navigation"),
"is_important", TRUE,
"short_label", _("Back"),
- "stock_id", GTK_STOCK_GO_BACK,
+ "stock_id", "gtk-go-back",
/*translators: this is the history action*/
"tooltip", _("Move across visited pages"),
NULL);
@@ -6614,7 +6614,7 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
"name", "FileOpenRecent",
"label", _("_Open…"),
"tooltip", _("Open an existing document"),
- "stock_id", GTK_STOCK_OPEN,
+ "stock_id", "gtk-open",
NULL);
g_signal_connect (action, "activate",
G_CALLBACK (ev_window_cmd_file_open), window);
@@ -7126,9 +7126,9 @@ ev_view_popup_cmd_save_image_as (GtkAction *action, EvWindow *window)
fc = gtk_file_chooser_dialog_new (_("Save Image"),
GTK_WINDOW (window),
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ "gtk-save", GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
@@ -7365,9 +7365,9 @@ ev_attachment_popup_cmd_save_attachment_as (GtkAction *action, EvWindow *window)
_("Save Attachment"),
GTK_WINDOW (window),
attachment ? GTK_FILE_CHOOSER_ACTION_SAVE : GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL,
+ "gtk-cancel",
GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ "gtk-save", GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);