Changeset 55697 in vbox

Timestamp:

May 6, 2015 4:50:27 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Extend manual-override mode to prevent unwanted visual-representation mode switches.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (7 diffs)
• UIMachineLogic.h (modified) (2 diffs)
• UISession.cpp (modified) (3 diffs)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)

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

@@ -378 +378 @@
 void UIMachineLogic::saveState()
 {
-    /* Prevent auto-closure: */
-    setPreventAutoClose(true);
+    /* Enable 'manual-override',
+     * preventing automatic Runtime UI closing: */
+    setManualOverrideMode(true);
 
     /* Was the step successful? */
@@ -391 +392 @@
         fSuccess = uisession()->saveState();
 
-    /* Allow auto-closure: */
-    setPreventAutoClose(false);
+    /* Disable 'manual-override' finally: */
+    setManualOverrideMode(false);
 
     /* Manually close Runtime UI: */
@@ -411 +412 @@
 void UIMachineLogic::powerOff(bool fDiscardingState)
 {
-    /* Prevent auto-closure: */
-    setPreventAutoClose(true);
+    /* Enable 'manual-override',
+     * preventing automatic Runtime UI closing: */
+    setManualOverrideMode(true);
 
     /* Was the step successful? */
@@ -420 +422 @@
     fSuccess = uisession()->powerOff(fDiscardingState, fServerCrashed) || fServerCrashed;
 
-    /* Allow auto-closure: */
-    setPreventAutoClose(false);
+    /* Disable 'manual-override' finally: */
+    setManualOverrideMode(false);
 
     /* Manually close Runtime UI: */
@@ -555 +557 @@
         case KMachineState_Aborted:
         {
-            /* Is it allowed to close Runtime UI? */
-            if (!isPreventAutoClose())
+            /* If not in 'manual-override' mode: */
+            if (!isManualOverrideMode())
             {
                 /* VM has been powered off, saved, teleported or aborted.
@@ -753 +755 @@
     , m_pDragAndDropActions(0)
     , m_fIsWindowsCreated(false)
-    , m_fIsPreventAutoClose(false)
+    , m_fIsManualOverride(false)
 #ifdef VBOX_WITH_DEBUGGER_GUI
     , m_pDbgGui(0)
@@ -1506 +1508 @@
         return;
 
-    /* Do not try to close machine-window if restricted: */
-    if (isPreventAutoClose())
+    /* Do not close machine-window in 'manual-override' mode: */
+    if (isManualOverrideMode())
         return;
 

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

@@ -118 +118 @@
     UIMachineWindow* activeMachineWindow() const;
 
-    /* Maintenance getters/setters: */
-    bool isPreventAutoClose() const { return m_fIsPreventAutoClose; }
-    void setPreventAutoClose(bool fIsPreventAutoClose) { m_fIsPreventAutoClose = fIsPreventAutoClose; }
+    /** Returns whether VM is in 'manual-override' mode.
+      * @note S.a. #m_fIsManualOverride description for more information. */
+    bool isManualOverrideMode() const { return m_fIsManualOverride; }
+    /** Defines whether VM is in 'manual-override' mode.
+      * @note S.a. #m_fIsManualOverride description for more information. */
+    void setManualOverrideMode(bool fIsManualOverride) { m_fIsManualOverride = fIsManualOverride; }
 
     /** Adjusts machine-window(s) geometry if necessary. */
@@ -361 +364 @@
 
     bool m_fIsWindowsCreated : 1;
-    bool m_fIsPreventAutoClose : 1;
+
+    /** Holds whether VM is in 'manual-override' mode
+      * which means there will be no automatic UI shutdowns,
+      * visual representation mode changes and other similar routines. */
+    bool m_fIsManualOverride : 1;
 
 #ifdef VBOX_WITH_DEBUGGER_GUI

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

@@ -273 +273 @@
     }
 
-    /* Guard progressbar warnings from auto-closing: */
-    if (uimachine()->machineLogic())
-        uimachine()->machineLogic()->setPreventAutoClose(true);
+    /* Enable 'manual-override',
+     * preventing automatic Runtime UI closing
+     * and visual representation mode changes: */
+    if (machineLogic())
+        machineLogic()->setManualOverrideMode(true);
 
     /* Show "Starting/Restoring" progress dialog: */
@@ -295 +297 @@
     }
 
-    /* Allow further auto-closing: */
-    if (uimachine()->machineLogic())
-        uimachine()->machineLogic()->setPreventAutoClose(false);
+    /* Disable 'manual-override' finally: */
+    if (machineLogic())
+        machineLogic()->setManualOverrideMode(false);
 
     /* True by default: */
@@ -1923 +1925 @@
         if (fShouldWeClose)
         {
-            /* Prevent auto-closure during power off sequence: */
-            machineLogic()->setPreventAutoClose(true);
+            /* Enable 'manual-override',
+             * preventing automatic Runtime UI closing: */
+            if (machineLogic())
+                machineLogic()->setManualOverrideMode(true);
             /* Power off VM: */
             bool fServerCrashed = false;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -340 +340 @@
     /* Do not try to change visual-state type if machine was not started yet: */
     if (!uisession()->isRunning() && !uisession()->isPaused())
+        return;
+
+    /* Do not try to change visual-state type in 'manual override' mode: */
+    if (isManualOverrideMode())
         return;
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -70 +70 @@
     /* Do not try to change visual-state type if machine was not started yet: */
     if (!uisession()->isRunning() && !uisession()->isPaused())
+        return;
+
+    /* Do not try to change visual-state type in 'manual override' mode: */
+    if (isManualOverrideMode())
         return;
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -132 +132 @@
         return;
 
+    /* Do not try to change visual-state type in 'manual override' mode: */
+    if (isManualOverrideMode())
+        return;
+
     /* If 'seamless' visual-state type is no more supported: */
     if (!uisession()->isGuestSupportsSeamless())