Removing "remove" and "local" keywords from command names and hints where possible

Source commit: 8b550fc5e3d7ef9f1318735aadae814ab25e0a44

source/forms/CustomScpExplorer.cpp

@@ -9415,14 +9415,14 @@ void __fastcall TCustomScpExplorerForm::ReadDirectoryCancelled()
 //---------------------------------------------------------------------------
 void __fastcall TCustomScpExplorerForm::SynchronizeBrowsingChanged()
 {
-  if (NonVisualDataModule->SynchronizeBrowsingAction->Checked)
+  if (NonVisualDataModule->SynchronizeBrowsingAction2->Checked)
   {
     Configuration->Usage->Inc(L"SynchronizeBrowsingEnabled");
   }
 
   PostNote(FORMAT(LoadStrPart(SYNC_DIR_BROWSE_TOGGLE, 1),
     (LoadStrPart(SYNC_DIR_BROWSE_TOGGLE,
-      (NonVisualDataModule->SynchronizeBrowsingAction->Checked ? 2 : 3)))),
+      (NonVisualDataModule->SynchronizeBrowsingAction2->Checked ? 2 : 3)))),
     0, NULL, NULL);
 }
 //---------------------------------------------------------------------------
@@ -10316,7 +10316,7 @@ void __fastcall TCustomScpExplorerForm::CreateOpenDirMenuList(
       {
         std::unique_ptr<TTBCustomItem> Item(new TTBXSubmenuItem(Owner));
         Item->Caption = Folders->Strings[Index];
-        Item->ImageIndex = NonVisualDataModule->RemoteChangePathAction->ImageIndex;
+        Item->ImageIndex = NonVisualDataModule->RemoteChangePathAction2->ImageIndex;
         Folders->Objects[Index] = Item.get();
         Menu->Add(Item.release());
       }
@@ -10388,7 +10388,7 @@ void __fastcall TCustomScpExplorerForm::CreateOpenDirMenu(TTBCustomItem * Menu,
   CreateOpenDirMenuList(Menu, Side, WinConfiguration->SharedBookmarks);
 
   Item.reset(new TTBXItem(Owner));
-  Item->Action = (Side == osLocal) ? NonVisualDataModule->LocalAddBookmarkAction : NonVisualDataModule->RemoteAddBookmarkAction;
+  Item->Action = (Side == osLocal) ? NonVisualDataModule->LocalAddBookmarkAction2 : NonVisualDataModule->RemoteAddBookmarkAction2;
   Menu->Add(Item.release());
 }
 //---------------------------------------------------------------------------

source/forms/NonVisual.cpp

@@ -75,10 +75,10 @@ TNonVisualDataModule *NonVisualDataModule;
     else COLPROPS(Current)->SortColumn = NewSortCol \
   )
 #define UPDSHCOL(SIDE, PREFIX, COL) \
