callisto-debian/atril
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust Patch 3001 to avoid conflict with Patch 0005

Browse Source
This commit is contained in:
Maia 2025-07-18 21:16:43 -07:00
parent dba225476a
commit 77a0b1acbb
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
debian/patches/3001-command-key.patch vendored
View File

@ -4,8 +4,8 @@ Author: Maia <maia@tsundoku.ne.jp>
Last-Update: 2025-07-18 atril-1.26.0
diff -urN '--exclude=.git' a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c
--- a/previewer/ev-previewer-window.c 2025-07-16 08:23:24.878639487 -0700
+++ b/previewer/ev-previewer-window.c 2025-07-18 20:43:21.569420309 -0700
--- a/previewer/ev-previewer-window.c 2025-07-18 21:08:39.604717543 -0700
+++ b/previewer/ev-previewer-window.c 2025-07-18 21:13:32.502918042 -0700
@@ -281,22 +281,22 @@
#endif
@ -63,9 +63,9 @@ diff -urN '--exclude=.git' a/previewer/ev-previewer-window.c b/previewer/ev-prev
};
diff -urN '--exclude=.git' a/shell/ev-window.c b/shell/ev-window.c
--- a/shell/ev-window.c 2025-07-16 08:23:24.886638693 -0700
+++ b/shell/ev-window.c 2025-07-18 20:46:00.657675262 -0700
@@ -6450,62 +6450,62 @@
--- a/shell/ev-window.c 2025-07-18 21:08:39.608717134 -0700
+++ b/shell/ev-window.c 2025-07-18 21:13:32.502918042 -0700
@@ -6443,61 +6443,61 @@
{ "Help", NULL, N_("_Help"), NULL, NULL, NULL },
/* File menu */
@ -124,7 +124,6 @@ diff -urN '--exclude=.git' a/shell/ev-window.c b/shell/ev-window.c
+ { "EditSaveSettings", NULL, N_("Save Current Settings as _Default"), "<super>T", NULL,
G_CALLBACK (ev_window_cmd_edit_save_settings) },
/* View menu */
- { "ViewZoomIn", "zoom-in", N_("Zoom _In"), "<control>plus",
+ { "ViewZoomIn", "zoom-in", N_("Zoom _In"), "<super>plus",
@ -147,7 +146,7 @@ diff -urN '--exclude=.git' a/shell/ev-window.c b/shell/ev-window.c
N_("Expand Window to Fit"),
G_CALLBACK (ev_window_cmd_view_expand_window) },
@@ -6513,26 +6513,26 @@
@@ -6505,26 +6505,26 @@
G_CALLBACK (ev_window_cmd_view_autoscroll) },
/* Go menu */
@ -180,7 +179,7 @@ diff -urN '--exclude=.git' a/shell/ev-window.c b/shell/ev-window.c
G_CALLBACK (ev_window_cmd_help_contents) },
{ "HelpAbout", "help-about", N_("_About"), NULL, NULL,
@@ -6563,13 +6563,13 @@
@@ -6555,13 +6555,13 @@
G_CALLBACK (ev_window_cmd_go_next_page) },
{ "Plus", "zoom-in", NULL, "plus", NULL,
G_CALLBACK (ev_window_cmd_view_zoom_in) },
@ -196,7 +195,7 @@ diff -urN '--exclude=.git' a/shell/ev-window.c b/shell/ev-window.c
G_CALLBACK (ev_window_cmd_focus_page_selector) },
{ "GoBackwardFast", NULL, "", "<shift>Page_Up", NULL,
G_CALLBACK (ev_window_cmd_go_backward) },
@@ -6579,13 +6579,13 @@
@@ -6571,13 +6571,13 @@
G_CALLBACK (ev_window_cmd_view_zoom_in) },
{ "KpMinus", "zoom-out", NULL, "KP_Subtract", NULL,
G_CALLBACK (ev_window_cmd_view_zoom_out) },
@ -214,7 +213,7 @@ diff -urN '--exclude=.git' a/shell/ev-window.c b/shell/ev-window.c
G_CALLBACK (ev_window_cmd_edit_copy) },
{ "FitPage", EV_STOCK_ZOOM_PAGE, NULL, "f", NULL,
G_CALLBACK (ev_window_cmd_fit_page) },
@@ -6598,10 +6598,10 @@
@@ -6590,10 +6590,10 @@
/* Toggle items */
static const GtkToggleActionEntry toggle_entries[] = {
/* View Menu */
@ -227,7 +226,7 @@ diff -urN '--exclude=.git' a/shell/ev-window.c b/shell/ev-window.c
N_("Show or hide the side pane"),
G_CALLBACK (ev_window_view_sidebar_cb), TRUE },
{ "ViewContinuous", EV_STOCK_VIEW_CONTINUOUS, N_("_Continuous"), "c",
@@ -6613,10 +6613,10 @@
@@ -6605,10 +6605,10 @@
{ "ViewDualOddLeft", NULL, N_("_Odd pages left"), "o",
N_("Show odd pages on the left in dual mode"),
G_CALLBACK (ev_window_cmd_dual_odd_pages_left), FALSE },
@ -240,7 +239,7 @@ diff -urN '--exclude=.git' a/shell/ev-window.c b/shell/ev-window.c
N_("Run document as a presentation"),
G_CALLBACK (ev_window_cmd_view_presentation) },
{ "ViewFitPage", EV_STOCK_ZOOM_PAGE, N_("Fit Pa_ge"), "f",
@@ -6625,10 +6625,10 @@
@@ -6617,10 +6617,10 @@
{ "ViewFitWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit _Width"), "w",
N_("Make the current document fill the window width"),
G_CALLBACK (ev_window_cmd_view_fit_width) },