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

Timestamp:

Apr 5, 2013 2:41:52 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Integrating multi-screen support for the messaging system; Removing some obsolete stuff around the application.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIFileDialog.cpp (modified) (4 diffs)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)
• main.cpp (modified) (3 diffs)
• medium/UIMediumManager.cpp (modified) (2 diffs)
• net/UINetworkManagerDialog.cpp (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (1 diff)
• runtime/UIMachine.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (1 diff)
• selector/UISelectorWindow.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp

@@ -20 +20 @@
 /* VBox includes */
 #include "VBoxGlobal.h"
+#include "UIModalWindowManager.h"
+#include "UIMessageCenter.h"
 #include "QIFileDialog.h"
 
@@ -265 +267 @@
             QString result;
 
-            QWidget *topParent = mParent ? mParent->window() : vboxGlobal().mainWindow();
+            QWidget *topParent = mwManager().realParentWindow(mParent ? mParent : msgCenter().mainWindowShown());
             QString title = mCaption.isNull() ? tr ("Select a directory") : mCaption;
 
@@ -466 +468 @@
             QString title = mCaption.isNull() ? tr ("Select a file") : mCaption;
 
-            QWidget *topParent = mParent ? mParent->window() : vboxGlobal().mainWindow();
+            QWidget *topParent = mwManager().realParentWindow(mParent ? mParent : msgCenter().mainWindowShown());
             QString winFilters = winFilter (mFilters);
             AssertCompile (sizeof (TCHAR) == sizeof (QChar));
@@ -715 +717 @@
             QString title = mCaption.isNull() ? tr ("Select a file") : mCaption;
 
-            QWidget *topParent = mParent ? mParent->window() : vboxGlobal().mainWindow();
+            QWidget *topParent = mwManager().realParentWindow(mParent ? mParent : msgCenter().mainWindowShown());
             QString winFilters = winFilter (mFilters);
             AssertCompile (sizeof (TCHAR) == sizeof (QChar));

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

@@ -325 +325 @@
     if (vboxGlobal().isVMConsoleProcess())
     {
-        /* It will be currently active machine window if visible: */
-        if (vboxGlobal().vmWindow()->isVisible())
-            return vboxGlobal().vmWindow();
+        /* It will be currently active machine-window if visible: */
+        if (vboxGlobal().activeMachineWindow()->isVisible())
+            return vboxGlobal().activeMachineWindow();
     }
     /* Otherwise: */

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

@@ -270 +270 @@
     , mSelectorWnd (NULL)
     , m_pVirtualMachine(0)
-    , mMainWindow (NULL)
     , mMediaEnumThread (NULL)
     , mIsKWinManaged (false)
@@ -457 +456 @@
 }
 
-QWidget* VBoxGlobal::vmWindow()
+QWidget* VBoxGlobal::activeMachineWindow()
 {
     /* Null if that is NOT console-process or machine not yet created: */
     if (!isVMConsoleProcess() || !m_pVirtualMachine)
         return 0;
-    /* Main machine-window otherwise: */
-    return m_pVirtualMachine->mainWindow();
+    /* Active machine-window otherwise: */
+    return m_pVirtualMachine->activeWindow();
 }
 

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

@@ -90 +90 @@
     bool startMachine(const QString &strMachineId);
     UIMachine* virtualMachine();
-    QWidget* vmWindow();
-
-    /* Main application window storage: */
-    void setMainWindow(QWidget *pMainWindow) { mMainWindow = pMainWindow; }
-    QWidget* mainWindow() const { return mMainWindow; }
+    QWidget* activeMachineWindow();
 
     bool is3DAvailable() const { return m3DAvailable; }
@@ -451 +447 @@
     UISelectorWindow *mSelectorWnd;
     UIMachine *m_pVirtualMachine;
-    QWidget* mMainWindow;
 
     QString vmUuid;

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

