From 27b615b151b328655d501fb1269d30426903c62a Mon Sep 17 00:00:00 2001
From: heliguy <heliguy4599@hotmail.com>
Date: Fri, 1 Sep 2023 02:45:18 -0400
Subject: [PATCH] Add more shortcuts Allow escape to cancel batch mode and
 ctrl+enter to also open batch mode

---
 src/gtk/help-overlay.blp | 20 ++++++++++----------
 src/main.py              |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gtk/help-overlay.blp b/src/gtk/help-overlay.blp
index 4fc3a28..b8e1533 100644
--- a/src/gtk/help-overlay.blp
+++ b/src/gtk/help-overlay.blp
@@ -15,16 +15,6 @@ ShortcutsWindow help_overlay {
         action-name: "app.search";
       }
 
-      ShortcutsShortcut {
-        title: C_("shortcut window", "Show Shortcuts");
-        action-name: "win.show-help-overlay";
-      }
-
-      ShortcutsShortcut {
-        title: C_("shortcut window", "Quit");
-        action-name: "app.quit";
-      }
-
       ShortcutsShortcut {
         title: C_("shortcut window", "Toggle Batch Mode");
         action-name: "app.toggle-batch-mode";
@@ -39,6 +29,16 @@ ShortcutsWindow help_overlay {
         title: C_("shortcut window", "Select All Flatpaks");
         action-name: "app.select-all-in-batch-mode";
       }
+
+      ShortcutsShortcut {
+        title: C_("shortcut window", "Show Shortcuts");
+        action-name: "win.show-help-overlay";
+      }
+
+      ShortcutsShortcut {
+        title: C_("shortcut window", "Quit");
+        action-name: "app.quit";
+      }
     }
   }
 }
diff --git a/src/main.py b/src/main.py
index b05d9ef..75c04a4 100644
--- a/src/main.py
+++ b/src/main.py
@@ -39,7 +39,7 @@ class FlattoolGuiApplication(Adw.Application):
         self.create_action('preferences', self.on_preferences_action)
         self.create_action('search', self.on_search_action, ['<primary>f'])
         self.create_action('manage-data-folders', self.on_manage_data_folders_action)
-        self.create_action('toggle-batch-mode', self.batch_mode_shortcut, ['<primary>b'])
+        self.create_action('toggle-batch-mode', self.batch_mode_shortcut, ['<primary>b', '<primary>Return'])
         self.create_action('select-all-in-batch-mode', self.select_all_shortcut, ['<primary>a'])
         self.create_action('open-orphans-window', self.manage_data_shortcut, ['<primary>d'])