Bug 1375: Disambiguate commands in Once Done/Empty menus

https://winscp.net/tracker/1375

Source commit: c5ad19cac1b34294ee1acf39877a3b48ba256eda

source/forms/CustomScpExplorer.dfm

@@ -279,15 +279,15 @@ object CustomScpExplorerForm: TCustomScpExplorerForm
             RadioItem = True
           end
           object TBXItem225: TTBXItem
-            Action = NonVisualDataModule.QueueDisconnectOnceEmptyAction
+            Action = NonVisualDataModule.QueueDisconnectOnceEmptyAction2
             RadioItem = True
           end
           object TBXItem173: TTBXItem
-            Action = NonVisualDataModule.QueueSuspendOnceEmptyAction
+            Action = NonVisualDataModule.QueueSuspendOnceEmptyAction2
             RadioItem = True
           end
           object TBXItem226: TTBXItem
-            Action = NonVisualDataModule.QueueShutDownOnceEmptyAction
+            Action = NonVisualDataModule.QueueShutDownOnceEmptyAction2
             RadioItem = True
           end
         end

source/forms/NonVisual.cpp

@@ -496,9 +496,9 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
     QueueCycleOnceEmptyAction->ImageIndex = CurrentQueueOnceEmptyAction()->ImageIndex;
     QueueCycleOnceEmptyAction->Checked = !QueueIdleOnceEmptyAction->Checked)
   UPD(QueueIdleOnceEmptyAction, ScpExplorer->AllowQueueOperation(qoOnceEmpty))
