Merge branch 'release/debian/44.0-1'HEADdebian/44.0-1master

1 files changed, 33 insertions, 6 deletions

diff --git a/src/app-window.vala b/src/app-window.vala
index cea6837..c4f9af7 100644
--- a/src/app-window.vala
+++ b/src/app-window.vala
@@ -1343,6 +1343,27 @@ public class AppWindow : Hdy.ApplicationWindow
         b.visible = true;
         g.attach (b, 1, 2, 1, 1);
 
+        /* Label on button for keeping the ordering, but flip every second upside down */
+        b = make_reorder_button (_("Flip even pages upside-down"), "R1U2R3U4R5U6-R1R2R3R4R5R6");
+        b.clicked.connect (() =>
+        {
+            book.flip_every_second(FlipEverySecond.Even);
+            dialog.destroy ();
+        });
+        b.visible = true;
+        g.attach (b, 0, 3, 1, 1);
+
+
+        /* Label on button for keeping the ordering, but flip every second upside down */
+        b = make_reorder_button (_("Flip odd pages upside-down"), "U1R2U3R4U5R6-R1R2R3R4R5R6");
+        b.clicked.connect (() =>
+        {
+            book.flip_every_second(FlipEverySecond.Odd);
+            dialog.destroy ();
+        });
+        b.visible = true;
+        g.attach (b, 1, 3, 1, 1);
+
         dialog.present ();
     }
 
@@ -1401,10 +1422,15 @@ public class AppWindow : Hdy.ApplicationWindow
                 page_box.visible = true;
                 box.add (page_box);
             }
-
-            var icon = new PageIcon (side, items[i] - '1');
-            icon.visible = true;
-            page_box.add (icon);
+            if (side == 'U') {
+                var icon = new PageIcon (side, items[i] - '1', 180);
+                icon.visible = true;
+                page_box.add (icon);
+            } else {
+                var icon = new PageIcon (side, items[i] - '1', 0);
+                icon.visible = true;
+                page_box.add (icon);
+            }
         }
 
         return box;
@@ -1650,8 +1676,8 @@ public class AppWindow : Hdy.ApplicationWindow
             instructions = _("Drivers for this are available on the <a href=\"http://support.epson.com\">Epson website</a>.");
             break;
         case "lexmark_nscan":
-            /* Message to indicate an Lexmark scanner has been detected */
-            message = _("You appear to have an Lexmark scanner.");
+            /* Message to indicate a Lexmark scanner has been detected */
+            message = _("You appear to have a Lexmark scanner.");
             /* Instructions on how to install Lexmark scanner drivers */
             instructions = _("Drivers for this are available on the <a href=\"http://support.lexmark.com\">Lexmark website</a>.");
             break;
@@ -1849,6 +1875,7 @@ public class AppWindow : Hdy.ApplicationWindow
         app.set_accels_for_action ("app.print", { "<Ctrl>P" });
         app.set_accels_for_action ("app.help", { "F1" });
         app.set_accels_for_action ("app.quit", { "<Ctrl>Q" });
+        app.set_accels_for_action ("app.preferences", { "<Ctrl>comma" });
         app.set_accels_for_action ("win.show-help-overlay", { "<Ctrl>question" });
 
         var gear_menu = new Menu ();