Merge branch 'feature/upstream' into develop

2 files changed, 34 insertions, 17 deletions

diff --git a/data/simple-scan.appdata.xml.in b/data/simple-scan.appdata.xml.in
index ce92f9c..1f10b94 100644
--- a/data/simple-scan.appdata.xml.in
+++ b/data/simple-scan.appdata.xml.in
@@ -26,6 +26,16 @@
   <url type="vcs-browser">https://gitlab.gnome.org/GNOME/simple-scan</url>
   <developer_name>The GNOME Project</developer_name>
   <releases>
+    <release date="2023-03-19" version="44.0">
+      <description>
+        <ul>
+          <li>Add shortcut for Preferences (Ctrl+comma: Opens the preferences window).</li>
+          <li>Add buttons to change orientation of even/odd pages - usecase for Reversing Automatic Document Feeder (RADF) scanners.</li>
+          <li>Fix image size after cropping.</li>
+          <li>Updated translations.</li>
+        </ul>
+      </description>
+    </release>
     <release date="2022-09-19" version="42.5">
       <description>
         <ul>
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index 105d876..9dbd746 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -13,28 +13,28 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;1</property>
+                <property name="action-name">app.scan_single</property>
                 <property name="title" translatable="yes" context="shortcut window">Scan a single page</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;f</property>
+                <property name="action-name">app.scan_adf</property>
                 <property name="title" translatable="yes" context="shortcut window">Scan all pages from document feeder</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;m</property>
+                <property name="action-name">app.scan_batch</property>
                 <property name="title" translatable="yes" context="shortcut window">Scan continuously from a flatbed scanner</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">Escape</property>
+                <property name="action-name">app.scan_stop</property>
                 <property name="title" translatable="yes" context="shortcut window">Stop scan in progress</property>
               </object>
             </child>
@@ -47,35 +47,35 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">less</property>
+                <property name="action-name">app.move_left</property>
                 <property name="title" translatable="yes" context="shortcut window">Move page left</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">greater</property>
+                <property name="action-name">app.move_right</property>
                 <property name="title" translatable="yes" context="shortcut window">Move page right</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">bracketleft</property>
+                <property name="action-name">app.rotate_left</property>
                 <property name="title" translatable="yes" context="shortcut window">Rotate page to the left (anti-clockwise)</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">bracketright</property>
+                <property name="action-name">app.rotate_right</property>
                 <property name="title" translatable="yes" context="shortcut window">Rotate page to the right (clockwise)</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">Delete</property>
+                <property name="action-name">app.delete_page</property>
                 <property name="title" translatable="yes" context="shortcut window">Delete page</property>
               </object>
             </child>
@@ -88,35 +88,35 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;n</property>
+                <property name="action-name">app.new_document</property>
                 <property name="title" translatable="yes" context="shortcut window">Start new document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;s</property>
+                <property name="action-name">app.save</property>
                 <property name="title" translatable="yes" context="shortcut window">Save scanned document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;e</property>
+                <property name="action-name">app.email</property>
                 <property name="title" translatable="yes" context="shortcut window">Email scanned document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;p</property>
+                <property name="action-name">app.print</property>
                 <property name="title" translatable="yes" context="shortcut window">Print scanned document</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;c</property>
+                <property name="action-name">app.copy_page</property>
                 <property name="title" translatable="yes" context="shortcut window">Copy current page to clipboard</property>
               </object>
             </child>
@@ -129,7 +129,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">F1</property>
+                <property name="action-name">app.help</property>
                 <property name="title" translatable="yes" context="shortcut window">Show help</property>
               </object>
             </child>
@@ -143,14 +143,21 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;question</property>
+                <property name="action-name">app.preferences</property>
+                <property name="title" translatable="yes" context="shortcut window">Show preferences</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="action-name">win.show-help-overlay</property>
                 <property name="title" translatable="yes" context="shortcut window">Keyboard shortcuts</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;q</property>
+                <property name="action-name">app.quit</property>
                 <property name="title" translatable="yes" context="shortcut window">Quit</property>
               </object>
             </child>