Changeset 45224 in vbox for trunk/src

Timestamp:

Mar 28, 2013 10:12:52 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Power-off sequence cleanup.

Location:

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

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (1 diff)
• UIMachineWindow.cpp (modified) (5 diffs)
• UISession.cpp (modified) (9 diffs)
• UISession.h (modified) (3 diffs)

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

@@ -488 +488 @@
 }
 
-void UIMachine::sltCloseVirtualMachine()
-{
-    delete this;
-}
-
 void UIMachine::enterInitialVisualState()
 {

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

@@ -55 +55 @@
     void sltChangeVisualState(UIVisualStateType visualStateType);
 
-    /* Close VM slot: */
-    void sltCloseVirtualMachine();
-
 private:
 

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

@@ -361 +361 @@
         case KMachineState_Aborted:
         {
-            /* Close VM if it was turned off and closure allowed: */
+            /* Is it allowed to close Runtime UI? */
             if (!isPreventAutoClose())
             {
-                /* VM has been powered off, saved or aborted, no matter
-                 * internally or externally. We must *safely* close VM window(s): */
-                QTimer::singleShot(0, uisession(), SLOT(sltCloseVirtualSession()));
+                /* VM has been powered off, saved, teleported or aborted.
+                 * We must close Runtime UI: */
+                uisession()->closeRuntimeUI();
             }
             break;

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

@@ -251 +251 @@
     pEvent->ignore();
 
-    /* Should we shutdown UI session? */
-    bool fShutdownSession = false;
+    /* Should we close Runtime UI? */
+    bool fCloseRuntimeUI = false;
 
     /* Make sure machine is in one of the allowed states: */
@@ -320 +320 @@
                 {
                     fSuccess = uisession()->saveState();
-                    fShutdownSession = fSuccess;
+                    fCloseRuntimeUI = fSuccess;
                     break;
                 }
@@ -336 +336 @@
                     fSuccess = uisession()->powerOff(dialogResult == UIVMCloseDialog::ResultCode_PowerOff_With_Discarding,
                                                      fServerCrashed);
-                    fShutdownSession = fSuccess || fServerCrashed;
+                    fCloseRuntimeUI = fSuccess || fServerCrashed;
                     break;
                 }
@@ -345 +345 @@
 
         /* Restore the running state if needed: */
-        if (fSuccess && !fShutdownSession && !fWasPaused && uisession()->machineState() == KMachineState_Paused)
+        if (fSuccess && !fCloseRuntimeUI && !fWasPaused && uisession()->machineState() == KMachineState_Paused)
             uisession()->unpause();
 
@@ -352 +352 @@
     }
 
-    if (fShutdownSession)
-    {
-        /* VM has been powered off or saved. We must *safely* close VM window(s): */
-        QTimer::singleShot(0, uisession(), SLOT(sltCloseVirtualSession()));
-    }
+    /* We've received a request to close Runtime UI: */
+    if (fCloseRuntimeUI)
+        uisession()->closeRuntimeUI();
 }
 

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

@@ -22 +22 @@
 #include <QDesktopWidget>
 #include <QWidget>
-#include <QTimer>
 
 /* GUI includes: */
@@ -211 +210 @@
         if (vboxGlobal().showStartVMErrors())
             msgCenter().cannotStartMachine(console);
-        QTimer::singleShot(0, this, SLOT(sltCloseVirtualSession()));
+        closeRuntimeUI();
         return;
     }
@@ -236 +235 @@
         if (vboxGlobal().showStartVMErrors())
             msgCenter().cannotStartMachine(progress);
-        QTimer::singleShot(0, this, SLOT(sltCloseVirtualSession()));
+        closeRuntimeUI();
         return;
     }
@@ -247 +246 @@
     if (isTurnedOff())
     {
-        QTimer::singleShot(0, this, SLOT(sltCloseVirtualSession()));
+        closeRuntimeUI();
         return;
     }
