Evince

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

  1. lp1310782
  2. Merge into ubuntu
Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 242
Merged at revision: 243
Proposed branch: lp:~larsu/evince/lp1310782
Merge into: lp:~ubuntu-desktop/evince/ubuntu
Diff against target: 103 lines (+22/-17)
2 files modified
debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch (+1/-1)
debian/patches/gtk310-secondary-keybindings.patch (+21/-16)
To merge this branch: bzr merge lp:~larsu/evince/lp1310782
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
VCS imports Pending
Review via email: mp+217429@code.launchpad.net

This proposal supersedes a proposal from 2014-04-28.

Description of the change

gmenumodel patches: add '=' accel for zooming in

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 16:16:33 +0000
3+++ debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch 2014-04-28 12:54:27 +0000
4@@ -180,7 +180,7 @@
5 + "win.sizing-mode::fit-width", "w", NULL,
6 + "win.open-menu", "F10", NULL,
7 + "win.caret-navigation", "F7", NULL,
8-+ "win.zoom-in", "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL,
9++ "win.zoom-in", "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", "equal", NULL,
10 + "win.zoom-out", "minus", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
11 + "win.show-side-pane", "F9", NULL,
12 + "win.fullscreen", "F11", NULL,
13
14=== modified file 'debian/patches/gtk310-secondary-keybindings.patch'
15--- debian/patches/gtk310-secondary-keybindings.patch 2014-03-11 17:35:19 +0000
16+++ debian/patches/gtk310-secondary-keybindings.patch 2014-04-28 12:54:27 +0000
17@@ -1,4 +1,4 @@
18-From 92845bc09910884a4762102897244bcb45d7c46f Mon Sep 17 00:00:00 2001
19+From 24c0293b4d520193553d99f1423b9e0394eec0ef Mon Sep 17 00:00:00 2001
20 From: Lars Uebernickel <lars.uebernickel@canonical.com>
21 Date: Tue, 11 Mar 2014 17:00:02 +0100
22 Subject: [PATCH] Add secondary (and tertiary) keybindings
23@@ -9,15 +9,15 @@
24 new function that can handle setting multiple accels for a single
25 action.
26 ---
27- shell/ev-application.c | 9 +++++++++
28- shell/ev-window.c | 9 +++++++++
29- 2 files changed, 18 insertions(+)
30+ shell/ev-application.c | 10 ++++++++++
31+ shell/ev-window.c | 10 ++++++++++
32+ 2 files changed, 20 insertions(+)
33
34-Index: evince-3.10.3/shell/ev-application.c
35-===================================================================
36---- evince-3.10.3.orig/shell/ev-application.c 2014-03-11 17:17:53.065260481 +0100
37-+++ evince-3.10.3/shell/ev-application.c 2014-03-11 17:17:53.057260481 +0100
38-@@ -1110,6 +1110,7 @@
39+diff --git a/shell/ev-application.c b/shell/ev-application.c
40+index 4493b1e..65064b1 100644
41+--- a/shell/ev-application.c
42++++ b/shell/ev-application.c
43+@@ -1093,6 +1093,7 @@ ev_application_startup (GApplication *gapplication)
44 "win.save-copy", "<Ctrl>S", NULL,
45 "win.print", "<Ctrl>P", NULL,
46 "win.copy", "<Ctrl>C", "<Ctrl>Insert", NULL,
47@@ -25,7 +25,7 @@
48 "win.select-all", "<Ctrl>A", NULL,
49 "win.save-settings", "<Ctrl>T", NULL,
50 "win.go-first-page", "<Ctrl>Home", NULL,
51-@@ -1124,13 +1125,21 @@
52+@@ -1107,13 +1108,22 @@ ev_application_startup (GApplication *gapplication)
53 "win.go-backward", "<Shift>Page_Up", NULL,
54 "win.go-forward", "<Shift>Page_Down", NULL,
55 "win.go-next-page", "<Ctrl>Page_Down", "n", NULL,
56@@ -40,6 +40,7 @@
57 + "win.zoom-in2", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL,
58 + "win.zoom-in3", "KP_Add", "<Ctrl>KP_Add", NULL,
59 + "win.zoom-in4", "<Ctrl>KP_Add", NULL,
60++ "win.zoom-in5", "equal", NULL,
61 "win.zoom-out", "minus", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
62 + "win.zoom-out2", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
63 + "win.zoom-out3", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
64@@ -47,11 +48,11 @@
65 "win.show-side-pane", "F9", NULL,
66 "win.fullscreen", "F11", NULL,
67 "win.presentation", "F5", NULL,
68-Index: evince-3.10.3/shell/ev-window.c
69-===================================================================
70---- evince-3.10.3.orig/shell/ev-window.c 2014-03-11 17:17:53.065260481 +0100
71-+++ evince-3.10.3/shell/ev-window.c 2014-03-11 17:17:53.057260481 +0100
72-@@ -6658,10 +6658,13 @@
73+diff --git a/shell/ev-window.c b/shell/ev-window.c
74+index fc2258e..9f685fa 100644
75+--- a/shell/ev-window.c
76++++ b/shell/ev-window.c
77+@@ -6658,10 +6658,13 @@ ev_window_init (EvWindow *ev_window)
78 { "print", ev_window_activate_print_action, NULL, NULL, NULL },
79 { "show-properties", ev_window_activate_show_properties_action, NULL, NULL, NULL },
80 { "copy", ev_window_activate_copy_action, NULL, NULL, NULL },
81@@ -65,13 +66,14 @@
82 { "go-first-page", ev_window_activate_go_first_page_action, NULL, NULL, NULL },
83 { "go-last-page", ev_window_activate_go_last_page_action, NULL, NULL, NULL },
84 { "go-forward", ev_window_activate_go_forward_action, NULL, NULL, NULL },
85-@@ -6680,7 +6683,13 @@
86+@@ -6680,7 +6683,14 @@ ev_window_init (EvWindow *ev_window)
87 { "rotate-left", ev_window_activate_rotate_left_action, NULL, NULL, NULL },
88 { "rotate-right", ev_window_activate_rotate_right_action, NULL, NULL, NULL },
89 { "zoom-in", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
90 + { "zoom-in2", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
91 + { "zoom-in3", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
92 + { "zoom-in4", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
93++ { "zoom-in5", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
94 { "zoom-out", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
95 + { "zoom-out2", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
96 + { "zoom-out3", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
97@@ -79,3 +81,6 @@
98 { "reload", ev_window_activate_reload_action, NULL, NULL, NULL },
99 { "auto-scroll", ev_window_activate_auto_scroll_action, NULL, NULL, NULL },
100 { "add-bookmark", ev_window_activate_add_bookmark_action, NULL, NULL, NULL },
101+--
102+1.9.1
103+

Subscribers

People subscribed via source and target branches

to all changes: