Merge branch 'feature/upsttream' into develop

4 files changed, 60 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index ee19cae..71cadf7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in simple-scan 3.34.4
+
+  * Fix page shortcuts no longer working.
+
 Overview of changes in simple-scan 3.34.2
 
   * Updated translations
diff --git a/debian/changelog b/debian/changelog
index 2fe9dc4..87ebb9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+simple-scan (3.34.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Tue, 18 Feb 2020 12:40:32 +0100
+
 simple-scan (3.34.2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/meson.build b/meson.build
index 40969b9..7dbdd16 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project ('simple-scan', ['vala', 'c'],
-         version: '3.34.2',
+         version: '3.34.4',
          license: 'GPLv3+',
          default_options: [
              'warning_level=1',
diff --git a/src/app-window.vala b/src/app-window.vala
index 7901cd7..02f2072 100644
--- a/src/app-window.vala
+++ b/src/app-window.vala
@@ -23,6 +23,12 @@ public class AppWindow : Gtk.ApplicationWindow
         { "scan_adf", scan_adf_cb },
         { "scan_batch", scan_batch_cb },
         { "scan_stop", scan_stop_cb },
+        { "rotate_left", rotate_left_cb },
+        { "rotate_right", rotate_right_cb },
+        { "move_left", move_left_cb },
+        { "move_right", move_right_cb },
+        { "copy_page", copy_page_cb },
+        { "delete_page", delete_page_cb },
         { "reorder", reorder_document_cb },
         { "save", save_document_activate_cb },
         { "email", email_document_cb },
@@ -648,6 +654,36 @@ public class AppWindow : Gtk.ApplicationWindow
         stop_scan ();
     }
 
+    private void rotate_left_cb ()
+    {
+        rotate_left_button_clicked_cb ();
+    }
+
+    private void rotate_right_cb ()
+    {
+        rotate_right_button_clicked_cb ();
+    }
+
+    private void move_left_cb ()
+    {
+        page_move_left_menuitem_activate_cb ();
+    }
+
+    private void move_right_cb ()
+    {
+        page_move_right_menuitem_activate_cb ();
+    }
+
+    private void copy_page_cb ()
+    {
+        copy_to_clipboard_button_clicked_cb ();
+    }
+
+    private void delete_page_cb ()
+    {
+        page_delete_menuitem_activate_cb ();
+    }
+
     private void set_scan_type (ScanType scan_type)
     {
         this.scan_type = scan_type;
@@ -856,7 +892,7 @@ public class AppWindow : Gtk.ApplicationWindow
     }
 
     [GtkCallback]
-    private void rotate_left_button_clicked_cb (Gtk.Widget widget)
+    private void rotate_left_button_clicked_cb ()
     {
         if (updating_page_menu)
             return;
@@ -866,7 +902,7 @@ public class AppWindow : Gtk.ApplicationWindow
     }
 
     [GtkCallback]
-    private void rotate_right_button_clicked_cb (Gtk.Widget widget)
+    private void rotate_right_button_clicked_cb ()
     {
         if (updating_page_menu)
             return;
@@ -968,7 +1004,7 @@ public class AppWindow : Gtk.ApplicationWindow
     }
 
     [GtkCallback]
-    private void crop_rotate_menuitem_activate_cb (Gtk.Widget widget)
+    private void crop_rotate_menuitem_activate_cb ()
     {
         var page = book_view.selected_page;
         if (page == null)
@@ -977,7 +1013,7 @@ public class AppWindow : Gtk.ApplicationWindow
     }
 
     [GtkCallback]
-    private void page_move_left_menuitem_activate_cb (Gtk.Widget widget)
+    private void page_move_left_menuitem_activate_cb ()
     {
         var page = book_view.selected_page;
         var index = book.get_page_index (page);
@@ -986,7 +1022,7 @@ public class AppWindow : Gtk.ApplicationWindow
     }
 
     [GtkCallback]
-    private void page_move_right_menuitem_activate_cb (Gtk.Widget widget)
+    private void page_move_right_menuitem_activate_cb ()
     {
         var page = book_view.selected_page;
         var index = book.get_page_index (page);
@@ -995,7 +1031,7 @@ public class AppWindow : Gtk.ApplicationWindow
     }
 
     [GtkCallback]
-    private void page_delete_menuitem_activate_cb (Gtk.Widget widget)
+    private void page_delete_menuitem_activate_cb ()
     {
         book_view.book.delete_page (book_view.selected_page);
     }
@@ -1179,7 +1215,7 @@ public class AppWindow : Gtk.ApplicationWindow
     }
 
     [GtkCallback]
-    private void copy_to_clipboard_button_clicked_cb (Gtk.Widget widget)
+    private void copy_to_clipboard_button_clicked_cb ()
     {
         var page = book_view.selected_page;
         if (page != null)
@@ -1562,6 +1598,12 @@ public class AppWindow : Gtk.ApplicationWindow
         app.set_accels_for_action ("app.scan_adf", { "<Ctrl>F" });
         app.set_accels_for_action ("app.scan_batch", { "<Ctrl>M" });
         app.set_accels_for_action ("app.scan_stop", { "Escape" });
+        app.set_accels_for_action ("app.rotate_left", { "bracketleft" });
+        app.set_accels_for_action ("app.rotate_right", { "bracketright" });
+        app.set_accels_for_action ("app.move_left", { "less" });
+        app.set_accels_for_action ("app.move_right", { "greater" });
+        app.set_accels_for_action ("app.copy_page", { "<Ctrl>C" });
+        app.set_accels_for_action ("app.delete_page", { "Delete" });
         app.set_accels_for_action ("app.save", { "<Ctrl>S" });
         app.set_accels_for_action ("app.email", { "<Ctrl>E" });
         app.set_accels_for_action ("app.print", { "<Ctrl>P" });