Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp (revision 45432) @@ -267,5 +267,5 @@ QString result; - QWidget *topParent = mwManager().realParentWindow(mParent ? mParent : msgCenter().mainWindowShown()); + QWidget *topParent = windowManager().realParentWindow(mParent ? mParent : msgCenter().mainWindowShown()); QString title = mCaption.isNull() ? tr ("Select a directory") : mCaption; @@ -468,5 +468,5 @@ QString title = mCaption.isNull() ? tr ("Select a file") : mCaption; - QWidget *topParent = mwManager().realParentWindow(mParent ? mParent : msgCenter().mainWindowShown()); + QWidget *topParent = windowManager().realParentWindow(mParent ? mParent : msgCenter().mainWindowShown()); QString winFilters = winFilter (mFilters); AssertCompile (sizeof (TCHAR) == sizeof (QChar)); @@ -717,5 +717,5 @@ QString title = mCaption.isNull() ? tr ("Select a file") : mCaption; - QWidget *topParent = mwManager().realParentWindow(mParent ? mParent : msgCenter().mainWindowShown()); + QWidget *topParent = windowManager().realParentWindow(mParent ? mParent : msgCenter().mainWindowShown()); QString winFilters = winFilter (mFilters); AssertCompile (sizeof (TCHAR) == sizeof (QChar)); Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 45432) @@ -243,8 +243,8 @@ /* Create message-box: */ - QWidget *pBoxParent = mwManager().realParentWindow(pParent); + QWidget *pBoxParent = windowManager().realParentWindow(pParent); QPointer pBox = new QIMessageBox(strTitle, strMessage, icon, iButton1, iButton2, iButton3, pBoxParent); - mwManager().registerNewParent(pBox, pBoxParent); + windowManager().registerNewParent(pBox, pBoxParent); /* Load option: */ @@ -293,7 +293,7 @@ /* Create progress-dialog: */ - QWidget *pDlgParent = mwManager().realParentWindow(pParent ? pParent : mainWindowShown()); + QWidget *pDlgParent = windowManager().realParentWindow(pParent ? pParent : windowManager().mainWindowShown()); QPointer pProgressDlg = new UIProgressDialog(progress, strTitle, pPixmap, cMinDuration, pDlgParent); - mwManager().registerNewParent(pProgressDlg, pDlgParent); + windowManager().registerNewParent(pProgressDlg, pDlgParent); /* Run the dialog with the 350 ms refresh interval. */ @@ -312,36 +312,4 @@ return true; -} - -QWidget* UIMessageCenter::mainWindowShown() const -{ - /* It may happen that this method is called during VBoxGlobal - * initialization or even after it failed (for example, to show some error message). - * Return no main window in this case: */ - if (!vboxGlobal().isValid()) - return 0; - - /* For VM console process: */ - if (vboxGlobal().isVMConsoleProcess()) - { - /* It will be currently active machine-window if visible: */ - if (vboxGlobal().activeMachineWindow()->isVisible()) - return vboxGlobal().activeMachineWindow(); - } - /* Otherwise: */ - else - { - /* It will be the selector window if visible: */ - if (vboxGlobal().selectorWnd().isVisible()) - return &vboxGlobal().selectorWnd(); - } - - /* Nothing by default: */ - return 0; -} - -QWidget* UIMessageCenter::networkManagerOrMainWindowShown() const -{ - return gNetworkManager->window()->isVisible() ? gNetworkManager->window() : mainWindowShown(); } @@ -1989,5 +1957,5 @@ bool UIMessageCenter::confirmCancelingAllNetworkRequests() const { - return questionBinary(networkManagerOrMainWindowShown(), MessageType_Question, + return questionBinary(windowManager().networkManagerOrMainWindowShown(), MessageType_Question, tr("Do you wish to cancel all current network operations?")); } @@ -1995,5 +1963,5 @@ void UIMessageCenter::showUpdateSuccess(const QString &strVersion, const QString &strLink) const { - alert(networkManagerOrMainWindowShown(), MessageType_Info, + alert(windowManager().networkManagerOrMainWindowShown(), MessageType_Info, tr("

A new version of VirtualBox has been released! Version %1 is available " "at virtualbox.org.

" @@ -2005,5 +1973,5 @@ void UIMessageCenter::showUpdateNotFound() const { - alert(networkManagerOrMainWindowShown(), MessageType_Info, + alert(windowManager().networkManagerOrMainWindowShown(), MessageType_Info, tr("You are already running the most recent version of VirtualBox.")); } @@ -2011,5 +1979,5 @@ void UIMessageCenter::askUserToDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion, const QString &strVBoxVersion) const { - alert(networkManagerOrMainWindowShown(), MessageType_Info, + alert(windowManager().networkManagerOrMainWindowShown(), MessageType_Info, tr("

You have version %1 of the %2 installed.

" "

You should download and install version %3 of this extension pack from Oracle!

") @@ -2028,5 +1996,5 @@ bool UIMessageCenter::confirmDownloadGuestAdditions(const QString &strUrl, qulonglong uSize) const { - return questionBinary(networkManagerOrMainWindowShown(), MessageType_Question, + return questionBinary(windowManager().networkManagerOrMainWindowShown(), MessageType_Question, tr("

Are you sure you want to download the VirtualBox Guest Additions CD image " "from %1 (size %2 bytes)?

") @@ -2038,5 +2006,5 @@ void UIMessageCenter::cannotSaveGuestAdditions(const QString &strURL, const QString &strTarget) const { - alert(networkManagerOrMainWindowShown(), MessageType_Error, + alert(windowManager().networkManagerOrMainWindowShown(), MessageType_Error, tr("

The VirtualBox Guest Additions CD image has been successfully downloaded " "from %1 " @@ -2048,5 +2016,5 @@ bool UIMessageCenter::proposeMountGuestAdditions(const QString &strUrl, const QString &strSrc) const { - return questionBinary(networkManagerOrMainWindowShown(), MessageType_Question, + return questionBinary(windowManager().networkManagerOrMainWindowShown(), MessageType_Question, tr("

The VirtualBox Guest Additions CD image has been successfully downloaded " "from %1 " @@ -2087,5 +2055,5 @@ bool UIMessageCenter::confirmDownloadUserManual(const QString &strURL, qulonglong uSize) const { - return questionBinary(networkManagerOrMainWindowShown(), MessageType_Question, + return questionBinary(windowManager().networkManagerOrMainWindowShown(), MessageType_Question, tr("

Are you sure you want to download the VirtualBox User Manual " "from %1 (size %2 bytes)?

") @@ -2097,5 +2065,5 @@ void UIMessageCenter::cannotSaveUserManual(const QString &strURL, const QString &strTarget) const { - alert(networkManagerOrMainWindowShown(), MessageType_Error, + alert(windowManager().networkManagerOrMainWindowShown(), MessageType_Error, tr("

The VirtualBox User Manual has been successfully downloaded " "from %1 " @@ -2107,5 +2075,5 @@ void UIMessageCenter::warnAboutUserManualDownloaded(const QString &strURL, const QString &strTarget) const { - alert(networkManagerOrMainWindowShown(), MessageType_Warning, + alert(windowManager().networkManagerOrMainWindowShown(), MessageType_Warning, tr("

The VirtualBox User Manual has been successfully downloaded " "from %1 " @@ -2116,5 +2084,5 @@ bool UIMessageCenter::warAboutOutdatedExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion) const { - return questionBinary(networkManagerOrMainWindowShown(), MessageType_Question, + return questionBinary(windowManager().networkManagerOrMainWindowShown(), MessageType_Question, tr("

You have an old version (%1) of the %2 installed.

" "

Do you wish to download latest one from the Internet?

") @@ -2126,5 +2094,5 @@ bool UIMessageCenter::confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize) const { - return questionBinary(networkManagerOrMainWindowShown(), MessageType_Question, + return questionBinary(windowManager().networkManagerOrMainWindowShown(), MessageType_Question, tr("

Are you sure you want to download the %1 " "from %2 (size %3 bytes)?

") @@ -2136,5 +2104,5 @@ void UIMessageCenter::cannotSaveExtensionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) const { - alert(networkManagerOrMainWindowShown(), MessageType_Error, + alert(windowManager().networkManagerOrMainWindowShown(), MessageType_Error, tr("

The %1 has been successfully downloaded " "from %2 " @@ -2146,5 +2114,5 @@ bool UIMessageCenter::proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) const { - return questionBinary(networkManagerOrMainWindowShown(), MessageType_Question, + return questionBinary(windowManager().networkManagerOrMainWindowShown(), MessageType_Question, tr("

The %1 has been successfully downloaded " "from %2 " @@ -2469,5 +2437,5 @@ AssertWrapperOk(vbox); - (new VBoxAboutDlg(mainWindowShown(), strFullVersion))->show(); + (new VBoxAboutDlg(windowManager().mainWindowShown(), strFullVersion))->show(); } @@ -2755,9 +2723,9 @@ /* Create message-box: */ - QWidget *pMessageBoxParent = mwManager().realParentWindow(pParent ? pParent : mainWindowShown()); + QWidget *pMessageBoxParent = windowManager().realParentWindow(pParent ? pParent : windowManager().mainWindowShown()); QPointer pMessageBox = new QIMessageBox(title, strMessage, icon, iButton1, iButton2, iButton3, pMessageBoxParent); - mwManager().registerNewParent(pMessageBox, pMessageBoxParent); + windowManager().registerNewParent(pMessageBox, pMessageBoxParent); /* Prepare auto-confirmation check-box: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h (revision 45432) @@ -151,8 +151,4 @@ const QString &strImage = "", QWidget *pParent = 0, int cMinDuration = 2000); - - /* API: Main window stuff: */ - QWidget* mainWindowShown() const; - QWidget* networkManagerOrMainWindowShown() const; /* API: Main (startup) warnings: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp (revision 45432) @@ -20,4 +20,8 @@ /* GUI includes: */ #include "UIModalWindowManager.h" +#include "UINetworkManagerDialog.h" +#include "UINetworkManager.h" +#include "UISelectorWindow.h" +#include "VBoxGlobal.h" /* Other VBox includes: */ @@ -62,4 +66,42 @@ if (m_spInstance == this) m_spInstance = 0; +} + +QWidget* UIModalWindowManager::mainWindowShown() const +{ + /* Later this function will be independent of VBoxGlobal at all, + * but for now VBoxGlobal creates all the main application windows, + * so we should honor this fact. + * + * It may happen that this method is called during VBoxGlobal + * initialization or even after it had failed (for example, to show some message). + * Return NULL pointer in this case: */ + if (!vboxGlobal().isValid()) + return 0; + + /* For VM console process: */ + if (vboxGlobal().isVMConsoleProcess()) + { + /* It will be currently active machine-window if visible: */ + if (vboxGlobal().activeMachineWindow()->isVisible()) + return vboxGlobal().activeMachineWindow(); + } + /* Otherwise: */ + else + { + /* It will be the selector window if visible: */ + if (vboxGlobal().selectorWnd().isVisible()) + return &vboxGlobal().selectorWnd(); + } + + /* Nothing by default: */ + return 0; +} + +QWidget* UIModalWindowManager::networkManagerOrMainWindowShown() const +{ + /* It may happen that this method is called before network-manager initialization + * or when the network-manager is hidden, return main application window in this case: */ + return gNetworkManager && gNetworkManager->window()->isVisible() ? gNetworkManager->window() : mainWindowShown(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.h (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.h (revision 45432) @@ -46,4 +46,8 @@ void registerNewParent(QWidget *pWindow, QWidget *pParentWindow = 0); + /* API: Main application window stuff: */ + QWidget* mainWindowShown() const; + QWidget* networkManagerOrMainWindowShown() const; + private slots: @@ -66,9 +70,9 @@ /* Static API: Instance stuff: */ static UIModalWindowManager* instance(); - friend UIModalWindowManager& mwManager(); + friend UIModalWindowManager& windowManager(); }; /* Shortcut to the static UIModalWindowManager::instance() method: */ -inline UIModalWindowManager& mwManager() { return *(UIModalWindowManager::instance()); } +inline UIModalWindowManager& windowManager() { return *(UIModalWindowManager::instance()); } #endif /* !__UIModalWindowManager_h__ */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp (revision 45432) @@ -28,4 +28,5 @@ #include "VBoxGlobal.h" #include "UIMessageCenter.h" +#include "UIModalWindowManager.h" /* static */ @@ -103,5 +104,5 @@ /* Ask the user for another location for the additions-image file: */ QString strTarget = QIFileDialog::getExistingDirectory(QFileInfo(target()).absolutePath(), - msgCenter().networkManagerOrMainWindowShown(), + windowManager().networkManagerOrMainWindowShown(), tr("Select folder to save Guest Additions image to"), true); Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp (revision 45432) @@ -29,4 +29,5 @@ #include "VBoxGlobal.h" #include "UIMessageCenter.h" +#include "UIModalWindowManager.h" /* static */ @@ -120,5 +121,5 @@ /* Ask the user for another location for the extension-pack file: */ QString strTarget = QIFileDialog::getExistingDirectory(QFileInfo(target()).absolutePath(), - msgCenter().networkManagerOrMainWindowShown(), + windowManager().networkManagerOrMainWindowShown(), tr("Select folder to save %1 to").arg(GUI_ExtPackName), true); Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp (revision 45432) @@ -28,4 +28,5 @@ #include "VBoxGlobal.h" #include "UIMessageCenter.h" +#include "UIModalWindowManager.h" /* static */ @@ -107,5 +108,5 @@ /* Ask the user for another location for the user-manual file: */ QString strTarget = QIFileDialog::getExistingDirectory(QFileInfo(target()).absolutePath(), - msgCenter().networkManagerOrMainWindowShown(), + windowManager().networkManagerOrMainWindowShown(), tr("Select folder to save User Manual to"), true); Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp (revision 45432) @@ -34,4 +34,5 @@ #include "VBoxGlobal.h" #include "UIMessageCenter.h" +#include "UIModalWindowManager.h" #include "QIDialogButtonBox.h" @@ -168,5 +169,5 @@ /* Center according current main application window: */ - vboxGlobal().centerWidget(this, msgCenter().mainWindowShown(), false); + vboxGlobal().centerWidget(this, windowManager().mainWindowShown(), false); /* Pass event to the base-class: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp (revision 45432) @@ -32,4 +32,5 @@ #include "VBoxGlobal.h" #include "UIMessageCenter.h" +#include "UIModalWindowManager.h" #include "VBoxUtils.h" #include "UIDownloaderExtensionPack.h" @@ -443,5 +444,5 @@ /* Warn the user about extension pack was downloaded and saved, propose to install it: */ if (msgCenter().proposeInstallExtentionPack(GUI_ExtPackName, strSource, QDir::toNativeSeparators(strTarget))) - UIGlobalSettingsExtension::doInstallation(strTarget, strDigest, msgCenter().networkManagerOrMainWindowShown(), NULL); + UIGlobalSettingsExtension::doInstallation(strTarget, strDigest, windowManager().networkManagerOrMainWindowShown(), NULL); } }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (revision 45432) @@ -999,7 +999,7 @@ /* Create take-snapshot dialog: */ - QWidget *pDlgParent = mwManager().realParentWindow(activeMachineWindow()); + QWidget *pDlgParent = windowManager().realParentWindow(activeMachineWindow()); QPointer pDlg = new VBoxTakeSnapshotDlg(pDlgParent, machine); - mwManager().registerNewParent(pDlg, pDlgParent); + windowManager().registerNewParent(pDlg, pDlgParent); /* Assign corresponding icon: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp (revision 45432) @@ -273,7 +273,7 @@ /* Prepare close-dialog: */ - QWidget *pParentDlg = mwManager().realParentWindow(this); + QWidget *pParentDlg = windowManager().realParentWindow(this); QPointer pCloseDlg = new UIVMCloseDialog(pParentDlg, machineCopy, session()); - mwManager().registerNewParent(pCloseDlg, pParentDlg); + windowManager().registerNewParent(pCloseDlg, pParentDlg); /* Makes sure the dialog is valid: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp (revision 45432) @@ -814,7 +814,7 @@ { /* Create take-snapshot dialog: */ - QWidget *pDlgParent = mwManager().realParentWindow(this); + QWidget *pDlgParent = windowManager().realParentWindow(this); QPointer pDlg = new VBoxTakeSnapshotDlg(pDlgParent, mMachine); - mwManager().registerNewParent(pDlg, pDlgParent); + windowManager().registerNewParent(pDlg, pDlgParent); /* Assign corresponding icon: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp (revision 45431) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp (revision 45432) @@ -193,5 +193,5 @@ * modal dialog prevents our event-loop from * being exit overlapping 'this'. */ - if (m_fEnded && !isHidden() && mwManager().isWindowOnTheTopOfTheModalWindowStack(this)) + if (m_fEnded && !isHidden() && windowManager().isWindowOnTheTopOfTheModalWindowStack(this)) { hide(); @@ -204,5 +204,5 @@ { /* Is this progress-dialog a top-level modal-dialog now? */ - if (mwManager().isWindowOnTheTopOfTheModalWindowStack(this)) + if (windowManager().isWindowOnTheTopOfTheModalWindowStack(this)) { /* Progress finished: */