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

Timestamp:

Mar 16, 2018 3:53:24 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Detach VBoxGlobal from UIMachine stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (2 diffs)
• globals/UIModalWindowManager.cpp (modified) (2 diffs)
• globals/VBoxGlobal.cpp (modified) (3 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)

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

@@ -36 +36 @@
 # include "VBoxFBOverlay.h"
 # include "UIDesktopWidgetWatchdog.h"
+# include "UIExtraDataManager.h"
 # include "UIMessageCenter.h"
+# include "UIModalWindowManager.h"
 # include "UIPopupCenter.h"
-# include "UIExtraDataManager.h"
 # include "VBoxGlobal.h"
 
@@ -3999 +4000 @@
 
     if (remind)
-        popupCenter().remindAboutWrongColorDepth(vboxGlobal().activeMachineWindow(), size.bitsPerPixel(), 32);
+        popupCenter().remindAboutWrongColorDepth(windowManager().mainWindowShown(), size.bitsPerPixel(), 32);
     else
-        popupCenter().forgetAboutWrongColorDepth(vboxGlobal().activeMachineWindow());
+        popupCenter().forgetAboutWrongColorDepth(windowManager().mainWindowShown());
 }
 

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

@@ -21 +21 @@
 
 /* GUI includes: */
+# include "VBoxGlobal.h"
+# include "UIMachine.h"
 # include "UIModalWindowManager.h"
 # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+#  include "UINetworkManager.h"
 #  include "UINetworkManagerDialog.h"
-#  include "UINetworkManager.h"
 # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+# include "UIProgressDialog.h"
 # include "UISelectorWindow.h"
-# include "UIProgressDialog.h"
-# include "VBoxGlobal.h"
 
 /* Other VBox includes: */
@@ -92 +93 @@
     {
         /* It will be currently active machine-window if visible: */
-        if (vboxGlobal().activeMachineWindow() &&
-            vboxGlobal().activeMachineWindow()->isVisible())
-            return vboxGlobal().activeMachineWindow();
+        if (gpMachine &&
+            gpMachine->activeWindow() &&
+            gpMachine->activeWindow()->isVisible())
+            return gpMachine->activeWindow();
     }
     /* For VM selector process: */

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

@@ -66 +66 @@
 #  include "UIUpdateManager.h"
 # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-# include "UIMachine.h"
 # include "UIConverter.h"
 # include "UIMediumEnumerator.h"
@@ -337 +336 @@
 }
 #endif /* VBOX_WS_MAC */
-
-QWidget* VBoxGlobal::activeMachineWindow() const
-{
-    if (isVMConsoleProcess() && gpMachine && gpMachine->activeWindow())
-        return gpMachine->activeWindow();
-    return 0;
-}
 
 /**
@@ -1637 +1629 @@
         machine.SaveSettings();
         if (!machine.isOk())
-            msgCenter().cannotSaveMachineSettings(machine, activeMachineWindow());
+            msgCenter().cannotSaveMachineSettings(machine, windowManager().mainWindowShown());
     }
 

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

@@ -129 +129 @@
     /** Returns the thread-pool instance. */
     UIThreadPool* threadPool() const { return m_pThreadPool; }
-
-    /** Returns currently active virtual machine window. */
-    QWidget* activeMachineWindow() const;
 
     bool is3DAvailableWorker() const;