Explicitly mentioning the "Clipboard" in the Copy and Paste command names to distinguish the clipboard Copy from upcoming file Copy command in the local-local mode

Source commit: bf5bc8a74938632bf5ad441f69f61e3a545b0b63

source/forms/NonVisual.cpp

@@ -157,7 +157,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
     !WinConfiguration->DisableOpenEdit)
   UPD(CurrentEditInternalFocusedAction, EnabledFocusedFileOperation &&
     !WinConfiguration->DisableOpenEdit)
-  UPD(CurrentCopyToClipboardFocusedAction, EnabledFocusedOperation)
+  UPD(CurrentCopyToClipboardFocusedAction2, EnabledFocusedOperation)
   // file operation
   UPD(CurrentRenameAction, EnabledFocusedOperation &&
     (ScpExplorer->IsSideLocalBrowser(osCurrent) || ScpExplorer->Terminal->IsCapable[fcRename]))
@@ -176,7 +176,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   UPD(CurrentDeleteAction, EnabledSelectedOperation)
   UPD(CurrentDeleteAlternativeAction, EnabledSelectedOperation)
   UPD(CurrentPropertiesAction, EnabledSelectedOperation)
-  UPD(CurrentCopyToClipboardAction, EnabledSelectedOperation)
+  UPD(CurrentCopyToClipboardAction2, EnabledSelectedOperation)
   UPD(RemoteMoveToAction, EnabledSelectedOperation &&
     !ScpExplorer->IsSideLocalBrowser(osCurrent) &&
     ScpExplorer->Terminal->IsCapable[fcRemoteMove])
@@ -248,7 +248,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   UPD(RestoreSelectionAction, DirView(osCurrent)->SelectedNamesSaved)
   UPD(SelectSameExtAction, EnabledFocusedFileOperation)
   UPD(UnselectSameExtAction, EnabledFocusedFileOperation)
-  UPD(PasteAction2, ScpExplorer->CanPasteFromClipBoard())
+  UPD(PasteAction3, ScpExplorer->CanPasteFromClipBoard())
   UPD(LocalSelectAction2, ScpExplorer->HasDirView[osLocal] && DirView(osLocal)->FilesCount)
   UPD(LocalUnselectAction2, ScpExplorer->HasDirView[osLocal] && DirView(osLocal)->SelCount)
   UPD(LocalSelectAllAction2, ScpExplorer->HasDirView[osLocal] && DirView(osLocal)->FilesCount)
@@ -518,7 +518,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     EXE(CurrentSystemMenuFocusedAction, ScpExplorer->DisplaySystemContextMenu())
     EXE(CurrentEditWithFocusedAction, ScpExplorer->ExecuteCurrentFileWith(true))
     EXE(CurrentEditInternalFocusedAction, ScpExplorer->ExecuteFile(osCurrent, efInternalEditor, NULL, true, true))
-    EXE(CurrentCopyToClipboardFocusedAction, ScpExplorer->CopyFilesToClipboard(osCurrent, true))
+    EXE(CurrentCopyToClipboardFocusedAction2, ScpExplorer->CopyFilesToClipboard(osCurrent, true))
     // operation
     EXE(CurrentEditAction, ScpExplorer->ExecuteFile(osCurrent, efDefaultEditor, NULL, true, false))
     EXE(CurrentEditInternalAction, ScpExplorer->ExecuteFile(osCurrent, efInternalEditor, NULL, true, false))
@@ -531,7 +531,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     EXE(CurrentDeleteAction, ScpExplorer->ExecuteFileOperationCommand(foDelete, osCurrent, false))
     EXE(CurrentDeleteAlternativeAction, ScpExplorer->ExecuteFileOperationCommand(foDelete, osCurrent, false, false, (void*)true))
     EXE(CurrentPropertiesAction, ScpExplorer->ExecuteFileOperationCommand(foSetProperties, osCurrent, false))
-    EXE(CurrentCopyToClipboardAction, ScpExplorer->CopyFilesToClipboard(osCurrent, false))
+    EXE(CurrentCopyToClipboardAction2, ScpExplorer->CopyFilesToClipboard(osCurrent, false))
     EXE(FileListToCommandLineAction, ScpExplorer->PanelExport(osCurrent, peFileList, pedCommandLine))
     EXE(FileListToClipboardAction, ScpExplorer->PanelExport(osCurrent, peFileList, pedClipboard))
     EXE(FullFileListToClipboardAction, ScpExplorer->PanelExport(osCurrent, peFullFileList, pedClipboard))
@@ -597,7 +597,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     EXE(RemoteSelectAction2, ScpExplorer->SelectByMask(osRemote, true))
     EXE(RemoteUnselectAction2, ScpExplorer->SelectByMask(osRemote, false))
     EXE(RemoteSelectAllAction2, ScpExplorer->SelectAll(osRemote, smAll))
