From 12172de922efc811a4ddd41b478e52d7662f9984 Mon Sep 17 00:00:00 2001
From: Tanner <tannerhelland@gmail.com>
Date: Fri, 6 Sep 2024 11:33:11 -0600
Subject: [PATCH] Additional UI for the main window

Relates to #474
---
 Forms/MainWindow.frm | 16 +++++++++++-----
 Modules/Menus.bas    | 19 ++++++++++---------
 PhotoDemon.vbp       |  2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Forms/MainWindow.frm b/Forms/MainWindow.frm
index 625897b06..207bbcd75 100644
--- a/Forms/MainWindow.frm
+++ b/Forms/MainWindow.frm
@@ -1624,20 +1624,24 @@ Begin VB.Form FormMain
          Index           =   10
       End
       Begin VB.Menu MnuTool 
-         Caption         =   "Options..."
+         Caption         =   "Keyboard shortcuts..."
          Index           =   11
       End
       Begin VB.Menu MnuTool 
-         Caption         =   "Third-party libraries..."
+         Caption         =   "Options..."
          Index           =   12
       End
       Begin VB.Menu MnuTool 
-         Caption         =   "-"
+         Caption         =   "Third-party libraries..."
          Index           =   13
       End
       Begin VB.Menu MnuTool 
-         Caption         =   "Developers"
+         Caption         =   "-"
          Index           =   14
+      End
+      Begin VB.Menu MnuTool 
+         Caption         =   "Developers"
+         Index           =   15
          Begin VB.Menu MnuDevelopers 
             Caption         =   "Theme editor..."
             Index           =   0
@@ -3860,8 +3864,10 @@ Private Sub mnuTool_Click(Index As Integer)
         Case 10
             '(separator)
         Case 11
-            Actions.LaunchAction_ByName "tools_options"
+            Actions.LaunchAction_ByName "tools_hotkeys"
         Case 12
+            Actions.LaunchAction_ByName "tools_options"
+        Case 13
             Actions.LaunchAction_ByName "tools_3rdpartylibs"
     End Select
 End Sub
diff --git a/Modules/Menus.bas b/Modules/Menus.bas
index d5ced98ea..08919e36b 100644
--- a/Modules/Menus.bas
+++ b/Modules/Menus.bas
@@ -556,19 +556,20 @@ Public Sub InitializeMenus()
     AddMenuItem "-", "-", 7, 8
     AddMenuItem "Animated screen capture...", "tools_screenrecord", 7, 9, , "file_importscreen"
     AddMenuItem "-", "-", 7, 10
-    AddMenuItem "Options...", "tools_options", 7, 11, , "pref_advanced"
-    AddMenuItem "Third-party libraries...", "tools_3rdpartylibs", 7, 12, , "tools_plugin"
+    AddMenuItem "Keyboard shortcuts...", "tools_hotkeys", 7, 11
+    AddMenuItem "Options...", "tools_options", 7, 12, , "pref_advanced"
+    AddMenuItem "Third-party libraries...", "tools_3rdpartylibs", 7, 13, , "tools_plugin"
     
     Dim debugMenuVisibility As Boolean
     debugMenuVisibility = (PD_BUILD_QUALITY <> PD_PRODUCTION) And (PD_BUILD_QUALITY <> PD_BETA)
     If debugMenuVisibility Then
-        AddMenuItem "-", "-", 7, 13
-        AddMenuItem "Developers", "tools_developers", 7, 14
-            AddMenuItem "Theme editor...", "tools_themeeditor", 7, 14, 0, , False
-            AddMenuItem "Build theme package...", "tools_themepackage", 7, 14, 1, , False
-            AddMenuItem "-", "-", 7, 14, 2
-            AddMenuItem "Build standalone package...", "tools_standalonepackage", 7, 14, 3, , False
-        AddMenuItem "Test", "effects_developertest", 7, 15
+        AddMenuItem "-", "-", 7, 14
+        AddMenuItem "Developers", "tools_developers", 7, 15
+            AddMenuItem "Theme editor...", "tools_themeeditor", 7, 15, 0, , False
+            AddMenuItem "Build theme package...", "tools_themepackage", 7, 15, 1, , False
+            AddMenuItem "-", "-", 7, 15, 2
+            AddMenuItem "Build standalone package...", "tools_standalonepackage", 7, 15, 3, , False
+        AddMenuItem "Test", "effects_developertest", 7, 16
     End If
     
     'View Menu
diff --git a/PhotoDemon.vbp b/PhotoDemon.vbp
index fa2c85acd..f807268ca 100644
--- a/PhotoDemon.vbp
+++ b/PhotoDemon.vbp
@@ -532,7 +532,7 @@ Description="PhotoDemon Photo Editor"
 CompatibleMode="0"
 MajorVer=2024
 MinorVer=8
-RevisionVer=52
+RevisionVer=53
 AutoIncrementVer=1
 ServerSupportFiles=0
 VersionComments="Copyright 2000-2024 Tanner Helland - photodemon.org"