From cbde386126f77276b54c60397693facf20f63c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
Date: Sat, 17 Dec 2022 17:07:22 +0000
Subject: [PATCH] help-overlay: Improve some shortcuts and help-overlay

---
 data/gtk/help_overlay.ui | 110 ++++++++++++++++++++++++---------------
 src/application.rs       |   9 ++--
 2 files changed, 74 insertions(+), 45 deletions(-)

diff --git a/data/gtk/help_overlay.ui b/data/gtk/help_overlay.ui
index 2fb35bc..a457927 100644
--- a/data/gtk/help_overlay.ui
+++ b/data/gtk/help_overlay.ui
@@ -5,6 +5,7 @@
     <child>
       <object class="GtkShortcutsSection">
         <property name="section_name">shortcuts</property>
+        <property name="max-height">12</property>
         <child>
           <object class="GtkShortcutsGroup">
             <property name="title" translatable="yes" context="shortcut window">General Shortcuts</property>
@@ -20,6 +21,12 @@
                 <property name="action-name">win.toggle-properties</property>
               </object>
             </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes" context="shortcut window">Set as Background</property>
+                <property name="action-name">win.set-background</property>
+              </object>
+            </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Toggle Fullscreen</property>
@@ -67,48 +74,56 @@
         <child>
           <object class="GtkShortcutsGroup">
             <property name="title" translatable="yes" context="shortcut window">Navigate Images</property>
-            <!-- TODO: All these need RTL support -->
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Next Image</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Previous Image</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
-              </object>
-            </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="direction">GTK_TEXT_DIR_LTR</property>
                 <property name="title" translatable="yes" context="shortcut window">Next Image</property>
                 <property name="accelerator">Right</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="direction">GTK_TEXT_DIR_LTR</property>
                 <property name="title" translatable="yes" context="shortcut window">Previous Image</property>
                 <property name="accelerator">Left</property>
               </object>
             </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="direction">GTK_TEXT_DIR_RTL</property>
+                <property name="title" translatable="yes" context="shortcut window">Next Image</property>
+                <property name="accelerator">Left</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="direction">GTK_TEXT_DIR_RTL</property>
+                <property name="title" translatable="yes" context="shortcut window">Previous Image</property>
+                <property name="accelerator">Right</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="title" translatable="yes" context="shortcut window">Rotate Image</property>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes" context="shortcut window">Rotate Clockwise</property>
+                <property name="accelerator">&lt;Ctrl&gt;R</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes" context="shortcut window">Rotate Counterclockwise</property>
+                <property name="accelerator">&lt;Ctrl&gt;&lt;Shift&gt;R</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>
           <object class="GtkShortcutsGroup">
             <property name="title" translatable="yes" context="shortcut window">Zoom Image</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Zoom In</property>
-                <property name="shortcut-type">gesture-stretch</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Zoom Out</property>
-                <property name="shortcut-type">gesture-pinch</property>
-              </object>
-            </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Zoom In</property>
@@ -124,26 +139,51 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Best Fit</property>
-                <property name="action-name">win.zoom-best-fit</property>
+                <property name="accelerator">&lt;Ctrl&gt;0 0</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Original Scale</property>
-                <property name="accelerator">1</property>
+                <property name="accelerator">&lt;Ctrl&gt;1 1</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">200% Scale</property>
-                <property name="accelerator">2</property>
+                <property name="accelerator">&lt;Ctrl&gt;2 2</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="title" translatable="yes" context="shortcut window">Rotate Image</property>
+            <property name="title" translatable="yes" context="shortcut window">Gestures</property>
+            <!-- TODO: All these need RTL support -->
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes" context="shortcut window">Next Image</property>
+                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes" context="shortcut window">Previous Image</property>
+                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes" context="shortcut window">Zoom In</property>
+                <property name="shortcut-type">gesture-stretch</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes" context="shortcut window">Zoom Out</property>
+                <property name="shortcut-type">gesture-pinch</property>
+              </object>
+            </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Rotate Clockwise</property>
@@ -156,18 +196,6 @@
                 <property name="shortcut-type">gesture-rotate-counterclockwise</property>
               </object>
             </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Rotate Clockwise</property>
-                <property name="accelerator">&lt;Ctrl&gt;R</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Rotate Counterclockwise</property>
-                <property name="accelerator">&lt;Ctrl&gt;&lt;Shift&gt;R</property>
-              </object>
-            </child>
           </object>
         </child>
       </object>
diff --git a/src/application.rs b/src/application.rs
index ec5b56b..cf44246 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -168,15 +168,16 @@ impl LpApplication {
         self.set_accels_for_action("win.copy", &["<Ctrl>C"]);
         self.set_accels_for_action("win.show-help-overlay", &["<Ctrl>question"]);
         self.set_accels_for_action("win.leave-fullscreen", &["Escape"]);
-        self.set_accels_for_action("win.toggle-properties", &["F9"]);
+        self.set_accels_for_action("win.toggle-properties", &["F9", "<Alt>Return"]);
         self.set_accels_for_action("win.toggle-fullscreen", &["F11"]);
+        self.set_accels_for_action("win.set-background", &["<Ctrl>F8"]);
 
         self.set_accels_for_action("win.previous", &["Left"]);
         self.set_accels_for_action("win.next", &["Right"]);
 
-        self.set_accels_for_action("win.zoom-to(1.0)", &["1"]);
-        self.set_accels_for_action("win.zoom-to(2.0)", &["2"]);
-        self.set_accels_for_action("win.zoom-best-fit", &["<Ctrl>0", "0"]);
+        self.set_accels_for_action("win.zoom-to(1.0)", &["1", "KP_1", "<Ctrl>1", "<Ctrl>KP_1"]);
+        self.set_accels_for_action("win.zoom-to(2.0)", &["2", "KP_2", "<Ctrl>2", "<Ctrl>KP_2"]);
+        self.set_accels_for_action("win.zoom-best-fit", &["0", "KP_0", "<Ctrl>0", "<Ctrl>KP_0"]);
         self.set_accels_for_action(
             "win.zoom-in",
             &[