@@ -291 +290 @@
             else
                 msgCenter().cannotStopMachine(console);
-            /* Now signal the destruction of the rest. */
-            QTimer::singleShot(0, this, SLOT(sltCloseVirtualSession()));
+            closeRuntimeUI();
             return;
         }
@@ -427 +425 @@
 }
 
+void UISession::closeRuntimeUI()
+{
+    /* Start corresponding slot asynchronously: */
+    emit sigCloseRuntimeUI();
+}
+
 UIMachineLogic* UISession::machineLogic() const
 {
@@ -601 +605 @@
 }
 
-void UISession::sltCloseVirtualSession()
-{
-    /* First, we have to close/hide any opened modal & popup application widgets.
-     * We have to make sure such window is hidden even if close-event was rejected.
-     * We are re-throwing this slot if any widget present to test again.
-     * If all opened widgets are closed/hidden, we can try to close machine-window: */
-    QWidget *pWidget = QApplication::activeModalWidget() ? QApplication::activeModalWidget() :
-                       QApplication::activePopupWidget() ? QApplication::activePopupWidget() : 0;
-    if (pWidget)
-    {
-        /* Closing/hiding all we found: */
+void UISession::sltCloseRuntimeUI()
+{
+    /* First, we have to hide any opened modal/popup widgets.
+     * They then should unlock their event-loops synchronously.
+     * If all such loops are unlocked, we can close Runtime UI: */
+    if (QWidget *pWidget = QApplication::activeModalWidget() ?
+                           QApplication::activeModalWidget() :
+                           QApplication::activePopupWidget() ?
+                           QApplication::activePopupWidget() : 0)
+    {
+        /* First we should try to close this widget: */
         pWidget->close();
+        /* If widget rejected the 'close-event' we can
+         * still hide it and hope it will behave correctly
+         * and unlock his event-loop if any: */
         if (!pWidget->isHidden())
             pWidget->hide();
-        QTimer::singleShot(0, this, SLOT(sltCloseVirtualSession()));
+        /* Restart this slot asynchronously: */
+        emit sigCloseRuntimeUI();
         return;
     }
 
-    /* Recursively close all the opened warnings... */
-    if (msgCenter().isAnyWarningShown())
-    {
-        msgCenter().closeAllWarnings();
-        QTimer::singleShot(0, this, SLOT(sltCloseVirtualSession()));
-        return;
-    }
-
-    /* Finally, ask for closing virtual machine: */
-    QTimer::singleShot(0, m_pMachine, SLOT(sltCloseVirtualMachine()));
+    /* Finally close the Runtime UI: */
+    m_pMachine->deleteLater();
 }
 
@@ -845 +845 @@
 void UISession::prepareConnections()
 {
+    connect(this, SIGNAL(sigCloseRuntimeUI()), this, SLOT(sltCloseRuntimeUI()));
+
     connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)),
             this, SIGNAL(sigHostScreenCountChanged(int)));
@@ -1366 +1368 @@
         else
         {
-            QTimer::singleShot(0, this, SLOT(sltCloseVirtualSession()));
+            closeRuntimeUI();
             return false;
         }

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

@@ -87 +87 @@
     virtual ~UISession();
 
-    /* Common members: */
+    /* API: Runtime UI stuff: */
     void powerUp();
     bool saveState();
     bool shutDown();
     bool powerOff(bool fIncludingDiscard, bool &fServerCrashed);
+    void closeRuntimeUI();
 
     /* Common getters: */
@@ -167 +168 @@
 
 signals:
+
+    /* Notifier: Close Runtime UI stuff: */
+    void sigCloseRuntimeUI();
 
     /* Console callback signals: */
@@ -199 +203 @@
 private slots:
 
-    /* Close uisession handler: */
-    void sltCloseVirtualSession();
+    /* Handler: Close Runtime UI stuff: */
+    void sltCloseRuntimeUI();
 
     /* Console events slots */