@@ -483 +483 @@
             if (vboxGlobal().isVMConsoleProcess())
             {
-                if (vboxGlobal().startMachine (vboxGlobal().managedVMUuid()))
-                {
-                    vboxGlobal().setMainWindow (vboxGlobal().vmWindow());
+                if (vboxGlobal().startMachine(vboxGlobal().managedVMUuid()))
                     rc = a.exec();
-                }
             }
             else if (noSelector)
@@ -497 +494 @@
 #ifdef VBOX_BLEEDING_EDGE
                 msgCenter().showBEBWarning();
-#else
+#else /* VBOX_BLEEDING_EDGE */
 # ifndef DEBUG
                 /* Check for BETA version */
@@ -509 +506 @@
                         msgCenter().showBETAWarning();
                 }
-# endif
-#endif
-
-                vboxGlobal().setMainWindow (&vboxGlobal().selectorWnd());
-                    vboxGlobal().selectorWnd().show();
-                    rc = a.exec();
+# endif /* !DEBUG */
+#endif /* !VBOX_BLEEDING_EDGE*/
+                vboxGlobal().selectorWnd().show();
+                rc = a.exec();
             }
         }

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -218 +218 @@
     /* Apply UI decorations */
     Ui::UIMediumManager::setupUi (this);
+
+    /* No need to count that window as important for application,
+     * it will NOT be taken into account when other top-level windows will be closed: */
+    setAttribute(Qt::WA_QuitOnClose, false);
 
     /* Apply window icons */
@@ -562 +566 @@
         mModelessDialog->setup (UIMediumType_All, false /* aDoSelect */, aRefresh);
 
-        /* Setup 'closing' connection if main window is UISelectorWindow: */
-        if (vboxGlobal().mainWindow() && vboxGlobal().mainWindow()->inherits("UISelectorWindow"))
-            connect(vboxGlobal().mainWindow(), SIGNAL(closing()), mModelessDialog, SLOT(close()));
-
         /* listen to events that may change the media status and refresh
          * the contents of the modeless dialog */

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp

@@ -168 +168 @@
 
     /* Center according current main application window: */
-    vboxGlobal().centerWidget(this, vboxGlobal().mainWindow(), false);
+    vboxGlobal().centerWidget(this, msgCenter().mainWindowShown(), false);
 
     /* Pass event to the base-class: */

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

@@ -415 +415 @@
 }
 
-QWidget* UIMachine::mainWindow() const
+QWidget* UIMachine::activeWindow() const
 {
     /* Null if machine-logic not yet created: */
     if (!machineLogic())
         return 0;
-    /* Main machine-window otherwise: */
-    return machineLogic()->mainMachineWindow();
+    /* Active machine-window otherwise: */
+    return machineLogic()->activeMachineWindow();
 }
 

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

@@ -47 +47 @@
 
     /* Public getters: */
-    QWidget* mainWindow() const;
+    QWidget* activeWindow() const;
     UISession *uisession() const { return m_pSession; }
 

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

@@ -182 +182 @@
     setWindowIcon(vboxGlobal().vmGuestOSTypeIcon(machine().GetOSTypeId()));
 #endif /* !Q_WS_MAC */
-
-    /* Set the main application window for VBoxGlobal: */
-    if (m_uScreenId == 0)
-        vboxGlobal().setMainWindow(this);
 }
 

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

@@ -1026 +1026 @@
 }
 
-void UISelectorWindow::closeEvent(QCloseEvent *pEvent)
-{
-    // TODO: Such things are obsolete, rework required!
-    emit closing();
-    QMainWindow::closeEvent(pEvent);
-}
-
 #ifdef Q_WS_MAC
 bool UISelectorWindow::eventFilter(QObject *pObject, QEvent *pEvent)

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

@@ -46 +46 @@
 {
     Q_OBJECT;
-
-signals:
-
-    /* Obsolete: Signal to notify listeners about this dialog closed: */
-    void closing();
 
 public:
@@ -117 +112 @@
     void showEvent(QShowEvent *pEvent);
     void polishEvent(QShowEvent *pEvent);
-    void closeEvent(QCloseEvent *pEvent);
 #ifdef Q_WS_MAC
     bool eventFilter(QObject *pObject, QEvent *pEvent);