-    EXE(PasteAction2, ScpExplorer->PasteFromClipBoard())
+    EXE(PasteAction3, ScpExplorer->PasteFromClipBoard())
 
     // style
     EXE(CurrentCycleStyleAction,

source/forms/NonVisual.dfm

@@ -48,7 +48,7 @@ object NonVisualDataModule: TNonVisualDataModule
     object TBXSeparatorItem12: TTBXSeparatorItem
     end
     object TBXItem82: TTBXItem
-      Action = CurrentCopyToClipboardFocusedAction
+      Action = CurrentCopyToClipboardFocusedAction2
     end
     object N45: TTBXSeparatorItem
     end
@@ -1626,15 +1626,15 @@ object NonVisualDataModule: TNonVisualDataModule
       Hint = 'Customize queue list'
       ImageIndex = 28
     end
-    object PasteAction2: TAction
+    object PasteAction3: TAction
       Tag = 15
       Category = 'Command'
-      Caption = '&Paste'
-      HelpKeyword = 'task_upload#using_copy_amp:paste'
+      Caption = '&Paste from Clipboard'
+      HelpKeyword = 'task_upload#copy_paste'
       Hint = 
-        'Paste files from clipboard to current directory in active panel;' +
-        ' or opens path from clipboard in active panel; or opens session ' +
-        'URL from clipboard'
+        'Paste files from the clipboard to the current directory in the a' +
+        'ctive panel; or open a path from the clipboard in the active pan' +
+        'el; or open a session URL from the clipboard'
       ImageIndex = 75
       ShortCut = 16470
     end
@@ -2261,11 +2261,11 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'task_connections#renaming'
       Hint = 'Rename session|Changes name of the current session'
     end
-    object CurrentCopyToClipboardAction: TAction
+    object CurrentCopyToClipboardAction2: TAction
       Tag = 15
       Category = 'Selected Operation'
-      Caption = '&Copy'
-      Hint = 'Copy|Copy the selected files to clipboard'
+      Caption = '&Copy to Clipboard'
+      Hint = 'Copy the selected files to the clipboard'
       ImageIndex = 111
       ShortCut = 16451
     end
@@ -2276,11 +2276,11 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'ui_pref_file_colors'
       Hint = 'Configure file color rules'
     end
-    object CurrentCopyToClipboardFocusedAction: TAction
+    object CurrentCopyToClipboardFocusedAction2: TAction
       Tag = 12
       Category = 'Focused Operation'
-      Caption = '&Copy'
-      Hint = 'Copy|Copy the selected files to clipboard'
+      Caption = '&Copy to Clipboard'
+      Hint = 'Copy the selected files to the clipboard'
       ImageIndex = 111
       ShortCut = 16451
     end
@@ -2998,7 +2998,7 @@ object NonVisualDataModule: TNonVisualDataModule
       end
     end
     object TBXItem75: TTBXItem
-      Action = PasteAction2
+      Action = PasteAction3
     end
     object RemoteDirViewPopupCustomCommandsMenu: TTBXSubmenuItem
       Action = CustomCommandsNonFileAction
@@ -3066,7 +3066,7 @@ object NonVisualDataModule: TNonVisualDataModule
       end
     end
     object TBXItem76: TTBXItem
-      Action = PasteAction2
+      Action = PasteAction3
     end
   end
   object RemoteAddressPopup: TTBXPopupMenu
@@ -3200,7 +3200,7 @@ object NonVisualDataModule: TNonVisualDataModule
     object TBXSeparatorItem11: TTBXSeparatorItem
     end
     object TBXItem81: TTBXItem
-      Action = CurrentCopyToClipboardFocusedAction
+      Action = CurrentCopyToClipboardFocusedAction2
     end
     object TBXSeparatorItem3: TTBXSeparatorItem
     end

source/forms/NonVisual.h

@@ -225,7 +225,7 @@ __published:    // IDE-managed Components
   TAction *QueueHideAction;
   TAction *QueueToolbarAction;
   TAction *QueuePreferencesAction;
-  TAction *PasteAction2;
+  TAction *PasteAction3;
   TAction *RemoteTreeAction;
   TAction *LocalTreeAction;
   TAction *GoToTreeAction;
@@ -615,13 +615,13 @@ __published:    // IDE-managed Components
   TAction *PrivateKeyUploadAction;
   TAction *RenameSessionAction;
   TTBXItem *TBXItem78;
-  TAction *CurrentCopyToClipboardAction;
+  TAction *CurrentCopyToClipboardAction2;
   TAction *FileColorsPreferencesAction;
   TAction *DisconnectSessionAction;
   TTBXItem *TBXItem79;
   TAction *ReconnectSessionAction;
   TTBXItem *TBXItem80;
-  TAction *CurrentCopyToClipboardFocusedAction;
+  TAction *CurrentCopyToClipboardFocusedAction2;
   TTBXSeparatorItem *TBXSeparatorItem11;
   TTBXItem *TBXItem81;
   TTBXSeparatorItem *TBXSeparatorItem12;

source/forms/ScpCommander.dfm

@@ -253,10 +253,10 @@ inherited ScpCommanderForm: TScpCommanderForm
         object TBXSeparatorItem62: TTBXSeparatorItem
         end
         object TBXItem163: TTBXItem
-          Action = NonVisualDataModule.CurrentCopyToClipboardAction
+          Action = NonVisualDataModule.CurrentCopyToClipboardAction2
         end
         object TBXItem36: TTBXItem
-          Action = NonVisualDataModule.PasteAction2
+          Action = NonVisualDataModule.PasteAction3
         end
         object TBXSeparatorItem8: TTBXSeparatorItem
         end

source/forms/ScpExplorer.dfm

@@ -97,10 +97,10 @@ inherited ScpExplorerForm: TScpExplorerForm
         object TBXSeparatorItem42: TTBXSeparatorItem
         end
         object TBXItem62: TTBXItem
-          Action = NonVisualDataModule.CurrentCopyToClipboardAction
+          Action = NonVisualDataModule.CurrentCopyToClipboardAction2
         end
         object TBXItem36: TTBXItem
-          Action = NonVisualDataModule.PasteAction2
+          Action = NonVisualDataModule.PasteAction3
         end
         object TBXSeparatorItem9: TTBXSeparatorItem
         end