Changeset 90883 in vbox for trunk/src

Timestamp:

Aug 25, 2021 1:49:13 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Runtime UI: Move close Runtime UI stuff to the place where it belongs (UISession).

Location:

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

Files:

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

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

@@ -78 +78 @@
     UIVisualStateType requestedVisualState() const;
 
-    /** Close Runtime UI. */
+public slots:
+
+    /** Closes Runtime UI. */
     void closeRuntimeUI();
 

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

@@ -399 +399 @@
     /* Manually close Runtime UI: */
     if (fSuccess)
-        closeRuntimeUI();
+        uisession()->closeRuntimeUI();
 }
 
@@ -455 +455 @@
     /* Manually close Runtime UI: */
     if (fSuccess)
-        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: */
-    LogRel(("GUI: Passing request to close Runtime UI from machine-logic to UI session.\n"));
-    QMetaObject::invokeMethod(uisession(), "sltCloseRuntimeUI", Qt::QueuedConnection);
+        uisession()->closeRuntimeUI();
 }
 
@@ -643 +615 @@
 
                 LogRel(("GUI: Request to close Runtime UI because VM is powered off already.\n"));
-                closeRuntimeUI();
+                uisession()->closeRuntimeUI();
                 return;
             }
@@ -1947 +1919 @@
     /* Close Runtime UI if state was saved: */
     if (fSuccess)
-        closeRuntimeUI();
+        uisession()->closeRuntimeUI();
 }
 

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

@@ -151 +151 @@
     /** Power off VM, then close Runtime UI. */
     void powerOff(bool fDiscardingState);
-    /** Close Runtime UI. */
-    void closeRuntimeUI();
 
     /* API: 3D overlay visibility stuff: */
@@ -356 +354 @@
     void sltShowGlobalPreferences();
 
-    /** Close Runtime UI. */
-    void sltCloseRuntimeUI() { closeRuntimeUI(); }
-
     /** Handles request for visual state change. */
     void sltHandleVisualStateChange();

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

@@ -455 +455 @@
 }
 
+void UISession::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, "closeRuntimeUI", Qt::QueuedConnection);
+        return;
+    }
+
+    /* Asynchronously ask UIMachine to close Runtime UI: */
+    LogRel(("GUI: Passing request to close Runtime UI from UI session to UI machine.\n"));
+    QMetaObject::invokeMethod(uimachine(), "closeRuntimeUI", Qt::QueuedConnection);
+}
+
 void UISession::sltDetachCOM()
 {
@@ -462 +491 @@
     cleanupNotificationCenter();
     cleanupSession();
-}
-
-void UISession::sltCloseRuntimeUI()
-{
-    /* Ask UIMachine to close Runtime UI: */
-    uimachine()->closeRuntimeUI();
 }
 

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

@@ -345 +345 @@
     void setMouseState(int iMouseState) { m_iMouseState = iMouseState; emit sigMouseStateChange(m_iMouseState); }
 
+    /** Closes Runtime UI. */
+    void closeRuntimeUI();
+
 private slots:
 
     /** Detaches COM. */
     void sltDetachCOM();
-    /** Close Runtime UI. */
-    void sltCloseRuntimeUI();
 
 #ifdef RT_OS_DARWIN