Changeset 57178 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 4, 2015 3:57:24 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Closing code adjustment.

Location:

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

Files:

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

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

@@ -70 +70 @@
     void asyncChangeVisualState(UIVisualStateType visualStateType);
 
+    /** Close Runtime UI. */
+    void closeRuntimeUI() { destroy(); }
+
 private slots:
 

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

@@ -408 +408 @@
     /* Manually close Runtime UI: */
     if (fSuccess)
-        uisession()->closeRuntimeUI();
+        closeRuntimeUI();
 }
 
@@ -438 +438 @@
     /* Manually close Runtime UI: */
     if (fSuccess)
-        uisession()->closeRuntimeUI();
+        closeRuntimeUI();
+}
+
+void UIMachineLogic::closeRuntimeUI()
+{
+    /* First, we have to hide any opened modal/popup widgets.
+     * They then should unlock their event-loops asynchronously.
+     * If all such loops are unlocked, we can close Runtime UI: */
+    QWidget *pWidget = QApplication::activeModalWidget() ?
+                       QApplication::activeModalWidget() :
+                       QApplication::activePopupWidget() ?
+                       QApplication::activePopupWidget() : 0;
+    if (pWidget)
+    {
+        /* 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();
+        /* Asynchronously restart this slot: */
+        QMetaObject::invokeMethod(this, "sltCloseRuntimeUI", Qt::QueuedConnection);
+        return;
+    }
+
+    /* Asynchronously ask UISession to close Runtime UI: */
+    QMetaObject::invokeMethod(uisession(), "sltCloseRuntimeUI", Qt::QueuedConnection);
 }
 
@@ -592 +619 @@
                 }
 
-                uisession()->closeRuntimeUI();
+                closeRuntimeUI();
                 return;
             }

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

@@ -140 +140 @@
 #endif /* Q_WS_MAC */
 
-    /* API: Close actions: */
+    /** Save VM state, then close Runtime UI. */
     void saveState();
+    /** Call for guest shutdown to close Runtime UI. */
     void shutdown();
+    /** Power off VM, then close Runtime UI. */
     void powerOff(bool fDiscardingState);
+    /** Close Runtime UI. */
+    void closeRuntimeUI();
 
     /* API: 3D overlay visibility stuff: */
@@ -317 +321 @@
     void sltShowGlobalPreferences();
 
+    /** Close Runtime UI. */
+    void sltCloseRuntimeUI() { closeRuntimeUI(); }
+
 private:
 

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

@@ -415 +415 @@
         {
             /* Just close Runtime UI: */
-            uisession()->closeRuntimeUI();
+            machineLogic()->closeRuntimeUI();
             break;
         }

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

@@ -456 +456 @@
 }
 
-void UISession::closeRuntimeUI()
-{
-    /* Start corresponding slot asynchronously: */
-    emit sigCloseRuntimeUI();
-}
-
 UIMachineLogic* UISession::machineLogic() const
 {
@@ -618 +612 @@
 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();
-        /* Restart this slot: */
-        emit sigCloseRuntimeUI();
-        return;
-    }
-
-    /* Finally close the Runtime UI: */
-    UIMachine::destroy();
+    /* Ask UIMachine to close Runtime UI: */
+    uimachine()->closeRuntimeUI();
 }
 
@@ -1174 +1148 @@
 {
     connect(this, SIGNAL(sigInitialized()), this, SLOT(sltMarkInitialized()));
-    connect(this, SIGNAL(sigCloseRuntimeUI()), this, SLOT(sltCloseRuntimeUI()));
 
 #ifdef Q_WS_MAC

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

@@ -98 +98 @@
     bool powerOff(bool fIncludingDiscard, bool &fServerCrashed);
     bool restoreCurrentSnapshot();
-    void closeRuntimeUI();
 
     /** Returns the session instance. */
@@ -243 +242 @@
 
 signals:
-
-    /* Notifier: Close Runtime UI stuff: */
-    void sigCloseRuntimeUI();
 
     /** Notifies about frame-buffer resize. */
@@ -300 +296 @@
     void sltMarkInitialized() { m_fInitialized = true; }
 
-    /* Handler: Close Runtime UI stuff: */
+    /** Close Runtime UI. */
     void sltCloseRuntimeUI();