← Back to branch summary

~larsu/evince/drop-gtk-310-hacks

« back to all changes in this revision

Viewing changes to debian/patches/gtk310-secondary-keybindings.patch

  • Committer: Lars Uebernickel
  • Date: 2014-07-15 08:08:35 UTC
  • Revision ID: lars.uebernickel@canonical.com-20140715080835-6zdsjvh7qphttigm
* debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch,
  debian/patches/gtk310-secondary-keybindings.patch:
  - drop those patches as gtk 3.12 doesn't need those hacks anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/gtk310-secondary-keybindings.patch
1
 
From 24c0293b4d520193553d99f1423b9e0394eec0ef Mon Sep 17 00:00:00 2001
2
 
From: Lars Uebernickel <lars.uebernickel@canonical.com>
3
 
Date: Tue, 11 Mar 2014 17:00:02 +0100
4
 
Subject: [PATCH] Add secondary (and tertiary) keybindings
5
 
 
6
 
gtk_application_add_accelerator() can only add one accel per action.
7
 
Duplicate the actions so that we can add multiple accels. This is very
8
 
gross, but only needed until we update to gtk 3.12, which introduces a
9
 
new function that can handle setting multiple accels for a single
10
 
action.
11
 
---
12
 
 shell/ev-application.c | 10 ++++++++++
13
 
 shell/ev-window.c      | 10 ++++++++++
14
 
 2 files changed, 20 insertions(+)
15
 
 
16
 
diff --git a/shell/ev-application.c b/shell/ev-application.c
17
 
index 4493b1e..65064b1 100644
18
 
--- a/shell/ev-application.c
19
 
+++ b/shell/ev-application.c
20
 
@@ -1093,6 +1093,7 @@ ev_application_startup (GApplication *gapplication)
21
 
           "win.save-copy",              "<Ctrl>S", NULL,
22
 
           "win.print",                  "<Ctrl>P", NULL,
23
 
           "win.copy",                   "<Ctrl>C", "<Ctrl>Insert", NULL,
24
 
+          "win.copy2",                  "<Ctrl>Insert", NULL,
25
 
           "win.select-all",             "<Ctrl>A", NULL,
26
 
           "win.save-settings",          "<Ctrl>T", NULL,
27
 
           "win.go-first-page",          "<Ctrl>Home", NULL,
28
 
@@ -1107,13 +1108,22 @@ ev_application_startup (GApplication *gapplication)
29
 
           "win.go-backward",            "<Shift>Page_Up", NULL,
30
 
           "win.go-forward",             "<Shift>Page_Down", NULL,
31
 
           "win.go-next-page",           "<Ctrl>Page_Down", "n", NULL,
32
 
+          "win.go-next-page2",          "n", NULL,
33
 
           "win.go-previous-page",       "<Ctrl>Page_Up", "p", NULL,
34
 
+          "win.go-previous-page2",      "p", NULL,
35
 
           "win.sizing-mode::fit-page",  "f", NULL,
36
 
           "win.sizing-mode::fit-width", "w", NULL,
37
 
           "win.open-menu",              "F10", NULL,
38
 
           "win.caret-navigation",       "F7", NULL,
39
 
           "win.zoom-in",                "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", "equal", NULL,
40
 
+          "win.zoom-in2",               "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL,
41
 
+          "win.zoom-in3",               "KP_Add", "<Ctrl>KP_Add", NULL,
42
 
+          "win.zoom-in4",               "<Ctrl>KP_Add", NULL,
43
 
+          "win.zoom-in5",               "equal", NULL,
44
 
           "win.zoom-out",               "minus", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
45
 
+          "win.zoom-out2",              "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
46
 
+          "win.zoom-out3",              "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
47
 
+          "win.zoom-out4",              "<Ctrl>KP_Subtract", NULL,
48
 
           "win.show-side-pane",         "F9", NULL,
49
 
           "win.fullscreen",             "F11", NULL,
50
 
           "win.presentation",           "F5", NULL,
51
 
diff --git a/shell/ev-window.c b/shell/ev-window.c
52
 
index fc2258e..9f685fa 100644
53
 
--- a/shell/ev-window.c
54
 
+++ b/shell/ev-window.c
55
 
@@ -6658,10 +6658,13 @@ ev_window_init (EvWindow *ev_window)
56
 
                { "print", ev_window_activate_print_action, NULL, NULL, NULL },
57
 
                { "show-properties", ev_window_activate_show_properties_action, NULL, NULL, NULL },
58
 
                { "copy", ev_window_activate_copy_action, NULL, NULL, NULL },
59
 
+               { "copy2", ev_window_activate_copy_action, NULL, NULL, NULL },
60
 
                { "select-all", ev_window_activate_select_all_action, NULL, NULL, NULL },
61
 
                { "save-settings", ev_window_activate_save_settings_action, NULL, NULL, NULL },
62
 
                { "go-previous-page", ev_window_activate_go_previous_page_action, NULL, NULL, NULL },
63
 
+               { "go-previous-page2", ev_window_activate_go_previous_page_action, NULL, NULL, NULL },
64
 
                { "go-next-page", ev_window_activate_go_next_page_action, NULL, NULL, NULL },
65
 
+               { "go-next-page2", ev_window_activate_go_next_page_action, NULL, NULL, NULL },
66
 
                { "go-first-page", ev_window_activate_go_first_page_action, NULL, NULL, NULL },
67
 
                { "go-last-page", ev_window_activate_go_last_page_action, NULL, NULL, NULL },
68
 
                { "go-forward", ev_window_activate_go_forward_action, NULL, NULL, NULL },
69
 
@@ -6680,7 +6683,14 @@ ev_window_init (EvWindow *ev_window)
70
 
                { "rotate-left", ev_window_activate_rotate_left_action, NULL, NULL, NULL },
71
 
                { "rotate-right", ev_window_activate_rotate_right_action, NULL, NULL, NULL },
72
 
                { "zoom-in", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
73
 
+               { "zoom-in2", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
74
 
+               { "zoom-in3", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
75
 
+               { "zoom-in4", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
76
 
+               { "zoom-in5", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
77
 
                { "zoom-out", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
78
 
+               { "zoom-out2", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
79
 
+               { "zoom-out3", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
80
 
+               { "zoom-out4", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
81
 
                { "reload", ev_window_activate_reload_action, NULL, NULL, NULL },
82
 
                { "auto-scroll", ev_window_activate_auto_scroll_action, NULL, NULL, NULL },
83
 
                { "add-bookmark", ev_window_activate_add_bookmark_action, NULL, NULL, NULL },
84
 
1.9.1
85