Changeset 99561 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 2, 2023 10:19:01 AM (20 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Make sure Debug actions still active in stuck VM case as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (4 diffs)
• UIMachineLogic.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -399 +399 @@
     m_pRunningActions->setEnabled(uimachine()->isRunning());
     m_pRunningOrPausedActions->setEnabled(uimachine()->isRunning() || uimachine()->isPaused());
-    m_pRunningOrPausedOrStackedActions->setEnabled(uimachine()->isRunning() || uimachine()->isPaused() || uimachine()->isStuck());
+    m_pRunningOrPausedOrStuckActions->setEnabled(uimachine()->isRunning() || uimachine()->isPaused() || uimachine()->isStuck());
 
     switch (state)
@@ -756 +756 @@
     , m_pRunningActions(0)
     , m_pRunningOrPausedActions(0)
-    , m_pRunningOrPausedOrStackedActions(0)
+    , m_pRunningOrPausedOrStuckActions(0)
     , m_pSharedClipboardActions(0)
     , m_pDragAndDropActions(0)
@@ -906 +906 @@
      * Note that only actions whose enabled state depends exclusively on the
      * execution state of the VM are added to this group. */
-    m_pRunningOrPausedOrStackedActions = new QActionGroup(this);
-    m_pRunningOrPausedOrStackedActions->setExclusive(false);
+    m_pRunningOrPausedOrStuckActions = new QActionGroup(this);
+    m_pRunningOrPausedOrStuckActions->setExclusive(false);
 
     /* Move actions into running actions group: */
@@ -979 +979 @@
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndex_M_Window_S_Minimize));
 #endif /* VBOX_WS_MAC */
+
+    /* Move actions into running-n-paused-n-stuck actions group: */
 #ifdef VBOX_WITH_DEBUGGER_GUI
-    m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Debug));
-    m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Debug_S_ShowStatistics));
-    m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Debug_S_ShowCommandLine));
-    m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Debug_T_Logging));
-    m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Debug_S_GuestControlConsole));
+    m_pRunningOrPausedOrStuckActions->addAction(actionPool()->action(UIActionIndexRT_M_Debug));
+    m_pRunningOrPausedOrStuckActions->addAction(actionPool()->action(UIActionIndexRT_M_Debug_S_ShowStatistics));
+    m_pRunningOrPausedOrStuckActions->addAction(actionPool()->action(UIActionIndexRT_M_Debug_S_ShowCommandLine));
+    m_pRunningOrPausedOrStuckActions->addAction(actionPool()->action(UIActionIndexRT_M_Debug_T_Logging));
+    m_pRunningOrPausedOrStuckActions->addAction(actionPool()->action(UIActionIndexRT_M_Debug_S_GuestControlConsole));
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-
-    /* Move actions into running-n-paused-n-stucked actions group: */
-    m_pRunningOrPausedOrStackedActions->addAction(actionPool()->action(UIActionIndexRT_M_Machine_S_PowerOff));
+    m_pRunningOrPausedOrStuckActions->addAction(actionPool()->action(UIActionIndexRT_M_Machine_S_PowerOff));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -371 +371 @@
     QActionGroup *m_pRunningActions;
     QActionGroup *m_pRunningOrPausedActions;
-    QActionGroup *m_pRunningOrPausedOrStackedActions;
+    QActionGroup *m_pRunningOrPausedOrStuckActions;
     QActionGroup *m_pSharedClipboardActions;
     QActionGroup *m_pDragAndDropActions;