Evince

Merge lp:~larsu/evince/restore-zoom-popup into lp:~ubuntu-desktop/evince/ubuntu

  1. restore-zoom-popup
  2. Merge into ubuntu
Proposed by Lars Karlitski
Status: Merged
Merged at revision: 239
Proposed branch: lp:~larsu/evince/restore-zoom-popup
Merge into: lp:~ubuntu-desktop/evince/ubuntu
Diff against target: 356 lines (+64/-62)
1 file modified
debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch (+64/-62)
To merge this branch: bzr merge lp:~larsu/evince/restore-zoom-popup
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
VCS imports Pending
Review via email: mp+210424@code.launchpad.net

This proposal supersedes a proposal from 2014-03-11.

Description of the change

gmenumodel patch: restore zoom selector popup

It got deleted by accident in the last commit.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch'
2--- debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch 2014-03-04 13:04:18 +0000
3+++ debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch 2014-03-11 14:40:49 +0000
4@@ -30,8 +30,8 @@
5
6 Index: evince-3.10.3/shell/Makefile.am
7 ===================================================================
8---- evince-3.10.3.orig/shell/Makefile.am 2014-03-04 14:02:21.045143557 +0100
9-+++ evince-3.10.3/shell/Makefile.am 2014-03-04 14:02:21.029143557 +0100
10+--- evince-3.10.3.orig/shell/Makefile.am 2014-03-11 15:02:44.713138815 +0100
11++++ evince-3.10.3/shell/Makefile.am 2014-03-11 15:02:44.697138814 +0100
12 @@ -75,6 +75,8 @@
13 ev-sidebar-page.h \
14 ev-sidebar-thumbnails.c \
15@@ -41,13 +41,13 @@
16 main.c
17
18 nodist_evince_SOURCES = \
19-@@ -172,12 +174,12 @@
20+@@ -172,12 +174,13 @@
21
22 EXTRA_DIST = \
23 evince.css \
24 - evince-appmenu.ui \
25 evince-icon.rc \
26-- evince-ui.xml \
27+ evince-ui.xml \
28 evince.gresource.xml \
29 ev-gdbus.xml \
30 - ev-daemon-gdbus.xml
31@@ -59,8 +59,8 @@
32 $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate-source --c-name ev $<
33 Index: evince-3.10.3/shell/ev-application.c
34 ===================================================================
35---- evince-3.10.3.orig/shell/ev-application.c 2014-03-04 14:02:21.045143557 +0100
36-+++ evince-3.10.3/shell/ev-application.c 2014-03-04 14:02:24.000000000 +0100
37+--- evince-3.10.3.orig/shell/ev-application.c 2014-03-11 15:02:44.713138815 +0100
38++++ evince-3.10.3/shell/ev-application.c 2014-03-11 15:04:05.000000000 +0100
39 @@ -42,6 +42,9 @@
40 #include "ev-application.h"
41 #include "ev-file-helpers.h"
42@@ -447,8 +447,8 @@
43 +}
44 Index: evince-3.10.3/shell/ev-application.h
45 ===================================================================
46---- evince-3.10.3.orig/shell/ev-application.h 2014-03-04 14:02:21.045143557 +0100
47-+++ evince-3.10.3/shell/ev-application.h 2014-03-04 14:02:21.033143557 +0100
48+--- evince-3.10.3.orig/shell/ev-application.h 2014-03-11 15:02:44.713138815 +0100
49++++ evince-3.10.3/shell/ev-application.h 2014-03-11 15:02:44.697138814 +0100
50 @@ -81,6 +81,14 @@
51 GdkScreen *screen,
52 const char *topic);
53@@ -466,8 +466,8 @@
54 #endif /* !EV_APPLICATION_H */
55 Index: evince-3.10.3/shell/ev-bookmarks.c
56 ===================================================================
57---- evince-3.10.3.orig/shell/ev-bookmarks.c 2014-03-04 14:02:21.045143557 +0100
58-+++ evince-3.10.3/shell/ev-bookmarks.c 2014-03-04 14:02:21.033143557 +0100
59+--- evince-3.10.3.orig/shell/ev-bookmarks.c 2014-03-11 15:02:44.713138815 +0100
60++++ evince-3.10.3/shell/ev-bookmarks.c 2014-03-11 15:02:44.701138814 +0100
61 @@ -224,6 +224,14 @@
62 return g_list_copy (bookmarks->items);
63 }
64@@ -485,8 +485,8 @@
65 EvBookmark *bookmark)
66 Index: evince-3.10.3/shell/ev-bookmarks.h
67 ===================================================================
68---- evince-3.10.3.orig/shell/ev-bookmarks.h 2014-03-04 14:02:21.045143557 +0100
69-+++ evince-3.10.3/shell/ev-bookmarks.h 2014-03-04 14:02:21.033143557 +0100
70+--- evince-3.10.3.orig/shell/ev-bookmarks.h 2014-03-11 15:02:44.713138815 +0100
71++++ evince-3.10.3/shell/ev-bookmarks.h 2014-03-11 15:02:44.701138814 +0100
72 @@ -43,6 +43,7 @@
73 GType ev_bookmarks_get_type (void) G_GNUC_CONST;
74 EvBookmarks *ev_bookmarks_new (EvMetadata *metadata);
75@@ -498,7 +498,7 @@
76 Index: evince-3.10.3/shell/ev-recent-menu-model.c
77 ===================================================================
78 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
79-+++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-03-04 14:02:21.033143557 +0100
80++++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-03-11 15:02:44.701138814 +0100
81 @@ -0,0 +1,108 @@
82 +/*
83 + * Copyright 2014 Canonical Ltd
84@@ -611,7 +611,7 @@
85 Index: evince-3.10.3/shell/ev-recent-menu-model.h
86 ===================================================================
87 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
88-+++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-03-04 14:02:21.033143557 +0100
89++++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-03-11 15:02:44.701138814 +0100
90 @@ -0,0 +1,30 @@
91 +/*
92 + * Copyright 2014 Canonical Ltd
93@@ -645,8 +645,8 @@
94 +#endif
95 Index: evince-3.10.3/shell/ev-sidebar-bookmarks.c
96 ===================================================================
97---- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c 2014-03-04 14:02:21.045143557 +0100
98-+++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-03-04 14:02:21.037143557 +0100
99+--- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c 2014-03-11 15:02:44.713138815 +0100
100++++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-03-11 15:02:44.701138814 +0100
101 @@ -40,11 +40,6 @@
102 N_COLUMNS
103 };
104@@ -716,8 +716,8 @@
105 GtkWidget *
106 Index: evince-3.10.3/shell/ev-toolbar.c
107 ===================================================================
108---- evince-3.10.3.orig/shell/ev-toolbar.c 2014-03-04 14:02:21.045143557 +0100
109-+++ evince-3.10.3/shell/ev-toolbar.c 2014-03-04 14:02:21.037143557 +0100
110+--- evince-3.10.3.orig/shell/ev-toolbar.c 2014-03-11 15:02:44.713138815 +0100
111++++ evince-3.10.3/shell/ev-toolbar.c 2014-03-11 15:02:44.701138814 +0100
112 @@ -24,9 +24,12 @@
113
114 #include "ev-toolbar.h"
115@@ -984,8 +984,8 @@
116 static void
117 Index: evince-3.10.3/shell/ev-utils.c
118 ===================================================================
119---- evince-3.10.3.orig/shell/ev-utils.c 2014-03-04 14:02:21.045143557 +0100
120-+++ evince-3.10.3/shell/ev-utils.c 2014-03-04 14:02:21.037143557 +0100
121+--- evince-3.10.3.orig/shell/ev-utils.c 2014-03-11 15:02:44.713138815 +0100
122++++ evince-3.10.3/shell/ev-utils.c 2014-03-11 15:02:44.701138814 +0100
123 @@ -22,6 +22,7 @@
124
125 #include "ev-utils.h"
126@@ -1087,8 +1087,8 @@
127 +}
128 Index: evince-3.10.3/shell/ev-utils.h
129 ===================================================================
130---- evince-3.10.3.orig/shell/ev-utils.h 2014-03-04 14:02:21.045143557 +0100
131-+++ evince-3.10.3/shell/ev-utils.h 2014-03-04 14:02:21.037143557 +0100
132+--- evince-3.10.3.orig/shell/ev-utils.h 2014-03-11 15:02:44.713138815 +0100
133++++ evince-3.10.3/shell/ev-utils.h 2014-03-11 15:02:44.701138814 +0100
134 @@ -42,6 +42,13 @@
135 void file_chooser_dialog_add_writable_pixbuf_formats (GtkFileChooser *chooser);
136 GdkPixbufFormat* get_gdk_pixbuf_format_by_extension (const gchar *uri);
137@@ -1105,8 +1105,8 @@
138 #endif /* __EV_VIEW_H__ */
139 Index: evince-3.10.3/shell/ev-window.c
140 ===================================================================
141---- evince-3.10.3.orig/shell/ev-window.c 2014-03-04 14:02:21.045143557 +0100
142-+++ evince-3.10.3/shell/ev-window.c 2014-03-04 14:02:45.629144561 +0100
143+--- evince-3.10.3.orig/shell/ev-window.c 2014-03-11 15:02:44.713138815 +0100
144++++ evince-3.10.3/shell/ev-window.c 2014-03-11 15:02:44.705138814 +0100
145 @@ -87,10 +87,10 @@
146 #include "ev-print-operation.h"
147 #include "ev-progress-message-area.h"
148@@ -3832,7 +3832,7 @@
149 action_group = gtk_action_group_new ("ZoomSelectorPopupActions");
150 ev_window->priv->zoom_selector_popup_action_group = action_group;
151 gtk_action_group_set_translation_domain (action_group, NULL);
152-@@ -7397,11 +6802,6 @@
153+@@ -7397,10 +6802,10 @@
154 gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
155 action_group, 0);
156
157@@ -3840,11 +3840,14 @@
158 - "/org/gnome/evince/shell/ui/evince.xml",
159 - &error);
160 - g_assert_no_error (error);
161--
162++ gtk_ui_manager_add_ui_from_resource (ev_window->priv->ui_manager,
163++ "/org/gnome/evince/shell/ui/evince.xml",
164++ &error);
165++ g_assert_no_error (error);
166+
167 ev_window_register_zoom_selector_popup_actions (ev_window);
168
169- css_provider = gtk_css_provider_new ();
170-@@ -7415,12 +6815,6 @@
171+@@ -7415,12 +6820,6 @@
172 g_object_unref (css_provider);
173
174 ev_window->priv->recent_manager = gtk_recent_manager_get_default ();
175@@ -3857,7 +3860,7 @@
176
177 ev_window->priv->toolbar = ev_toolbar_new (ev_window);
178 gtk_widget_set_no_show_all (ev_window->priv->toolbar, TRUE);
179-@@ -7526,10 +6920,6 @@
180+@@ -7526,10 +6925,6 @@
181
182 sidebar_widget = ev_sidebar_bookmarks_new ();
183 ev_window->priv->sidebar_bookmarks = sidebar_widget;
184@@ -3868,7 +3871,7 @@
185 gtk_widget_show (sidebar_widget);
186 ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
187 sidebar_widget);
188-@@ -7565,7 +6955,7 @@
189+@@ -7565,7 +6960,7 @@
190 g_object_set(ev_window->priv->view, "enable-gestures",
191 _oif_ev_application_get_gestures_enabled (EV_APP), NULL);
192 #endif
193@@ -3877,7 +3880,7 @@
194 GS_PAGE_CACHE_SIZE);
195 ev_view_set_page_cache_size (EV_VIEW (ev_window->priv->view),
196 page_cache_mb * 1024 * 1024);
197-@@ -7707,13 +7097,17 @@
198+@@ -7707,13 +7102,17 @@
199 G_CALLBACK (find_bar_visibility_changed_cb),
200 ev_window);
201
202@@ -3900,7 +3903,7 @@
203 ev_window->priv->attach_list = NULL;
204
205 /* Media player keys */
206-@@ -7731,9 +7125,6 @@
207+@@ -7731,9 +7130,6 @@
208 g_settings_delay (ev_window->priv->default_settings);
209 ev_window_setup_default (ev_window);
210
211@@ -3910,7 +3913,7 @@
212 gtk_window_set_default_size (GTK_WINDOW (ev_window), 600, 600);
213
214 ev_window_sizing_mode_changed_cb (ev_window->priv->model, NULL, ev_window);
215-@@ -7745,6 +7136,8 @@
216+@@ -7745,6 +7141,8 @@
217 NULL, 0,
218 GDK_ACTION_COPY);
219 gtk_drag_dest_add_uri_targets (GTK_WIDGET (ev_window));
220@@ -3919,7 +3922,7 @@
221 }
222
223 /**
224-@@ -7762,7 +7155,6 @@
225+@@ -7762,7 +7160,6 @@
226 ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW,
227 "type", GTK_WINDOW_TOPLEVEL,
228 "application", g_application_get_default (),
229@@ -3927,7 +3930,7 @@
230 NULL));
231
232 return ev_window;
233-@@ -7801,3 +7193,11 @@
234+@@ -7801,3 +7198,11 @@
235
236 return ev_window->priv->zoom_selector_popup_action_group;
237 }
238@@ -3941,8 +3944,8 @@
239 +}
240 Index: evince-3.10.3/shell/ev-window.h
241 ===================================================================
242---- evince-3.10.3.orig/shell/ev-window.h 2014-03-04 14:02:21.045143557 +0100
243-+++ evince-3.10.3/shell/ev-window.h 2014-03-04 14:02:21.041143557 +0100
244+--- evince-3.10.3.orig/shell/ev-window.h 2014-03-11 15:02:44.713138815 +0100
245++++ evince-3.10.3/shell/ev-window.h 2014-03-11 15:02:44.705138814 +0100
246 @@ -89,7 +89,7 @@
247 GtkUIManager *ev_window_get_ui_manager (EvWindow *ev_window);
248 GtkActionGroup *ev_window_get_main_action_group (EvWindow *ev_window);
249@@ -3954,8 +3957,8 @@
250
251 Index: evince-3.10.3/shell/evince-appmenu.ui
252 ===================================================================
253---- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-03-04 14:02:21.045143557 +0100
254-+++ evince-3.10.3/shell/evince-appmenu.ui 2014-03-04 14:02:21.041143557 +0100
255+--- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-03-11 15:02:44.713138815 +0100
256++++ evince-3.10.3/shell/evince-appmenu.ui 2014-03-11 15:02:44.705138814 +0100
257 @@ -20,6 +20,16 @@
258 <menu id="appmenu">
259 <section>
260@@ -3975,10 +3978,10 @@
261 <attribute name="accel">F1</attribute>
262 Index: evince-3.10.3/shell/evince-ui.xml
263 ===================================================================
264---- evince-3.10.3.orig/shell/evince-ui.xml 2014-03-04 14:02:21.045143557 +0100
265-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
266-@@ -1,118 +0,0 @@
267--<ui>
268+--- evince-3.10.3.orig/shell/evince-ui.xml 2014-03-11 15:02:44.713138815 +0100
269++++ evince-3.10.3/shell/evince-ui.xml 2014-03-11 15:04:00.681139955 +0100
270+@@ -1,86 +1,4 @@
271+ <ui>
272 - <popup name="ActionMenu" accelerators="true">
273 - <menuitem name="FileOpenMenu" action="FileOpen"/>
274 - <menuitem name="FileOpenCopyMenu" action="FileOpenCopy"/>
275@@ -4061,13 +4064,13 @@
276 - <menuitem name="SaveAttachmentAs" action="SaveAttachmentAs"/>
277 - </popup>
278 -
279-- <popup name="ZoomSelectorPopup">
280-- <menuitem name="ViewFitPage" action="ViewFitPage"/>
281-- <menuitem name="ViewFitWidth" action="ViewFitWidth"/>
282-- <menuitem name="ViewZoomAutomatic" action="ViewZoomAutomatic"/>
283-- <separator/>
284-- <placeholder name="ViewZoomItems"/>
285-- </popup>
286+ <popup name="ZoomSelectorPopup">
287+ <menuitem name="ViewFitPage" action="ViewFitPage"/>
288+ <menuitem name="ViewFitWidth" action="ViewFitWidth"/>
289+@@ -88,31 +6,5 @@
290+ <separator/>
291+ <placeholder name="ViewZoomItems"/>
292+ </popup>
293 -
294 - <accelerator name="PageDownAccel" action="PageDown"/>
295 - <accelerator name="PageUpAccel" action="PageUp"/>
296@@ -4095,16 +4098,15 @@
297 - <accelerator name="FitWidthAccel" action ="FitWidth" />
298 - <accelerator name="F10Accel" action="F10" />
299 - <accelerator name="F7Accel" action="F7" />
300--</ui>
301+ </ui>
302++
303 Index: evince-3.10.3/shell/evince.gresource.xml
304 ===================================================================
305---- evince-3.10.3.orig/shell/evince.gresource.xml 2014-03-04 14:02:21.045143557 +0100
306-+++ evince-3.10.3/shell/evince.gresource.xml 2014-03-04 14:02:21.041143557 +0100
307-@@ -17,8 +17,9 @@
308- -->
309- <gresources>
310+--- evince-3.10.3.orig/shell/evince.gresource.xml 2014-03-11 15:02:44.713138815 +0100
311++++ evince-3.10.3/shell/evince.gresource.xml 2014-03-11 15:02:44.705138814 +0100
312+@@ -19,6 +19,8 @@
313 <gresource prefix="/org/gnome/evince/shell">
314-- <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>
315+ <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>
316 <file alias="ui/evince.css" compressed="true">evince.css</file>
317 - <file alias="ui/appmenu.ui" compressed="true" preprocess="xml-stripblanks">evince-appmenu.ui</file>
318 + <file alias="ui/menus.ui" compressed="true" preprocess="xml-stripblanks">menus.ui</file>
319@@ -4115,7 +4117,7 @@
320 Index: evince-3.10.3/shell/menus.ui
321 ===================================================================
322 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
323-+++ evince-3.10.3/shell/menus.ui 2014-03-04 14:02:24.000000000 +0100
324++++ evince-3.10.3/shell/menus.ui 2014-03-11 15:04:05.000000000 +0100
325 @@ -0,0 +1,188 @@
326 +<?xml version="1.0" encoding="UTF-8"?>
327 +<!--
328@@ -4308,7 +4310,7 @@
329 Index: evince-3.10.3/shell/traditional-menus.ui
330 ===================================================================
331 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
332-+++ evince-3.10.3/shell/traditional-menus.ui 2014-03-04 14:02:21.041143557 +0100
333++++ evince-3.10.3/shell/traditional-menus.ui 2014-03-11 15:02:44.709138815 +0100
334 @@ -0,0 +1,230 @@
335 +<?xml version="1.0" encoding="UTF-8"?>
336 +<!--
337@@ -4542,8 +4544,8 @@
338 +</interface>
339 Index: evince-3.10.3/po/POTFILES.in
340 ===================================================================
341---- evince-3.10.3.orig/po/POTFILES.in 2014-03-04 14:02:21.045143557 +0100
342-+++ evince-3.10.3/po/POTFILES.in 2014-03-04 14:02:21.041143557 +0100
343+--- evince-3.10.3.orig/po/POTFILES.in 2014-03-11 15:02:44.713138815 +0100
344++++ evince-3.10.3/po/POTFILES.in 2014-03-11 15:02:44.709138815 +0100
345 @@ -56,3 +56,6 @@
346 shell/ev-window-title.c
347 shell/main.c
348@@ -4554,7 +4556,7 @@
349 Index: evince-3.10.3/shell/popup-menus.ui
350 ===================================================================
351 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
352-+++ evince-3.10.3/shell/popup-menus.ui 2014-03-04 14:02:45.629144561 +0100
353++++ evince-3.10.3/shell/popup-menus.ui 2014-03-11 15:02:44.709138815 +0100
354 @@ -0,0 +1,114 @@
355 +<?xml version="1.0" encoding="UTF-8"?>
356 +<!--

Subscribers

People subscribed via source and target branches

to all changes: