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

Timestamp:

Sep 24, 2015 3:13:29 PM (10 years ago)

Author:

vboxsync

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

102850

Message:

FE/Qt: Main.cpp cleanup/rework bit-by-bit (step 11): Move UI stuff to VBoxGlobal; recreate Selector UI on VBoxSVC crashes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (5 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)
• main.cpp (modified) (3 diffs)

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

@@ -232 +232 @@
 VBoxGlobal::VBoxGlobal()
     : mValid (false)
+    , m_fWrappersValid(false)
     , m_fVBoxSVCAvailable(true)
     , m_fSeparateProcess(false)
@@ -4022 +4023 @@
     m_host = virtualBox().GetHost();
     m_strHomeFolder = virtualBox().GetHomeFolder();
+    /* Mark wrappers valid: */
+    m_fWrappersValid = true;
 
     /* Watch for the VBoxSVC availability changes: */
@@ -4379 +4382 @@
     UIUpdateManager::schedule();
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+
+#ifdef RT_OS_LINUX
+    /* Make sure no wrong USB mounted: */
+    checkForWrongUSBMounted();
+#endif /* RT_OS_LINUX */
 }
 
@@ -4467 +4475 @@
     /* Cache the new VBoxSVC availability value: */
     m_fVBoxSVCAvailable = fAvailable;
+
+    /* If VBoxSVC is not available: */
+    if (!m_fVBoxSVCAvailable)
+    {
+        /* Mark wrappers invalid: */
+        m_fWrappersValid = false;
+        /* Re-fetch corresponding CVirtualBox to restart VBoxSVC: */
+        // CVirtualBox is still NULL in current Main implementation,
+        // and this call do not restart anything, so we are waiting
+        // for subsequent event about VBoxSVC is available again.
+        m_vbox = virtualBoxClient().GetVirtualBox();
+    }
+    /* If VBoxSVC is available: */
+    else
+    {
+        if (!m_fWrappersValid)
+        {
+            /* Re-fetch corresponding objects/values: */
+            m_vbox = virtualBoxClient().GetVirtualBox();
+            m_host = virtualBox().GetHost();
+            m_strHomeFolder = virtualBox().GetHomeFolder();
+            /* Mark wrappers valid: */
+            m_fWrappersValid = true;
+
+            /* If that is Selector UI: */
+            if (!isVMConsoleProcess())
+            {
+                /* Recreate/show selector-window: */
+                UISelectorWindow::destroy();
+                UISelectorWindow::create();
+            }
+        }
+    }
 
     /* Notify listeners about the VBoxSVC availability change: */
@@ -4585 +4626 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-/** @fn vboxGlobal
- *
- *  Shortcut to the static VBoxGlobal::instance() method, for convenience.
- */
+bool VBoxGlobal::showUI()
+{
+    /* Load application settings: */
+    VBoxGlobalSettings appSettings = settings();
+
+    /* Show Selector UI: */
+    if (!isVMConsoleProcess())
+    {
+        /* Make sure Selector UI is permitted: */
+        if (appSettings.isFeatureActive("noSelector"))
+        {
+            msgCenter().cannotStartSelector();
+            return false;
+        }
+
+#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 */
+
+        /* Create/show selector-window: */
+        UISelectorWindow::create();
+    }
+    /* Show Runtime UI: */
+    else
+    {
+        /* Make sure machine is started: */
+        if (!UIMachine::startMachine(vboxGlobal().managedVMUuid()))
+            return false;
+    }
+
+    /* True by default: */
+    return true;
+}
 
 bool VBoxGlobal::switchToMachine(CMachine &machine)

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

@@ -191 +191 @@
     bool processArgs();
 
+    /** Shows UI. */
+    bool showUI();
+
     bool switchToMachine(CMachine &machine);
 
@@ -529 +532 @@
     QString m_strHomeFolder;
 
-    /** Holds the VBoxSVC availability value. */
+    /** Holds whether acquired COM wrappers are currently valid. */
+    bool m_fWrappersValid;
+    /** Holds whether VBoxSVC is currently available. */
     bool m_fVBoxSVCAvailable;
 

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

@@ -21 +21 @@
 
 /* Qt includes: */
-# include <QLocale>
 # include <QMessageBox>
-# include <QTranslator>
 
 /* GUI includes: */
-# include "VBoxUtils.h"
 # include "VBoxGlobal.h"
 # include "UIMachine.h"
-# include "UIMessageCenter.h"
 # include "UISelectorWindow.h"
-# include "UIExtraDataManager.h"
 # include "UIModalWindowManager.h"
+# ifdef VBOX_WITH_HARDENING
+#  include "QIMessageBox.h"
+# endif /* VBOX_WITH_HARDENING */
 # ifdef Q_WS_MAC
+#  include "VBoxUtils.h"
 #  include "UICocoaApplication.h"
 # endif /* Q_WS_MAC */
 
 /* Other VBox includes: */
-# include <iprt/asm.h>
 # include <iprt/buildconfig.h>
-# include <iprt/initterm.h>
-# include <iprt/process.h>
 # include <iprt/stream.h>
-# include <iprt/system.h>
 # include <VBox/version.h>
+# ifdef VBOX_WITH_HARDENING
+#  include <VBox/sup.h>
+# else /* !VBOX_WITH_HARDENING */
+#  include <iprt/initterm.h>
+#  ifdef Q_WS_MAC
+#   include <iprt/asm.h>
+#  endif /* Q_WS_MAC */
+# endif /* !VBOX_WITH_HARDENING */
 # ifdef Q_WS_X11
 #  include <iprt/env.h>
 # endif /* Q_WS_X11 */
+
+#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+
+/* Qt includes: */
+#ifdef Q_WS_X11
+# ifdef Q_OS_SOLARIS
+#  include <QPlastiqueStyle>
+# endif /* Q_OS_SOLARIS */
+# ifndef Q_OS_SOLARIS
+#  include <QFontDatabase>
+# endif /* !Q_OS_SOLARIS */
+#endif /* Q_WS_X11 */
+
+/* Other VBox includes: */
 #ifdef VBOX_WITH_HARDENING
-# include <VBox/sup.h>
-#endif /* VBOX_WITH_HARDENING */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-/* Qt includes: */
-#include <QCleanlooksStyle>
-#include <QPlastiqueStyle>
-#ifdef Q_WS_X11
-# include <QFontDatabase>
-#endif /* Q_WS_X11 */
-
-/* Other VBox includes: */
-#include <iprt/ctype.h>
-#include <VBox/err.h>
+# include <iprt/ctype.h>
+#else /* !VBOX_WITH_HARDENING */
+# include <VBox/err.h>
+#endif /* !VBOX_WITH_HARDENING */
 
 /* Other includes: */
-#include <cstdio>
 #ifdef Q_WS_MAC
 # include <dlfcn.h>
@@ -321 +326 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char ** /*envp*/)
 {
+    /* Failed result initially: */
+    int iResultCode = 1;
+
     /* Start logging: */
     LogFlowFuncEnter();
-
-    /* Failed result initially: */
-    int iResultCode = 1;
 
     /* Simulate try-catch block: */
@@ -466 +471 @@
                 break;
 
-            /* Exit if VBoxGlobal was able to pre-process arguments: */
+            /* Exit if VBoxGlobal pre-processed arguments: */
             if (vboxGlobal().processArgs())
                 break;
 
-#ifdef RT_OS_LINUX
-            /* Make sure no wrong USB mounted: */
-            VBoxGlobal::checkForWrongUSBMounted();
-#endif /* RT_OS_LINUX */
-
-            /* Load application settings: */
-            VBoxGlobalSettings settings = vboxGlobal().settings();
-
-            /* VM console process: */
-            if (vboxGlobal().isVMConsoleProcess())
-            {
-                /* Make sure VM is started: */
-                if (!UIMachine::startMachine(vboxGlobal().managedVMUuid()))
-                    break;
-
-                /* Start application: */
-                iResultCode = a.exec();
-            }
-            /* VM selector process: */
-            else
-            {
-                /* Make sure VM selector is permitted: */
-                if (settings.isFeatureActive("noSelector"))
-                {
-                    msgCenter().cannotStartSelector();
-                    break;
-                }
-
-#ifdef VBOX_BLEEDING_EDGE
-                msgCenter().showExperimentalBuildWarning();
-#else /* VBOX_BLEEDING_EDGE */
-# ifndef DEBUG
-                /* Check for BETA version: */
-                const QString vboxVersion(vboxGlobal().virtualBox().GetVersion());
-                if (   vboxVersion.contains("BETA")
-                    && gEDataManager->preventBetaBuildWarningForVersion() != vboxVersion)
-                    msgCenter().showBetaBuildWarning();
-# endif /* !DEBUG */
-#endif /* !VBOX_BLEEDING_EDGE*/
-
-                /* Create/show selector window: */
-                UISelectorWindow::create();
-
-                /* Start application: */
-                iResultCode = a.exec();
-            }
+            /* Exit if VBoxGlobal is unable to show UI: */
+            if (!vboxGlobal().showUI())
+                break;
+
+            /* Start application: */
+            iResultCode = a.exec();
         }
         while (0);