-  EXE(ShowHide ## SIDE ## COL ## ColumnAction, \
-    ShowHide ## SIDE ## COL ## ColumnAction->Checked = COLPROPS(SIDE)->Visible[PREFIX ## COL])
+  EXE(ShowHide ## SIDE ## COL ## ColumnAction2, \
+    ShowHide ## SIDE ## COL ## ColumnAction2->Checked = COLPROPS(SIDE)->Visible[PREFIX ## COL])
 #define EXESHCOL(SIDE, PREFIX, COL) \
-  EXE(ShowHide ## SIDE ## COL ## ColumnAction, \
+  EXE(ShowHide ## SIDE ## COL ## ColumnAction2, \
     COLPROPS(SIDE)->Visible[PREFIX ## COL] = !COLPROPS(SIDE)->Visible[PREFIX ## COL])
 
 #define BAND_COMPONENTS \
@@ -198,13 +198,13 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   UPD(LocalCopyAction, HasTerminal && EnabledLocalSelectedOperation)
   UPD(LocalCopyQueueAction, HasTerminal && EnabledLocalSelectedOperation && ScpExplorer->Terminal->IsCapable[fcBackgroundTransfers])
   UPD(LocalCopyNonQueueAction, HasTerminal && EnabledLocalSelectedOperation)
-  UPD(LocalRenameAction, EnabledLocalSelectedOperation)
-  UPD(LocalEditAction, EnabledLocalSelectedFileOperation && !WinConfiguration->DisableOpenEdit)
+  UPD(LocalRenameAction2, EnabledLocalSelectedOperation)
+  UPD(LocalEditAction2, EnabledLocalSelectedFileOperation && !WinConfiguration->DisableOpenEdit)
   UPD(LocalMoveAction, HasTerminal && EnabledLocalSelectedOperation)
-  UPD(LocalCreateDirAction2, true)
-  UPD(LocalDeleteAction, EnabledLocalSelectedOperation)
-  UPD(LocalPropertiesAction, EnabledLocalSelectedOperation)
-  UPD(LocalAddEditLinkAction2, ScpExplorer->CanAddEditLink(osLocal))
+  UPD(LocalCreateDirAction3, true)
+  UPD(LocalDeleteAction2, EnabledLocalSelectedOperation)
+  UPD(LocalPropertiesAction2, EnabledLocalSelectedOperation)
+  UPD(LocalAddEditLinkAction3, ScpExplorer->CanAddEditLink(osLocal))
   UPD(LocalNewFileAction, !WinConfiguration->DisableOpenEdit)
   // local focused operation
   UPD(LocalCopyFocusedAction, HasTerminal && EnabledLocalFocusedOperation)
@@ -215,15 +215,15 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   UPD(RemoteCopyAction, EnabledRemoteSelectedOperation)
   UPD(RemoteCopyQueueAction, EnabledRemoteSelectedOperation && ScpExplorer->Terminal->IsCapable[fcBackgroundTransfers])
   UPD(RemoteCopyNonQueueAction, EnabledRemoteSelectedOperation)
-  UPD(RemoteRenameAction, EnabledRemoteSelectedOperation &&
+  UPD(RemoteRenameAction2, EnabledRemoteSelectedOperation &&
     ScpExplorer->Terminal->IsCapable[fcRename])
-  UPD(RemoteEditAction, EnabledRemoteSelectedFileOperation && !WinConfiguration->DisableOpenEdit)
+  UPD(RemoteEditAction2, EnabledRemoteSelectedFileOperation && !WinConfiguration->DisableOpenEdit)
   UPD(RemoteMoveAction, EnabledRemoteSelectedOperation)
-  UPD(RemoteCreateDirAction2, DirViewEnabled(osRemote))
+  UPD(RemoteCreateDirAction3, DirViewEnabled(osRemote))
   UPD(RemoteNewFileAction, DirViewEnabled(osRemote) && !WinConfiguration->DisableOpenEdit)
-  UPD(RemoteDeleteAction, EnabledRemoteSelectedOperation)
-  UPD(RemotePropertiesAction, EnabledRemoteSelectedOperation)
-  UPD(RemoteAddEditLinkAction2, ScpExplorer->CanAddEditLink(osRemote))
+  UPD(RemoteDeleteAction2, EnabledRemoteSelectedOperation)
+  UPD(RemotePropertiesAction2, EnabledRemoteSelectedOperation)
+  UPD(RemoteAddEditLinkAction3, ScpExplorer->CanAddEditLink(osRemote))
   // remote focused operation
   UPD(RemoteCopyFocusedAction, EnabledRemoteFocusedOperation)
   UPD(RemoteCopyFocusedQueueAction, EnabledRemoteFocusedOperation && ScpExplorer->Terminal->IsCapable[fcBackgroundTransfers])
@@ -237,7 +237,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   // directory
   UPD(CurrentCreateDirAction, DirViewEnabled(osCurrent))
   UPD(NewDirAction, DirViewEnabled(osCurrent))
-  UPD(RemoteFindFilesAction, DirViewEnabled(osRemote))
+  UPD(RemoteFindFilesAction2, DirViewEnabled(osRemote))
   // selection
   UPD(SelectOneAction, DirView(osCurrent)->FilesCount)
   UPD(SelectAction, DirView(osCurrent)->FilesCount)
@@ -249,12 +249,12 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   UPD(SelectSameExtAction, EnabledFocusedFileOperation)
   UPD(UnselectSameExtAction, EnabledFocusedFileOperation)
   UPD(PasteAction2, ScpExplorer->CanPasteFromClipBoard())
-  UPD(LocalSelectAction, ScpExplorer->HasDirView[osLocal] && DirView(osLocal)->FilesCount)
-  UPD(LocalUnselectAction, ScpExplorer->HasDirView[osLocal] && DirView(osLocal)->SelCount)
-  UPD(LocalSelectAllAction, ScpExplorer->HasDirView[osLocal] && DirView(osLocal)->FilesCount)
-  UPD(RemoteSelectAction, DirView(osRemote)->FilesCount)
-  UPD(RemoteUnselectAction, DirView(osRemote)->SelCount)
-  UPD(RemoteSelectAllAction, DirView(osRemote)->FilesCount)
+  UPD(LocalSelectAction2, ScpExplorer->HasDirView[osLocal] && DirView(osLocal)->FilesCount)
+  UPD(LocalUnselectAction2, ScpExplorer->HasDirView[osLocal] && DirView(osLocal)->SelCount)
+  UPD(LocalSelectAllAction2, ScpExplorer->HasDirView[osLocal] && DirView(osLocal)->FilesCount)
+  UPD(RemoteSelectAction2, DirView(osRemote)->FilesCount)
+  UPD(RemoteUnselectAction2, DirView(osRemote)->SelCount)
+  UPD(RemoteSelectAllAction2, DirView(osRemote)->FilesCount)
 
   //style
   UPDACT(CurrentCycleStyleAction,
@@ -284,14 +284,14 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
     UPD(SIDE ## HomeDirAction, DirViewEnabled(os ## SIDE)) \
     UPD(SIDE ## RefreshAction, DirViewEnabled(os ## SIDE) && DirView(os ## SIDE)->DirOK) \
     UPD(SIDE ## OpenDirAction, DirViewEnabled(os ## SIDE)) \
-    UPD(SIDE ## ChangePathAction, DirViewEnabled(os ## SIDE)) \
-    UPD(SIDE ## AddBookmarkAction, DirViewEnabled(os ## SIDE)) \
-    UPD(SIDE ## PathToClipboardAction, DirViewEnabled(os ## SIDE)) \
+    UPD(SIDE ## ChangePathAction2, DirViewEnabled(os ## SIDE)) \
+    UPD(SIDE ## AddBookmarkAction2, DirViewEnabled(os ## SIDE)) \
+    UPD(SIDE ## PathToClipboardAction2, DirViewEnabled(os ## SIDE)) \
     UPDEX1(SIDE ## FilterAction, DirViewEnabled(os ## SIDE), ((TAction *)Action)->Checked = !DirView(os ## SIDE)->Mask.IsEmpty())
   PANEL_ACTIONS(Local)
   PANEL_ACTIONS(Remote)
   #undef PANEL_ACTIONS
-  UPD(LocalExploreDirectoryAction, true)
+  UPD(LocalExploreDirectoryAction2, true)
 
   // HELP
   UPD(AboutAction, true)
@@ -409,13 +409,13 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   UPD(SaveWorkspaceAction, HasTerminal)
 
   // COMMAND
-  UPD(CompareDirectoriesAction, HasTerminal)
+  UPD(CompareDirectoriesAction2, HasTerminal)
   UPD(SynchronizeAction, HasTerminal)
   UPD(FullSynchronizeAction, HasTerminal)
   UPD(ConsoleAction, ScpExplorer->CanConsole())
   UPD(PuttyAction, HasTerminal && TTerminalManager::Instance()->CanOpenInPutty())
-  UPD(SynchronizeBrowsingAction, HasTerminal)
-  UPD(CloseApplicationAction, true)
+  UPD(SynchronizeBrowsingAction2, HasTerminal)
+  UPD(CloseApplicationAction2, true)
   UPD(FileSystemInfoAction, HasTerminal)
   UPD(SessionGenerateUrlAction2, HasTerminal)
   UPD(ClearCachesAction, HasTerminal && !ScpExplorer->Terminal->AreCachesEmpty)
@@ -536,13 +536,13 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     EXE(LocalCopyAction, ScpExplorer->ExecuteCopyOperationCommand(osLocal, false, ShortCutFlag))
     EXE(LocalCopyQueueAction, ScpExplorer->ExecuteCopyOperationCommand(osLocal, false, cocQueue))
     EXE(LocalCopyNonQueueAction, ScpExplorer->ExecuteCopyOperationCommand(osLocal, false, cocNonQueue))
-    EXE(LocalRenameAction, ScpExplorer->ExecuteFileOperationCommand(foRename, osLocal, false))
-    EXE(LocalEditAction, ScpExplorer->ExecuteFile(osLocal, efDefaultEditor, NULL, true, false))
+    EXE(LocalRenameAction2, ScpExplorer->ExecuteFileOperationCommand(foRename, osLocal, false))
+    EXE(LocalEditAction2, ScpExplorer->ExecuteFile(osLocal, efDefaultEditor, NULL, true, false))
     EXE(LocalMoveAction, ScpExplorer->ExecuteFileOperationCommand(foMove, osLocal, false))
-    EXE(LocalCreateDirAction2, ScpExplorer->CreateDirectory(osLocal))
-    EXE(LocalDeleteAction, ScpExplorer->ExecuteFileOperationCommand(foDelete, osLocal, false))
-    EXE(LocalPropertiesAction, ScpExplorer->ExecuteFileOperationCommand(foSetProperties, osLocal, false))
-    EXE(LocalAddEditLinkAction2, ScpExplorer->AddEditLink(osLocal, false))
+    EXE(LocalCreateDirAction3, ScpExplorer->CreateDirectory(osLocal))
+    EXE(LocalDeleteAction2, ScpExplorer->ExecuteFileOperationCommand(foDelete, osLocal, false))
+    EXE(LocalPropertiesAction2, ScpExplorer->ExecuteFileOperationCommand(foSetProperties, osLocal, false))
+    EXE(LocalAddEditLinkAction3, ScpExplorer->AddEditLink(osLocal, false))
     EXE(LocalNewFileAction, ScpExplorer->EditNew(osLocal))
     // local focused operation
     EXE(LocalCopyFocusedAction, ScpExplorer->ExecuteCopyOperationCommand(osLocal, true, ShortCutFlag))
@@ -553,16 +553,16 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     EXE(RemoteCopyAction, ScpExplorer->ExecuteCopyOperationCommand(osRemote, false, ShortCutFlag))
     EXE(RemoteCopyQueueAction, ScpExplorer->ExecuteCopyOperationCommand(osRemote, false, cocQueue))
     EXE(RemoteCopyNonQueueAction, ScpExplorer->ExecuteCopyOperationCommand(osRemote, false, cocNonQueue))
-    EXE(RemoteRenameAction, ScpExplorer->ExecuteFileOperationCommand(foRename, osRemote, false))
-    EXE(RemoteEditAction, ScpExplorer->ExecuteFile(osRemote, efDefaultEditor, NULL, true, false))
+    EXE(RemoteRenameAction2, ScpExplorer->ExecuteFileOperationCommand(foRename, osRemote, false))
+    EXE(RemoteEditAction2, ScpExplorer->ExecuteFile(osRemote, efDefaultEditor, NULL, true, false))
     EXE(RemoteMoveAction, ScpExplorer->ExecuteFileOperationCommand(foMove, osRemote, false))
-    EXE(RemoteCreateDirAction2, ScpExplorer->CreateDirectory(osRemote))
+    EXE(RemoteCreateDirAction3, ScpExplorer->CreateDirectory(osRemote))
     EXE(RemoteNewFileAction, ScpExplorer->EditNew(osRemote))
-    EXE(RemoteDeleteAction, ScpExplorer->ExecuteFileOperationCommand(foDelete, osRemote, false))
-    EXE(RemotePropertiesAction, ScpExplorer->ExecuteFileOperationCommand(foSetProperties, osRemote, false))
+    EXE(RemoteDeleteAction2, ScpExplorer->ExecuteFileOperationCommand(foDelete, osRemote, false))
+    EXE(RemotePropertiesAction2, ScpExplorer->ExecuteFileOperationCommand(foSetProperties, osRemote, false))
     EXE(RemoteMoveToAction, ScpExplorer->ExecuteFileOperationCommand(foRemoteMove, osCurrent, false))
     EXE(RemoteCopyToAction, ScpExplorer->ExecuteFileOperationCommand(foRemoteCopy, osCurrent, false))
-    EXE(RemoteAddEditLinkAction2, ScpExplorer->AddEditLink(osRemote, false))
+    EXE(RemoteAddEditLinkAction3, ScpExplorer->AddEditLink(osRemote, false))
     // remote focused operation
     EXE(RemoteCopyFocusedAction, ScpExplorer->ExecuteCopyOperationCommand(osRemote, true, ShortCutFlag))
     EXE(RemoteCopyFocusedQueueAction, ScpExplorer->ExecuteCopyOperationCommand(osRemote, true, cocQueue))
@@ -573,7 +573,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     // directory
     EXE(CurrentCreateDirAction, ScpExplorer->CreateDirectory(osCurrent))
     EXE(NewDirAction, ScpExplorer->CreateDirectory(osCurrent))
-    EXE(RemoteFindFilesAction, ScpExplorer->RemoteFindFiles())
+    EXE(RemoteFindFilesAction2, ScpExplorer->RemoteFindFiles())
     //selection
     EXE(SelectOneAction, DirView(osCurrent)->SelectCurrentItem(DirView(osCurrent)->NortonLike))
     EXE(SelectAction, ScpExplorer->SelectByMask(osCurrent, true))
@@ -584,12 +584,12 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     EXE(RestoreSelectionAction, ScpExplorer->RestoreSelectedNames(osCurrent))
     EXE(SelectSameExtAction, ScpExplorer->SelectSameExt(true))
     EXE(UnselectSameExtAction, ScpExplorer->SelectSameExt(false))
-    EXE(LocalSelectAction, ScpExplorer->SelectByMask(osLocal, true))
-    EXE(LocalUnselectAction, ScpExplorer->SelectByMask(osLocal, false))
-    EXE(LocalSelectAllAction, ScpExplorer->SelectAll(osLocal, smAll))
-    EXE(RemoteSelectAction, ScpExplorer->SelectByMask(osRemote, true))
-    EXE(RemoteUnselectAction, ScpExplorer->SelectByMask(osRemote, false))
-    EXE(RemoteSelectAllAction, ScpExplorer->SelectAll(osRemote, smAll))
+    EXE(LocalSelectAction2, ScpExplorer->SelectByMask(osLocal, true))
+    EXE(LocalUnselectAction2, ScpExplorer->SelectByMask(osLocal, false))
+    EXE(LocalSelectAllAction2, ScpExplorer->SelectAll(osLocal, smAll))
+    EXE(RemoteSelectAction2, ScpExplorer->SelectByMask(osRemote, true))
+    EXE(RemoteUnselectAction2, ScpExplorer->SelectByMask(osRemote, false))
+    EXE(RemoteSelectAllAction2, ScpExplorer->SelectAll(osRemote, smAll))
     EXE(PasteAction2, ScpExplorer->PasteFromClipBoard())
 
     // style
@@ -613,14 +613,14 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
       EXE(SIDE ## HomeDirAction, ScpExplorer->HomeDirectory(os ## SIDE)) \
       EXE(SIDE ## RefreshAction, ScpExplorer->ReloadDirectory(os ## SIDE)) \
       EXE(SIDE ## OpenDirAction, ScpExplorer->OpenDirectory(os ## SIDE)) \
-      EXE(SIDE ## ChangePathAction, ScpExplorer->ChangePath(os ## SIDE)) \
-      EXE(SIDE ## AddBookmarkAction, ScpExplorer->AddBookmark(os ## SIDE)) \
-      EXE(SIDE ## PathToClipboardAction, ScpExplorer->PanelExport(os ## SIDE, pePath, pedClipboard)) \
+      EXE(SIDE ## ChangePathAction2, ScpExplorer->ChangePath(os ## SIDE)) \
+      EXE(SIDE ## AddBookmarkAction2, ScpExplorer->AddBookmark(os ## SIDE)) \
+      EXE(SIDE ## PathToClipboardAction2, ScpExplorer->PanelExport(os ## SIDE, pePath, pedClipboard)) \
       EXE(SIDE ## FilterAction, ScpExplorer->Filter(os ## SIDE))
     PANEL_ACTIONS(Local)
     PANEL_ACTIONS(Remote)
     #undef PANEL_ACTIONS
-    EXE(LocalExploreDirectoryAction, ScpExplorer->ExploreLocalDirectory())
+    EXE(LocalExploreDirectoryAction2, ScpExplorer->ExploreLocalDirectory())
 
     //HELP
     EXE(AboutAction, DoAboutDialog(Configuration))
@@ -732,13 +732,13 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     EXE(SaveWorkspaceAction, ScpExplorer->SaveWorkspace(false))
 
     // COMMAND
-    EXE(CompareDirectoriesAction, ScpExplorer->CompareDirectories())
+    EXE(CompareDirectoriesAction2, ScpExplorer->CompareDirectories())
     EXE(SynchronizeAction, ScpExplorer->SynchronizeDirectories())
     EXE(FullSynchronizeAction, ScpExplorer->FullSynchronizeDirectories())
     EXE(ConsoleAction, ScpExplorer->OpenConsole())
     EXE(PuttyAction, TTerminalManager::Instance()->OpenInPutty())
-    EXE(SynchronizeBrowsingAction, ScpExplorer->SynchronizeBrowsingChanged())
-    EXE(CloseApplicationAction, ScpExplorer->CloseApp())
+    EXE(SynchronizeBrowsingAction2, ScpExplorer->SynchronizeBrowsingChanged())
+    EXE(CloseApplicationAction2, ScpExplorer->CloseApp())
     EXE(FileSystemInfoAction, ScpExplorer->FileSystemInfo())
     EXE(SessionGenerateUrlAction2, ScpExplorer->SessionGenerateUrl())
     EXE(ClearCachesAction, ScpExplorer->Terminal->ClearCaches())
@@ -835,7 +835,7 @@ void __fastcall TNonVisualDataModule::ExplorerShortcuts()
   RemoteOpenDirAction->ShortCut = ShortCut(L'O', CTRL);
   RemoteRefreshAction->ShortCut = ShortCut(VK_F5, NONE);
   RemoteHomeDirAction->ShortCut = ShortCut(L'H', CTRL);
-  RemotePathToClipboardAction->ShortCut = ShortCut(L'P', CTRLSHIFT);
+  RemotePathToClipboardAction2->ShortCut = ShortCut(L'P', CTRLSHIFT);
   // selected operation
   CurrentDeleteAlternativeAction->ShortCut = ShortCut(VK_DELETE, SHIFT);
   RemoteMoveToAction->ShortCut = ShortCut(L'M', CTRLALT);
@@ -848,9 +848,9 @@ void __fastcall TNonVisualDataModule::ExplorerShortcuts()
   RestoreSelectionAction->ShortCut = ShortCut(L'R', CTRLSHIFT);
   // commands
   NewFileAction->ShortCut = ShortCut(L'E', CTRLSHIFT);
-  RemoteFindFilesAction->ShortCut = ShortCut(VK_F3, NONE);
+  RemoteFindFilesAction2->ShortCut = ShortCut(VK_F3, NONE);
 
-  CloseApplicationAction->ShortCut = ShortCut(VK_F4, ALT);
+  CloseApplicationAction2->ShortCut = ShortCut(VK_F4, ALT);
 
   CloneShortcuts();
 }
@@ -879,9 +879,9 @@ void __fastcall TNonVisualDataModule::CommanderShortcuts()
   RemoteRefreshAction->ShortCut =
     ExplorerKeyboardShortcuts ? ShortCut(VK_F5, NONE) : ShortCut(L'R', CTRL);
   RemoteHomeDirAction->ShortCut = ShortCut(L'H', CTRL);
-  RemotePathToClipboardAction->ShortCut = ShortCut(VK_OEM_6 /* ] */, CTRL);
+  RemotePathToClipboardAction2->ShortCut = ShortCut(VK_OEM_6 /* ] */, CTRL);
   // local directory
-  LocalPathToClipboardAction->ShortCut = ShortCut(VK_OEM_4 /* [ */, CTRL);
+  LocalPathToClipboardAction2->ShortCut = ShortCut(VK_OEM_4 /* [ */, CTRL);
   // selected operation
   CurrentDeleteAction->SecondaryShortCuts->Clear();
   CurrentDeleteAction->SecondaryShortCuts->Add(ShortCutToText(ShortCut(VK_DELETE, NONE)));
@@ -900,7 +900,7 @@ void __fastcall TNonVisualDataModule::CommanderShortcuts()
   RestoreSelectionAction->ShortCut = ShortCut(L'R', CTRLSHIFT);
   // commands
   NewFileAction->ShortCut = ShortCut(VK_F4, SHIFT);
-  RemoteFindFilesAction->ShortCut =
+  RemoteFindFilesAction2->ShortCut =
     ExplorerKeyboardShortcuts ? ShortCut(VK_F3, NONE) : ShortCut(VK_F7, ALT);
   // legacy shortcut (can be removed when necessary)
   NewFileAction->SecondaryShortCuts->Clear();
@@ -909,7 +909,7 @@ void __fastcall TNonVisualDataModule::CommanderShortcuts()
   ConsoleAction->SecondaryShortCuts->Clear();
   ConsoleAction->SecondaryShortCuts->Add(ShortCutToText(ShortCut(L'T', CTRL)));
 
-  CloseApplicationAction->ShortCut = ShortCut(VK_F10, NONE);
+  CloseApplicationAction2->ShortCut = ShortCut(VK_F10, NONE);
 
   TShortCut CtrlF4 = ShortCut(VK_F4, CTRL);
   LocalSortByExtAction->ShortCut = ExplorerKeyboardShortcuts ? TShortCut(0) : CtrlF4;
@@ -937,8 +937,8 @@ void __fastcall TNonVisualDataModule::CloneShortcuts()
   NewDirAction->ShortCut = CurrentCreateDirAction->ShortCut;
   // File operation
   CurrentAddEditLinkContextAction->ShortCut = CurrentAddEditLinkAction->ShortCut;
-  LocalAddEditLinkAction2->ShortCut = CurrentAddEditLinkAction->ShortCut;
-  RemoteAddEditLinkAction2->ShortCut = CurrentAddEditLinkAction->ShortCut;
+  LocalAddEditLinkAction3->ShortCut = CurrentAddEditLinkAction->ShortCut;
+  RemoteAddEditLinkAction3->ShortCut = CurrentAddEditLinkAction->ShortCut;
   RemoteNewFileAction->ShortCut = NewFileAction->ShortCut;
   LocalNewFileAction->ShortCut = NewFileAction->ShortCut;
   // local directory
@@ -950,31 +950,31 @@ void __fastcall TNonVisualDataModule::CloneShortcuts()
   CurrentPropertiesAction->ShortCut = CurrentPropertiesFocusedAction->ShortCut;
   // local selected operation
   LocalCopyAction->ShortCut = RemoteCopyAction->ShortCut;
-  LocalRenameAction->ShortCut = CurrentRenameAction->ShortCut;
-  LocalEditAction->ShortCut = CurrentEditAction->ShortCut;
+  LocalRenameAction2->ShortCut = CurrentRenameAction->ShortCut;
+  LocalEditAction2->ShortCut = CurrentEditAction->ShortCut;
   LocalMoveAction->ShortCut = RemoteMoveAction->ShortCut;
-  LocalCreateDirAction2->ShortCut = CurrentCreateDirAction->ShortCut;
-  LocalDeleteAction->ShortCut = CurrentDeleteAction->ShortCut;
-  LocalPropertiesAction->ShortCut = CurrentPropertiesAction->ShortCut;
+  LocalCreateDirAction3->ShortCut = CurrentCreateDirAction->ShortCut;
+  LocalDeleteAction2->ShortCut = CurrentDeleteAction->ShortCut;
+  LocalPropertiesAction2->ShortCut = CurrentPropertiesAction->ShortCut;
   // local focused operation
   LocalCopyFocusedAction->ShortCut = LocalCopyAction->ShortCut;
   LocalMoveFocusedAction->ShortCut = LocalMoveAction->ShortCut;
   // remote selected operation
-  RemoteRenameAction->ShortCut = CurrentRenameAction->ShortCut;
-  RemoteEditAction->ShortCut = CurrentEditAction->ShortCut;
-  RemoteCreateDirAction2->ShortCut = CurrentCreateDirAction->ShortCut;
-  RemoteDeleteAction->ShortCut = CurrentDeleteAction->ShortCut;
-  RemotePropertiesAction->ShortCut = CurrentPropertiesAction->ShortCut;
+  RemoteRenameAction2->ShortCut = CurrentRenameAction->ShortCut;
+  RemoteEditAction2->ShortCut = CurrentEditAction->ShortCut;
+  RemoteCreateDirAction3->ShortCut = CurrentCreateDirAction->ShortCut;
+  RemoteDeleteAction2->ShortCut = CurrentDeleteAction->ShortCut;
+  RemotePropertiesAction2->ShortCut = CurrentPropertiesAction->ShortCut;
   // remote focused operation
   RemoteCopyFocusedAction->ShortCut = RemoteCopyAction->ShortCut;
   RemoteMoveFocusedAction->ShortCut = RemoteMoveAction->ShortCut;
   // selection
-  LocalSelectAction->ShortCut = SelectAction->ShortCut;
-  LocalUnselectAction->ShortCut = UnselectAction->ShortCut;
-  LocalSelectAllAction->ShortCut = SelectAllAction->ShortCut;
-  RemoteSelectAction->ShortCut = SelectAction->ShortCut;
-  RemoteUnselectAction->ShortCut = UnselectAction->ShortCut;
-  RemoteSelectAllAction->ShortCut = SelectAllAction->ShortCut;
+  LocalSelectAction2->ShortCut = SelectAction->ShortCut;
+  LocalUnselectAction2->ShortCut = UnselectAction->ShortCut;
+  LocalSelectAllAction2->ShortCut = SelectAllAction->ShortCut;
+  RemoteSelectAction2->ShortCut = SelectAction->ShortCut;
+  RemoteUnselectAction2->ShortCut = UnselectAction->ShortCut;
+  RemoteSelectAllAction2->ShortCut = SelectAllAction->ShortCut;
 }
 //---------------------------------------------------------------------------
 void __fastcall TNonVisualDataModule::SetScpExplorer(TCustomScpExplorerForm * value)

source/forms/NonVisual.dfm

@@ -677,12 +677,12 @@ object NonVisualDataModule: TNonVisualDataModule
       ImageIndex = 28
       ShortCut = 49232
     end
-    object RemoteChangePathAction: TAction
+    object RemoteChangePathAction2: TAction
       Tag = 11
       Category = 'Remote Directory'
       Caption = '&Change Directory'
       HelpKeyword = 'task_navigate'
-      Hint = 'Allows selection of different directory for remote panel'
+      Hint = 'Allows selection of different directory for panel'
       ImageIndex = 29
       ShortCut = 32881
     end
@@ -736,12 +736,12 @@ object NonVisualDataModule: TNonVisualDataModule
         'rk'
       ImageIndex = 18
     end
-    object LocalChangePathAction: TAction
+    object LocalChangePathAction2: TAction
       Tag = 11
       Category = 'Local Directory'
       Caption = '&Change Drive'
       HelpKeyword = 'task_navigate'
-      Hint = 'Allows selection of different drive for local panel'
+      Hint = 'Allows selection of different drive for panel'
       ImageIndex = 30
       ShortCut = 32880
     end
@@ -1134,142 +1134,132 @@ object NonVisualDataModule: TNonVisualDataModule
       Hint = 'Save session as site|Save current session as site'
       ImageIndex = 43
     end
-    object ShowHideRemoteNameColumnAction: TAction
+    object ShowHideRemoteNameColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Name'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide name|Show/hide name column on remote panel'
+      Hint = 'Show/hide name column'
       ImageIndex = 44
     end
-    object ShowHideRemoteExtColumnAction: TAction
+    object ShowHideRemoteExtColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Extension'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide extension|Show/hide extension column on remote panel'
+      Hint = 'Show/hide extension column'
       ImageIndex = 45
     end
-    object ShowHideRemoteSizeColumnAction: TAction
+    object ShowHideRemoteSizeColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Size'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide size|Show/hide size column on remote panel'
+      Hint = 'Show/hide size column'
       ImageIndex = 47
     end
-    object ShowHideRemoteChangedColumnAction: TAction
+    object ShowHideRemoteChangedColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Modification'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 
-        'Show/hide modification|Show/hide modification column on remote p' +
-        'anel'
+      Hint = 'Show/hide modification column'
       ImageIndex = 48
     end
-    object ShowHideRemoteRightsColumnAction: TAction
+    object ShowHideRemoteRightsColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Permissions'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 
-        'Show/hide permissions|Show/hide permissions column on remote pan' +
-        'el'
+      Hint = 'Show/hide permissions column'
       ImageIndex = 49
     end
-    object ShowHideRemoteOwnerColumnAction: TAction
+    object ShowHideRemoteOwnerColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Owner'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide owner|Show/hide owner column on remote panel'
+      Hint = 'Show/hide owner column'
       ImageIndex = 50
     end
-    object ShowHideRemoteGroupColumnAction: TAction
+    object ShowHideRemoteGroupColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Group'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide group|Show/hide group column on remote panel'
+      Hint = 'Show/hide group column'
       ImageIndex = 51
     end
-    object ShowHideRemoteLinkTargetColumnAction: TAction
+    object ShowHideRemoteLinkTargetColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Link Target'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 
-        'Show/hide link target|Show/hide link target column on remote pan' +
-        'el'
+      Hint = 'Show/hide link target column'
       ImageIndex = 82
     end
-    object ShowHideRemoteTypeColumnAction: TAction
+    object ShowHideRemoteTypeColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Type'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide type|Show/hide type column on remote panel'
+      Hint = 'Show/hide type column'
       ImageIndex = 46
     end
-    object ShowHideLocalNameColumnAction: TAction
+    object ShowHideLocalNameColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Name'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide name|Show/hide name column on local panel'
+      Hint = 'Show/hide name column'
       ImageIndex = 44
     end
-    object ShowHideLocalExtColumnAction: TAction
+    object ShowHideLocalExtColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Extension'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide extension|Show/hide extension column on local panel'
+      Hint = 'Show/hide extension column'
       ImageIndex = 45
     end
-    object ShowHideLocalTypeColumnAction: TAction
+    object ShowHideLocalTypeColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Type'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide type|Show/hide type column on local panel'
+      Hint = 'Show/hide type column'
       ImageIndex = 46
     end
-    object ShowHideLocalSizeColumnAction: TAction
+    object ShowHideLocalSizeColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Size'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide size|Show/hide size column on local panel'
+      Hint = 'Show/hide size column'
       ImageIndex = 47
     end
-    object ShowHideLocalChangedColumnAction: TAction
+    object ShowHideLocalChangedColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Modification'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 
-        'Show/hide modification|Show/hide modification column on local pa' +
-        'nel'
+      Hint = 'Show/hide modification column'
       ImageIndex = 48
     end
-    object ShowHideLocalAttrColumnAction: TAction
+    object ShowHideLocalAttrColumnAction2: TAction
       Tag = 15
       Category = 'Columns'
       Caption = '&Attributes'
       HelpKeyword = 'ui_file_panel#selecting_columns'
-      Hint = 'Show/hide attributes|Show/hide attributes column on local panel'
+      Hint = 'Show/hide attributes column'
       ImageIndex = 49
     end
-    object CompareDirectoriesAction: TAction
+    object CompareDirectoriesAction2: TAction
       Tag = 11
       Category = 'Command'
       Caption = '&Compare Directories'
       HelpKeyword = 'task_compare_directories'
-      Hint = 
-        'Compare directories|Mark different files in local and remote dir' +
-        'ectory'
+      Hint = 'Compare directories|Mark different files between files panels'
       ImageIndex = 52
       ShortCut = 8305
     end
@@ -1290,21 +1280,21 @@ object NonVisualDataModule: TNonVisualDataModule
       Caption = '&Support Forum'
       Hint = 'Opens web browser and points it to support forum page'
     end
-    object LocalAddBookmarkAction: TAction
+    object LocalAddBookmarkAction2: TAction
       Tag = 9
       Category = 'Local Directory'
       Caption = '&Add Path to Bookmarks'
       HelpKeyword = 'task_navigate#bookmarks'
-      Hint = 'Add to bookmarks|Add current local directory to bookmark list'
+      Hint = 'Add to bookmarks|Add the current directory to bookmark list'
       ImageIndex = 54
       ShortCut = 16450
     end
-    object RemoteAddBookmarkAction: TAction
+    object RemoteAddBookmarkAction2: TAction
       Tag = 14
       Category = 'Remote Directory'
       Caption = '&Add Path to Bookmarks'
       HelpKeyword = 'task_navigate#bookmarks'
-      Hint = 'Add to bookmarks|Add current remote directory to bookmark list'
+      Hint = 'Add to bookmarks|Add the current directory to bookmark list'
       ImageIndex = 54
       ShortCut = 16450
     end
@@ -1330,11 +1320,11 @@ object NonVisualDataModule: TNonVisualDataModule
       ImageIndex = 64
       ShortCut = 16464
     end
-    object LocalExploreDirectoryAction: TAction
+    object LocalExploreDirectoryAction2: TAction
       Tag = 15
       Category = 'Local Directory'
       Caption = '&Explore Directory'
-      Hint = 'Opens Windows File Explorer with current local directory'
+      Hint = 'Opens Windows File Explorer with the current directory'
       ImageIndex = 56
       ShortCut = 49221
     end
@@ -1348,15 +1338,13 @@ object NonVisualDataModule: TNonVisualDataModule
         'd with document type'
       ImageIndex = 58
     end
-    object SynchronizeBrowsingAction: TAction
+    object SynchronizeBrowsingAction2: TAction
       Tag = 11
       Category = 'Command'
       AutoCheck = True
       Caption = 'Synchronize &Browsing'
       HelpKeyword = 'task_navigate#synchronize_browsing'
-      Hint = 
-        'Synchronize browsing|Synchronize local and remote directory brow' +
-        'sing'
+      Hint = 'Synchronize browsing|Synchronize browsing between panels'
       ImageIndex = 59
       ShortCut = 49218
     end
@@ -1378,13 +1366,13 @@ object NonVisualDataModule: TNonVisualDataModule
       Hint = 'Edit link|Edit selected link/shortcut'
       ImageIndex = 60
     end
-    object CloseApplicationAction: TAction
+    object CloseApplicationAction2: TAction
       Tag = 15
       Category = 'Command'
       Caption = '&Quit'
       Hint = 
-        'Exit application|Terminate opened session(s) and close applicati' +
-        'on'
+        'Exit application|Close application (any opened sessions are clos' +
+        'ed)'
     end
     object OpenedSessionsAction: TAction
       Tag = 15
@@ -1525,19 +1513,19 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'ui_pref_panels#common'
       Hint = 'Show files sizes in bytes'
     end
-    object LocalPathToClipboardAction: TAction
+    object LocalPathToClipboardAction2: TAction
       Tag = 15
       Category = 'Local Directory'
       Caption = 'Copy &Path to Clipboard'
       HelpKeyword = 'filenames#cwd'
-      Hint = 'Copy current local path to clipboard'
+      Hint = 'Copy the current path to the clipboard'
     end
-    object RemotePathToClipboardAction: TAction
+    object RemotePathToClipboardAction2: TAction
       Tag = 15
       Category = 'Remote Directory'
       Caption = 'Copy &Path to Clipboard'
       HelpKeyword = 'filenames#cwd'
-      Hint = 'Copy current remote path to clipboard'
+      Hint = 'Copy the current path to the clipboard'
     end
     object FileListToCommandLineAction: TAction
       Tag = 11
@@ -1868,28 +1856,28 @@ object NonVisualDataModule: TNonVisualDataModule
       Hint = 'Restore previous selection'
       ImageIndex = 86
     end
-    object LocalSelectAction: TAction
+    object LocalSelectAction2: TAction
       Tag = 12
       Category = 'Selection'
       Caption = 'Sele&ct Files...'
       HelpKeyword = 'ui_select'
-      Hint = 'Select|Select local files by mask'
+      Hint = 'Select|Select files by mask'
       ImageIndex = 19
     end
-    object LocalUnselectAction: TAction
+    object LocalUnselectAction2: TAction
       Tag = 12
       Category = 'Selection'
       Caption = '&Unselect Files...'
       HelpKeyword = 'ui_select'
-      Hint = 'Unselect|Unselect local files by mask'
+      Hint = 'Unselect|Unselect files by mask'
       ImageIndex = 20
     end
-    object LocalSelectAllAction: TAction
+    object LocalSelectAllAction2: TAction
       Tag = 12
       Category = 'Selection'
       Caption = 'Select &All'
       HelpKeyword = 'ui_file_panel#selecting_files'
-      Hint = 'Select all local files'
+      Hint = 'Select all files'
       ImageIndex = 21
     end
     object CurrentEditFocusedAction: TAction
@@ -1982,12 +1970,12 @@ object NonVisualDataModule: TNonVisualDataModule
       ImageIndex = 92
       ShortCut = 49222
     end
-    object RemoteFindFilesAction: TAction
+    object RemoteFindFilesAction2: TAction
       Tag = 15
       Category = 'Remote Directory'
       Caption = '&Find Files...'
       HelpKeyword = 'task_find'
-      Hint = 'Find files|Find remote files and directories'
+      Hint = 'Find files|Find files and directories'
       ImageIndex = 95
     end
     object CurrentEditInternalAction: TAction
@@ -2005,20 +1993,20 @@ object NonVisualDataModule: TNonVisualDataModule
       Hint = 'Save workspace|Save workspace'
       ImageIndex = 102
     end
-    object LocalRenameAction: TAction
+    object LocalRenameAction2: TAction
       Tag = 12
       Category = 'Local Selected Operation'
       Caption = '&Rename'
       HelpKeyword = 'task_rename'
-      Hint = 'Rename|Rename selected local file'
+      Hint = 'Rename|Rename selected file'
       ImageIndex = 3
     end
-    object LocalEditAction: TAction
+    object LocalEditAction2: TAction
       Tag = 12
       Category = 'Local Selected Operation'
       Caption = '&Edit'
       HelpKeyword = 'task_edit'
-      Hint = 'Edit|Edit selected local file(s)'
+      Hint = 'Edit|Edit selected file(s)'
       ImageIndex = 57
     end
     object LocalMoveAction: TAction
@@ -2031,54 +2019,54 @@ object NonVisualDataModule: TNonVisualDataModule
         'ory and delete original'
       ImageIndex = 98
     end
-    object LocalCreateDirAction2: TAction
+    object LocalCreateDirAction3: TAction
       Tag = 12
       Category = 'Local Selected Operation'
       Caption = '&Directory...'
       HelpKeyword = 'task_create_directory'
-      Hint = 'Create directory|Create new local directory'
+      Hint = 'Create directory|Create new directory'
       ImageIndex = 5
     end
-    object LocalDeleteAction: TAction
+    object LocalDeleteAction2: TAction
       Tag = 12
       Category = 'Local Selected Operation'
       Caption = '&Delete'
       HelpKeyword = 'task_delete'
-      Hint = 'Delete|Delete selected local file(s)'
+      Hint = 'Delete|Delete selected file(s)'
       ImageIndex = 2
     end
-    object LocalPropertiesAction: TAction
+    object LocalPropertiesAction2: TAction
       Tag = 12
       Category = 'Local Selected Operation'
       Caption = '&Properties'
       HelpKeyword = 'task_properties'
-      Hint = 'Properties|Display/change properties of selected local file(s)'
+      Hint = 'Properties|Display/change properties of selected file(s)'
       ImageIndex = 4
     end
-    object LocalAddEditLinkAction2: TAction
+    object LocalAddEditLinkAction3: TAction
       Tag = 12
       Category = 'Local Selected Operation'
       Caption = '&Shortcut...'
       HelpKeyword = 'task_link'
       Hint = 
-        'Add/edit shortcut|Add new local shortcut or edit selected local ' +
-        'shortcut'
+        'Add/edit link|Add new link/shortcut or edit selected link/shortc' +
+        'ut'
       ImageIndex = 60
     end
-    object RemoteRenameAction: TAction
+    object RemoteRenameAction2: TAction
       Tag = 12
       Category = 'Remote Selected Operation'
       Caption = '&Rename'
       HelpKeyword = 'task_rename'
-      Hint = 'Rename|Rename selected remote file'
+      Hint = 'Rename|Rename selected file'
       ImageIndex = 3
     end
-    object RemoteEditAction: TAction
+    object RemoteEditAction2: TAction
       Tag = 12
       Category = 'Remote Selected Operation'
       Caption = '&Edit'
       HelpKeyword = 'task_edit'
-      Hint = 'Edit|Edit selected remote file(s)'
+      Hint = 'Edit|Edit selected file(s)'
       ImageIndex = 57
     end
     object RemoteMoveAction: TAction
@@ -2091,62 +2079,62 @@ object NonVisualDataModule: TNonVisualDataModule
         'rectory and delete original'
       ImageIndex = 97
     end
-    object RemoteCreateDirAction2: TAction
+    object RemoteCreateDirAction3: TAction
       Tag = 12
       Category = 'Remote Selected Operation'
       Caption = '&Directory...'
       HelpKeyword = 'task_create_directory'
-      Hint = 'Create directory|Create new remote directory'
+      Hint = 'Create directory|Create new directory'
       ImageIndex = 5
     end
-    object RemoteDeleteAction: TAction
+    object RemoteDeleteAction2: TAction
       Tag = 12
       Category = 'Remote Selected Operation'
       Caption = '&Delete'
       HelpKeyword = 'task_delete'
-      Hint = 'Delete|Delete selected remote file(s)'
+      Hint = 'Delete|Delete selected file(s)'
       ImageIndex = 2
     end
-    object RemotePropertiesAction: TAction
+    object RemotePropertiesAction2: TAction
       Tag = 12
       Category = 'Remote Selected Operation'
       Caption = '&Properties'
       HelpKeyword = 'task_properties'
-      Hint = 
-        'Properties|Display/change permissions, ownership or other proper' +
-        'ties of selected remote file(s) '
+      Hint = 'Properties|Display/change properties of selected file(s)'
       ImageIndex = 4
     end
-    object RemoteAddEditLinkAction2: TAction
+    object RemoteAddEditLinkAction3: TAction
       Tag = 12
       Category = 'Remote Selected Operation'
       Caption = '&Link...'
       HelpKeyword = 'task_link'
-      Hint = 'Add/edit link|Add new remote link or edit selected remote link'
+      Hint = 
+        'Add/edit link|Add new link/shortcut or edit selected link/shortc' +
+        'ut'
       ImageIndex = 60
     end
-    object RemoteSelectAction: TAction
+    object RemoteSelectAction2: TAction
       Tag = 12
       Category = 'Selection'
       Caption = 'Sele&ct Files...'
       HelpKeyword = 'ui_select'
-      Hint = 'Select|Select remote files by mask'
+      Hint = 'Select|Select files by mask'
       ImageIndex = 19
     end
-    object RemoteUnselectAction: TAction
+    object RemoteUnselectAction2: TAction
       Tag = 12
       Category = 'Selection'
       Caption = '&Unselect Files...'
       HelpKeyword = 'ui_select'
-      Hint = 'Unselect|Unselect remote files by mask'
+      Hint = 'Unselect|Unselect files by mask'
       ImageIndex = 20
     end
-    object RemoteSelectAllAction: TAction
+    object RemoteSelectAllAction2: TAction
       Tag = 12
       Category = 'Selection'
       Caption = 'Select &All'
       HelpKeyword = 'ui_file_panel#selecting_files'
-      Hint = 'Select all remote files'
+      Hint = 'Select all files'
       ImageIndex = 21
     end
     object LocalMoveFocusedAction: TAction
@@ -2532,10 +2520,10 @@ object NonVisualDataModule: TNonVisualDataModule
       Action = RemoteRefreshAction
     end
     object TBXItem30: TTBXItem
-      Action = RemoteAddBookmarkAction
+      Action = RemoteAddBookmarkAction2
     end
     object CopyPathtoClipboard1: TTBXItem
-      Action = RemotePathToClipboardAction
+      Action = RemotePathToClipboardAction2
     end
     object OpenDirectoryBookmark1: TTBXItem
       Action = RemoteOpenDirAction
@@ -2586,10 +2574,10 @@ object NonVisualDataModule: TNonVisualDataModule
       Action = LocalRefreshAction
     end
     object TBXItem31: TTBXItem
-      Action = LocalAddBookmarkAction
+      Action = LocalAddBookmarkAction2
     end
     object CopyPathtoClipboard2: TTBXItem
-      Action = LocalPathToClipboardAction
+      Action = LocalPathToClipboardAction2
     end
     object OpenDirectoryBookmark2: TTBXItem
       Action = LocalOpenDirAction
@@ -2671,19 +2659,19 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'ui_file_panel#selecting_columns'
       Hint = 'Select columns to show in panel'
       object Name3: TTBXItem
-        Action = ShowHideLocalNameColumnAction
+        Action = ShowHideLocalNameColumnAction2
       end
       object Size3: TTBXItem
-        Action = ShowHideLocalSizeColumnAction
+        Action = ShowHideLocalSizeColumnAction2
       end
       object Type2: TTBXItem
-        Action = ShowHideLocalTypeColumnAction
+        Action = ShowHideLocalTypeColumnAction2
       end
       object Modification3: TTBXItem
-        Action = ShowHideLocalChangedColumnAction
+        Action = ShowHideLocalChangedColumnAction2
       end
       object Attributes3: TTBXItem
-        Action = ShowHideLocalAttrColumnAction
+        Action = ShowHideLocalAttrColumnAction2
       end
     end
   end
@@ -2729,28 +2717,28 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'ui_file_panel#selecting_columns'
       Hint = 'Select columns to show in panel'
       object Name4: TTBXItem
-        Action = ShowHideRemoteNameColumnAction
+        Action = ShowHideRemoteNameColumnAction2
       end
       object Size4: TTBXItem
-        Action = ShowHideRemoteSizeColumnAction
+        Action = ShowHideRemoteSizeColumnAction2
       end
       object TBXItem8: TTBXItem
-        Action = ShowHideRemoteTypeColumnAction
+        Action = ShowHideRemoteTypeColumnAction2
       end
       object Modification4: TTBXItem
-        Action = ShowHideRemoteChangedColumnAction
+        Action = ShowHideRemoteChangedColumnAction2
       end
       object Permissions1: TTBXItem
-        Action = ShowHideRemoteRightsColumnAction
+        Action = ShowHideRemoteRightsColumnAction2
       end
       object Owner2: TTBXItem
-        Action = ShowHideRemoteOwnerColumnAction
+        Action = ShowHideRemoteOwnerColumnAction2
       end
       object Group2: TTBXItem
-        Action = ShowHideRemoteGroupColumnAction
+        Action = ShowHideRemoteGroupColumnAction2
       end
       object TBXItem1: TTBXItem
-        Action = ShowHideRemoteLinkTargetColumnAction
+        Action = ShowHideRemoteLinkTargetColumnAction2
       end
     end
   end
@@ -2908,13 +2896,13 @@ object NonVisualDataModule: TNonVisualDataModule
       Action = RemoteRefreshAction
     end
     object AddToBookmarks4: TTBXItem
-      Action = RemoteAddBookmarkAction
+      Action = RemoteAddBookmarkAction2
     end
     object TBXItem35: TTBXItem
       Action = RemoteFilterAction
     end
     object CopyPathtoClipboard6: TTBXItem
-      Action = RemotePathToClipboardAction
+      Action = RemotePathToClipboardAction2
     end
     object N79: TTBXSeparatorItem
     end
@@ -2953,7 +2941,7 @@ object NonVisualDataModule: TNonVisualDataModule
         Action = LocalOpenDirAction
       end
       object ExploreDirectory2: TTBXItem
-        Action = LocalExploreDirectoryAction
+        Action = LocalExploreDirectoryAction2
       end
       object N84: TTBXSeparatorItem
       end
@@ -2982,10 +2970,10 @@ object NonVisualDataModule: TNonVisualDataModule
       Action = LocalFilterAction
     end
     object AddToBookmarks5: TTBXItem
-      Action = LocalAddBookmarkAction
+      Action = LocalAddBookmarkAction2
     end
     object CopyPathtoClipboard7: TTBXItem
-      Action = LocalPathToClipboardAction
+      Action = LocalPathToClipboardAction2
     end
     object N82: TTBXSeparatorItem
     end
@@ -3013,10 +3001,10 @@ object NonVisualDataModule: TNonVisualDataModule
       Action = RemoteRefreshAction
     end
     object TBXItem24: TTBXItem
-      Action = RemoteAddBookmarkAction
+      Action = RemoteAddBookmarkAction2
     end
     object TBXItem25: TTBXItem
-      Action = RemotePathToClipboardAction
+      Action = RemotePathToClipboardAction2
     end
     object TBXSeparatorItem1: TTBXSeparatorItem
     end

source/forms/NonVisual.h

@@ -117,8 +117,8 @@ __published:    // IDE-managed Components
   TAction *ExplorerSessionBandAction;
   TAction *PreferencesAction;
   TAction *ExplorerPreferencesBandAction;
-  TAction *RemoteChangePathAction;
-  TAction *LocalChangePathAction;
+  TAction *RemoteChangePathAction2;
+  TAction *LocalChangePathAction2;
   TAction *LocalOpenDirAction;
   TAction *LocalBackAction;
   TAction *LocalForwardAction;
@@ -164,33 +164,33 @@ __published:    // IDE-managed Components
   TAction *LocalSortByExtAction;
   TAction *RemoteSortByExtAction;
   TAction *CurrentSortByExtAction;
-  TAction *ShowHideRemoteNameColumnAction;
-  TAction *ShowHideRemoteExtColumnAction;
-  TAction *ShowHideRemoteSizeColumnAction;
-  TAction *ShowHideRemoteChangedColumnAction;
-  TAction *ShowHideRemoteRightsColumnAction;
-  TAction *ShowHideRemoteOwnerColumnAction;
-  TAction *ShowHideRemoteGroupColumnAction;
-  TAction *ShowHideLocalNameColumnAction;
-  TAction *ShowHideLocalExtColumnAction;
-  TAction *ShowHideLocalTypeColumnAction;
-  TAction *ShowHideLocalSizeColumnAction;
-  TAction *ShowHideLocalChangedColumnAction;
-  TAction *ShowHideLocalAttrColumnAction;
+  TAction *ShowHideRemoteNameColumnAction2;
+  TAction *ShowHideRemoteExtColumnAction2;
+  TAction *ShowHideRemoteSizeColumnAction2;
+  TAction *ShowHideRemoteChangedColumnAction2;
+  TAction *ShowHideRemoteRightsColumnAction2;
+  TAction *ShowHideRemoteOwnerColumnAction2;
+  TAction *ShowHideRemoteGroupColumnAction2;
+  TAction *ShowHideLocalNameColumnAction2;
+  TAction *ShowHideLocalExtColumnAction2;
+  TAction *ShowHideLocalTypeColumnAction2;
+  TAction *ShowHideLocalSizeColumnAction2;
+  TAction *ShowHideLocalChangedColumnAction2;
+  TAction *ShowHideLocalAttrColumnAction2;
   TAction *HideColumnAction;
-  TAction *CompareDirectoriesAction;
+  TAction *CompareDirectoriesAction2;
   TAction *CommanderCommandsBandAction;
   TAction *SynchronizeAction;
   TAction *ForumPageAction;
-  TAction *LocalAddBookmarkAction;
-  TAction *RemoteAddBookmarkAction;
+  TAction *LocalAddBookmarkAction2;
+  TAction *RemoteAddBookmarkAction2;
   TAction *ConsoleAction;
-  TAction *LocalExploreDirectoryAction;
+  TAction *LocalExploreDirectoryAction2;
   TAction *CurrentEditAction;
   TAction *CurrentOpenAction;
-  TAction *SynchronizeBrowsingAction;
+  TAction *SynchronizeBrowsingAction2;
   TAction *CurrentAddEditLinkAction;
-  TAction *CloseApplicationAction;
+  TAction *CloseApplicationAction2;
   TAction *OpenedSessionsAction;
   TAction *CustomCommandsFileAction;
   TAction *CustomCommandsCustomizeAction;
@@ -206,8 +206,8 @@ __published:    // IDE-managed Components
   TAction *ShowHiddenFilesAction;
   TAction *FormatSizeBytesNoneAction;
   TAction *CommandLinePanelAction;
-  TAction *LocalPathToClipboardAction;
-  TAction *RemotePathToClipboardAction;
+  TAction *LocalPathToClipboardAction2;
+  TAction *RemotePathToClipboardAction2;
   TAction *GoToCommandLineAction;
   TAction *FileListToCommandLineAction;
   TAction *FileListToClipboardAction;
@@ -401,7 +401,7 @@ __published:    // IDE-managed Components
   TTBXItem *TBXItem67;
   TTBXItem *LocalSortByExtColumnPopupItem;
   TAction *FileListFromClipboardAction;
-  TAction *ShowHideRemoteLinkTargetColumnAction;
+  TAction *ShowHideRemoteLinkTargetColumnAction2;
   TTBXItem *TBXItem1;
   TAction *DownloadPageAction;
   TAction *CommanderUpdatesBandAction;
@@ -419,7 +419,7 @@ __published:    // IDE-managed Components
   TAction *LockToolbarsAction;
   TTBXItem *TBXItem6;
   TTBXItem *TBXItem7;
-  TAction *ShowHideRemoteTypeColumnAction;
+  TAction *ShowHideRemoteTypeColumnAction2;
   TTBXItem *TBXItem8;
   TAction *RemoteSortByTypeAction;
   TAction *QueueItemPauseAction;
@@ -485,7 +485,7 @@ __published:    // IDE-managed Components
   TTBXItem *TBXItem28;
   TTBXItem *TBXItem29;
   TAction *QueueCycleOnceEmptyAction;
-  TAction *RemoteFindFilesAction;
+  TAction *RemoteFindFilesAction2;
   TTBXItem *TBXItem30;
   TTBXItem *TBXItem31;
   TTBXItem *TBXItem32;
@@ -499,20 +499,20 @@ __published:    // IDE-managed Components
   TTBXColorItem *ColorMenuItem;
   TAction *CurrentEditInternalAction;
   TAction *SaveWorkspaceAction;
-  TAction *LocalRenameAction;
-  TAction *LocalEditAction;
+  TAction *LocalRenameAction2;
+  TAction *LocalEditAction2;
   TAction *LocalMoveAction;
-  TAction *LocalCreateDirAction2;
-  TAction *LocalDeleteAction;
-  TAction *LocalPropertiesAction;
-  TAction *RemoteRenameAction;
-  TAction *RemoteEditAction;
+  TAction *LocalCreateDirAction3;
+  TAction *LocalDeleteAction2;
+  TAction *LocalPropertiesAction2;
+  TAction *RemoteRenameAction2;
+  TAction *RemoteEditAction2;
   TAction *RemoteMoveAction;
-  TAction *RemoteCreateDirAction2;
-  TAction *RemoteDeleteAction;
-  TAction *RemotePropertiesAction;
-  TAction *LocalAddEditLinkAction2;
-  TAction *RemoteAddEditLinkAction2;
+  TAction *RemoteCreateDirAction3;
+  TAction *RemoteDeleteAction2;
+  TAction *RemotePropertiesAction2;
+  TAction *LocalAddEditLinkAction3;
+  TAction *RemoteAddEditLinkAction3;
   TAction *CommanderLocalFileBandAction;
   TAction *CommanderRemoteFileBandAction;
   TTBXItem *TBXItem14;
@@ -521,12 +521,12 @@ __published:    // IDE-managed Components
   TTBXItem *TBXItem41;
   TAction *RemoteCopyFocusedAction;
   TAction *RemoteMoveFocusedAction;
-  TAction *LocalSelectAction;
-  TAction *LocalUnselectAction;
-  TAction *LocalSelectAllAction;
-  TAction *RemoteSelectAction;
-  TAction *RemoteUnselectAction;
-  TAction *RemoteSelectAllAction;
+  TAction *LocalSelectAction2;
+  TAction *LocalUnselectAction2;
+  TAction *LocalSelectAllAction2;
+  TAction *RemoteSelectAction2;
+  TAction *RemoteUnselectAction2;
+  TAction *RemoteSelectAllAction2;
   TAction *CommanderLocalSelectionBandAction;
   TAction *CommanderRemoteSelectionBandAction;
   TTBXItem *TBXItem42;

source/forms/ScpCommander.cpp

@@ -52,13 +52,13 @@ class TSynchronizedBrowsingGuard
 public:
   TSynchronizedBrowsingGuard()
   {
-    FWasSynchronisingBrowsing = NonVisualDataModule->SynchronizeBrowsingAction->Checked;
-    NonVisualDataModule->SynchronizeBrowsingAction->Checked = false;
+    FWasSynchronisingBrowsing = NonVisualDataModule->SynchronizeBrowsingAction2->Checked;
+    NonVisualDataModule->SynchronizeBrowsingAction2->Checked = false;
   }
 
   ~TSynchronizedBrowsingGuard()
   {
-    NonVisualDataModule->SynchronizeBrowsingAction->Checked = FWasSynchronisingBrowsing;
+    NonVisualDataModule->SynchronizeBrowsingAction2->Checked = FWasSynchronisingBrowsing;
   }
 
 private:
@@ -269,7 +269,7 @@ void __fastcall TScpCommanderForm::UpdateSessionData(TSessionData * Data)
 
   DebugAssert(LocalDirView);
   Data->LocalDirectory = LocalDirView->PathName;
-  Data->SynchronizeBrowsing = NonVisualDataModule->SynchronizeBrowsingAction->Checked;
+  Data->SynchronizeBrowsing = NonVisualDataModule->SynchronizeBrowsingAction2->Checked;
 }
 //---------------------------------------------------------------------------
 bool __fastcall TScpCommanderForm::InternalDDDownload(UnicodeString & TargetDirectory)
@@ -516,7 +516,7 @@ void __fastcall TScpCommanderForm::StartingDisconnected()
 void __fastcall TScpCommanderForm::TerminalChanged(bool Replaced)
 {
   DebugAssert(!IsLocalBrowserMode());
-  NonVisualDataModule->SynchronizeBrowsingAction->Checked = false;
+  NonVisualDataModule->SynchronizeBrowsingAction2->Checked = false;
 
   TCustomScpExplorerForm::TerminalChanged(Replaced);
 
@@ -575,7 +575,7 @@ void __fastcall TScpCommanderForm::TerminalChanged(bool Replaced)
         LocalDirView->ClearState();
       }
 
-      NonVisualDataModule->SynchronizeBrowsingAction->Checked = Terminal->StateData->SynchronizeBrowsing;
+      NonVisualDataModule->SynchronizeBrowsingAction2->Checked = Terminal->StateData->SynchronizeBrowsing;
     }
   }
 }
@@ -687,8 +687,8 @@ void __fastcall TScpCommanderForm::ConfigurationChanged()
     MenuToolbar->Items->Move(LocalIndex, RemoteIndex);
     RemoteIndex = MenuToolbar->Items->IndexOf(RemoteMenuButton);
     MenuToolbar->Items->Move(RemoteIndex, LocalIndex);
-    SWAP(TShortCut, NonVisualDataModule->LocalChangePathAction->ShortCut,
-      NonVisualDataModule->RemoteChangePathAction->ShortCut);
+    SWAP(TShortCut, NonVisualDataModule->LocalChangePathAction2->ShortCut,
+      NonVisualDataModule->RemoteChangePathAction2->ShortCut);
   }
 
   if ((RemoteDrivePanel->Align == alLeft) != WinConfiguration->ScpCommander.TreeOnLeft)
@@ -1261,7 +1261,7 @@ void __fastcall TScpCommanderForm::SynchronizeBrowsing(TCustomDirView * ADirView
     FPrevPath[ADirView == LocalDirView] = ADirView->Path;
   }
 
-  if (!FSynchronisingBrowse && NonVisualDataModule->SynchronizeBrowsingAction->Checked &&
+  if (!FSynchronisingBrowse && NonVisualDataModule->SynchronizeBrowsingAction2->Checked &&
       !PrevPath.IsEmpty() && PrevPath != ADirView->Path)
   {
     DebugAssert(!IsLocalBrowserMode());
@@ -1327,14 +1327,14 @@ void __fastcall TScpCommanderForm::SynchronizeBrowsing(TCustomDirView * ADirView
         }
         else
         {
-          NonVisualDataModule->SynchronizeBrowsingAction->Checked = false;
+          NonVisualDataModule->SynchronizeBrowsingAction2->Checked = false;
         }
       }
 
     }
     catch(Exception & E)
     {
-      NonVisualDataModule->SynchronizeBrowsingAction->Checked = false;
+      NonVisualDataModule->SynchronizeBrowsingAction2->Checked = false;
       // what does this say?
       if (Application->Terminated)
       {
@@ -2125,7 +2125,7 @@ void __fastcall TScpCommanderForm::LocalDriveViewRefreshDrives(TObject * /*Sende
 //---------------------------------------------------------------------------
 void __fastcall TScpCommanderForm::HomeDirectory(TOperationSide Side)
 {
-  bool SynchronizeBrowsing = NonVisualDataModule->SynchronizeBrowsingAction->Checked;
+  bool SynchronizeBrowsing = NonVisualDataModule->SynchronizeBrowsingAction2->Checked;
 
   TSynchronizedBrowsingGuard SynchronizedBrowsingGuard;
 
@@ -2158,7 +2158,7 @@ TOperationSide __fastcall TScpCommanderForm::GetOtherSize(TOperationSide Side)
 void __fastcall TScpCommanderForm::HistoryGo(TOperationSide Side, int Index)
 {
   TOperationSide OtherSide = GetOtherSize(Side);
-  if (NonVisualDataModule->SynchronizeBrowsingAction->Checked &&
+  if (NonVisualDataModule->SynchronizeBrowsingAction2->Checked &&
       ((Index < 0) ? (-Index < DirView(OtherSide)->BackCount) : (Index < DirView(OtherSide)->ForwardCount)))
   {
     TSynchronizedBrowsingGuard SynchronizedBrowsingGuard;

source/forms/ScpCommander.dfm

@@ -46,7 +46,7 @@ inherited ScpCommanderForm: TScpCommanderForm
         HelpKeyword = 'ui_commander_menu#local'
         Hint = 'Change local panel layout or change displayed directory/drive'
         object TBXItem1: TTBXItem
-          Action = NonVisualDataModule.LocalChangePathAction
+          Action = NonVisualDataModule.LocalChangePathAction2
         end
         object TBXSeparatorItem1: TTBXSeparatorItem
         end
@@ -58,7 +58,7 @@ inherited ScpCommanderForm: TScpCommanderForm
             Action = NonVisualDataModule.LocalOpenDirAction
           end
           object TBXItem3: TTBXItem
-            Action = NonVisualDataModule.LocalExploreDirectoryAction
+            Action = NonVisualDataModule.LocalExploreDirectoryAction2
           end
           object TBXSeparatorItem2: TTBXSeparatorItem
           end
@@ -84,10 +84,10 @@ inherited ScpCommanderForm: TScpCommanderForm
           Action = NonVisualDataModule.LocalRefreshAction
         end
         object TBXItem10: TTBXItem
-          Action = NonVisualDataModule.LocalAddBookmarkAction
+          Action = NonVisualDataModule.LocalAddBookmarkAction2
         end
         object TBXItem11: TTBXItem
-          Action = NonVisualDataModule.LocalPathToClipboardAction
+          Action = NonVisualDataModule.LocalPathToClipboardAction2
         end
         object TBXSeparatorItem4: TTBXSeparatorItem
         end
@@ -136,19 +136,19 @@ inherited ScpCommanderForm: TScpCommanderForm
           HelpKeyword = 'ui_file_panel#selecting_columns'
           Hint = 'Select columns to show in panel'
           object TBXItem19: TTBXItem
-            Action = NonVisualDataModule.ShowHideLocalNameColumnAction
+            Action = NonVisualDataModule.ShowHideLocalNameColumnAction2
           end
           object TBXItem20: TTBXItem
-            Action = NonVisualDataModule.ShowHideLocalSizeColumnAction
+            Action = NonVisualDataModule.ShowHideLocalSizeColumnAction2
           end
           object TBXItem21: TTBXItem
-            Action = NonVisualDataModule.ShowHideLocalTypeColumnAction
+            Action = NonVisualDataModule.ShowHideLocalTypeColumnAction2
           end
           object TBXItem22: TTBXItem
-            Action = NonVisualDataModule.ShowHideLocalChangedColumnAction
+            Action = NonVisualDataModule.ShowHideLocalChangedColumnAction2
           end
           object TBXItem23: TTBXItem
-            Action = NonVisualDataModule.ShowHideLocalAttrColumnAction
+            Action = NonVisualDataModule.ShowHideLocalAttrColumnAction2
           end
         end
         object TBXItem221: TTBXItem
@@ -302,7 +302,7 @@ inherited ScpCommanderForm: TScpCommanderForm
         HelpKeyword = 'ui_commander_menu#commands'
         Hint = 'Other commands'
         object TBXItem42: TTBXItem
-          Action = NonVisualDataModule.CompareDirectoriesAction
+          Action = NonVisualDataModule.CompareDirectoriesAction2
         end
         object TBXItem43: TTBXItem
           Action = NonVisualDataModule.SynchronizeAction
@@ -311,10 +311,10 @@ inherited ScpCommanderForm: TScpCommanderForm
           Action = NonVisualDataModule.FullSynchronizeAction
         end
         object TBXItem45: TTBXItem
-          Action = NonVisualDataModule.SynchronizeBrowsingAction
+          Action = NonVisualDataModule.SynchronizeBrowsingAction2
         end
         object TBXItem210: TTBXItem
-          Action = NonVisualDataModule.RemoteFindFilesAction
+          Action = NonVisualDataModule.RemoteFindFilesAction2
         end
         object QueueSubmenuItem: TTBXSubmenuItem
           Caption = 'Q&ueue'
@@ -404,7 +404,7 @@ inherited ScpCommanderForm: TScpCommanderForm
         object TBXSeparatorItem15: TTBXSeparatorItem
         end
         object TBXItem58: TTBXItem
-          Action = NonVisualDataModule.CloseApplicationAction
+          Action = NonVisualDataModule.CloseApplicationAction2
         end
       end
       object TBXSubmenuItem19: TTBXSubmenuItem
@@ -637,7 +637,7 @@ inherited ScpCommanderForm: TScpCommanderForm
         HelpKeyword = 'ui_commander_menu#remote'
         Hint = 'Change remote panel layout or change displayed directory'
         object TBXItem83: TTBXItem
-          Action = NonVisualDataModule.RemoteChangePathAction
+          Action = NonVisualDataModule.RemoteChangePathAction2
         end
         object TBXSeparatorItem24: TTBXSeparatorItem
         end
@@ -672,10 +672,10 @@ inherited ScpCommanderForm: TScpCommanderForm
           Action = NonVisualDataModule.RemoteRefreshAction
         end
         object TBXItem91: TTBXItem
-          Action = NonVisualDataModule.RemoteAddBookmarkAction
+          Action = NonVisualDataModule.RemoteAddBookmarkAction2
         end
         object TBXItem92: TTBXItem
-          Action = NonVisualDataModule.RemotePathToClipboardAction
+          Action = NonVisualDataModule.RemotePathToClipboardAction2
         end
         object TBXSeparatorItem27: TTBXSeparatorItem
         end
@@ -733,28 +733,28 @@ inherited ScpCommanderForm: TScpCommanderForm
           HelpKeyword = 'ui_file_panel#selecting_columns'
           Hint = 'Select columns to show in panel'
           object TBXItem101: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteNameColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteNameColumnAction2
           end
           object TBXItem102: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteSizeColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteSizeColumnAction2
           end
           object TBXItem192: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteTypeColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteTypeColumnAction2
           end
           object TBXItem103: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteChangedColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteChangedColumnAction2
           end
           object TBXItem104: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteRightsColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteRightsColumnAction2
           end
           object TBXItem105: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteOwnerColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteOwnerColumnAction2
           end
           object TBXItem106: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteGroupColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteGroupColumnAction2
           end
           object TBXItem179: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteLinkTargetColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteLinkTargetColumnAction2
           end
         end
         object TBXItem220: TTBXItem
@@ -923,7 +923,7 @@ inherited ScpCommanderForm: TScpCommanderForm
       ShowHint = True
       TabOrder = 3
       object TBXItem154: TTBXItem
-        Action = NonVisualDataModule.CompareDirectoriesAction
+        Action = NonVisualDataModule.CompareDirectoriesAction2
       end
       object TBXItem155: TTBXItem
         Action = NonVisualDataModule.SynchronizeAction
@@ -943,7 +943,7 @@ inherited ScpCommanderForm: TScpCommanderForm
       object TBXSeparatorItem42: TTBXSeparatorItem
       end
       object TBXItem158: TTBXItem
-        Action = NonVisualDataModule.SynchronizeBrowsingAction
+        Action = NonVisualDataModule.SynchronizeBrowsingAction2
       end
     end
     object UpdatesToolbar: TTBXToolbar
@@ -1189,7 +1189,7 @@ inherited ScpCommanderForm: TScpCommanderForm
         object TBXSeparatorItem37: TTBXSeparatorItem
         end
         object TBXItem132: TTBXItem
-          Action = NonVisualDataModule.RemoteFindFilesAction
+          Action = NonVisualDataModule.RemoteFindFilesAction2
           DisplayMode = nbdmImageAndText
         end
         object TBXSeparatorItem44: TTBXSeparatorItem
@@ -1274,19 +1274,19 @@ inherited ScpCommanderForm: TScpCommanderForm
         object TBXSeparatorItem55: TTBXSeparatorItem
         end
         object TBXItem242: TTBXSubmenuItem
-          Action = NonVisualDataModule.RemoteEditAction
+          Action = NonVisualDataModule.RemoteEditAction2
           DisplayMode = nbdmImageAndText
           DropdownCombo = True
           OnPopup = EditMenuItemPopup
         end
         object TBXItem241: TTBXItem
-          Action = NonVisualDataModule.RemoteDeleteAction
+          Action = NonVisualDataModule.RemoteDeleteAction2
         end
         object TBXItem240: TTBXItem
-          Action = NonVisualDataModule.RemoteRenameAction
+          Action = NonVisualDataModule.RemoteRenameAction2
         end
         object TBXItem243: TTBXItem
-          Action = NonVisualDataModule.RemotePropertiesAction
+          Action = NonVisualDataModule.RemotePropertiesAction2
           DisplayMode = nbdmImageAndText
         end
         object TBXSeparatorItem56: TTBXSeparatorItem
@@ -1301,10 +1301,10 @@ inherited ScpCommanderForm: TScpCommanderForm
             Action = NonVisualDataModule.RemoteNewFileAction
           end
           object TBXItem244: TTBXItem
-            Action = NonVisualDataModule.RemoteCreateDirAction2
+            Action = NonVisualDataModule.RemoteCreateDirAction3
           end
           object TBXItem246: TTBXItem
-            Action = NonVisualDataModule.RemoteAddEditLinkAction2
+            Action = NonVisualDataModule.RemoteAddEditLinkAction3
           end
         end
       end
@@ -1320,13 +1320,13 @@ inherited ScpCommanderForm: TScpCommanderForm
         ShowHint = True
         TabOrder = 4
         object TBXItem138: TTBXItem
-          Action = NonVisualDataModule.RemoteSelectAction
+          Action = NonVisualDataModule.RemoteSelectAction2
         end
         object TBXItem139: TTBXItem
-          Action = NonVisualDataModule.RemoteUnselectAction
+          Action = NonVisualDataModule.RemoteUnselectAction2
         end
         object TBXItem140: TTBXItem
-          Action = NonVisualDataModule.RemoteSelectAllAction
+          Action = NonVisualDataModule.RemoteSelectAllAction2
         end
       end
     end
@@ -1623,19 +1623,19 @@ inherited ScpCommanderForm: TScpCommanderForm
         object TBXSeparatorItem54: TTBXSeparatorItem
         end
         object TBXItem235: TTBXSubmenuItem
-          Action = NonVisualDataModule.LocalEditAction
+          Action = NonVisualDataModule.LocalEditAction2
           DisplayMode = nbdmImageAndText
           DropdownCombo = True
           OnPopup = EditMenuItemPopup
         end
         object TBXItem234: TTBXItem
-          Action = NonVisualDataModule.LocalDeleteAction
+          Action = NonVisualDataModule.LocalDeleteAction2
         end
         object TBXItem233: TTBXItem
-          Action = NonVisualDataModule.LocalRenameAction
+          Action = NonVisualDataModule.LocalRenameAction2
         end
         object TBXItem236: TTBXItem
-          Action = NonVisualDataModule.LocalPropertiesAction
+          Action = NonVisualDataModule.LocalPropertiesAction2
           DisplayMode = nbdmImageAndText
         end
         object TBXSeparatorItem35: TTBXSeparatorItem
@@ -1650,10 +1650,10 @@ inherited ScpCommanderForm: TScpCommanderForm
             Action = NonVisualDataModule.LocalNewFileAction
           end
           object TBXItem249: TTBXItem
-            Action = NonVisualDataModule.LocalCreateDirAction2
+            Action = NonVisualDataModule.LocalCreateDirAction3
           end
           object TBXItem250: TTBXItem
-            Action = NonVisualDataModule.LocalAddEditLinkAction2
+            Action = NonVisualDataModule.LocalAddEditLinkAction3
           end
         end
       end
@@ -1669,13 +1669,13 @@ inherited ScpCommanderForm: TScpCommanderForm
         ShowHint = True
         TabOrder = 4
         object TBXItem137: TTBXItem
-          Action = NonVisualDataModule.LocalSelectAction
+          Action = NonVisualDataModule.LocalSelectAction2
         end
         object TBXItem32: TTBXItem
-          Action = NonVisualDataModule.LocalUnselectAction
+          Action = NonVisualDataModule.LocalUnselectAction2
         end
         object TBXItem30: TTBXItem
-          Action = NonVisualDataModule.LocalSelectAllAction
+          Action = NonVisualDataModule.LocalSelectAllAction2
         end
       end
     end
@@ -1768,7 +1768,7 @@ inherited ScpCommanderForm: TScpCommanderForm
         Stretch = True
       end
       object TBXItem178: TTBXItem
-        Action = NonVisualDataModule.CloseApplicationAction
+        Action = NonVisualDataModule.CloseApplicationAction2
         DisplayMode = nbdmImageAndText
         ImageIndex = 61
         Stretch = True

source/forms/ScpExplorer.dfm

@@ -53,23 +53,23 @@ inherited ScpExplorerForm: TScpExplorerForm
           Action = NonVisualDataModule.CurrentOpenAction
         end
         object TBXItem26: TTBXSubmenuItem
-          Action = NonVisualDataModule.RemoteEditAction
+          Action = NonVisualDataModule.RemoteEditAction2
           DropdownCombo = True
           OnPopup = EditMenuItemPopup
         end
         object TBXItem4: TTBXItem
-          Action = NonVisualDataModule.RemoteAddEditLinkAction2
+          Action = NonVisualDataModule.RemoteAddEditLinkAction3
         end
         object TBXSeparatorItem7: TTBXSeparatorItem
         end
         object TBXItem34: TTBXItem
-          Action = NonVisualDataModule.RemoteDeleteAction
+          Action = NonVisualDataModule.RemoteDeleteAction2
         end
         object TBXItem35: TTBXItem
-          Action = NonVisualDataModule.RemoteRenameAction
+          Action = NonVisualDataModule.RemoteRenameAction2
         end
         object TBXItem41: TTBXItem
-          Action = NonVisualDataModule.RemotePropertiesAction
+          Action = NonVisualDataModule.RemotePropertiesAction2
         end
         object TBXSeparatorItem8: TTBXSeparatorItem
         end
@@ -137,7 +137,7 @@ inherited ScpExplorerForm: TScpExplorerForm
           Action = NonVisualDataModule.CloseSessionAction2
         end
         object TBXItem2: TTBXItem
-          Action = NonVisualDataModule.CloseApplicationAction
+          Action = NonVisualDataModule.CloseApplicationAction2
         end
       end
       object TBXSubmenuItem7: TTBXSubmenuItem
@@ -151,7 +151,7 @@ inherited ScpExplorerForm: TScpExplorerForm
           Action = NonVisualDataModule.FullSynchronizeAction
         end
         object TBXItem3: TTBXItem
-          Action = NonVisualDataModule.RemoteFindFilesAction
+          Action = NonVisualDataModule.RemoteFindFilesAction2
         end
         object QueueSubmenuItem: TTBXSubmenuItem
           Caption = 'Q&ueue'
@@ -228,10 +228,10 @@ inherited ScpExplorerForm: TScpExplorerForm
         object TBXSeparatorItem13: TTBXSeparatorItem
         end
         object TBXItem5: TTBXItem
-          Action = NonVisualDataModule.RemoteAddBookmarkAction
+          Action = NonVisualDataModule.RemoteAddBookmarkAction2
         end
         object TBXItem6: TTBXItem
-          Action = NonVisualDataModule.RemotePathToClipboardAction
+          Action = NonVisualDataModule.RemotePathToClipboardAction2
         end
         object TBXSeparatorItem2: TTBXSeparatorItem
         end
@@ -540,28 +540,28 @@ inherited ScpExplorerForm: TScpExplorerForm
           HelpKeyword = 'ui_file_panel#selecting_columns'
           Hint = 'Select columns to show in panel'
           object TBXItem101: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteNameColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteNameColumnAction2
           end
           object TBXItem102: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteSizeColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteSizeColumnAction2
           end
           object TBXItem131: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteTypeColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteTypeColumnAction2
           end
           object TBXItem103: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteChangedColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteChangedColumnAction2
           end
           object TBXItem104: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteRightsColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteRightsColumnAction2
           end
           object TBXItem105: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteOwnerColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteOwnerColumnAction2
           end
           object TBXItem106: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteGroupColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteGroupColumnAction2
           end
           object TBXItem76: TTBXItem
-            Action = NonVisualDataModule.ShowHideRemoteLinkTargetColumnAction
+            Action = NonVisualDataModule.ShowHideRemoteLinkTargetColumnAction2
           end
         end
         object TBXItem138: TTBXItem
@@ -647,7 +647,7 @@ inherited ScpExplorerForm: TScpExplorerForm
       object TBXSeparatorItem24: TTBXSeparatorItem
       end
       object TBXItem139: TTBXItem
-        Action = NonVisualDataModule.RemoteFindFilesAction
+        Action = NonVisualDataModule.RemoteFindFilesAction2
         DisplayMode = nbdmImageAndText
       end
       object TBXSeparatorItem15: TTBXSeparatorItem
@@ -671,7 +671,7 @@ inherited ScpExplorerForm: TScpExplorerForm
       object TBXSeparatorItem27: TTBXSeparatorItem
       end
       object TBXItem42: TTBXSubmenuItem
-        Action = NonVisualDataModule.RemoteEditAction
+        Action = NonVisualDataModule.RemoteEditAction2
         DisplayMode = nbdmImageAndText
         DropdownCombo = True
         OnPopup = EditMenuItemPopup
@@ -680,14 +680,14 @@ inherited ScpExplorerForm: TScpExplorerForm
         Action = NonVisualDataModule.CurrentOpenAction
       end
       object TBXItem58: TTBXItem
-        Action = NonVisualDataModule.RemoteDeleteAction
+        Action = NonVisualDataModule.RemoteDeleteAction2
       end
       object TBXItem59: TTBXItem
-        Action = NonVisualDataModule.RemotePropertiesAction
+        Action = NonVisualDataModule.RemotePropertiesAction2
         DisplayMode = nbdmImageAndText
       end
       object TBXItem60: TTBXItem
-        Action = NonVisualDataModule.RemoteRenameAction
+        Action = NonVisualDataModule.RemoteRenameAction2
       end
       object TBXSeparatorItem16: TTBXSeparatorItem
       end
@@ -701,10 +701,10 @@ inherited ScpExplorerForm: TScpExplorerForm
           Action = NonVisualDataModule.RemoteNewFileAction
         end
         object TBXItem244: TTBXItem
-          Action = NonVisualDataModule.RemoteCreateDirAction2
+          Action = NonVisualDataModule.RemoteCreateDirAction3
         end
         object TBXItem246: TTBXItem
-          Action = NonVisualDataModule.RemoteAddEditLinkAction2
+          Action = NonVisualDataModule.RemoteAddEditLinkAction3
         end
       end
       object TBXItem63: TTBXItem