Changeset 72389 in vbox for trunk

Timestamp:

May 30, 2018 9:18:18 AM (7 years ago)

Author:

vboxsync

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

122849

Message:

FE/Qt: bugref:9049: Allow VBoxGlobal library distinguish whether it is used from VM or VBox Manager UI; this also allows to ignore --startvm argument passed to VirtualBox executable.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (4 diffs)
• globals/VBoxGlobal.h (modified) (4 diffs)
• main.cpp (modified) (1 diff)

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

@@ -188 +188 @@
 
 /* static */
+#ifndef VBOX_GUI_WITH_SHARED_LIBRARY
 void VBoxGlobal::create()
+#else
+void VBoxGlobal::create(UIType enmType)
+#endif
 {
     /* Make sure instance is NOT created yet: */
@@ -197 +201 @@
     }
 
+#ifndef VBOX_GUI_WITH_SHARED_LIBRARY
     /* Create instance: */
     new VBoxGlobal;
+#else
+    /* Create instance: */
+    new VBoxGlobal(enmType);
+#endif
     /* Prepare instance: */
     s_pInstance->prepare();
@@ -223 +232 @@
 }
 
+#ifndef VBOX_GUI_WITH_SHARED_LIBRARY
 VBoxGlobal::VBoxGlobal()
-    : mValid (false)
+    : mValid(false)
+#else
+VBoxGlobal::VBoxGlobal(UIType enmType)
+    : m_enmType(enmType)
+    , mValid(false)
+#endif
 #ifdef VBOX_WS_MAC
     , m_osRelease(MacOSXRelease_Old)
@@ -4017 +4032 @@
     }
 
+#ifndef VBOX_GUI_WITH_SHARED_LIBRARY
     if (startVM)
+#else
+    if (m_enmType == UIType_RuntimeUI && startVM)
+#endif
     {
         /* m_fSeparateProcess makes sense only if a VM is started. */

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

@@ -65 +65 @@
 public:
 
+#ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+    /** UI types. */
+    enum UIType
+    {
+        UIType_SelectorUI,
+        UIType_RuntimeUI
+    };
+#endif
+
     /** VM launch modes. */
     enum LaunchMode
@@ -84 +93 @@
     /* Static API: Create/destroy stuff: */
     static VBoxGlobal *instance() { return s_pInstance; }
+#ifndef VBOX_GUI_WITH_SHARED_LIBRARY
     static void create();
+#else
+    static void create(UIType enmType);
+#endif
     static void destroy();
 
@@ -501 +514 @@
 private:
 
-    /* Constructor/destructor: */
+#ifndef VBOX_GUI_WITH_SHARED_LIBRARY
+    /** Construcs global VirtualBox object. */
     VBoxGlobal();
-    ~VBoxGlobal();
+#else
+    /** Construcs global VirtualBox object of passed @a enmType. */
+    VBoxGlobal(UIType enmType);
+#endif
+
+    /** Destrucs global VirtualBox object. */
+    virtual ~VBoxGlobal() /* override */;
 
     /** Re-initializes COM wrappers and containers. */
@@ -517 +537 @@
     void setDebuggerVar(int *piDbgCfgVar, bool fState);
     bool isDebuggerWorker(int *piDbgCfgVar, const char *pszExtraDataName) const;
+#endif
+
+#ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+    /** Holds the UI type. */
+    UIType m_enmType;
 #endif
 

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

@@ -464 +464 @@
         /* Create UI starter: */
         UIStarter::create();
+#ifndef VBOX_GUI_WITH_SHARED_LIBRARY
         /* Create global app instance: */
         VBoxGlobal::create();
+#else
+# ifndef VBOX_RUNTIME_UI
+        /* Create global app instance for Selecotr UI: */
+        VBoxGlobal::create(VBoxGlobal::UIType_SelectorUI);
+# else
+        /* Create global app instance for Runtime UI: */
+        VBoxGlobal::create(VBoxGlobal::UIType_RuntimeUI);
+# endif
+#endif
 
         /* Simulate try-catch block: */