add windows shortcuts

jafl · Dec 11, 2023 · 1809ec2 · 1809ec2
1 parent 87138d8
commit 1809ec2
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/code/FileTreeTable-File.h b/code/FileTreeTable-File.h
@@ -99,7 +99,7 @@ enum {
 #endif
 
 static void ConfigureFileMenu(JXTextMenu* menu, const int offset = 0) {
-	if (menu->IsEmpty() && JXMenu::GetDisplayStyle() == JXMenu::kWindowsStyle) {
+	if (offset == 0 && JXMenu::GetDisplayStyle() == JXMenu::kWindowsStyle) {
 		menu->SetShortcuts(JString("#f", JString::kNoCopy));
 	}
 	menu->SetItemImage(kNewDirCmd + offset, jx_folder_small);

diff --git a/code/FileTreeTable-Git.h b/code/FileTreeTable-Git.h
@@ -65,7 +65,7 @@ enum {
 #endif
 
 static void ConfigureGitMenu(JXTextMenu* menu, const int offset = 0) {
-	if (menu->IsEmpty() && JXMenu::GetDisplayStyle() == JXMenu::kWindowsStyle) {
+	if (offset == 0 && JXMenu::GetDisplayStyle() == JXMenu::kWindowsStyle) {
 		menu->SetShortcuts(JString("#g", JString::kNoCopy));
 	}
 	menu->SetItemImage(kGitStatusCmd + offset, git_status);

diff --git a/code/FileTreeTable-Shortcuts.h b/code/FileTreeTable-Shortcuts.h
@@ -19,6 +19,9 @@ enum {
 
 
 static void ConfigureShortcutsMenu(JXTextMenu* menu, const int offset = 0) {
+	if (offset == 0 && JXMenu::GetDisplayStyle() == JXMenu::kWindowsStyle) {
+		menu->SetShortcuts(JString("#s", JString::kNoCopy));
+	}
 };
 
 #endif
diff --git a/code/FileTreeTable-Shortcuts.jxm b/code/FileTreeTable-Shortcuts.jxm
@@ -2,7 +2,7 @@ jx_menu_editor 0
 670 300
 "FileTreeTable"
 "Shortcuts"
-' 
+'s
 40
 40
 100
@@ -18,7 +18,7 @@ jx_menu_editor 0
 0 ""
 "Add Shortcut"
 "Ctrl-plus"
-' 
+'a
 "AddShortcut"
 "kAddShortcutCmd"
 0
@@ -28,7 +28,7 @@ jx_menu_editor 0
 0 ""
 "Remove Shortcut"
 "Ctrl-minus"
-' 
+'r
 "RemoveShortcut"
 "kRemoveShortcutCmd"
 0
@@ -38,7 +38,7 @@ jx_menu_editor 0
 0 ""
 "Remove All Shortcuts"
 ""
-' 
+'l
 "RemoveAllShortcuts"
 "kRemoveAllShortcutsCmd"
 1

diff --git a/code/FileTreeTable-View.h b/code/FileTreeTable-View.h
@@ -61,7 +61,7 @@ enum {
 #endif
 
 static void ConfigureViewMenu(JXTextMenu* menu, const int offset = 0) {
-	if (menu->IsEmpty() && JXMenu::GetDisplayStyle() == JXMenu::kWindowsStyle) {
+	if (offset == 0 && JXMenu::GetDisplayStyle() == JXMenu::kWindowsStyle) {
 		menu->SetShortcuts(JString("#v", JString::kNoCopy));
 	}
 	menu->SetItemImage(kShowFilterCmd + offset, filter);

diff --git a/code/TreeDir-Help.h b/code/TreeDir-Help.h
@@ -27,7 +27,7 @@ enum {
 #endif
 
 static void ConfigureHelpMenu(JXTextMenu* menu, const int offset = 0) {
-	if (menu->IsEmpty() && JXMenu::GetDisplayStyle() == JXMenu::kWindowsStyle) {
+	if (offset == 0 && JXMenu::GetDisplayStyle() == JXMenu::kWindowsStyle) {
 		menu->SetShortcuts(JString("#h", JString::kNoCopy));
 	}
 	menu->SetItemImage(kTOCCmd + offset, jx_help_toc);

diff --git a/code/TreeDir-Preferences.h b/code/TreeDir-Preferences.h
@@ -23,7 +23,7 @@ enum {
 
 
 static void ConfigurePreferencesMenu(JXTextMenu* menu, const int offset = 0) {
-	if (menu->IsEmpty() && JXMenu::GetDisplayStyle() == JXMenu::kWindowsStyle) {
+	if (offset == 0 && JXMenu::GetDisplayStyle() == JXMenu::kWindowsStyle) {
 		menu->SetShortcuts(JString("#p", JString::kNoCopy));
 	}
 };

diff --git a/strings/FileTreeTable-Shortcuts b/strings/FileTreeTable-Shortcuts
@@ -6,6 +6,6 @@
 
 MenuTitle::FileTreeTable_Shortcuts "Shortcuts"
 
-AddShortcut::FileTreeTable "Add Shortcut %k Ctrl-plus"
-RemoveShortcut::FileTreeTable "Remove Shortcut %k Ctrl-minus"
-RemoveAllShortcuts::FileTreeTable "Remove All Shortcuts"
+AddShortcut::FileTreeTable "Add Shortcut %k Ctrl-plus %h a"
+RemoveShortcut::FileTreeTable "Remove Shortcut %k Ctrl-minus %h r"
+RemoveAllShortcuts::FileTreeTable "Remove All Shortcuts %h l"