rev |
line source |
al@19475
|
1 --- a/src/gtk/FindView.cxx
|
al@19475
|
2 +++ b/srv/gtk/FindView.cxx
|
al@19475
|
3 @@ -50,7 +50,7 @@
|
al@19475
|
4 gtk_toolbar_set_style (GTK_TOOLBAR (m_FindBar), GTK_TOOLBAR_BOTH_HORIZ);
|
al@19475
|
5
|
al@19475
|
6 // The "Close" button.
|
al@19475
|
7 - m_Close = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE);
|
al@19475
|
8 + m_Close = gtk_tool_button_new (gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_SMALL_TOOLBAR), _("Close"));
|
al@19475
|
9 gtk_toolbar_insert (GTK_TOOLBAR (m_FindBar), m_Close, -1);
|
al@19475
|
10
|
al@19475
|
11 // The text to find entry.
|
al@19475
|
12 @@ -65,13 +65,13 @@
|
al@19475
|
13 gtk_toolbar_insert (GTK_TOOLBAR (m_FindBar), textToFindItem, -1);
|
al@19475
|
14
|
al@19475
|
15 // The "Find Next" button.
|
al@19475
|
16 - m_FindNext = gtk_tool_button_new_from_stock (EPDFVIEW_STOCK_FIND_NEXT);
|
al@19475
|
17 + m_FindNext = gtk_tool_button_new (gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_SMALL_TOOLBAR), _("Find _Next"));
|
al@19475
|
18 gtk_tool_item_set_is_important (m_FindNext, TRUE);
|
al@19475
|
19 gtk_toolbar_insert (GTK_TOOLBAR (m_FindBar), m_FindNext, -1);
|
al@19475
|
20
|
al@19475
|
21 // The "Find Previous" button.
|
al@19475
|
22 m_FindPrevious =
|
al@19475
|
23 - gtk_tool_button_new_from_stock (EPDFVIEW_STOCK_FIND_PREVIOUS);
|
al@19475
|
24 + gtk_tool_button_new (gtk_image_new_from_icon_name ("go-previous", GTK_ICON_SIZE_SMALL_TOOLBAR), _("Find _Previous"));
|
al@19475
|
25 gtk_tool_item_set_is_important (m_FindPrevious, TRUE);
|
al@19475
|
26 gtk_toolbar_insert (GTK_TOOLBAR (m_FindBar), m_FindPrevious, -1);
|
al@19475
|
27
|
al@19475
|
28 --- a/src/gtk/MainView.cxx
|
al@19475
|
29 +++ b/src/gtk/MainView.cxx
|
al@19475
|
30 @@ -92,80 +92,80 @@
|
al@19475
|
31 { "GoMenu", NULL, N_("_Go"), NULL, NULL, NULL },
|
al@19475
|
32 { "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL },
|
al@19475
|
33
|
al@19475
|
34 - { "OpenFile", GTK_STOCK_OPEN, N_("_Open"), "<control>O",
|
al@19475
|
35 + { "OpenFile", "document-open", N_("_Open"), "<control>O",
|
al@19475
|
36 N_("Open a PDF document"),
|
al@19475
|
37 G_CALLBACK (main_window_open_file_cb) },
|
al@19475
|
38
|
al@19475
|
39 - { "ReloadFile", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R",
|
al@19475
|
40 + { "ReloadFile", "view-refresh", N_("_Reload"), "<control>R",
|
al@19475
|
41 N_("Reload the current document"),
|
al@19475
|
42 G_CALLBACK (main_window_reload_cb) },
|
al@19475
|
43
|
al@19475
|
44 - { "SaveFile", GTK_STOCK_SAVE, N_("_Save a Copy..."), "<control>S",
|
al@19475
|
45 + { "SaveFile", "document-save", N_("_Save a Copy..."), "<control>S",
|
al@19475
|
46 N_("Save a copy of the current document"),
|
al@19475
|
47 G_CALLBACK (main_window_save_file_cb) },
|
al@19475
|
48
|
al@19475
|
49 #if defined (HAVE_CUPS)
|
al@19475
|
50 - { "Print", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
|
al@19475
|
51 + { "Print", "document-print", N_("_Print..."), "<control>P",
|
al@19475
|
52 N_("Print the current document"),
|
al@19475
|
53 G_CALLBACK (main_window_print_cb) },
|
al@19475
|
54 #endif // HAVE_CUPS
|
al@19475
|
55
|
al@19475
|
56 - { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
|
al@19475
|
57 + { "Quit", "window-close", N_("_Close"), "<control>W",
|
al@19475
|
58 N_("Close this window"),
|
al@19475
|
59 G_CALLBACK (main_window_quit_cb) },
|
al@19475
|
60
|
al@19475
|
61 - { "Find", GTK_STOCK_FIND, N_("_Find"), "<control>F",
|
al@19475
|
62 + { "Find", "edit-find", N_("_Find"), "<control>F",
|
al@19475
|
63 N_("Find a word in the document"),
|
al@19475
|
64 G_CALLBACK (main_window_find_cb) },
|
al@19475
|
65
|
al@19475
|
66 - { "Preferences", GTK_STOCK_PREFERENCES, N_("_Preferences..."), NULL,
|
al@19475
|
67 + { "Preferences", "preferences-system", N_("_Preferences..."), NULL,
|
al@19475
|
68 N_("Change the application's preferences"),
|
al@19475
|
69 G_CALLBACK (main_window_preferences_cb) },
|
al@19475
|
70
|
al@19475
|
71 - { "ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "<control>plus",
|
al@19475
|
72 + { "ZoomIn", "zoom-in", N_("Zoom _In"), "<control>plus",
|
al@19475
|
73 N_("Enlarge the document"),
|
al@19475
|
74 G_CALLBACK (main_window_zoom_in_cb) },
|
al@19475
|
75
|
al@19475
|
76 - { "ZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>minus",
|
al@19475
|
77 + { "ZoomOut", "zoom-out", N_("Zoom _Out"), "<control>minus",
|
al@19475
|
78 N_("Shrink the document"),
|
al@19475
|
79 G_CALLBACK (main_window_zoom_out_cb) },
|
al@19475
|
80
|
al@19475
|
81 - { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), "<control>bracketright",
|
al@19475
|
82 + { "RotateRight", "object-rotate-right", N_("Rotate _Right"), "<control>bracketright",
|
al@19475
|
83 N_("Rotate the document 90 degrees clockwise"),
|
al@19475
|
84 G_CALLBACK (main_window_rotate_right_cb) },
|
al@19475
|
85
|
al@19475
|
86 - { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), "<control>bracketleft",
|
al@19475
|
87 + { "RotateLeft", "object-rotate-left", N_("Rotate _Left"), "<control>bracketleft",
|
al@19475
|
88 N_("Rotate the document 90 degrees counter-clockwise"),
|
al@19475
|
89 G_CALLBACK (main_window_rotate_left_cb) },
|
al@19475
|
90
|
al@19475
|
91 - { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
|
al@19475
|
92 + { "GoToFirstPage", "go-first", N_("_First Page"), "<control>Home",
|
al@19475
|
93 N_("Go to the first page"),
|
al@19475
|
94 G_CALLBACK (main_window_go_to_first_page_cb) },
|
al@19475
|
95
|
al@19475
|
96 - { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<Shift>Page_Down",
|
al@19475
|
97 + { "GoToNextPage", "go-next", N_("_Next Page"), "<Shift>Page_Down",
|
al@19475
|
98 N_("Go to the next page"),
|
al@19475
|
99 G_CALLBACK (main_window_go_to_next_page_cb) },
|
al@19475
|
100
|
al@19475
|
101 - { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<Shift>Page_Up",
|
al@19475
|
102 + { "GoToPreviousPage", "go-previous", N_("_Previous Page"), "<Shift>Page_Up",
|
al@19475
|
103 N_("Go to the previous page"),
|
al@19475
|
104 G_CALLBACK (main_window_go_to_previous_page_cb) },
|
al@19475
|
105
|
al@19475
|
106 - { "GoToLastPage", GTK_STOCK_GOTO_LAST, N_("_Last Page"), "<control>End",
|
al@19475
|
107 + { "GoToLastPage", "go-last", N_("_Last Page"), "<control>End",
|
al@19475
|
108 N_("Go to the last page"),
|
al@19475
|
109 G_CALLBACK (main_window_go_to_last_page_cb) },
|
al@19475
|
110
|
al@19475
|
111 - { "About", GTK_STOCK_ABOUT, N_("_About"), NULL,
|
al@19475
|
112 + { "About", "help-about", N_("_About"), NULL,
|
al@19475
|
113 N_("Display application's credits"),
|
al@19475
|
114 G_CALLBACK (main_window_about_box_cb) },
|
al@19475
|
115
|
al@19475
|
116 // Accelerator keys.
|
al@19475
|
117 - { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL,
|
al@19475
|
118 + { "Slash", "edit-find", NULL, "slash", NULL,
|
al@19475
|
119 G_CALLBACK (main_window_find_cb) },
|
al@19475
|
120
|
al@19475
|
121 - { "KPAdd", GTK_STOCK_ZOOM_IN, NULL, "<control>KP_Add", NULL,
|
al@19475
|
122 + { "KPAdd", "zoom-in", NULL, "<control>KP_Add", NULL,
|
al@19475
|
123 G_CALLBACK (main_window_zoom_in_cb) },
|
al@19475
|
124
|
al@19475
|
125 - { "KPSubtract", GTK_STOCK_ZOOM_OUT, NULL, "<control>KP_Subtract",
|
al@19475
|
126 + { "KPSubtract", "zoom-out", NULL, "<control>KP_Subtract",
|
al@19475
|
127 NULL,
|
al@19475
|
128 G_CALLBACK (main_window_zoom_out_cb) }
|
al@19475
|
129 };
|
al@19475
|
130 @@ -188,21 +188,21 @@
|
al@19475
|
131 N_("Show or hide the document's outline"),
|
al@19475
|
132 G_CALLBACK (main_window_show_index_cb), FALSE },
|
al@19475
|
133
|
al@19475
|
134 - { "ZoomFit", GTK_STOCK_ZOOM_FIT, N_("Zoom to _Fit"), NULL,
|
al@19475
|
135 + { "ZoomFit", "zoom-fit-best", N_("Zoom to _Fit"), NULL,
|
al@19475
|
136 N_("Make the current document fill the window"),
|
al@19475
|
137 G_CALLBACK (main_window_zoom_fit_cb), FALSE },
|
al@19475
|
138
|
al@19475
|
139 - { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, N_("Zoom to _Width"), NULL,
|
al@19475
|
140 + { "ZoomWidth", "format-justify-fill", N_("Zoom to _Width"), NULL,
|
al@19475
|
141 N_("Make the current document fill the window width"),
|
al@19475
|
142 G_CALLBACK (main_window_zoom_width_cb), FALSE },
|
al@19475
|
143 };
|
al@19475
|
144
|
al@19475
|
145 static GtkRadioActionEntry g_PageScrollEntries[] =
|
al@19475
|
146 {
|
al@19475
|
147 - { "PageModeScroll", GTK_STOCK_FULLSCREEN, N_("Scroll"), NULL,
|
al@19475
|
148 + { "PageModeScroll", "view-fullscreen", N_("Scroll"), NULL,
|
al@19475
|
149 N_("Mouse scroll page"), (int)PagePterModeScroll },
|
al@19475
|
150
|
al@19475
|
151 - { "PageModeText", GTK_STOCK_SELECT_ALL, N_("Select Text"), NULL,
|
al@19475
|
152 + { "PageModeText", "edit-select-all", N_("Select Text"), NULL,
|
al@19475
|
153 N_(" Mouse select text"), (int)PagePterModeSelectText },
|
al@19475
|
154 };
|
al@19475
|
155
|
al@19475
|
156 @@ -1031,35 +1031,7 @@
|
al@19475
|
157 void
|
al@19475
|
158 MainView::setMainWindowIcon ()
|
al@19475
|
159 {
|
al@19475
|
160 - const gchar *iconFiles[] =
|
al@19475
|
161 - {
|
al@19475
|
162 - "icon_epdfview-48.png",
|
al@19475
|
163 - "icon_epdfview-32.png",
|
al@19475
|
164 - "icon_epdfview-24.png",
|
al@19475
|
165 - };
|
al@19475
|
166 -
|
al@19475
|
167 - GList *iconList = NULL;
|
al@19475
|
168 - int iconFilesNum = G_N_ELEMENTS (iconFiles);
|
al@19475
|
169 - for ( int iconIndex = 0 ; iconIndex < iconFilesNum ; iconIndex++ )
|
al@19475
|
170 - {
|
al@19475
|
171 - gchar *filename = g_strconcat (DATADIR, "/pixmaps/",
|
al@19475
|
172 - iconFiles[iconIndex], NULL);
|
al@19475
|
173 - GError *error = NULL;
|
al@19475
|
174 - GdkPixbuf *iconPixbuf = gdk_pixbuf_new_from_file (filename, &error);
|
al@19475
|
175 - if ( NULL != iconPixbuf )
|
al@19475
|
176 - {
|
al@19475
|
177 - iconList = g_list_prepend (iconList, iconPixbuf);
|
al@19475
|
178 - }
|
al@19475
|
179 - else
|
al@19475
|
180 - {
|
al@19475
|
181 - g_warning ("Error loading icon: %s\n", error->message);
|
al@19475
|
182 - g_error_free (error);
|
al@19475
|
183 - }
|
al@19475
|
184 - g_free (filename);
|
al@19475
|
185 - }
|
al@19475
|
186 - gtk_window_set_default_icon_list (iconList);
|
al@19475
|
187 - g_list_foreach (iconList, (GFunc)g_object_unref, NULL);
|
al@19475
|
188 - g_list_free (iconList);
|
al@19475
|
189 + gtk_window_set_default_icon_name ("epdfview");
|
al@19475
|
190 }
|
al@19475
|
191
|
al@19475
|
192 ///
|