From 9063f4d2ba8b84ee3c3839a6f7565c8d621fee14 Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Wed, 31 Jul 2024 01:32:51 +0200
Subject: [PATCH] help-overlay: Update keyboard shortcuts

Using actions no longer works since they are not global anymore. Also
add "Open with" to the list.

Closes #254
---
 data/resources/gtk/help-overlay.ui | 63 ++++++++++++++++++------------
 src/window/actions.rs              |  1 +
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/data/resources/gtk/help-overlay.ui b/data/resources/gtk/help-overlay.ui
index 5f79ad9..42951d2 100644
--- a/data/resources/gtk/help-overlay.ui
+++ b/data/resources/gtk/help-overlay.ui
@@ -11,13 +11,7 @@
             <property name="title" translatable="yes" context="shortcut window">General Shortcuts</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Show Main Menu</property>
-                <property name="accelerator">F10</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Copy Image or Metadata to Clipboard</property>
+                <property name="title" translatable="yes" context="shortcut window">Copy Image or Selected Text to Clipboard</property>
                 <property name="accelerator">&lt;Ctrl&gt;C</property>
               </object>
             </child>
@@ -35,26 +29,14 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Toggle Image Properties</property>
-                <property name="action-name">win.toggle-properties</property>
+                <property name="title" translatable="yes" context="shortcut window">Open Image with Other App</property>
+                <property name="accelerator">&lt;Ctrl&gt;&lt;Shift&gt;O</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>
-                <property name="action-name">win.toggle-fullscreen</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Leave Fullscreen</property>
-                <property name="action-name">win.leave-fullscreen</property>
+                <property name="accelerator">&lt;Ctrl&gt;F8</property>
               </object>
             </child>
             <child>
@@ -123,13 +105,13 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">First Image</property>
-                <property name="action-name">win.first</property>
+                <property name="accelerator">Home</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Last Image</property>
-                <property name="action-name">win.last</property>
+                <property name="accelerator">End</property>
               </object>
             </child>
           </object>
@@ -140,13 +122,13 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes" context="shortcut window">Rotate Clockwise</property>
-                <property name="action-name">win.rotate-cw</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="action-name">win.rotate-ccw</property>
+                <property name="accelerator">&lt;Ctrl&gt;&lt;Shift&gt;R</property>
               </object>
             </child>
           </object>
@@ -215,6 +197,35 @@
             </child>
           </object>
         </child>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="title" translatable="yes" context="shortcut window">View</property>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes" context="shortcut window">Toggle Fullscreen</property>
+                <property name="accelerator">F11</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes" context="shortcut window">Leave Fullscreen</property>
+                <property name="accelerator">Escape</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes" context="shortcut window">Toggle Image Properties</property>
+                <property name="accelerator">F9 &lt;Alt&gt;Return</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes" context="shortcut window">Show Main Menu</property>
+                <property name="accelerator">F10</property>
+              </object>
+            </child>
+          </object>
+        </child>
         <child>
           <object class="GtkShortcutsGroup">
             <property name="title" translatable="yes" context="shortcut window">Gestures</property>
diff --git a/src/window/actions.rs b/src/window/actions.rs
index a9667ea..65895cd 100644
--- a/src/window/actions.rs
+++ b/src/window/actions.rs
@@ -397,6 +397,7 @@ impl Action {
                 Action::CopyImage => klass.install_action(&action, None, move |win, _, _| {
                     win.copy_image();
                 }),
+
                 Action::SetBackground => {
                     klass.install_action_async(&action, None, |win, _, _| async move {
                         win.set_background().await;