Changeset 71375 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 19, 2018 3:29:54 PM (7 years ago)

Author:

vboxsync

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

121332

Message:

FE/Qt: bugref:9049: Detach UIModalWindowManager from the Runtime/Selector UI stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIModalWindowManager.cpp (modified) (4 diffs)
• globals/UIModalWindowManager.h (modified) (2 diffs)
• runtime/UIMachineWindow.cpp (modified) (2 diffs)
• runtime/UIMachineWindow.h (modified) (2 diffs)
• selector/UISelectorWindow.cpp (modified) (2 diffs)

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
@@ -29 +27 @@
 # endif
 # include "UIProgressDialog.h"
-# include "UISelectorWindow.h"
 
 /* Other VBox includes: */
@@ -70 +67 @@
 
 UIModalWindowManager::UIModalWindowManager()
+    : m_pMainWindowShown(0)
 {
     /* Assign instance: */
@@ -79 +77 @@
     /* Unassign instance: */
     s_pInstance = 0;
-}
-
-QWidget *UIModalWindowManager::mainWindowShown() const
-{
-    /* It may happen that this method is called before VBoxGlobal initialization
-     * or after initialization had failed (for example, to show some message).
-     * Return NULL pointer in such cases: */
-    if (!VBoxGlobal::instance() || !vboxGlobal().isValid())
-        return 0;
-
-    /* For VM console process: */
-    if (vboxGlobal().isVMConsoleProcess())
-    {
-        /* It will be currently active machine-window if visible: */
-        if (gpMachine &&
-            gpMachine->activeWindow() &&
-            gpMachine->activeWindow()->isVisible())
-            return gpMachine->activeWindow();
-    }
-    /* For VM selector process: */
-    else
-    {
-        /* It will be the selector window if visible: */
-        if (gpSelectorWindow &&
-            gpSelectorWindow->isVisible())
-            return gpSelectorWindow;
-    }
-
-    /* NULL by default: */
-    return 0;
 }
 

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

@@ -52 +52 @@
     void registerNewParent(QWidget *pWindow, QWidget *pParentWindow = 0);
 
-    /** Returns main application window. */
-    QWidget *mainWindowShown() const;
+    /** Defines the main application @a pWindow shown. */
+    void setMainWindowShown(QWidget *pWindow) { m_pMainWindowShown = pWindow; }
+    /** Returns the main application window shown. */
+    QWidget *mainWindowShown() const { return m_pMainWindowShown; }
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /** Returns network manager or main window shown. */
@@ -80 +82 @@
     QList<QList<QWidget*> > m_windows;
 
+    /** Holds the main application window shown. */
+    QWidget *m_pMainWindowShown;
+
     /** Holds the static singleton instance. */
     static UIModalWindowManager *s_pInstance;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -260 +260 @@
 }
 
+bool UIMachineWindow::event(QEvent *pEvent)
+{
+    /* Call to base-class: */
+    const bool fResult = QIWithRetranslateUI2<QMainWindow>::event(pEvent);
+
+    /* Handle particular events: */
+    switch (pEvent->type())
+    {
+        case QEvent::WindowActivate:
+        {
+            /* Initiate registration in the modal window manager: */
+            windowManager().setMainWindowShown(this);
+            break;
+        }
+        default:
+            break;
+    }
+
+    /* Return result: */
+    return fResult;
+}
+
 void UIMachineWindow::showEvent(QShowEvent *pEvent)
 {
@@ -265 +287 @@
     QMainWindow::showEvent(pEvent);
 
+    /* Initiate registration in the modal window manager: */
+    windowManager().setMainWindowShown(this);
+
     /* Update appearance for indicator-pool: */
     updateAppearanceOf(UIVisualElement_IndicatorPoolStuff);
+}
+
+void UIMachineWindow::hideEvent(QHideEvent *pEvent)
+{
+    /* Update registration in the modal window manager: */
+    if (windowManager().mainWindowShown() == this)
+    {
+        if (machineLogic()->activeMachineWindow())
+            windowManager().setMainWindowShown(machineLogic()->activeMachineWindow());
+        else
+            windowManager().setMainWindowShown(machineLogic()->mainMachineWindow());
+    }
+
+    /* Call to base-class: */
+    QMainWindow::hideEvent(pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h

@@ -35 +35 @@
 /* Forward declarations: */
 class QCloseEvent;
+class QEvent;
+class QHideEvent;
 class QGridLayout;
 class QShowEvent;
@@ -126 +128 @@
     void retranslateUi();
 
+    /** Handles any Qt @a pEvent. */
+    virtual bool event(QEvent *pEvent) /* override */;
+
     /** Handles show @a pEvent. */
     virtual void showEvent(QShowEvent *pEvent) /* override */;
+    /** Handles hide @a pEvent. */
+    virtual void hideEvent(QHideEvent *pEvent) /* override */;
 
     /** Close event handler. */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -97 +97 @@
     /* Show selector-window: */
     m_spInstance->show();
+    /* Register in the modal window manager: */
+    windowManager().setMainWindowShown(m_spInstance);
 }
 
@@ -105 +107 @@
     AssertPtrReturnVoid(m_spInstance);
 
+    /* Unregister in the modal window manager: */
+    windowManager().setMainWindowShown(0);
     /* Cleanup selector-window: */
     m_spInstance->cleanup();