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

Timestamp:

Mar 15, 2018 5:14:12 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Detach VBoxGlobal dependencies from Selector and Runtime UIs.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/globals/UIStarter.cpp (added)
• src/globals/UIStarter.h (added)
• src/globals/VBoxGlobal.cpp (modified) (5 diffs)
• src/globals/VBoxGlobal.h (modified) (2 diffs)
• src/main.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -353 +353 @@
         src/globals/UIPopupCenter.h \
         src/globals/UIShortcutPool.h \
+        src/globals/UIStarter.h \
         src/globals/UIThreadPool.h \
         src/globals/VBoxGlobal.h \
@@ -695 +696 @@
         src/globals/UIPopupCenter.cpp \
         src/globals/UIShortcutPool.cpp \
+        src/globals/UIStarter.cpp \
         src/globals/UIThreadPool.cpp \
         src/globals/VBoxGlobal.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -53 +53 @@
 /* GUI includes: */
 # include "VBoxGlobal.h"
-# include "UISelectorWindow.h"
 # include "UIMessageCenter.h"
 # include "UIPopupCenter.h"
@@ -3634 +3633 @@
     if (!list.isEmpty())
     {
+        /* Store the URLs: */
         m_ArgUrlList = list;
-        UISelectorWindow::create();
-        QTimer::singleShot(0, gpSelectorWindow, SLOT(sltOpenUrls()));
+        /* Ask UIStarter to open them: */
+        emit sigAskToOpenURLs();
     }
     return fResult;
@@ -4061 +4061 @@
 #endif /* VBOX_GUI_WITH_PIDFILE */
 
-    /* Destroy the GUI root windows _BEFORE_
-     * the media related code which could race us: */
-    if (gpSelectorWindow)
-        UISelectorWindow::destroy();
-    if (gpMachine)
-        UIMachine::destroy();
-
     /* Starting medium-enumerator cleanup: */
     m_mediumEnumeratorDtorRwLock.lockForWrite();
@@ -4220 +4213 @@
                 UIExtraDataManager::instance();
                 UIVirtualBoxEventHandler::instance();
-                /* Recreate/show selector-window: */
-                UISelectorWindow::destroy();
-                UISelectorWindow::create();
+                /* Ask UIStarter to restart UI: */
+                emit sigAskToRestartUI();
             }
         }
@@ -4381 +4373 @@
 
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-
-void VBoxGlobal::showUI()
-{
-    /* Show Selector UI: */
-    if (!isVMConsoleProcess())
-    {
-        /* Make sure Selector UI is permitted, quit if not: */
-        if (gEDataManager->guiFeatureEnabled(GUIFeatureType_NoSelector))
-        {
-            msgCenter().cannotStartSelector();
-            return QApplication::quit();
-        }
-
-        /* Create/show selector-window: */
-        UISelectorWindow::create();
-
-#ifdef VBOX_BLEEDING_EDGE
-        /* Show EXPERIMENTAL BUILD warning: */
-        msgCenter().showExperimentalBuildWarning();
-#else /* !VBOX_BLEEDING_EDGE */
-# ifndef DEBUG
-        /* Show BETA warning if necessary: */
-        const QString vboxVersion(vboxGlobal().virtualBox().GetVersion());
-        if (   vboxVersion.contains("BETA")
-            && gEDataManager->preventBetaBuildWarningForVersion() != vboxVersion)
-            msgCenter().showBetaBuildWarning();
-# endif /* !DEBUG */
-#endif /* !VBOX_BLEEDING_EDGE */
-    }
-    /* Show Runtime UI: */
-    else
-    {
-        /* Make sure machine is started, quit if not: */
-        if (!UIMachine::startMachine(vboxGlobal().managedVMUuid()))
-            return QApplication::quit();
-    }
-}
 
 bool VBoxGlobal::switchToMachine(CMachine &machine)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -448 +448 @@
 signals:
 
+    /** Asks listener to recreate UI. */
+    void sigAskToRestartUI();
+    /** Ask listener to open URLs. */
+    void sigAskToOpenURLs();
+
     /** Notifies listeners about the VBoxSVC availability change. */
     void sigVBoxSVCAvailabilityChange();
@@ -474 +479 @@
     /** Handles @a manager request for emergency session shutdown. */
     void sltHandleCommitDataRequest(QSessionManager &manager);
-
-    /** Shows UI. */
-    void showUI();
 
     /** Handles the VBoxSVC availability change. */

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -26 +26 @@
 /* GUI includes: */
 # include "VBoxGlobal.h"
-# include "UIMachine.h"
-# include "UISelectorWindow.h"
+# include "UIStarter.h"
 # include "UIModalWindowManager.h"
 # ifdef VBOX_WS_MAC
@@ -462 +461 @@
         UIModalWindowManager::create();
 
-        /* Create global UI instance: */
+        /* Create UI starter: */
+        UIStarter::create();
+        /* Create global app instance: */
         VBoxGlobal::create();
 
@@ -471 +472 @@
             if (!vboxGlobal().isValid())
                 break;
+
+            /* Init link between UI starter and global app instance: */
+            gStarter->init();
 
             /* Exit if VBoxGlobal pre-processed arguments: */
@@ -483 +487 @@
             }
 
-            /* Request to Show UI _after_ QApplication started: */
-            QMetaObject::invokeMethod(&vboxGlobal(), "showUI", Qt::QueuedConnection);
+            /* Request to Show UI _after_ QApplication executed: */
+            QMetaObject::invokeMethod(gStarter, "sltShowUI", Qt::QueuedConnection);
 
             /* Start application: */
             iResultCode = a.exec();
+
+            /* Break link between UI starter and global app instance: */
+            gStarter->deinit();
         }
         while (0);
 
-        /* Destroy global UI instance: */
+        /* Destroy global app instance: */
         VBoxGlobal::destroy();
+        /* Destroy UI starter: */
+        UIStarter::destroy();
 
         /* Destroy modal-window manager: */