Removing "remove" and "local" keywords from sorting command names and hints

Source commit: 4c11a6ebedb2e9f91f5afca461b53793a07c8777

source/forms/NonVisual.cpp

@@ -47,17 +47,17 @@ TNonVisualDataModule *NonVisualDataModule;
   ScpExplorer->ComponentVisible[fc ## COMP] = !ScpExplorer->ComponentVisible[fc ## COMP] )
 #define COLPROPS(SIDE) \
   ((TCustomDirViewColProperties*)ScpExplorer->DirView(os ## SIDE)->ColProperties)
-#define UPDSORT(SIDE, PREFIX, COL) if (Action == SIDE ## SortBy ## COL ## Action) { \
-  SIDE ## SortBy ## COL ## Action->Enabled = true; Handled = true; \
-  SIDE ## SortBy ## COL ## Action->Checked = (COLPROPS(SIDE)->SortColumn == PREFIX ## COL); } else
-#define EXESORT(SIDE, PREFIX, COL) EXE(SIDE ## SortBy ## COL ## Action, \
+#define UPDSORT(SIDE, PREFIX, COL) if (Action == SIDE ## SortBy ## COL ## Action2) { \
+  SIDE ## SortBy ## COL ## Action2->Enabled = true; Handled = true; \
+  SIDE ## SortBy ## COL ## Action2->Checked = (COLPROPS(SIDE)->SortColumn == PREFIX ## COL); } else
+#define EXESORT(SIDE, PREFIX, COL) EXE(SIDE ## SortBy ## COL ## Action2, \
     if (COLPROPS(SIDE)->SortColumn == PREFIX ## COL) \
       COLPROPS(SIDE)->SortAscending = !COLPROPS(SIDE)->SortAscending; \
     else COLPROPS(SIDE)->SortColumn = PREFIX ## COL )
-#define UPDSORTA(SIDE) if (Action == SIDE ## SortAscendingAction) { \
-  SIDE ## SortAscendingAction->Enabled = true; Handled = true; \
-  SIDE ## SortAscendingAction->Checked = COLPROPS(SIDE)->SortAscending; } else
-#define EXESORTA(SIDE) EXE(SIDE ## SortAscendingAction, \
+#define UPDSORTA(SIDE, NUM) if (Action == SIDE ## SortAscendingAction ## NUM) { \
+  SIDE ## SortAscendingAction ## NUM->Enabled = true; Handled = true; \
+  SIDE ## SortAscendingAction ## NUM->Checked = COLPROPS(SIDE)->SortAscending; } else
+#define EXESORTA(SIDE, NUM) EXE(SIDE ## SortAscendingAction ## NUM, \
   COLPROPS(SIDE)->SortAscending = !COLPROPS(SIDE)->SortAscending; )
 #define UPDSORTC(LPREFIX, LCOL, RPREFIX, RCOL) if (Action == CurrentSortBy ## RCOL ## Action) { \
   CurrentSortBy ## RCOL ## Action->Enabled = ScpExplorer->AllowedAction((TAction *)Action, aaShortCut); \
@@ -343,14 +343,14 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   UPD(CustomizeToolbarAction, IsToolbarCustomizable())
 
   // SORT
-  UPDSORTA(Local)
+  UPDSORTA(Local, 2)
   UPDSORT(Local, dv, Name)
   UPDSORT(Local, dv, Ext)
   UPDSORT(Local, dv, Size)
   UPDSORT(Local, dv, Type)
   UPDSORT(Local, dv, Changed)
   UPDSORT(Local, dv, Attr)
-  UPDSORTA(Remote)
+  UPDSORTA(Remote, 2)
   UPDSORT(Remote, uv, Name)
   UPDSORT(Remote, uv, Ext)
   UPDSORT(Remote, uv, Size)
@@ -359,7 +359,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   UPDSORT(Remote, uv, Owner)
   UPDSORT(Remote, uv, Group)
   UPDSORT(Remote, uv, Type)
-  UPDSORTA(Current)
+  UPDSORTA(Current, )
   UPDSORTC(dv, Name, uv, Name)
   UPDSORTC(dv, Ext, uv, Ext)
   UPDSORTC(dv, Size, uv, Size)
@@ -666,14 +666,14 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
 
     #define COLVIEWPROPS ((TCustomDirViewColProperties*)(((TCustomDirView*)(((TListColumns*)(ListColumn->Collection))->Owner()))->ColProperties))
     // SORT
-    EXESORTA(Local)
+    EXESORTA(Local, 2)
     EXESORT(Local, dv, Name)
     EXESORT(Local, dv, Ext)
     EXESORT(Local, dv, Size)
     EXESORT(Local, dv, Type)
     EXESORT(Local, dv, Changed)
     EXESORT(Local, dv, Attr)
-    EXESORTA(Remote)
+    EXESORTA(Remote, 2)
     EXESORT(Remote, uv, Name)
     EXESORT(Remote, uv, Ext)
     EXESORT(Remote, uv, Size)
@@ -682,7 +682,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     EXESORT(Remote, uv, Owner)
     EXESORT(Remote, uv, Group)
     EXESORT(Remote, uv, Type)
-    EXESORTA(Current)
+    EXESORTA(Current, )
     EXESORTC(Name, dvName, uvName)
     EXESORTC(Ext, dvExt, uvExt)
     EXESORTC(Size, dvSize, uvSize)
@@ -912,9 +912,9 @@ void __fastcall TNonVisualDataModule::CommanderShortcuts()
   CloseApplicationAction2->ShortCut = ShortCut(VK_F10, NONE);
 
   TShortCut CtrlF4 = ShortCut(VK_F4, CTRL);
-  LocalSortByExtAction->ShortCut = ExplorerKeyboardShortcuts ? TShortCut(0) : CtrlF4;
-  RemoteSortByExtAction->ShortCut = LocalSortByExtAction->ShortCut;
-  CurrentSortByExtAction->ShortCut = LocalSortByExtAction->ShortCut;
+  LocalSortByExtAction2->ShortCut = ExplorerKeyboardShortcuts ? TShortCut(0) : CtrlF4;
+  RemoteSortByExtAction2->ShortCut = LocalSortByExtAction2->ShortCut;
+  CurrentSortByExtAction->ShortCut = LocalSortByExtAction2->ShortCut;
   int Index = CloseSessionAction2->SecondaryShortCuts->IndexOfShortCut(CtrlF4);
   if (ExplorerKeyboardShortcuts && (Index < 0))
   {

source/forms/NonVisual.dfm

@@ -286,14 +286,14 @@ object NonVisualDataModule: TNonVisualDataModule
       Hint = 'Rename|Rename selected file'
       ImageIndex = 3
     end
-    object LocalSortAscendingAction: TAction
+    object LocalSortAscendingAction2: TAction
       Tag = 9
       Category = 'Sort'
       Caption = '&Ascending'
       HelpKeyword = 'ui_file_panel#sorting_files'
       Hint = 
-        'Ascending/descending|Toggle ascending/descending sort of local p' +
-        'anel'
+        'Ascending/descending|Toggle ascending/descending sorting of file' +
+        's in the panel'
       ImageIndex = 37
     end
     object CurrentEditAction: TAction
@@ -876,138 +876,138 @@ object NonVisualDataModule: TNonVisualDataModule
       Caption = 'Status &Bar'
       Hint = 'Hide/show remote panel status bar'
     end
-    object LocalSortByNameAction: TAction
+    object LocalSortByNameAction2: TAction
       Tag = 9
       Category = 'Sort'
       Caption = 'By &Name'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by name|Sort local panel by name'
+      Hint = 'Sort by name|Sort panel by name'
       ImageIndex = 31
       ShortCut = 16498
     end
-    object LocalSortByExtAction: TAction
+    object LocalSortByExtAction2: TAction
       Tag = 9
       Category = 'Sort'
       Caption = 'By &Extension'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by extension|Sort local panel by file name extension'
+      Hint = 'Sort by extension|Sort panel by file name extension'
       ImageIndex = 32
       ShortCut = 16499
     end
-    object LocalSortBySizeAction: TAction
+    object LocalSortBySizeAction2: TAction
       Tag = 9
       Category = 'Sort'
       Caption = 'By &Size'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by size|Sort local panel by file size'
+      Hint = 'Sort by size|Sort panel by file size'
       ImageIndex = 35
       ShortCut = 16501
     end
-    object LocalSortByAttrAction: TAction
+    object LocalSortByAttrAction2: TAction
       Tag = 9
       Category = 'Sort'
       Caption = 'By A&ttributes'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by attributes|Sort local panel by attributes'
+      Hint = 'Sort by attributes|Sort panel by attributes'
       ImageIndex = 36
       ShortCut = 16502
     end
-    object LocalSortByTypeAction: TAction
+    object LocalSortByTypeAction2: TAction
       Tag = 9
       Category = 'Sort'
       Caption = 'By &Type'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by type|Sort local panel by file type'
+      Hint = 'Sort by type|Sort panel by file type'
       ImageIndex = 34
     end
-    object LocalSortByChangedAction: TAction
+    object LocalSortByChangedAction2: TAction
       Tag = 9
       Category = 'Sort'
       Caption = 'By &Modification'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by time|Sort local panel by last modification time'
+      Hint = 'Sort by time|Sort panel by last modification time'
       ImageIndex = 33
       ShortCut = 16500
     end
-    object RemoteSortAscendingAction: TAction
+    object RemoteSortAscendingAction2: TAction
       Tag = 14
       Category = 'Sort'
       Caption = '&Ascending'
       HelpKeyword = 'ui_file_panel#sorting_files'
       Hint = 
-        'Ascending/descending|Toggle ascending/descending sort of remote ' +
-        'panel'
+        'Ascending/descending|Toggle ascending/descending sorting of file' +
+        's in the panel'
       ImageIndex = 37
     end
-    object RemoteSortByNameAction: TAction
+    object RemoteSortByNameAction2: TAction
       Tag = 14
       Category = 'Sort'
       Caption = 'By &Name'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by name|Sort remote panel by name'
+      Hint = 'Sort by name|Sort panel by name'
       ImageIndex = 31
       ShortCut = 16498
     end
-    object RemoteSortByExtAction: TAction
+    object RemoteSortByExtAction2: TAction
       Tag = 14
       Category = 'Sort'
       Caption = 'By &Extension'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by extension|Sort remote panel by file name extension'
+      Hint = 'Sort by extension|Sort panel by file name extension'
       ImageIndex = 32
       ShortCut = 16499
     end
-    object RemoteSortBySizeAction: TAction
+    object RemoteSortBySizeAction2: TAction
       Tag = 14
       Category = 'Sort'
       Caption = 'By &Size'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by size|Sort remote panel by file size'
+      Hint = 'Sort by size|Sort panel by file size'
       ImageIndex = 35
       ShortCut = 16501
     end
-    object RemoteSortByRightsAction: TAction
+    object RemoteSortByRightsAction2: TAction
       Tag = 14
       Category = 'Sort'
       Caption = 'By &Permissions'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by permissions|Sort remote panel by permissions'
+      Hint = 'Sort by permissions|Sort panel by permissions'
       ImageIndex = 36
       ShortCut = 16502
     end
-    object RemoteSortByChangedAction: TAction
+    object RemoteSortByChangedAction2: TAction
       Tag = 14
       Category = 'Sort'
       Caption = 'By &Modification'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by time|Sort remote panel by last modification time'
+      Hint = 'Sort by time|Sort panel by last modification time'
       ImageIndex = 33
       ShortCut = 16500
     end
-    object RemoteSortByOwnerAction: TAction
+    object RemoteSortByOwnerAction2: TAction
       Tag = 14
       Category = 'Sort'
       Caption = 'By &Owner'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by owner|Sort remote panel by file owner'
+      Hint = 'Sort by owner|Sort panel by file owner'
       ImageIndex = 38
       ShortCut = 16503
     end
-    object RemoteSortByGroupAction: TAction
+    object RemoteSortByGroupAction2: TAction
       Tag = 14
       Category = 'Sort'
       Caption = 'By &Group'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by group|Sort remote panel by file group'
+      Hint = 'Sort by group|Sort panel by file group'
       ImageIndex = 39
       ShortCut = 16504
     end
-    object RemoteSortByTypeAction: TAction
+    object RemoteSortByTypeAction2: TAction
       Tag = 14
       Category = 'Sort'
       Caption = 'By &Type'
       HelpKeyword = 'ui_file_panel#sorting_files'
-      Hint = 'Sort by type|Sort remote panel by file type'
+      Hint = 'Sort by type|Sort panel by file type'
       ImageIndex = 34
     end
     object CurrentSortAscendingAction: TAction
@@ -2631,7 +2631,7 @@ object NonVisualDataModule: TNonVisualDataModule
       Action = SortColumnDescendingAction
     end
     object LocalSortByExtColumnPopupItem: TTBXItem
-      Action = LocalSortByExtAction
+      Action = LocalSortByExtAction2
     end
     object Hidecolumn1: TTBXItem
       Action = HideColumnAction
@@ -2689,7 +2689,7 @@ object NonVisualDataModule: TNonVisualDataModule
       RadioItem = True
     end
     object RemoteSortByExtColumnPopupItem: TTBXItem
-      Action = RemoteSortByExtAction
+      Action = RemoteSortByExtAction2
     end
     object Hidecolumn2: TTBXItem
       Action = HideColumnAction

source/forms/NonVisual.h

@@ -74,9 +74,9 @@
 class TNonVisualDataModule : public TDataModule
 {
 __published:    // IDE-managed Components
-  TAction *LocalSortByNameAction;
-  TAction *LocalSortAscendingAction;
-  TAction *LocalSortBySizeAction;
+  TAction *LocalSortByNameAction2;
+  TAction *LocalSortAscendingAction2;
+  TAction *LocalSortBySizeAction2;
   TActionList *ExplorerActions;
   TAction *CurrentRenameAction;
   TAction *CurrentDeleteAction;
@@ -136,17 +136,17 @@ __published:    // IDE-managed Components
   TAction *CommanderRemoteNavigationBandAction;
   TAction *LocalStatusBarAction;
   TAction *RemoteStatusBarAction;
-  TAction *LocalSortByAttrAction;
-  TAction *LocalSortByTypeAction;
-  TAction *LocalSortByChangedAction;
+  TAction *LocalSortByAttrAction2;
+  TAction *LocalSortByTypeAction2;
+  TAction *LocalSortByChangedAction2;
   TAction *CommanderSortBandAction;
-  TAction *RemoteSortAscendingAction;
-  TAction *RemoteSortByNameAction;
-  TAction *RemoteSortBySizeAction;
-  TAction *RemoteSortByRightsAction;
-  TAction *RemoteSortByChangedAction;
-  TAction *RemoteSortByOwnerAction;
-  TAction *RemoteSortByGroupAction;
+  TAction *RemoteSortAscendingAction2;
+  TAction *RemoteSortByNameAction2;
+  TAction *RemoteSortBySizeAction2;
+  TAction *RemoteSortByRightsAction2;
+  TAction *RemoteSortByChangedAction2;
+  TAction *RemoteSortByOwnerAction2;
+  TAction *RemoteSortByGroupAction2;
   TAction *CurrentSortByTypeAction;
   TAction *CurrentSortAscendingAction;
   TAction *CurrentSortByNameAction;
@@ -161,8 +161,8 @@ __published:    // IDE-managed Components
   TAction *HomepageAction;
   TAction *HistoryPageAction;
   TAction *SaveCurrentSessionAction2;
-  TAction *LocalSortByExtAction;
-  TAction *RemoteSortByExtAction;
+  TAction *LocalSortByExtAction2;
+  TAction *RemoteSortByExtAction2;
   TAction *CurrentSortByExtAction;
   TAction *ShowHideRemoteNameColumnAction2;
   TAction *ShowHideRemoteExtColumnAction2;
@@ -421,7 +421,7 @@ __published:    // IDE-managed Components
   TTBXItem *TBXItem7;
   TAction *ShowHideRemoteTypeColumnAction2;
   TTBXItem *TBXItem8;
-  TAction *RemoteSortByTypeAction;
+  TAction *RemoteSortByTypeAction2;
   TAction *QueueItemPauseAction;
   TTBXItem *TBXItem9;
   TAction *QueueItemResumeAction;

source/forms/ScpCommander.dfm

@@ -96,37 +96,37 @@ inherited ScpCommanderForm: TScpCommanderForm
           HelpKeyword = 'ui_file_panel#sorting_files'
           Hint = 'Change file order in local panel'
           object TBXItem12: TTBXItem
-            Action = NonVisualDataModule.LocalSortAscendingAction
+            Action = NonVisualDataModule.LocalSortAscendingAction2
           end
           object TBXSeparatorItem5: TTBXSeparatorItem
           end
           object TBXItem13: TTBXItem
-            Action = NonVisualDataModule.LocalSortByNameAction
+            Action = NonVisualDataModule.LocalSortByNameAction2
             GroupIndex = 1
             RadioItem = True
           end
           object TBXItem14: TTBXItem
-            Action = NonVisualDataModule.LocalSortByExtAction
+            Action = NonVisualDataModule.LocalSortByExtAction2
             GroupIndex = 1
             RadioItem = True
           end
           object TBXItem15: TTBXItem
-            Action = NonVisualDataModule.LocalSortByTypeAction
+            Action = NonVisualDataModule.LocalSortByTypeAction2
             GroupIndex = 1
             RadioItem = True
           end
           object TBXItem16: TTBXItem
-            Action = NonVisualDataModule.LocalSortByChangedAction
+            Action = NonVisualDataModule.LocalSortByChangedAction2
             GroupIndex = 1
             RadioItem = True
           end
           object TBXItem17: TTBXItem
-            Action = NonVisualDataModule.LocalSortBySizeAction
+            Action = NonVisualDataModule.LocalSortBySizeAction2
             GroupIndex = 1
             RadioItem = True
           end
           object TBXItem18: TTBXItem
-            Action = NonVisualDataModule.LocalSortByAttrAction
+            Action = NonVisualDataModule.LocalSortByAttrAction2
             GroupIndex = 1
             RadioItem = True
           end
@@ -684,46 +684,46 @@ inherited ScpCommanderForm: TScpCommanderForm
           HelpKeyword = 'ui_file_panel#sorting_files'
           Hint = 'Change file order in remote panel'
           object TBXItem93: TTBXItem
-            Action = NonVisualDataModule.RemoteSortAscendingAction
+            Action = NonVisualDataModule.RemoteSortAscendingAction2
           end
           object TBXSeparatorItem28: TTBXSeparatorItem
           end
           object TBXItem94: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByNameAction
+            Action = NonVisualDataModule.RemoteSortByNameAction2
             GroupIndex = 1
             RadioItem = True
           end
           object TBXItem95: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByExtAction
+            Action = NonVisualDataModule.RemoteSortByExtAction2
             GroupIndex = 1
             RadioItem = True
           end
           object TBXItem193: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByTypeAction
+            Action = NonVisualDataModule.RemoteSortByTypeAction2
             RadioItem = True
           end
           object TBXItem96: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByChangedAction
+            Action = NonVisualDataModule.RemoteSortByChangedAction2
             GroupIndex = 1
             RadioItem = True
           end
           object TBXItem97: TTBXItem
-            Action = NonVisualDataModule.RemoteSortBySizeAction
+            Action = NonVisualDataModule.RemoteSortBySizeAction2
             GroupIndex = 1
             RadioItem = True
           end
           object TBXItem98: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByRightsAction
+            Action = NonVisualDataModule.RemoteSortByRightsAction2
             GroupIndex = 1
             RadioItem = True
           end
           object TBXItem99: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByOwnerAction
+            Action = NonVisualDataModule.RemoteSortByOwnerAction2
             GroupIndex = 1
             RadioItem = True
           end
           object TBXItem100: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByGroupAction
+            Action = NonVisualDataModule.RemoteSortByGroupAction2
             GroupIndex = 1
             RadioItem = True
           end

source/forms/ScpExplorer.dfm

@@ -498,40 +498,40 @@ inherited ScpExplorerForm: TScpExplorerForm
           HelpKeyword = 'ui_file_panel#sorting_files'
           Hint = 'Change file order in panel'
           object TBXItem93: TTBXItem
-            Action = NonVisualDataModule.RemoteSortAscendingAction
+            Action = NonVisualDataModule.RemoteSortAscendingAction2
           end
           object TBXSeparatorItem28: TTBXSeparatorItem
           end
           object TBXItem94: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByNameAction
+            Action = NonVisualDataModule.RemoteSortByNameAction2
             GroupIndex = 1
           end
           object TBXItem95: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByExtAction
+            Action = NonVisualDataModule.RemoteSortByExtAction2
             GroupIndex = 1
           end
           object TBXItem132: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByTypeAction
+            Action = NonVisualDataModule.RemoteSortByTypeAction2
             RadioItem = True
           end
           object TBXItem96: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByChangedAction
+            Action = NonVisualDataModule.RemoteSortByChangedAction2
             GroupIndex = 1
           end
           object TBXItem97: TTBXItem
-            Action = NonVisualDataModule.RemoteSortBySizeAction
+            Action = NonVisualDataModule.RemoteSortBySizeAction2
             GroupIndex = 1
           end
           object TBXItem98: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByRightsAction
+            Action = NonVisualDataModule.RemoteSortByRightsAction2
             GroupIndex = 1
           end
           object TBXItem99: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByOwnerAction
+            Action = NonVisualDataModule.RemoteSortByOwnerAction2
             GroupIndex = 1
           end
           object TBXItem100: TTBXItem
-            Action = NonVisualDataModule.RemoteSortByGroupAction
+            Action = NonVisualDataModule.RemoteSortByGroupAction2
             GroupIndex = 1
           end
         end