Преглед изворни кода

Setting interface-inspecific selection shortcuts in DFM

(cherry picked from commit 7f92ef6042bc7e18aa10c2ff27f2f064bca39a59)

Source commit: 48d664af5e463803401b38704da90da8eaa25915
Martin Prikryl пре 4 година
родитељ
комит
af83ed5d8b
2 измењених фајлова са 6 додато и 13 уклоњено
  1. 0 13
      source/forms/NonVisual.cpp
  2. 6 0
      source/forms/NonVisual.dfm

+ 0 - 13
source/forms/NonVisual.cpp

@@ -841,13 +841,6 @@ void __fastcall TNonVisualDataModule::ExplorerShortcuts()
   // selected operation
   CurrentDeleteAlternativeAction->ShortCut = ShortCut(VK_DELETE, SHIFT);
   RemoteMoveToAction->ShortCut = ShortCut(L'M', CTRLALT);
-  // selection
-  SelectAction->ShortCut = ShortCut(VK_ADD, NONE);
-  UnselectAction->ShortCut = ShortCut(VK_SUBTRACT, NONE);
-  SelectAllAction->ShortCut = ShortCut(L'A', CTRL);
-  InvertSelectionAction->ShortCut = ShortCut(VK_MULTIPLY, NONE);
-  ClearSelectionAction->ShortCut = ShortCut(L'L', CTRLSHIFT);
-  RestoreSelectionAction->ShortCut = ShortCut(L'R', CTRLSHIFT);
   // commands
   NewFileAction->ShortCut = ShortCut(L'E', CTRLSHIFT);
   RemoteFindFilesAction->ShortCut = ShortCut(VK_F3, NONE);
@@ -894,12 +887,6 @@ void __fastcall TNonVisualDataModule::CommanderShortcuts()
   RemoteCopyToAction->ShortCut = ShortCut(VK_F5, SHIFT);
   // selection
   SelectOneAction->ShortCut = VK_INSERT;
-  SelectAction->ShortCut = ShortCut(VK_ADD, NONE);
-  UnselectAction->ShortCut = ShortCut(VK_SUBTRACT, NONE);
-  SelectAllAction->ShortCut = ShortCut(L'A', CTRL);
-  InvertSelectionAction->ShortCut = ShortCut(VK_MULTIPLY, NONE);
-  ClearSelectionAction->ShortCut = ShortCut(L'L', CTRLSHIFT);
-  RestoreSelectionAction->ShortCut = ShortCut(L'R', CTRLSHIFT);
   // commands
   NewFileAction->ShortCut = ShortCut(VK_F4, SHIFT);
   RemoteFindFilesAction->ShortCut =

+ 6 - 0
source/forms/NonVisual.dfm

@@ -523,6 +523,7 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'ui_select'
       Hint = 'Select|Select files by mask'
       ImageIndex = 19
+      ShortCut = 107
     end
     object UnselectAction: TAction
       Tag = 15
@@ -531,6 +532,7 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'ui_select'
       Hint = 'Unselect|Unselect files by mask'
       ImageIndex = 20
+      ShortCut = 109
     end
     object SelectAllAction: TAction
       Tag = 15
@@ -539,6 +541,7 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'ui_file_panel#selecting_files'
       Hint = 'Select all files'
       ImageIndex = 21
+      ShortCut = 16449
     end
     object InvertSelectionAction: TAction
       Tag = 15
@@ -547,6 +550,7 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'ui_file_panel#selecting_files'
       Hint = 'Invert selection'
       ImageIndex = 22
+      ShortCut = 106
     end
     object ExplorerSelectionBandAction: TAction
       Tag = 7
@@ -562,6 +566,7 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'ui_file_panel#selecting_files'
       Hint = 'Clear selection'
       ImageIndex = 23
+      ShortCut = 24652
     end
     object ExplorerSessionBandAction: TAction
       Tag = 7
@@ -1868,6 +1873,7 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'ui_file_panel#selecting_files'
       Hint = 'Restore previous selection'
       ImageIndex = 86
+      ShortCut = 24658
     end
     object LocalSelectAction: TAction
       Tag = 12