-  UPD(QueueDisconnectOnceEmptyAction, ScpExplorer->AllowQueueOperation(qoOnceEmpty))
-  UPD(QueueSuspendOnceEmptyAction, ScpExplorer->AllowQueueOperation(qoOnceEmpty))
-  UPD(QueueShutDownOnceEmptyAction, ScpExplorer->AllowQueueOperation(qoOnceEmpty))
+  UPD(QueueDisconnectOnceEmptyAction2, ScpExplorer->AllowQueueOperation(qoOnceEmpty))
+  UPD(QueueSuspendOnceEmptyAction2, ScpExplorer->AllowQueueOperation(qoOnceEmpty))
+  UPD(QueueShutDownOnceEmptyAction2, ScpExplorer->AllowQueueOperation(qoOnceEmpty))
   UPDCOMP(CommanderPreferencesBand)
   UPDACT(QueueToolbarAction,
     ((TAction *)Action)->Enabled = ScpExplorer->ComponentVisible[fcQueueView];
@@ -818,9 +818,9 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     #undef QUEUEACTION
     EXE(QueueCycleOnceEmptyAction, CycleQueueOnceEmptyAction())
     EXE(QueueIdleOnceEmptyAction, SetQueueOnceEmptyAction(QueueIdleOnceEmptyAction))
-    EXE(QueueDisconnectOnceEmptyAction, SetQueueOnceEmptyAction(QueueDisconnectOnceEmptyAction))
-    EXE(QueueSuspendOnceEmptyAction, SetQueueOnceEmptyAction(QueueSuspendOnceEmptyAction))
-    EXE(QueueShutDownOnceEmptyAction, SetQueueOnceEmptyAction(QueueShutDownOnceEmptyAction))
+    EXE(QueueDisconnectOnceEmptyAction2, SetQueueOnceEmptyAction(QueueDisconnectOnceEmptyAction2))
+    EXE(QueueSuspendOnceEmptyAction2, SetQueueOnceEmptyAction(QueueSuspendOnceEmptyAction2))
+    EXE(QueueShutDownOnceEmptyAction2, SetQueueOnceEmptyAction(QueueShutDownOnceEmptyAction2))
     EXECOMP(QueueToolbar)
     EXE(QueueItemSpeedAction, )
     ;
@@ -1676,17 +1676,17 @@ void __fastcall TNonVisualDataModule::CycleQueueOnceEmptyAction()
   Current->Checked = false;
   if (Current == QueueIdleOnceEmptyAction)
   {
-    QueueDisconnectOnceEmptyAction->Checked = true;
+    QueueDisconnectOnceEmptyAction2->Checked = true;
   }
-  else if (Current == QueueDisconnectOnceEmptyAction)
+  else if (Current == QueueDisconnectOnceEmptyAction2)
   {
-    QueueSuspendOnceEmptyAction->Checked = true;
+    QueueSuspendOnceEmptyAction2->Checked = true;
   }
-  else if (Current == QueueSuspendOnceEmptyAction)
+  else if (Current == QueueSuspendOnceEmptyAction2)
   {
-    QueueShutDownOnceEmptyAction->Checked = true;
+    QueueShutDownOnceEmptyAction2->Checked = true;
   }
-  else if (Current == QueueShutDownOnceEmptyAction)
+  else if (Current == QueueShutDownOnceEmptyAction2)
   {
     QueueIdleOnceEmptyAction->Checked = true;
   }
@@ -1703,17 +1703,17 @@ TAction * __fastcall TNonVisualDataModule::CurrentQueueOnceEmptyAction()
   {
     Result = QueueIdleOnceEmptyAction;
   }
-  else if (QueueDisconnectOnceEmptyAction->Checked)
+  else if (QueueDisconnectOnceEmptyAction2->Checked)
   {
-    Result = QueueDisconnectOnceEmptyAction;
+    Result = QueueDisconnectOnceEmptyAction2;
   }
-  else if (QueueSuspendOnceEmptyAction->Checked)
+  else if (QueueSuspendOnceEmptyAction2->Checked)
   {
-    Result = QueueSuspendOnceEmptyAction;
+    Result = QueueSuspendOnceEmptyAction2;
   }
-  else if (QueueShutDownOnceEmptyAction->Checked)
+  else if (QueueShutDownOnceEmptyAction2->Checked)
   {
-    Result = QueueShutDownOnceEmptyAction;
+    Result = QueueShutDownOnceEmptyAction2;
   }
   else
   {
@@ -1730,15 +1730,15 @@ TOnceDoneOperation __fastcall TNonVisualDataModule::CurrentQueueOnceEmptyOperati
   {
     Result = odoIdle;
   }
-  else if (Current == QueueDisconnectOnceEmptyAction)
+  else if (Current == QueueDisconnectOnceEmptyAction2)
   {
     Result = odoDisconnect;
   }
-  else if (Current == QueueSuspendOnceEmptyAction)
+  else if (Current == QueueSuspendOnceEmptyAction2)
   {
     Result = odoSuspend;
   }
-  else if (Current == QueueShutDownOnceEmptyAction)
+  else if (Current == QueueShutDownOnceEmptyAction2)
   {
     Result = odoShutDown;
   }

source/forms/NonVisual.dfm

@@ -1878,10 +1878,10 @@ object NonVisualDataModule: TNonVisualDataModule
       ImageIndex = 96
       ShortCut = 24657
     end
-    object QueueDisconnectOnceEmptyAction: TAction
+    object QueueDisconnectOnceEmptyAction2: TAction
       Tag = 12
       Category = 'Queue'
-      Caption = '&Disconnect'
+      Caption = '&Disconnect Session'
       HelpKeyword = 'ui_queue'
       Hint = 'Disconnect the session once the queue is empty'
       ImageIndex = 87
@@ -1941,18 +1941,18 @@ object NonVisualDataModule: TNonVisualDataModule
       Hint = 'Create directory|Create new directory'
       ImageIndex = 5
     end
-    object QueueShutDownOnceEmptyAction: TAction
+    object QueueShutDownOnceEmptyAction2: TAction
       Tag = 12
       Category = 'Queue'
-      Caption = '&Shut Down'
+      Caption = '&Shut Down Computer'
       HelpKeyword = 'ui_queue'
       Hint = 'Shut down the computer once the queue is empty'
       ImageIndex = 93
     end
-    object QueueSuspendOnceEmptyAction: TAction
+    object QueueSuspendOnceEmptyAction2: TAction
       Tag = 12
       Category = 'Queue'
-      Caption = 'Slee&p'
+      Caption = 'Slee&p Computer'
       HelpKeyword = 'ui_queue'
       Hint = 'Put the computer into sleep mode once the queue is empty'
       ImageIndex = 105
@@ -2762,15 +2762,15 @@ object NonVisualDataModule: TNonVisualDataModule
         RadioItem = True
       end
       object TBXItem13: TTBXItem
-        Action = QueueDisconnectOnceEmptyAction
+        Action = QueueDisconnectOnceEmptyAction2
         RadioItem = True
       end
       object TBXItem68: TTBXItem
-        Action = QueueSuspendOnceEmptyAction
+        Action = QueueSuspendOnceEmptyAction2
         RadioItem = True
       end
       object TBXItem29: TTBXItem
-        Action = QueueShutDownOnceEmptyAction
+        Action = QueueShutDownOnceEmptyAction2
         RadioItem = True
       end
     end

source/forms/NonVisual.h

@@ -451,7 +451,7 @@ __published:    // IDE-managed Components
   TTBXItem *TBXItem135;
   TTBXItem *TBXItem136;
   TTBXItem *TBXItem209;
-  TAction *QueueDisconnectOnceEmptyAction;
+  TAction *QueueDisconnectOnceEmptyAction2;
   TTBXItem *TBXItem13;
   TAction *LocalCopyAction;
   TAction *RemoteCopyAction;
@@ -488,7 +488,7 @@ __published:    // IDE-managed Components
   TAction *RemoteFilterAction;
   TTBXItem *TBXItem26;
   TTBXItem *TBXItem27;
-  TAction *QueueShutDownOnceEmptyAction;
+  TAction *QueueShutDownOnceEmptyAction2;
   TAction *QueueIdleOnceEmptyAction;
   TTBXSubmenuItem *TBXSubmenuItem3;
   TTBXItem *TBXItem28;
@@ -584,7 +584,7 @@ __published:    // IDE-managed Components
   TTBXItem *TBXItem64;
   TTBXItem *TBXItem65;
   TTBXItem *TBXItem66;
-  TAction *QueueSuspendOnceEmptyAction;
+  TAction *QueueSuspendOnceEmptyAction2;
   TTBXItem *TBXItem68;
   TAction *CurrentEditWithFocusedAction;
   TAction *CurrentEditInternalFocusedAction;

source/forms/Progress.dfm

@@ -243,19 +243,19 @@ object ProgressForm: TProgressForm
             OnClick = OnceDoneItemClick
           end
           object DisconnectOnceDoneItem: TTBXItem
-            Caption = '&Disconnect'
+            Caption = '&Disconnect Session'
             ImageIndex = 3
             RadioItem = True
             OnClick = OnceDoneItemClick
           end
           object SuspendOnceDoneItem: TTBXItem
-            Caption = 'Slee&p'
+            Caption = 'Slee&p Computer'
             ImageIndex = 5
             RadioItem = True
             OnClick = OnceDoneItemClick
           end
           object ShutDownOnceDoneItem: TTBXItem
-            Caption = '&Shut Down'
+            Caption = '&Shut Down Computer'
             ImageIndex = 4
             RadioItem = True
             OnClick = OnceDoneItemClick

source/forms/ScpCommander.dfm

@@ -580,14 +580,14 @@ inherited ScpCommanderForm: TScpCommanderForm
               RadioItem = True
             end
             object TBXItem223: TTBXItem
-              Action = NonVisualDataModule.QueueDisconnectOnceEmptyAction
+              Action = NonVisualDataModule.QueueDisconnectOnceEmptyAction2
               RadioItem = True
             end
             object TBXItem141: TTBXItem
-              Action = NonVisualDataModule.QueueSuspendOnceEmptyAction
+              Action = NonVisualDataModule.QueueSuspendOnceEmptyAction2
             end
             object TBXItem224: TTBXItem
-              Action = NonVisualDataModule.QueueShutDownOnceEmptyAction
+              Action = NonVisualDataModule.QueueShutDownOnceEmptyAction2
               RadioItem = True
             end
           end

source/forms/ScpExplorer.dfm

@@ -398,14 +398,14 @@ inherited ScpExplorerForm: TScpExplorerForm
               RadioItem = True
             end
             object TBXItem223: TTBXItem
-              Action = NonVisualDataModule.QueueDisconnectOnceEmptyAction
+              Action = NonVisualDataModule.QueueDisconnectOnceEmptyAction2
               RadioItem = True
             end
             object TBXItem148: TTBXItem
-              Action = NonVisualDataModule.QueueSuspendOnceEmptyAction
+              Action = NonVisualDataModule.QueueSuspendOnceEmptyAction2
             end
             object TBXItem224: TTBXItem
-              Action = NonVisualDataModule.QueueShutDownOnceEmptyAction
+              Action = NonVisualDataModule.QueueShutDownOnceEmptyAction2
               RadioItem = True
             end
           end