Changeset 72189 in vbox for trunk/src

Timestamp:

May 10, 2018 12:10:16 PM (7 years ago)

Author:

vboxsync

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

122622

Message:

FE/Qt: bugref:9049: Adding required ifdefs to UIStarter to make it distinguish the cases when the GUI is whole or separated to Selector & Runtime UIs.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIStarter.cpp (modified) (8 diffs)

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

@@ -22 +22 @@
 #include "VBoxGlobal.h"
 #include "UIExtraDataManager.h"
-#include "UIMachine.h"
 #include "UIMessageCenter.h"
-#include "UISelectorWindow.h"
-#include "UISession.h"
 #include "UIStarter.h"
+#if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || !defined(VBOX_RUNTIME_UI)
+# include "UISelectorWindow.h"
+#endif
+#if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || defined(VBOX_RUNTIME_UI)
+# include "UIMachine.h"
+# include "UISession.h"
+# endif
 
 
@@ -111 +115 @@
         return;
 
+#if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || !defined(VBOX_RUNTIME_UI)
     /* Show Selector UI: */
     if (!vboxGlobal().isVMConsoleProcess())
@@ -124 +129 @@
         UISelectorWindow::create();
 
-#ifdef VBOX_BLEEDING_EDGE
+# ifdef VBOX_BLEEDING_EDGE
         /* Show EXPERIMENTAL BUILD warning: */
         msgCenter().showExperimentalBuildWarning();
-#else /* !VBOX_BLEEDING_EDGE */
-# ifndef DEBUG
+# else /* !VBOX_BLEEDING_EDGE */
+#  ifndef DEBUG
         /* Show BETA warning if necessary: */
         const QString vboxVersion(vboxGlobal().virtualBox().GetVersion());
@@ -134 +139 @@
             && gEDataManager->preventBetaBuildWarningForVersion() != vboxVersion)
             msgCenter().showBetaBuildWarning();
-# endif /* !DEBUG */
-#endif /* !VBOX_BLEEDING_EDGE */
+#  endif /* !DEBUG */
+# endif /* !VBOX_BLEEDING_EDGE */
     }
+#endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || !VBOX_RUNTIME_UI */
+
+#if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || defined(VBOX_RUNTIME_UI)
     /* Show Runtime UI: */
-    else
+    if (vboxGlobal().isVMConsoleProcess())
     {
         /* Make sure machine is started, quit if not: */
@@ -144 +152 @@
             return QApplication::quit();
     }
+#endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || VBOX_RUNTIME_UI */
 }
 
 void UIStarter::sltRestartUI()
 {
+#if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || !defined(VBOX_RUNTIME_UI)
     /* Recreate/show selector-window: */
     UISelectorWindow::destroy();
     UISelectorWindow::create();
+#endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || !VBOX_RUNTIME_UI */
 }
 
 void UIStarter::sltDestroyUI()
 {
-    /* Destroy the root GUI windows: */
+#if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || !defined(VBOX_RUNTIME_UI)
+    /* Destroy Selector UI: */
     if (gpSelectorWindow)
         UISelectorWindow::destroy();
+#endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || !VBOX_RUNTIME_UI */
+
+#if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || defined(VBOX_RUNTIME_UI)
+    /* Destroy Runtime UI: */
     if (gpMachine)
         UIMachine::destroy();
+#endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || VBOX_RUNTIME_UI */
 }
 
 void UIStarter::sltOpenURLs()
 {
+#if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || !defined(VBOX_RUNTIME_UI)
     /* Create/show selector-window: */
     UISelectorWindow::create();
@@ -169 +187 @@
     /* Ask the Selector UI to open URLs asynchronously: */
     QMetaObject::invokeMethod(gpSelectorWindow, "sltOpenUrls", Qt::QueuedConnection);
+#endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || !VBOX_RUNTIME_UI */
 }
 
@@ -177 +196 @@
         return;
 
+#if !defined(VBOX_GUI_WITH_SHARED_LIBRARY) || defined(VBOX_RUNTIME_UI)
     /* For VM process: */
     if (vboxGlobal().isVMConsoleProcess())
@@ -184 +204 @@
             gpMachine->uisession()->setDefaultCloseAction(MachineCloseAction_SaveState);
     }
-}
-
+#endif /* !VBOX_GUI_WITH_SHARED_LIBRARY || VBOX_RUNTIME_UI */
+}