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