Changeset 10227

Timestamp:

07/04/08 15:09:29 (6 months ago)

Author:

vboxsync

Message:

FE/Qt4: Make sure that all windows are properly closed if the main selector
window is closed. Also prevent the main window from closing if a QIMainDialog
is open (Mac OS X bug).

Files:

• trunk/src/VBox/Frontends/VirtualBox4/src/QIMainDialog.cpp (modified) (2 diffs)
• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/src/QIMainDialog.cpp

@@ -52 +52 @@
-    bool deleteOnClose = testAttribute (Qt::WA_DeleteOnClose);
-    setAttribute (Qt::WA_DeleteOnClose, false);
+    bool wasShowModal = testAttribute (Qt::WA_ShowModal); 
+    setAttribute (Qt::WA_ShowModal, true);
-
-    /* Create a local event loop */
@@ -67 +69 @@
-        return QDialog::Rejected;
-    QDialog::DialogCode res = result();
+    /* Set the old show modal attribute */ 
+    setAttribute (Qt::WA_ShowModal, wasShowModal);
-    /* Delete us in the case we should do so on close */
-    if (deleteOnClose)

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp

@@ -752 +752 @@
-void VBoxSelectorWnd::fileExit()
-{
+    /* We have to check if there are any open windows beside this mainwindow
+     * (e.g. VDM) and if so close them. Note that the default behavior is
+     * different to Qt3 where a *mainWidget* exists & if this going to close
+     * all other windows are closed automatically. We do the same below. */
+    foreach (QWidget *widget, QApplication::topLevelWidgets()) 
+    {
+        if (widget->isVisible() && 
+            widget != this)
+            widget->close();
+    }
+    /* We close this widget last. */
-    close();
-}