Changeset 45290 in vbox for trunk/src

Timestamp:

Apr 2, 2013 3:23:00 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM selector: Make sure inaccessible medium warning will be shown even if medium-enumeration had finished before VM selector shown.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• medium/UIMediumManager.cpp (modified) (1 diff)
• medium/UIMediumManager.h (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (8 diffs)
• selector/UISelectorWindow.h (modified) (4 diffs)

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

@@ -583 +583 @@
 }
 
+/* static */
+UIMediumManager* UIMediumManager::modelessInstance()
+{
+    return mModelessDialog;
+}
+
 QString UIMediumManager::selectedId() const
 {

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

@@ -57 +57 @@
 
     static void showModeless (QWidget *aParent = NULL, bool aRefresh = true);
+    static UIMediumManager* modelessInstance();
 
     QString selectedId() const;

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

@@ -28 +28 @@
 #include <QResizeEvent>
 #include <QStackedWidget>
+#include <QTimer>
 
 /* Local includes: */
@@ -76 +77 @@
                                    Qt::WindowFlags flags /* = Qt::Window */)
     : QIWithRetranslateUI2<QMainWindow>(pParent, flags)
+    , m_fPolished(false)
+    , m_fWarningAboutInaccessibleMediumShown(false)
     , m_pSplitter(0)
 #ifndef Q_WS_MAC
@@ -85 +88 @@
     , m_pDetails(0)
     , m_pVMDesktop(0)
-    , m_fDoneInaccessibleWarningOnce(false)
 {
     /* Remember self: */
@@ -169 +171 @@
 }
 
-void UISelectorWindow::sltMediumEnumFinished(const VBoxMediaList &list)
-{
-    /* We warn about inaccessible media only once
+void UISelectorWindow::sltMediumEnumFinished()
+{
+    /* We try to warn about inaccessible mediums only once
      * (after media emumeration started from main() at startup),
      * to avoid annoying the user: */
-    if (m_fDoneInaccessibleWarningOnce)
-        return;
-    m_fDoneInaccessibleWarningOnce = true;
-
-    /* Ignore the signal if a modal widget is currently active
-     * (we won't be able to properly show the modeless VDI manager window in this case): */
-    // TODO: Not sure that is required at all...
-    if (QApplication::activeModalWidget())
-        return;
-
-    /* Ignore the signal if a UIMediumManager window is active: */
-    // TODO: Thats a very dirty way, rework required!
-    if (qApp->activeWindow() &&
-        !strcmp(qApp->activeWindow()->metaObject()->className(), "UIMediumManager"))
-        return;
-
-    /* Look for at least one inaccessible media: */
+    if (m_fWarningAboutInaccessibleMediumShown)
+        return;
+    m_fWarningAboutInaccessibleMediumShown = true;
+
+    /* Make sure MM window is not opened: */
+    if (UIMediumManager::modelessInstance())
+        return;
+
+    /* Look for at least one inaccessible medium: */
+    const VBoxMediaList &list = vboxGlobal().currentMediaList();
     VBoxMediaList::const_iterator it;
     for (it = list.begin(); it != list.end(); ++it)
         if ((*it).state() == KMediumState_Inaccessible)
             break;
-    /* Ask the user about: */
+
+    /* Warn the user about inaccessible medium: */
     if (it != list.end() && msgCenter().remindAboutInaccessibleMedia())
     {
-        /* Show the VMM dialog without refresh: */
+        /* Open the MM window (without refresh): */
         UIMediumManager::showModeless(this, false /* refresh? */);
     }
@@ -312 +308 @@
     m_pPreferencesDialogAction->setData(true);
 
+    /* Don't show the inaccessible warning
+     * if the user tries to open global settings: */
+    m_fWarningAboutInaccessibleMediumShown = true;
+
     /* Create and execute global settings dialog: */
     UISettingsDialogGlobal dialog(this);
@@ -402 +402 @@
     }
 
-    /* Don't show the inaccessible warning if the user tries to open VM settings: */
-    m_fDoneInaccessibleWarningOnce = true;
+    /* Don't show the inaccessible warning
+     * if the user tries to open VM settings: */
+    m_fWarningAboutInaccessibleMediumShown = true;
 
     /* Create and execute corresponding VM settings dialog: */
@@ -1001 +1002 @@
 }
 
+void UISelectorWindow::showEvent(QShowEvent *pEvent)
+{
+    /* Call to base-class: */
+    QMainWindow::showEvent(pEvent);
+
+    /* Is polishing required? */
+    if (!m_fPolished)
+    {
+        /* Pass the show-event to polish-event: */
+        polishEvent(pEvent);
+        /* Mark as polished: */
+        m_fPolished = true;
+    }
+}
+
+void UISelectorWindow::polishEvent(QShowEvent*)
+{
+    /* Make sure user warned about inaccessible medium(s)
+     * even if enumeration had finished before selector window shown: */
+    QTimer::singleShot(0, this, SLOT(sltMediumEnumFinished()));
+}
+
 void UISelectorWindow::closeEvent(QCloseEvent *pEvent)
 {
@@ -1379 +1402 @@
 {
     /* Medium enumeration connections: */
-    connect(&vboxGlobal(), SIGNAL(mediumEnumFinished(const VBoxMediaList &)), this, SLOT(sltMediumEnumFinished(const VBoxMediaList &)));
+    connect(&vboxGlobal(), SIGNAL(mediumEnumFinished(const VBoxMediaList &)), this, SLOT(sltMediumEnumFinished()));
 
     /* Menu-bar connections: */

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

@@ -70 +70 @@
 
     /* Handler: Medium enumeration stuff: */
-    void sltMediumEnumFinished(const VBoxMediaList &mediumList);
+    void sltMediumEnumFinished();
 
     /* Handler: Menubar/status stuff: */
@@ -115 +115 @@
     /* Event handlers: */
     bool event(QEvent *pEvent);
+    void showEvent(QShowEvent *pEvent);
+    void polishEvent(QShowEvent *pEvent);
     void closeEvent(QCloseEvent *pEvent);
 #ifdef Q_WS_MAC
@@ -157 +159 @@
     static bool isAtLeastOneItemStarted(const QList<UIVMItem*> &items);
     static bool isAtLeastOneItemRunning(const QList<UIVMItem*> &items);
+
+    /* Variables: */
+    bool m_fPolished : 1;
+    bool m_fWarningAboutInaccessibleMediumShown : 1;
 
     /* Central splitter window: */
@@ -240 +246 @@
     /* Other variables: */
     QRect m_normalGeo;
-    bool m_fDoneInaccessibleWarningOnce : 1;
 };