Changeset 76825 in vbox for trunk

Timestamp:

Jan 15, 2019 12:42:06 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128175

Message:

FE/Qt: bugref:9049: Wipe out VBoxGlobal::isVMConsoleProcess, there is better suitable stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIStarter.cpp (modified) (2 diffs)
• globals/VBoxGlobal.cpp (modified) (5 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• net/UINetworkManager.cpp (modified) (1 diff)
• net/UIUpdateManager.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsInput.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -4699 +4699 @@
     {
         /* Current VM only: */
-        if (   vboxGlobal().isVMConsoleProcess()
+        if (   vboxGlobal().uiType() == VBoxGlobal::UIType_RuntimeUI
             && uMachineID == vboxGlobal().managedVMUuid())
         {

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

@@ -2901 +2901 @@
     if (!strAutoConfirmId.isEmpty())
     {
-        const QUuid uID = vboxGlobal().isVMConsoleProcess() ? vboxGlobal().managedVMUuid() : UIExtraDataManager::GlobalID;
+        const QUuid uID = vboxGlobal().uiType() == VBoxGlobal::UIType_RuntimeUI
+                        ? vboxGlobal().managedVMUuid()
+                        : UIExtraDataManager::GlobalID;
         confirmedMessageList = gEDataManager->suppressedMessages(uID);
         if (   confirmedMessageList.contains(strAutoConfirmId)

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

@@ -112 +112 @@
 #ifndef VBOX_RUNTIME_UI
 
-    /* Show Selector UI: */
-    if (!vboxGlobal().isVMConsoleProcess())
+    /* Make sure Selector UI is permitted, quit if not: */
+    if (gEDataManager->guiFeatureEnabled(GUIFeatureType_NoSelector))
     {
-        /* Make sure Selector UI is permitted, quit if not: */
-        if (gEDataManager->guiFeatureEnabled(GUIFeatureType_NoSelector))
-        {
-            msgCenter().cannotStartSelector();
-            return QApplication::quit();
-        }
+        msgCenter().cannotStartSelector();
+        return QApplication::quit();
+    }
 
-        /* Create/show manager-window: */
-        UIVirtualBoxManager::create();
+    /* Create/show manager-window: */
+    UIVirtualBoxManager::create();
 
 # ifdef VBOX_BLEEDING_EDGE
-        /* Show EXPERIMENTAL BUILD warning: */
-        msgCenter().showExperimentalBuildWarning();
+    /* 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();
+    /* 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 */
-    }
 
 #else /* VBOX_RUNTIME_UI */
 
-    /* Show Runtime UI: */
-    if (vboxGlobal().isVMConsoleProcess())
-    {
-        /* Make sure machine is started, quit if not: */
-        if (!UIMachine::startMachine(vboxGlobal().managedVMUuid()))
-            return QApplication::quit();
-    }
-    /* Show the error message otherwise and quit: */
-    else
+    /* Make sure Runtime UI is even possible, quit if not: */
+    if (vboxGlobal().managedVMUuid().isNull())
     {
         msgCenter().cannotStartRuntime();
         return QApplication::quit();
     }
+
+    /* Make sure machine is started, quit if not: */
+    if (!UIMachine::startMachine(vboxGlobal().managedVMUuid()))
+        return QApplication::quit();
 
 #endif /* VBOX_RUNTIME_UI */
@@ -198 +191 @@
 
 #ifdef VBOX_RUNTIME_UI
-    /* For VM process: */
-    if (vboxGlobal().isVMConsoleProcess())
-    {
-        /* Temporary override the default close action to 'SaveState' if necessary: */
-        if (gpMachine->uisession()->defaultCloseAction() == MachineCloseAction_Invalid)
-            gpMachine->uisession()->setDefaultCloseAction(MachineCloseAction_SaveState);
-    }
+    /* Temporary override the default close action to 'SaveState' if necessary: */
+    if (gpMachine->uisession()->defaultCloseAction() == MachineCloseAction_Invalid)
+        gpMachine->uisession()->setDefaultCloseAction(MachineCloseAction_SaveState);
 #endif
 }

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

@@ -2239 +2239 @@
         && comMachine.CanShowConsoleWindow())
     {
-        /* For the Selector UI: */
-        if (!isVMConsoleProcess())
-        {
-            /* Just switch to existing VM window: */
-            return switchToMachine(comMachine);
-        }
-        /* For the Runtime UI: */
-        else
-        {
-            /* Only separate UI process can reach that place,
-             * switch to existing VM window and exit. */
-            switchToMachine(comMachine);
-            return false;
+        switch (uiType())
+        {
+            /* For Selector UI: */
+            case UIType_SelectorUI:
+            {
+                /* Just switch to existing VM window: */
+                return switchToMachine(comMachine);
+            }
+            /* For Runtime UI: */
+            case UIType_RuntimeUI:
+            {
+                /* Only separate UI process can reach that place.
+                 * Switch to existing VM window and exit. */
+                switchToMachine(comMachine);
+                return false;
+            }
         }
     }
@@ -3017 +3020 @@
         comMachine = comSession.GetMachine();
     }
-    /* Is it Selector UI call? */
-    else if (!isVMConsoleProcess())
+    /* Is this a Selector UI call? */
+    else if (uiType() == UIType_SelectorUI)
     {
         /* Open existing 'shared' session: */
@@ -4123 +4126 @@
     }
 
-    /* After initializing *m_strManagedVMId* we already know if that is VM process or not: */
-    if (!isVMConsoleProcess())
+    /* For Selector UI: */
+    if (uiType() == UIType_SelectorUI)
     {
         /* We should create separate logging file for VM selector: */
@@ -4155 +4158 @@
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
-    /* Setup the debugger gui if VM console process: */
-    if (isVMConsoleProcess())
-    {
+    /* For Runtime UI: */
+    if (uiType() == UIType_RuntimeUI)
+    {
+        /* Setup the debugger GUI: */
         if (RTEnvExist("VBOX_GUI_NO_DEBUGGER"))
             m_fDbgEnabled = m_fDbgAutoShow =  m_fDbgAutoShowCommandLine = m_fDbgAutoShowStatistics = false;
@@ -4355 +4359 @@
             comWrappersReinit();
 
-            /* If that is Selector UI: */
-            if (!isVMConsoleProcess())
+            /* For Selector UI: */
+            if (uiType() == UIType_SelectorUI)
             {
                 /* Recreate Main event listeners: */

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

@@ -206 +206 @@
         /** Returns the --startvm option value (managed VM id). */
         QUuid managedVMUuid() const { return m_strManagedVMId; }
-        /** Returns whether this is VM console process. */
-        bool isVMConsoleProcess() const { return !m_strManagedVMId.isNull(); }
         /** Returns the --separate option value (whether GUI process is separate from VM process). */
         bool isSeparateProcess() const { return m_fSeparateProcess; }

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp

@@ -65 +65 @@
 {
     /* For Selector UI only: */
-    AssertReturn(!vboxGlobal().isVMConsoleProcess(), 0);
+    AssertReturn(vboxGlobal().uiType() == VBoxGlobal::UIType_SelectorUI, 0);
 
     /* Create network-manager state-indicator: */

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

@@ -528 +528 @@
 
 #ifdef VBOX_WITH_UPDATE_REQUEST
-    /* Ask updater to check for the first time: */
-    if (gEDataManager->applicationUpdateEnabled() && !vboxGlobal().isVMConsoleProcess())
+    /* Ask updater to check for the first time, for Selector UI only: */
+    if (gEDataManager->applicationUpdateEnabled() && vboxGlobal().uiType() == VBoxGlobal::UIType_SelectorUI)
         QTimer::singleShot(0, this, SLOT(sltCheckIfUpdateIsNecessary()));
 #endif /* VBOX_WITH_UPDATE_REQUEST */

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

@@ -1141 +1141 @@
 
         /* In the VM process we start by displaying the Runtime UI tab: */
-        if (VBoxGlobal::instance()->isVMConsoleProcess())
+        if (vboxGlobal().uiType() == VBoxGlobal::UIType_RuntimeUI)
             m_pTabWidget->setCurrentWidget(pMachineTab);
     }