Evince

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

  1. lp1290104
  2. Merge into ubuntu
Proposed by Lars Karlitski
Status: Merged
Merged at revision: 240
Proposed branch: lp:~larsu/evince/lp1290104
Merge into: lp:~ubuntu-desktop/evince/ubuntu
Diff against target: 319 lines (+119/-37)
3 files modified
debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch (+37/-37)
debian/patches/add-secondary-and-tertiary-keybindings.patch (+81/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~larsu/evince/lp1290104
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+210445@code.launchpad.net

Commit message

Add add-secondary-and-tertiary-keybindings.patch

Description of the change

Add add-secondary-and-tertiary-keybindings.patch

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-11 14:05:02 +0000
3+++ debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch 2014-03-11 16:19:47 +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-11 15:02:44.713138815 +0100
9-+++ evince-3.10.3/shell/Makefile.am 2014-03-11 15:02:44.697138814 +0100
10+--- evince-3.10.3.orig/shell/Makefile.am 2014-03-11 17:15:56.533258733 +0100
11++++ evince-3.10.3/shell/Makefile.am 2014-03-11 17:15:56.517258733 +0100
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-03-11 15:02:44.713138815 +0100
20-+++ evince-3.10.3/shell/ev-application.c 2014-03-11 15:04:05.000000000 +0100
21+--- evince-3.10.3.orig/shell/ev-application.c 2014-03-11 17:15:56.533258733 +0100
22++++ evince-3.10.3/shell/ev-application.c 2014-03-11 17:16:13.333258985 +0100
23 @@ -42,6 +42,9 @@
24 #include "ev-application.h"
25 #include "ev-file-helpers.h"
26@@ -174,8 +174,8 @@
27 + "win.select-page", "<Ctrl>L", NULL,
28 + "win.go-backward", "<Shift>Page_Up", NULL,
29 + "win.go-forward", "<Shift>Page_Down", NULL,
30-+ "win.go-next-page", "n", NULL,
31-+ "win.go-previous-page", "p", NULL,
32++ "win.go-next-page", "<Ctrl>Page_Down", "n", NULL,
33++ "win.go-previous-page", "<Ctrl>Page_Up", "p", NULL,
34 + "win.sizing-mode::fit-page", "f", NULL,
35 + "win.sizing-mode::fit-width", "w", NULL,
36 + "win.open-menu", "F10", NULL,
37@@ -447,8 +447,8 @@
38 +}
39 Index: evince-3.10.3/shell/ev-application.h
40 ===================================================================
41---- evince-3.10.3.orig/shell/ev-application.h 2014-03-11 15:02:44.713138815 +0100
42-+++ evince-3.10.3/shell/ev-application.h 2014-03-11 15:02:44.697138814 +0100
43+--- evince-3.10.3.orig/shell/ev-application.h 2014-03-11 17:15:56.533258733 +0100
44++++ evince-3.10.3/shell/ev-application.h 2014-03-11 17:15:56.521258733 +0100
45 @@ -81,6 +81,14 @@
46 GdkScreen *screen,
47 const char *topic);
48@@ -466,8 +466,8 @@
49 #endif /* !EV_APPLICATION_H */
50 Index: evince-3.10.3/shell/ev-bookmarks.c
51 ===================================================================
52---- evince-3.10.3.orig/shell/ev-bookmarks.c 2014-03-11 15:02:44.713138815 +0100
53-+++ evince-3.10.3/shell/ev-bookmarks.c 2014-03-11 15:02:44.701138814 +0100
54+--- evince-3.10.3.orig/shell/ev-bookmarks.c 2014-03-11 17:15:56.533258733 +0100
55++++ evince-3.10.3/shell/ev-bookmarks.c 2014-03-11 17:15:56.521258733 +0100
56 @@ -224,6 +224,14 @@
57 return g_list_copy (bookmarks->items);
58 }
59@@ -485,8 +485,8 @@
60 EvBookmark *bookmark)
61 Index: evince-3.10.3/shell/ev-bookmarks.h
62 ===================================================================
63---- evince-3.10.3.orig/shell/ev-bookmarks.h 2014-03-11 15:02:44.713138815 +0100
64-+++ evince-3.10.3/shell/ev-bookmarks.h 2014-03-11 15:02:44.701138814 +0100
65+--- evince-3.10.3.orig/shell/ev-bookmarks.h 2014-03-11 17:15:56.533258733 +0100
66++++ evince-3.10.3/shell/ev-bookmarks.h 2014-03-11 17:15:56.521258733 +0100
67 @@ -43,6 +43,7 @@
68 GType ev_bookmarks_get_type (void) G_GNUC_CONST;
69 EvBookmarks *ev_bookmarks_new (EvMetadata *metadata);
70@@ -498,7 +498,7 @@
71 Index: evince-3.10.3/shell/ev-recent-menu-model.c
72 ===================================================================
73 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
74-+++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-03-11 15:02:44.701138814 +0100
75++++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-03-11 17:15:56.521258733 +0100
76 @@ -0,0 +1,108 @@
77 +/*
78 + * Copyright 2014 Canonical Ltd
79@@ -611,7 +611,7 @@
80 Index: evince-3.10.3/shell/ev-recent-menu-model.h
81 ===================================================================
82 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
83-+++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-03-11 15:02:44.701138814 +0100
84++++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-03-11 17:15:56.521258733 +0100
85 @@ -0,0 +1,30 @@
86 +/*
87 + * Copyright 2014 Canonical Ltd
88@@ -645,8 +645,8 @@
89 +#endif
90 Index: evince-3.10.3/shell/ev-sidebar-bookmarks.c
91 ===================================================================
92---- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c 2014-03-11 15:02:44.713138815 +0100
93-+++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-03-11 15:02:44.701138814 +0100
94+--- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c 2014-03-11 17:15:56.533258733 +0100
95++++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-03-11 17:15:56.521258733 +0100
96 @@ -40,11 +40,6 @@
97 N_COLUMNS
98 };
99@@ -716,8 +716,8 @@
100 GtkWidget *
101 Index: evince-3.10.3/shell/ev-toolbar.c
102 ===================================================================
103---- evince-3.10.3.orig/shell/ev-toolbar.c 2014-03-11 15:02:44.713138815 +0100
104-+++ evince-3.10.3/shell/ev-toolbar.c 2014-03-11 15:02:44.701138814 +0100
105+--- evince-3.10.3.orig/shell/ev-toolbar.c 2014-03-11 17:15:56.533258733 +0100
106++++ evince-3.10.3/shell/ev-toolbar.c 2014-03-11 17:15:56.521258733 +0100
107 @@ -24,9 +24,12 @@
108
109 #include "ev-toolbar.h"
110@@ -984,8 +984,8 @@
111 static void
112 Index: evince-3.10.3/shell/ev-utils.c
113 ===================================================================
114---- evince-3.10.3.orig/shell/ev-utils.c 2014-03-11 15:02:44.713138815 +0100
115-+++ evince-3.10.3/shell/ev-utils.c 2014-03-11 15:02:44.701138814 +0100
116+--- evince-3.10.3.orig/shell/ev-utils.c 2014-03-11 17:15:56.533258733 +0100
117++++ evince-3.10.3/shell/ev-utils.c 2014-03-11 17:15:56.521258733 +0100
118 @@ -22,6 +22,7 @@
119
120 #include "ev-utils.h"
121@@ -1087,8 +1087,8 @@
122 +}
123 Index: evince-3.10.3/shell/ev-utils.h
124 ===================================================================
125---- evince-3.10.3.orig/shell/ev-utils.h 2014-03-11 15:02:44.713138815 +0100
126-+++ evince-3.10.3/shell/ev-utils.h 2014-03-11 15:02:44.701138814 +0100
127+--- evince-3.10.3.orig/shell/ev-utils.h 2014-03-11 17:15:56.533258733 +0100
128++++ evince-3.10.3/shell/ev-utils.h 2014-03-11 17:15:56.521258733 +0100
129 @@ -42,6 +42,13 @@
130 void file_chooser_dialog_add_writable_pixbuf_formats (GtkFileChooser *chooser);
131 GdkPixbufFormat* get_gdk_pixbuf_format_by_extension (const gchar *uri);
132@@ -1105,8 +1105,8 @@
133 #endif /* __EV_VIEW_H__ */
134 Index: evince-3.10.3/shell/ev-window.c
135 ===================================================================
136---- evince-3.10.3.orig/shell/ev-window.c 2014-03-11 15:02:44.713138815 +0100
137-+++ evince-3.10.3/shell/ev-window.c 2014-03-11 15:02:44.705138814 +0100
138+--- evince-3.10.3.orig/shell/ev-window.c 2014-03-11 17:15:56.533258733 +0100
139++++ evince-3.10.3/shell/ev-window.c 2014-03-11 17:15:56.525258733 +0100
140 @@ -87,10 +87,10 @@
141 #include "ev-print-operation.h"
142 #include "ev-progress-message-area.h"
143@@ -3944,8 +3944,8 @@
144 +}
145 Index: evince-3.10.3/shell/ev-window.h
146 ===================================================================
147---- evince-3.10.3.orig/shell/ev-window.h 2014-03-11 15:02:44.713138815 +0100
148-+++ evince-3.10.3/shell/ev-window.h 2014-03-11 15:02:44.705138814 +0100
149+--- evince-3.10.3.orig/shell/ev-window.h 2014-03-11 17:15:56.533258733 +0100
150++++ evince-3.10.3/shell/ev-window.h 2014-03-11 17:15:56.525258733 +0100
151 @@ -89,7 +89,7 @@
152 GtkUIManager *ev_window_get_ui_manager (EvWindow *ev_window);
153 GtkActionGroup *ev_window_get_main_action_group (EvWindow *ev_window);
154@@ -3957,8 +3957,8 @@
155
156 Index: evince-3.10.3/shell/evince-appmenu.ui
157 ===================================================================
158---- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-03-11 15:02:44.713138815 +0100
159-+++ evince-3.10.3/shell/evince-appmenu.ui 2014-03-11 15:02:44.705138814 +0100
160+--- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-03-11 17:15:56.533258733 +0100
161++++ evince-3.10.3/shell/evince-appmenu.ui 2014-03-11 17:15:56.525258733 +0100
162 @@ -20,6 +20,16 @@
163 <menu id="appmenu">
164 <section>
165@@ -3978,8 +3978,8 @@
166 <attribute name="accel">F1</attribute>
167 Index: evince-3.10.3/shell/evince-ui.xml
168 ===================================================================
169---- evince-3.10.3.orig/shell/evince-ui.xml 2014-03-11 15:02:44.713138815 +0100
170-+++ evince-3.10.3/shell/evince-ui.xml 2014-03-11 15:04:00.681139955 +0100
171+--- evince-3.10.3.orig/shell/evince-ui.xml 2014-03-11 17:15:56.533258733 +0100
172++++ evince-3.10.3/shell/evince-ui.xml 2014-03-11 17:15:56.525258733 +0100
173 @@ -1,86 +1,4 @@
174 <ui>
175 - <popup name="ActionMenu" accelerators="true">
176@@ -4102,8 +4102,8 @@
177 +
178 Index: evince-3.10.3/shell/evince.gresource.xml
179 ===================================================================
180---- evince-3.10.3.orig/shell/evince.gresource.xml 2014-03-11 15:02:44.713138815 +0100
181-+++ evince-3.10.3/shell/evince.gresource.xml 2014-03-11 15:02:44.705138814 +0100
182+--- evince-3.10.3.orig/shell/evince.gresource.xml 2014-03-11 17:15:56.533258733 +0100
183++++ evince-3.10.3/shell/evince.gresource.xml 2014-03-11 17:15:56.525258733 +0100
184 @@ -19,6 +19,8 @@
185 <gresource prefix="/org/gnome/evince/shell">
186 <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>
187@@ -4117,7 +4117,7 @@
188 Index: evince-3.10.3/shell/menus.ui
189 ===================================================================
190 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
191-+++ evince-3.10.3/shell/menus.ui 2014-03-11 15:04:05.000000000 +0100
192++++ evince-3.10.3/shell/menus.ui 2014-03-11 17:16:00.000000000 +0100
193 @@ -0,0 +1,188 @@
194 +<?xml version="1.0" encoding="UTF-8"?>
195 +<!--
196@@ -4310,7 +4310,7 @@
197 Index: evince-3.10.3/shell/traditional-menus.ui
198 ===================================================================
199 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
200-+++ evince-3.10.3/shell/traditional-menus.ui 2014-03-11 15:02:44.709138815 +0100
201++++ evince-3.10.3/shell/traditional-menus.ui 2014-03-11 17:15:56.525258733 +0100
202 @@ -0,0 +1,230 @@
203 +<?xml version="1.0" encoding="UTF-8"?>
204 +<!--
205@@ -4544,8 +4544,8 @@
206 +</interface>
207 Index: evince-3.10.3/po/POTFILES.in
208 ===================================================================
209---- evince-3.10.3.orig/po/POTFILES.in 2014-03-11 15:02:44.713138815 +0100
210-+++ evince-3.10.3/po/POTFILES.in 2014-03-11 15:02:44.709138815 +0100
211+--- evince-3.10.3.orig/po/POTFILES.in 2014-03-11 17:15:56.533258733 +0100
212++++ evince-3.10.3/po/POTFILES.in 2014-03-11 17:15:56.525258733 +0100
213 @@ -56,3 +56,6 @@
214 shell/ev-window-title.c
215 shell/main.c
216@@ -4556,7 +4556,7 @@
217 Index: evince-3.10.3/shell/popup-menus.ui
218 ===================================================================
219 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
220-+++ evince-3.10.3/shell/popup-menus.ui 2014-03-11 15:02:44.709138815 +0100
221++++ evince-3.10.3/shell/popup-menus.ui 2014-03-11 17:15:56.525258733 +0100
222 @@ -0,0 +1,114 @@
223 +<?xml version="1.0" encoding="UTF-8"?>
224 +<!--
225
226=== added file 'debian/patches/add-secondary-and-tertiary-keybindings.patch'
227--- debian/patches/add-secondary-and-tertiary-keybindings.patch 1970-01-01 00:00:00 +0000
228+++ debian/patches/add-secondary-and-tertiary-keybindings.patch 2014-03-11 16:19:47 +0000
229@@ -0,0 +1,81 @@
230+From 92845bc09910884a4762102897244bcb45d7c46f Mon Sep 17 00:00:00 2001
231+From: Lars Uebernickel <lars.uebernickel@canonical.com>
232+Date: Tue, 11 Mar 2014 17:00:02 +0100
233+Subject: [PATCH] Add secondary (and tertiary) keybindings
234+
235+gtk_application_add_accelerator() can only add one accel per action.
236+Duplicate the actions so that we can add multiple accels. This is very
237+gross, but only needed until we update to gtk 3.12, which introduces a
238+new function that can handle setting multiple accels for a single
239+action.
240+---
241+ shell/ev-application.c | 9 +++++++++
242+ shell/ev-window.c | 9 +++++++++
243+ 2 files changed, 18 insertions(+)
244+
245+Index: evince-3.10.3/shell/ev-application.c
246+===================================================================
247+--- evince-3.10.3.orig/shell/ev-application.c 2014-03-11 17:17:53.065260481 +0100
248++++ evince-3.10.3/shell/ev-application.c 2014-03-11 17:17:53.057260481 +0100
249+@@ -1110,6 +1110,7 @@
250+ "win.save-copy", "<Ctrl>S", NULL,
251+ "win.print", "<Ctrl>P", NULL,
252+ "win.copy", "<Ctrl>C", "<Ctrl>Insert", NULL,
253++ "win.copy2", "<Ctrl>Insert", NULL,
254+ "win.select-all", "<Ctrl>A", NULL,
255+ "win.save-settings", "<Ctrl>T", NULL,
256+ "win.go-first-page", "<Ctrl>Home", NULL,
257+@@ -1124,13 +1125,21 @@
258+ "win.go-backward", "<Shift>Page_Up", NULL,
259+ "win.go-forward", "<Shift>Page_Down", NULL,
260+ "win.go-next-page", "<Ctrl>Page_Down", "n", NULL,
261++ "win.go-next-page2", "n", NULL,
262+ "win.go-previous-page", "<Ctrl>Page_Up", "p", NULL,
263++ "win.go-previous-page2", "p", NULL,
264+ "win.sizing-mode::fit-page", "f", NULL,
265+ "win.sizing-mode::fit-width", "w", NULL,
266+ "win.open-menu", "F10", NULL,
267+ "win.caret-navigation", "F7", NULL,
268+ "win.zoom-in", "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL,
269++ "win.zoom-in2", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL,
270++ "win.zoom-in3", "KP_Add", "<Ctrl>KP_Add", NULL,
271++ "win.zoom-in4", "<Ctrl>KP_Add", NULL,
272+ "win.zoom-out", "minus", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
273++ "win.zoom-out2", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
274++ "win.zoom-out3", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
275++ "win.zoom-out4", "<Ctrl>KP_Subtract", NULL,
276+ "win.show-side-pane", "F9", NULL,
277+ "win.fullscreen", "F11", NULL,
278+ "win.presentation", "F5", NULL,
279+Index: evince-3.10.3/shell/ev-window.c
280+===================================================================
281+--- evince-3.10.3.orig/shell/ev-window.c 2014-03-11 17:17:53.065260481 +0100
282++++ evince-3.10.3/shell/ev-window.c 2014-03-11 17:17:53.057260481 +0100
283+@@ -6658,10 +6658,13 @@
284+ { "print", ev_window_activate_print_action, NULL, NULL, NULL },
285+ { "show-properties", ev_window_activate_show_properties_action, NULL, NULL, NULL },
286+ { "copy", ev_window_activate_copy_action, NULL, NULL, NULL },
287++ { "copy2", ev_window_activate_copy_action, NULL, NULL, NULL },
288+ { "select-all", ev_window_activate_select_all_action, NULL, NULL, NULL },
289+ { "save-settings", ev_window_activate_save_settings_action, NULL, NULL, NULL },
290+ { "go-previous-page", ev_window_activate_go_previous_page_action, NULL, NULL, NULL },
291++ { "go-previous-page2", ev_window_activate_go_previous_page_action, NULL, NULL, NULL },
292+ { "go-next-page", ev_window_activate_go_next_page_action, NULL, NULL, NULL },
293++ { "go-next-page2", ev_window_activate_go_next_page_action, NULL, NULL, NULL },
294+ { "go-first-page", ev_window_activate_go_first_page_action, NULL, NULL, NULL },
295+ { "go-last-page", ev_window_activate_go_last_page_action, NULL, NULL, NULL },
296+ { "go-forward", ev_window_activate_go_forward_action, NULL, NULL, NULL },
297+@@ -6680,7 +6683,13 @@
298+ { "rotate-left", ev_window_activate_rotate_left_action, NULL, NULL, NULL },
299+ { "rotate-right", ev_window_activate_rotate_right_action, NULL, NULL, NULL },
300+ { "zoom-in", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
301++ { "zoom-in2", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
302++ { "zoom-in3", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
303++ { "zoom-in4", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
304+ { "zoom-out", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
305++ { "zoom-out2", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
306++ { "zoom-out3", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
307++ { "zoom-out4", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
308+ { "reload", ev_window_activate_reload_action, NULL, NULL, NULL },
309+ { "auto-scroll", ev_window_activate_auto_scroll_action, NULL, NULL, NULL },
310+ { "add-bookmark", ev_window_activate_add_bookmark_action, NULL, NULL, NULL },
311
312=== modified file 'debian/patches/series'
313--- debian/patches/series 2014-02-10 17:43:04 +0000
314+++ debian/patches/series 2014-03-11 16:19:47 +0000
315@@ -2,3 +2,4 @@
316 git_Don-t-allow-Send-To-when-there-is-no-mail-client-ava.patch
317 0001-Port-to-GMenuModel-and-add-menu-bar.patch
318 0002-Don-t-use-gtk_application_set_accels_for_action.patch
319+add-secondary-and-tertiary-keybindings.patch

Subscribers

People subscribed via source and target branches

to all changes: