Evince

Merge lp:~larsu/evince/lp1277370 into lp:~ubuntu-desktop/evince/ubuntu

  1. lp1277370
  2. Merge into ubuntu
Proposed by Lars Karlitski
Status: Merged
Merged at revision: 229
Proposed branch: lp:~larsu/evince/lp1277370
Merge into: lp:~ubuntu-desktop/evince/ubuntu
Diff against target: 422 lines (+207/-46)
2 files modified
debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch (+36/-35)
debian/patches/0002-Remove-gtk_application_set_accels_for_actions.patch (+171/-11)
To merge this branch: bzr merge lp:~larsu/evince/lp1277370
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+205342@code.launchpad.net

Description of the change

Restore keyboard accelerators on GNOME shell

Add them to menus.ui until we can depend on gtk+ 3.12 and drop
0002-Remove-gtk_application_set_accels_for_actions.patch.

This patch also adds an accel for "Add Bookmark" in traditional-menus.ui.

To post a comment you must log in.
lp:~larsu/evince/lp1277370 updated
228. By Lars Karlitski

Add accels for "Print" and "Save a Copy"

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-02-05 11:12:52 +0000
3+++ debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch 2014-02-07 14:04:19 +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-02-05 11:10:03.984089262 +0000
9-+++ evince-3.10.3/shell/Makefile.am 2014-02-05 11:10:03.972089263 +0000
10+--- evince-3.10.3.orig/shell/Makefile.am 2014-02-07 11:08:58.637444336 +0000
11++++ evince-3.10.3/shell/Makefile.am 2014-02-07 11:08:58.621444336 +0000
12 @@ -75,6 +75,8 @@
13 ev-sidebar-page.h \
14 ev-sidebar-thumbnails.c \
15@@ -59,8 +59,8 @@
16 $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate-source --c-name ev $<
17 Index: evince-3.10.3/shell/ev-application.c
18 ===================================================================
19---- evince-3.10.3.orig/shell/ev-application.c 2014-02-05 11:10:03.984089262 +0000
20-+++ evince-3.10.3/shell/ev-application.c 2014-02-05 11:10:17.000000000 +0000
21+--- evince-3.10.3.orig/shell/ev-application.c 2014-02-07 11:08:58.637444336 +0000
22++++ evince-3.10.3/shell/ev-application.c 2014-02-07 11:09:02.000000000 +0000
23 @@ -42,6 +42,9 @@
24 #include "ev-application.h"
25 #include "ev-file-helpers.h"
26@@ -447,8 +447,8 @@
27 +}
28 Index: evince-3.10.3/shell/ev-application.h
29 ===================================================================
30---- evince-3.10.3.orig/shell/ev-application.h 2014-02-05 11:10:03.984089262 +0000
31-+++ evince-3.10.3/shell/ev-application.h 2014-02-05 11:10:03.972089263 +0000
32+--- evince-3.10.3.orig/shell/ev-application.h 2014-02-07 11:08:58.637444336 +0000
33++++ evince-3.10.3/shell/ev-application.h 2014-02-07 11:08:58.625444336 +0000
34 @@ -81,6 +81,14 @@
35 GdkScreen *screen,
36 const char *topic);
37@@ -466,8 +466,8 @@
38 #endif /* !EV_APPLICATION_H */
39 Index: evince-3.10.3/shell/ev-bookmarks.c
40 ===================================================================
41---- evince-3.10.3.orig/shell/ev-bookmarks.c 2014-02-05 11:10:03.984089262 +0000
42-+++ evince-3.10.3/shell/ev-bookmarks.c 2014-02-05 11:10:03.972089263 +0000
43+--- evince-3.10.3.orig/shell/ev-bookmarks.c 2014-02-07 11:08:58.637444336 +0000
44++++ evince-3.10.3/shell/ev-bookmarks.c 2014-02-07 11:08:58.625444336 +0000
45 @@ -224,6 +224,14 @@
46 return g_list_copy (bookmarks->items);
47 }
48@@ -485,8 +485,8 @@
49 EvBookmark *bookmark)
50 Index: evince-3.10.3/shell/ev-bookmarks.h
51 ===================================================================
52---- evince-3.10.3.orig/shell/ev-bookmarks.h 2014-02-05 11:10:03.984089262 +0000
53-+++ evince-3.10.3/shell/ev-bookmarks.h 2014-02-05 11:10:03.972089263 +0000
54+--- evince-3.10.3.orig/shell/ev-bookmarks.h 2014-02-07 11:08:58.637444336 +0000
55++++ evince-3.10.3/shell/ev-bookmarks.h 2014-02-07 11:08:58.625444336 +0000
56 @@ -43,6 +43,7 @@
57 GType ev_bookmarks_get_type (void) G_GNUC_CONST;
58 EvBookmarks *ev_bookmarks_new (EvMetadata *metadata);
59@@ -498,7 +498,7 @@
60 Index: evince-3.10.3/shell/ev-recent-menu-model.c
61 ===================================================================
62 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
63-+++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-02-05 11:10:03.972089263 +0000
64++++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-02-07 11:08:58.625444336 +0000
65 @@ -0,0 +1,108 @@
66 +/*
67 + * Copyright 2014 Canonical Ltd
68@@ -611,7 +611,7 @@
69 Index: evince-3.10.3/shell/ev-recent-menu-model.h
70 ===================================================================
71 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
72-+++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-02-05 11:10:03.972089263 +0000
73++++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-02-07 11:08:58.625444336 +0000
74 @@ -0,0 +1,30 @@
75 +/*
76 + * Copyright 2014 Canonical Ltd
77@@ -645,8 +645,8 @@
78 +#endif
79 Index: evince-3.10.3/shell/ev-sidebar-bookmarks.c
80 ===================================================================
81---- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c 2014-02-05 11:10:03.984089262 +0000
82-+++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-02-05 11:10:03.972089263 +0000
83+--- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c 2014-02-07 11:08:58.637444336 +0000
84++++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-02-07 11:08:58.629444336 +0000
85 @@ -40,11 +40,6 @@
86 N_COLUMNS
87 };
88@@ -716,8 +716,8 @@
89 GtkWidget *
90 Index: evince-3.10.3/shell/ev-toolbar.c
91 ===================================================================
92---- evince-3.10.3.orig/shell/ev-toolbar.c 2014-02-05 11:10:03.984089262 +0000
93-+++ evince-3.10.3/shell/ev-toolbar.c 2014-02-05 11:10:03.972089263 +0000
94+--- evince-3.10.3.orig/shell/ev-toolbar.c 2014-02-07 11:08:58.637444336 +0000
95++++ evince-3.10.3/shell/ev-toolbar.c 2014-02-07 11:08:58.629444336 +0000
96 @@ -24,9 +24,12 @@
97
98 #include "ev-toolbar.h"
99@@ -984,8 +984,8 @@
100 static void
101 Index: evince-3.10.3/shell/ev-utils.c
102 ===================================================================
103---- evince-3.10.3.orig/shell/ev-utils.c 2014-02-05 11:10:03.984089262 +0000
104-+++ evince-3.10.3/shell/ev-utils.c 2014-02-05 11:10:03.976089262 +0000
105+--- evince-3.10.3.orig/shell/ev-utils.c 2014-02-07 11:08:58.637444336 +0000
106++++ evince-3.10.3/shell/ev-utils.c 2014-02-07 11:08:58.629444336 +0000
107 @@ -22,6 +22,7 @@
108
109 #include "ev-utils.h"
110@@ -1088,8 +1088,8 @@
111 +}
112 Index: evince-3.10.3/shell/ev-utils.h
113 ===================================================================
114---- evince-3.10.3.orig/shell/ev-utils.h 2014-02-05 11:10:03.984089262 +0000
115-+++ evince-3.10.3/shell/ev-utils.h 2014-02-05 11:10:03.976089262 +0000
116+--- evince-3.10.3.orig/shell/ev-utils.h 2014-02-07 11:08:58.637444336 +0000
117++++ evince-3.10.3/shell/ev-utils.h 2014-02-07 11:08:58.629444336 +0000
118 @@ -42,6 +42,13 @@
119 void file_chooser_dialog_add_writable_pixbuf_formats (GtkFileChooser *chooser);
120 GdkPixbufFormat* get_gdk_pixbuf_format_by_extension (const gchar *uri);
121@@ -1106,8 +1106,8 @@
122 #endif /* __EV_VIEW_H__ */
123 Index: evince-3.10.3/shell/ev-window.c
124 ===================================================================
125---- evince-3.10.3.orig/shell/ev-window.c 2014-02-05 11:10:03.984089262 +0000
126-+++ evince-3.10.3/shell/ev-window.c 2014-02-05 11:10:03.980089262 +0000
127+--- evince-3.10.3.orig/shell/ev-window.c 2014-02-07 11:08:58.637444336 +0000
128++++ evince-3.10.3/shell/ev-window.c 2014-02-07 11:08:58.633444336 +0000
129 @@ -87,10 +87,10 @@
130 #include "ev-print-operation.h"
131 #include "ev-progress-message-area.h"
132@@ -3374,8 +3374,8 @@
133 +}
134 Index: evince-3.10.3/shell/ev-window.h
135 ===================================================================
136---- evince-3.10.3.orig/shell/ev-window.h 2014-02-05 11:10:03.984089262 +0000
137-+++ evince-3.10.3/shell/ev-window.h 2014-02-05 11:10:03.980089262 +0000
138+--- evince-3.10.3.orig/shell/ev-window.h 2014-02-07 11:08:58.637444336 +0000
139++++ evince-3.10.3/shell/ev-window.h 2014-02-07 11:08:58.633444336 +0000
140 @@ -89,7 +89,7 @@
141 GtkUIManager *ev_window_get_ui_manager (EvWindow *ev_window);
142 GtkActionGroup *ev_window_get_main_action_group (EvWindow *ev_window);
143@@ -3387,8 +3387,8 @@
144
145 Index: evince-3.10.3/shell/evince-appmenu.ui
146 ===================================================================
147---- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-02-05 11:10:03.984089262 +0000
148-+++ evince-3.10.3/shell/evince-appmenu.ui 2014-02-05 11:10:03.980089262 +0000
149+--- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-02-07 11:08:58.637444336 +0000
150++++ evince-3.10.3/shell/evince-appmenu.ui 2014-02-07 11:08:58.633444336 +0000
151 @@ -20,6 +20,16 @@
152 <menu id="appmenu">
153 <section>
154@@ -3408,8 +3408,8 @@
155 <attribute name="accel">F1</attribute>
156 Index: evince-3.10.3/shell/evince-ui.xml
157 ===================================================================
158---- evince-3.10.3.orig/shell/evince-ui.xml 2014-02-05 11:10:03.984089262 +0000
159-+++ evince-3.10.3/shell/evince-ui.xml 2014-02-05 11:10:03.980089262 +0000
160+--- evince-3.10.3.orig/shell/evince-ui.xml 2014-02-07 11:08:58.637444336 +0000
161++++ evince-3.10.3/shell/evince-ui.xml 2014-02-07 11:08:58.633444336 +0000
162 @@ -1,70 +1,10 @@
163 <ui>
164 - <popup name="ActionMenu" accelerators="true">
165@@ -3523,8 +3523,8 @@
166 </ui>
167 Index: evince-3.10.3/shell/evince.gresource.xml
168 ===================================================================
169---- evince-3.10.3.orig/shell/evince.gresource.xml 2014-02-05 11:10:03.984089262 +0000
170-+++ evince-3.10.3/shell/evince.gresource.xml 2014-02-05 11:10:03.980089262 +0000
171+--- evince-3.10.3.orig/shell/evince.gresource.xml 2014-02-07 11:08:58.637444336 +0000
172++++ evince-3.10.3/shell/evince.gresource.xml 2014-02-07 11:08:58.633444336 +0000
173 @@ -19,6 +19,7 @@
174 <gresource prefix="/org/gnome/evince/shell">
175 <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>
176@@ -3537,7 +3537,7 @@
177 Index: evince-3.10.3/shell/menus.ui
178 ===================================================================
179 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
180-+++ evince-3.10.3/shell/menus.ui 2014-02-05 11:10:03.980089262 +0000
181++++ evince-3.10.3/shell/menus.ui 2014-02-07 11:08:58.633444336 +0000
182 @@ -0,0 +1,188 @@
183 +<?xml version="1.0" encoding="UTF-8"?>
184 +<!--
185@@ -3730,8 +3730,8 @@
186 Index: evince-3.10.3/shell/traditional-menus.ui
187 ===================================================================
188 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
189-+++ evince-3.10.3/shell/traditional-menus.ui 2014-02-05 11:10:03.980089262 +0000
190-@@ -0,0 +1,229 @@
191++++ evince-3.10.3/shell/traditional-menus.ui 2014-02-07 11:09:08.373443988 +0000
192+@@ -0,0 +1,230 @@
193 +<?xml version="1.0" encoding="UTF-8"?>
194 +<!--
195 + Copyright © 2014 Canonical Ltd.
196@@ -3943,6 +3943,7 @@
197 + <item>
198 + <attribute name="label" translatable="yes">_Add Bookmark</attribute>
199 + <attribute name="action">win.add-bookmark</attribute>
200++ <attribute name="accel">&lt;Ctrl&gt;D</attribute>
201 + </item>
202 + </section>
203 + </submenu>
204@@ -3963,8 +3964,8 @@
205 +</interface>
206 Index: evince-3.10.3/po/POTFILES.in
207 ===================================================================
208---- evince-3.10.3.orig/po/POTFILES.in 2013-07-26 16:27:27.000000000 +0100
209-+++ evince-3.10.3/po/POTFILES.in 2014-02-05 11:11:26.680087018 +0000
210+--- evince-3.10.3.orig/po/POTFILES.in 2014-02-07 11:08:58.637444336 +0000
211++++ evince-3.10.3/po/POTFILES.in 2014-02-07 11:08:58.633444336 +0000
212 @@ -56,3 +56,6 @@
213 shell/ev-window-title.c
214 shell/main.c
215
216=== modified file 'debian/patches/0002-Remove-gtk_application_set_accels_for_actions.patch'
217--- debian/patches/0002-Remove-gtk_application_set_accels_for_actions.patch 2014-02-04 15:40:21 +0000
218+++ debian/patches/0002-Remove-gtk_application_set_accels_for_actions.patch 2014-02-07 14:04:19 +0000
219@@ -8,11 +8,11 @@
220 shell/ev-application.c | 45 ---------------------------------------------
221 1 file changed, 45 deletions(-)
222
223-diff --git a/shell/ev-application.c b/shell/ev-application.c
224-index e2d87af..dac3411 100644
225---- a/shell/ev-application.c
226-+++ b/shell/ev-application.c
227-@@ -1087,47 +1087,9 @@ ev_application_startup (GApplication *gapplication)
228+Index: evince-3.10.3/shell/ev-application.c
229+===================================================================
230+--- evince-3.10.3.orig/shell/ev-application.c 2014-02-07 14:01:07.235558100 +0000
231++++ evince-3.10.3/shell/ev-application.c 2014-02-07 14:01:07.231558100 +0000
232+@@ -1104,47 +1104,9 @@
233 { "help", app_help_cb, NULL, NULL, NULL },
234 };
235
236@@ -60,20 +60,180 @@
237
238 G_APPLICATION_CLASS (ev_application_parent_class)->startup (gapplication);
239
240-@@ -1172,13 +1134,6 @@ ev_application_startup (GApplication *gapplication)
241+@@ -1184,18 +1146,15 @@
242+ gtk_builder_add_from_resource (builder, "/org/gnome/evince/shell/ui/menus.ui", &error);
243+ g_assert_no_error (error);
244+
245++ gtk_application_add_accelerator (GTK_APPLICATION (application), "<Ctrl>F", "win.find", NULL);
246++
247+ gtk_application_set_app_menu (GTK_APPLICATION (application),
248+ G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu")));
249 }
250
251- g_object_unref (builder);
252--
253+- g_object_unref (builder);
254++ gtk_application_add_accelerator (GTK_APPLICATION (application), "F7", "win.caret-navigation", NULL);
255+
256 - it = action_accels;
257 - while (it[0])
258 - {
259 - gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]);
260 - it += g_strv_length ((gchar **) it) + 1;
261 - }
262++ g_object_unref (builder);
263 }
264
265 static void
266---
267-1.9.rc1
268-
269+Index: evince-3.10.3/shell/menus.ui
270+===================================================================
271+--- evince-3.10.3.orig/shell/menus.ui 2014-02-07 14:01:07.235558100 +0000
272++++ evince-3.10.3/shell/menus.ui 2014-02-07 14:02:04.683556047 +0000
273+@@ -23,6 +23,7 @@
274+ <item>
275+ <attribute name="label" translatable="yes">_Open</attribute>
276+ <attribute name="action">app.open</attribute>
277++ <attribute name="accel">&lt;Ctrl&gt;O</attribute>
278+ </item>
279+ </section>
280+ <section>
281+@@ -33,6 +34,7 @@
282+ <item>
283+ <attribute name="label" translatable="yes">_Help</attribute>
284+ <attribute name="action">app.help</attribute>
285++ <attribute name="accel">F1</attribute>
286+ </item>
287+ </section>
288+ </menu>
289+@@ -52,36 +54,43 @@
290+ <item>
291+ <attribute name="label" translatable="yes">Side _Pane</attribute>
292+ <attribute name="action">win.show-side-pane</attribute>
293++ <attribute name="accel">F9</attribute>
294+ </item>
295+ </section>
296+ <section>
297+ <item>
298+ <attribute name="label" translatable="yes">_Fullscreen</attribute>
299+ <attribute name="action">win.fullscreen</attribute>
300++ <attribute name="accel">F11</attribute>
301+ </item>
302+ <item>
303+ <attribute name="label" translatable="yes">Pre_sentation</attribute>
304+ <attribute name="action">win.presentation</attribute>
305++ <attribute name="accel">F5</attribute>
306+ </item>
307+ </section>
308+ <section>
309+ <item>
310+ <attribute name="label" translatable="yes">Rotate _Left</attribute>
311+ <attribute name="action">win.rotate-left</attribute>
312++ <attribute name="accel">&lt;Ctrl&gt;Left</attribute>
313+ </item>
314+ <item>
315+ <attribute name="label" translatable="yes">Rotate _Right</attribute>
316+ <attribute name="action">win.rotate-right</attribute>
317++ <attribute name="accel">&lt;Ctrl&gt;Right</attribute>
318+ </item>
319+ </section>
320+ <section>
321+ <item>
322+ <attribute name="label" translatable="yes">Zoom _In</attribute>
323+ <attribute name="action">win.zoom-in</attribute>
324++ <attribute name="accel">&lt;Ctrl&gt;plus</attribute>
325+ </item>
326+ <item>
327+ <attribute name="label" translatable="yes">Zoom _Out</attribute>
328+ <attribute name="action">win.zoom-out</attribute>
329++ <attribute name="accel">&lt;Ctrl&gt;minus</attribute>
330+ </item>
331+ </section>
332+ <section>
333+@@ -92,12 +101,14 @@
334+ <item>
335+ <attribute name="label" translatable="yes">_Inverted Colors</attribute>
336+ <attribute name="action">win.inverted-colors</attribute>
337++ <attribute name="accel">&lt;Ctrl&gt;I</attribute>
338+ </item>
339+ </section>
340+ <section>
341+ <item>
342+ <attribute name="label" translatable="yes">_Reload</attribute>
343+ <attribute name="action">win.reload</attribute>
344++ <attribute name="accel">&lt;Ctrl&gt;R</attribute>
345+ </item>
346+ </section>
347+ </menu>
348+@@ -107,10 +118,12 @@
349+ <item>
350+ <attribute name="label" translatable="yes">_Open…</attribute>
351+ <attribute name="action">app.open</attribute>
352++ <attribute name="accel">&lt;Ctrl&gt;O</attribute>
353+ </item>
354+ <item>
355+ <attribute name="label" translatable="yes">Op_en a Copy</attribute>
356+ <attribute name="action">win.open-copy</attribute>
357++ <attribute name="accel">&lt;Ctrl&gt;N</attribute>
358+ </item>
359+ <item>
360+ <attribute name="label" translatable="yes">_Recent</attribute>
361+@@ -120,6 +133,7 @@
362+ <item>
363+ <attribute name="label" translatable="yes">_Save a Copy…</attribute>
364+ <attribute name="action">win.save-copy</attribute>
365++ <attribute name="accel">&lt;Ctrl&gt;S</attribute>
366+ </item>
367+ <item>
368+ <attribute name="label" translatable="yes">Send _To…</attribute>
369+@@ -132,22 +146,26 @@
370+ <item>
371+ <attribute name="label" translatable="yes">_Print…</attribute>
372+ <attribute name="action">win.print</attribute>
373++ <attribute name="accel">&lt;Ctrl&gt;P</attribute>
374+ </item>
375+ </section>
376+ <section>
377+ <item>
378+ <attribute name="label" translatable="yes">P_roperties…</attribute>
379+ <attribute name="action">win.show-properties</attribute>
380++ <attribute name="accel">&lt;Alt&gt;Return</attribute>
381+ </item>
382+ </section>
383+ <section>
384+ <item>
385+ <attribute name="label" translatable="yes">_Copy</attribute>
386+ <attribute name="action">win.copy</attribute>
387++ <attribute name="accel">&lt;Ctrl&gt;C</attribute>
388+ </item>
389+ <item>
390+ <attribute name="label" translatable="yes">Select _All</attribute>
391+ <attribute name="action">win.select-all</attribute>
392++ <attribute name="accel">&lt;Ctrl&gt;A</attribute>
393+ </item>
394+ </section>
395+ <section>
396+@@ -160,22 +178,26 @@
397+ <item>
398+ <attribute name="label" translatable="yes">_First Page</attribute>
399+ <attribute name="action">win.go-first-page</attribute>
400++ <attribute name="accel">&lt;Ctrl&gt;Home</attribute>
401+ </item>
402+ <item>
403+ <attribute name="label" translatable="yes">_Last Page</attribute>
404+ <attribute name="action">win.go-last-page</attribute>
405++ <attribute name="accel">&lt;Ctrl&gt;End</attribute>
406+ </item>
407+ </section>
408+ <section id="bookmarks">
409+ <item>
410+ <attribute name="label" translatable="yes">_Add Bookmark</attribute>
411+ <attribute name="action">win.add-bookmark</attribute>
412++ <attribute name="accel">&lt;Ctrl&gt;D</attribute>
413+ </item>
414+ </section>
415+ <section>
416+ <item>
417+ <attribute name="label" translatable="yes">_Close</attribute>
418+ <attribute name="action">win.close</attribute>
419++ <attribute name="accel">&lt;Ctrl&gt;W</attribute>
420+ </item>
421+ </section>
422+ <section>

Subscribers

People subscribed via source and target branches

to all changes: