diff options
Diffstat (limited to 'meta/recipes-sato/epdfview/epdfview/owl-menus.patch')
-rw-r--r-- | meta/recipes-sato/epdfview/epdfview/owl-menus.patch | 325 |
1 files changed, 325 insertions, 0 deletions
diff --git a/meta/recipes-sato/epdfview/epdfview/owl-menus.patch b/meta/recipes-sato/epdfview/epdfview/owl-menus.patch new file mode 100644 index 0000000000..755b71e7a4 --- /dev/null +++ b/meta/recipes-sato/epdfview/epdfview/owl-menus.patch | |||
@@ -0,0 +1,325 @@ | |||
1 | Index: epdfview-0.1.7/src/Makefile.am | ||
2 | =================================================================== | ||
3 | --- epdfview-0.1.7.orig/src/Makefile.am 2010-07-13 12:30:44.014172385 +0100 | ||
4 | +++ epdfview-0.1.7/src/Makefile.am 2010-07-13 12:30:48.780063260 +0100 | ||
5 | @@ -58,7 +58,7 @@ | ||
6 | main.cxx | ||
7 | |||
8 | libshell_cxxflags = -I$(top_srcdir)/src/gtk $(GTK2_CFLAGS) | ||
9 | -libshell_ldadd = $(GTK2_LIBS) $(top_builddir)/src/gtk/libshell-gtk.a | ||
10 | +libshell_ldadd = $(GTK2_LIBS) $(top_builddir)/src/gtk/libshell-gtk.a -lowl | ||
11 | |||
12 | epdfview_CXXFLAGS = \ | ||
13 | -DLOCALEDIR='"$(datadir)/locale"' \ | ||
14 | Index: epdfview-0.1.7/src/gtk/MainView.cxx | ||
15 | =================================================================== | ||
16 | --- epdfview-0.1.7.orig/src/gtk/MainView.cxx 2010-07-13 12:30:44.014172385 +0100 | ||
17 | +++ epdfview-0.1.7/src/gtk/MainView.cxx 2010-07-13 12:30:48.782124540 +0100 | ||
18 | @@ -20,6 +20,7 @@ | ||
19 | #include <string.h> | ||
20 | #include <gettext.h> | ||
21 | #include <gtk/gtk.h> | ||
22 | +#include <libowl/owlwindowmenu.h> | ||
23 | #include <epdfview.h> | ||
24 | #include "StockIcons.h" | ||
25 | #include "FindView.h" | ||
26 | @@ -86,6 +87,7 @@ | ||
27 | // The actions for menus and toolbars. | ||
28 | static const GtkActionEntry g_NormalEntries[] = | ||
29 | { | ||
30 | + { "Top", NULL, "", NULL, NULL, NULL }, | ||
31 | { "FileMenu", NULL, N_("_File"), NULL, NULL, NULL }, | ||
32 | { "EditMenu", NULL, N_("_Edit"), NULL, NULL, NULL }, | ||
33 | { "ViewMenu", NULL, N_("_View"), NULL, NULL, NULL }, | ||
34 | @@ -100,7 +102,7 @@ | ||
35 | N_("Reload the current document"), | ||
36 | G_CALLBACK (main_window_reload_cb) }, | ||
37 | |||
38 | - { "SaveFile", GTK_STOCK_SAVE, N_("_Save a Copy..."), "<control>S", | ||
39 | + { "SaveFile", GTK_STOCK_SAVE, N_("_Save a Copy..."), "<control>W", | ||
40 | N_("Save a copy of the current document"), | ||
41 | G_CALLBACK (main_window_save_file_cb) }, | ||
42 | |||
43 | @@ -110,11 +112,11 @@ | ||
44 | G_CALLBACK (main_window_print_cb) }, | ||
45 | #endif // HAVE_CUPS | ||
46 | |||
47 | - { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>W", | ||
48 | + { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>Q", | ||
49 | N_("Close this window"), | ||
50 | G_CALLBACK (main_window_quit_cb) }, | ||
51 | |||
52 | - { "Find", GTK_STOCK_FIND, N_("_Find"), "<control>F", | ||
53 | + { "Find", GTK_STOCK_FIND, N_("_Find"), "<control>S", | ||
54 | N_("Find a word in the document"), | ||
55 | G_CALLBACK (main_window_find_cb) }, | ||
56 | |||
57 | @@ -138,19 +140,19 @@ | ||
58 | N_("Rotate the document 90 degrees counter-clockwise"), | ||
59 | G_CALLBACK (main_window_rotate_left_cb) }, | ||
60 | |||
61 | - { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home", | ||
62 | + { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>1", | ||
63 | N_("Go to the first page"), | ||
64 | G_CALLBACK (main_window_go_to_first_page_cb) }, | ||
65 | |||
66 | - { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<Shift>Page_Down", | ||
67 | + { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<Shift>Down", | ||
68 | N_("Go to the next page"), | ||
69 | G_CALLBACK (main_window_go_to_next_page_cb) }, | ||
70 | |||
71 | - { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<Shift>Page_Up", | ||
72 | + { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<Shift>Up", | ||
73 | N_("Go to the previous page"), | ||
74 | G_CALLBACK (main_window_go_to_previous_page_cb) }, | ||
75 | |||
76 | - { "GoToLastPage", GTK_STOCK_GOTO_LAST, N_("_Last Page"), "<control>End", | ||
77 | + { "GoToLastPage", GTK_STOCK_GOTO_LAST, N_("_Last Page"), "<control>0", | ||
78 | N_("Go to the last page"), | ||
79 | G_CALLBACK (main_window_go_to_last_page_cb) }, | ||
80 | |||
81 | @@ -172,7 +174,7 @@ | ||
82 | |||
83 | static GtkToggleActionEntry g_ToggleEntries[] = | ||
84 | { | ||
85 | - { "FullScreen", NULL, N_("F_ull screen"), "F11", | ||
86 | + { "FullScreen", NULL, N_("F_ull screen"), "<control>F", | ||
87 | N_("Toggle full screen window"), | ||
88 | G_CALLBACK (main_window_fullscreen_cb), FALSE }, | ||
89 | |||
90 | @@ -184,7 +186,7 @@ | ||
91 | N_("Show or hide the statusbar"), | ||
92 | G_CALLBACK (main_window_show_statusbar_cb), TRUE }, | ||
93 | |||
94 | - { "ShowIndex", NULL, N_("Show I_ndex"), "F9", | ||
95 | + { "ShowIndex", NULL, N_("Show I_ndex"), "<control>I", | ||
96 | N_("Show or hide the document's outline"), | ||
97 | G_CALLBACK (main_window_show_index_cb), FALSE }, | ||
98 | |||
99 | @@ -234,9 +236,8 @@ | ||
100 | GtkAccelGroup *accelGroup = gtk_ui_manager_get_accel_group (m_UIManager); | ||
101 | gtk_window_add_accel_group (GTK_WINDOW (m_MainWindow), accelGroup); | ||
102 | // Add the menu bar and tool bar. | ||
103 | - GtkWidget *menuBar = gtk_ui_manager_get_widget (m_UIManager, "/MenuBar"); | ||
104 | - gtk_box_pack_start (GTK_BOX (m_MainBox), menuBar, FALSE, FALSE, 0); | ||
105 | - gtk_widget_show (menuBar); | ||
106 | + owl_set_window_menu_item (GTK_WINDOW (m_MainWindow), | ||
107 | + GTK_MENU_ITEM(gtk_ui_manager_get_widget(m_UIManager, "/MenuBar/TopMenu"))); | ||
108 | GtkWidget *toolBar = gtk_ui_manager_get_widget (m_UIManager, "/ToolBar"); | ||
109 | gtk_box_pack_start (GTK_BOX (m_MainBox), toolBar, FALSE, FALSE, 0); | ||
110 | // Add the current page tool item. | ||
111 | @@ -285,7 +286,7 @@ | ||
112 | MainView::activeZoomFit (gboolean active) | ||
113 | { | ||
114 | GtkAction *zoomFit = | ||
115 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomFit"); | ||
116 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomFit"); | ||
117 | gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomFit), active); | ||
118 | } | ||
119 | |||
120 | @@ -293,7 +294,7 @@ | ||
121 | MainView::activeZoomWidth (gboolean active) | ||
122 | { | ||
123 | GtkAction *zoomWidth = | ||
124 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomWidth"); | ||
125 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomWidth"); | ||
126 | gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomWidth), active); | ||
127 | } | ||
128 | |||
129 | @@ -484,7 +485,7 @@ | ||
130 | MainView::sensitiveFind (gboolean sensitive) | ||
131 | { | ||
132 | GtkAction *find = | ||
133 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/EditMenu/Find"); | ||
134 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/EditMenu/Find"); | ||
135 | gtk_action_set_sensitive (find, sensitive); | ||
136 | } | ||
137 | |||
138 | @@ -492,7 +493,7 @@ | ||
139 | MainView::sensitiveGoToFirstPage (gboolean sensitive) | ||
140 | { | ||
141 | GtkAction *goToFirstPage = gtk_ui_manager_get_action (m_UIManager, | ||
142 | - "/MenuBar/GoMenu/GoToFirstPage"); | ||
143 | + "/MenuBar/TopMenu/GoMenu/GoToFirstPage"); | ||
144 | gtk_action_set_sensitive (goToFirstPage, sensitive); | ||
145 | } | ||
146 | |||
147 | @@ -500,7 +501,7 @@ | ||
148 | MainView::sensitiveGoToLastPage (gboolean sensitive) | ||
149 | { | ||
150 | GtkAction *goToLastPage = | ||
151 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/GoMenu/GoToLastPage"); | ||
152 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/GoMenu/GoToLastPage"); | ||
153 | gtk_action_set_sensitive (goToLastPage, sensitive); | ||
154 | } | ||
155 | |||
156 | @@ -508,7 +509,7 @@ | ||
157 | MainView::sensitiveGoToNextPage (gboolean sensitive) | ||
158 | { | ||
159 | GtkAction *goToNextPage = | ||
160 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/GoMenu/GoToNextPage"); | ||
161 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/GoMenu/GoToNextPage"); | ||
162 | gtk_action_set_sensitive (goToNextPage, sensitive); | ||
163 | } | ||
164 | |||
165 | @@ -522,7 +523,7 @@ | ||
166 | MainView::sensitiveGoToPreviousPage (gboolean sensitive) | ||
167 | { | ||
168 | GtkAction *goToPreviousPage = gtk_ui_manager_get_action (m_UIManager, | ||
169 | - "/MenuBar/GoMenu/GoToPreviousPage"); | ||
170 | + "/MenuBar/TopMenu/GoMenu/GoToPreviousPage"); | ||
171 | gtk_action_set_sensitive (goToPreviousPage, sensitive); | ||
172 | } | ||
173 | |||
174 | @@ -530,7 +531,7 @@ | ||
175 | MainView::sensitiveOpen (gboolean sensitive) | ||
176 | { | ||
177 | GtkAction *open = | ||
178 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/FileMenu/OpenFile"); | ||
179 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/FileMenu/OpenFile"); | ||
180 | gtk_action_set_sensitive (open, sensitive); | ||
181 | } | ||
182 | |||
183 | @@ -539,7 +540,7 @@ | ||
184 | MainView::sensitivePrint (gboolean sensitive) | ||
185 | { | ||
186 | GtkAction *print = gtk_ui_manager_get_action (m_UIManager, | ||
187 | - "/MenuBar/FileMenu/PrintPlaceHolder/Print"); | ||
188 | + "/MenuBar/TopMenu/FileMenu/PrintPlaceHolder/Print"); | ||
189 | gtk_action_set_sensitive (print, sensitive); | ||
190 | } | ||
191 | #endif // HAVE_CUPS | ||
192 | @@ -548,7 +549,7 @@ | ||
193 | MainView::sensitiveReload (gboolean sensitive) | ||
194 | { | ||
195 | GtkAction *reload = | ||
196 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/FileMenu/ReloadFile"); | ||
197 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/FileMenu/ReloadFile"); | ||
198 | gtk_action_set_sensitive (reload, sensitive); | ||
199 | } | ||
200 | |||
201 | @@ -556,7 +557,7 @@ | ||
202 | MainView::sensitiveRotateLeft (gboolean sensitive) | ||
203 | { | ||
204 | GtkAction *rotateLeft = | ||
205 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/RotateLeft"); | ||
206 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/RotateLeft"); | ||
207 | gtk_action_set_sensitive (rotateLeft, sensitive); | ||
208 | } | ||
209 | |||
210 | @@ -564,7 +565,7 @@ | ||
211 | MainView::sensitiveRotateRight (gboolean sensitive) | ||
212 | { | ||
213 | GtkAction *rotateRight = gtk_ui_manager_get_action (m_UIManager, | ||
214 | - "/MenuBar/ViewMenu/RotateRight"); | ||
215 | + "/MenuBar/TopMenu/ViewMenu/RotateRight"); | ||
216 | gtk_action_set_sensitive (rotateRight, sensitive); | ||
217 | } | ||
218 | |||
219 | @@ -572,7 +573,7 @@ | ||
220 | MainView::sensitiveSave (gboolean sensitive) | ||
221 | { | ||
222 | GtkAction *save = | ||
223 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/FileMenu/SaveFile"); | ||
224 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/FileMenu/SaveFile"); | ||
225 | gtk_action_set_sensitive (save, sensitive); | ||
226 | } | ||
227 | |||
228 | @@ -586,7 +587,7 @@ | ||
229 | MainView::sensitiveZoomIn (gboolean sensitive) | ||
230 | { | ||
231 | GtkAction *zoomIn = | ||
232 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomIn"); | ||
233 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomIn"); | ||
234 | gtk_action_set_sensitive (zoomIn, sensitive); | ||
235 | } | ||
236 | |||
237 | @@ -594,7 +595,7 @@ | ||
238 | MainView::sensitiveZoomOut (gboolean sensitive) | ||
239 | { | ||
240 | GtkAction *zoomOut = | ||
241 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomOut"); | ||
242 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomOut"); | ||
243 | gtk_action_set_sensitive (zoomOut, sensitive); | ||
244 | } | ||
245 | |||
246 | @@ -602,7 +603,7 @@ | ||
247 | MainView::sensitiveZoomFit (gboolean sensitive) | ||
248 | { | ||
249 | GtkAction *zoomFit = | ||
250 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomFit"); | ||
251 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomFit"); | ||
252 | gtk_action_set_sensitive (zoomFit, sensitive); | ||
253 | } | ||
254 | |||
255 | @@ -610,7 +611,7 @@ | ||
256 | MainView::sensitiveZoomWidth (gboolean sensitive) | ||
257 | { | ||
258 | GtkAction *zoomWidth = | ||
259 | - gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomWidth"); | ||
260 | + gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomWidth"); | ||
261 | gtk_action_set_sensitive (zoomWidth, sensitive); | ||
262 | } | ||
263 | |||
264 | @@ -654,7 +655,7 @@ | ||
265 | } | ||
266 | GtkAction *showIndex = | ||
267 | gtk_ui_manager_get_action (m_UIManager, | ||
268 | - "/MenuBar/ViewMenu/ShowIndex"); | ||
269 | + "/MenuBar/TopMenu/ViewMenu/ShowIndex"); | ||
270 | gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (showIndex), show); | ||
271 | } | ||
272 | |||
273 | @@ -695,13 +696,13 @@ | ||
274 | gtk_window_fullscreen (GTK_WINDOW (m_MainWindow)); | ||
275 | // Hide the menu bar, tool bar, status bar and the index bar. Then | ||
276 | // zoom to fit. | ||
277 | - gtk_widget_hide (menuBar); | ||
278 | +// gtk_widget_hide (menuBar); | ||
279 | gtk_widget_hide (toolBar); | ||
280 | gtk_widget_hide (m_StatusBar); | ||
281 | gtk_widget_hide (m_Sidebar); | ||
282 | gtk_toggle_action_set_active ( | ||
283 | GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager, | ||
284 | - "/MenuBar/ViewMenu/ZoomFit")), TRUE); | ||
285 | + "/MenuBar/TopMenu/ViewMenu/ZoomFit")), TRUE); | ||
286 | } | ||
287 | else | ||
288 | { | ||
289 | @@ -711,15 +712,15 @@ | ||
290 | // enabled. | ||
291 | main_window_show_index_cb ( | ||
292 | GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager, | ||
293 | - "/MenuBar/ViewMenu/ShowIndex")), | ||
294 | + "/MenuBar/TopMenu/ViewMenu/ShowIndex")), | ||
295 | (gpointer)m_Pter); | ||
296 | main_window_show_statusbar_cb ( | ||
297 | GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager, | ||
298 | - "/MenuBar/ViewMenu/ShowStatusBar")), | ||
299 | + "/MenuBar/TopMenu/ViewMenu/ShowStatusBar")), | ||
300 | (gpointer)m_Pter); | ||
301 | main_window_show_toolbar_cb ( | ||
302 | GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager, | ||
303 | - "/MenuBar/ViewMenu/ShowToolBar")), | ||
304 | + "/MenuBar/TopMenu/ViewMenu/ShowToolBar")), | ||
305 | (gpointer)m_Pter); | ||
306 | } | ||
307 | } | ||
308 | @@ -814,7 +815,7 @@ | ||
309 | MainView::showStatusbar (gboolean show) | ||
310 | { | ||
311 | GtkAction *toggleAction = gtk_ui_manager_get_action (m_UIManager, | ||
312 | - "/MenuBar/ViewMenu/ShowStatusBar"); | ||
313 | + "/MenuBar/TopMenu/ViewMenu/ShowStatusBar"); | ||
314 | gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (toggleAction), show); | ||
315 | if ( show ) | ||
316 | { | ||
317 | @@ -830,7 +831,7 @@ | ||
318 | MainView::showToolbar (gboolean show) | ||
319 | { | ||
320 | GtkAction *toggleAction = gtk_ui_manager_get_action (m_UIManager, | ||
321 | - "/MenuBar/ViewMenu/ShowToolBar"); | ||
322 | + "/MenuBar/TopMenu/ViewMenu/ShowToolBar"); | ||
323 | gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (toggleAction), show); | ||
324 | GtkWidget *toolBar = gtk_ui_manager_get_widget (m_UIManager, "/ToolBar"); | ||
325 | if ( show ) | ||