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

Timestamp:

May 2, 2012 3:58:51 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: More predicted close VM handling.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (2 diffs)
• runtime/UIMachineWindow.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• settings/UISettingsDialog.cpp (modified) (1 diff)
• settings/UISettingsDialog.h (modified) (1 diff)

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

@@ -1031 +1031 @@
         return;
 
-    /* Propose to close active machine window: */
-    activeMachineWindow()->sltTryClose();
+    /* Do not try to close machine-window if restricted: */
+    if (isPreventAutoClose())
+        return;
+
+    /* First, we have to close/hide any opened modal & popup application widgets.
+     * We have to make sure such window is hidden even if close-event was rejected.
+     * We are re-throwing this slot if any widget present to test again.
+     * If all opened widgets are closed/hidden, we can try to close machine-window: */
+    QWidget *pWidget = QApplication::activeModalWidget() ? QApplication::activeModalWidget() :
+                       QApplication::activePopupWidget() ? QApplication::activePopupWidget() : 0;
+    if (pWidget)
+    {
+        /* Closing/hiding all we found: */
+        pWidget->close();
+        if (!pWidget->isHidden())
+            pWidget->hide();
+        QTimer::singleShot(0, this, SLOT(sltClose()));
+        return;
+    }
+
+    /* Try to close active machine-window: */
+    activeMachineWindow()->close();
 }
 

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

@@ -169 +169 @@
 }
 
-void UIMachineWindow::sltTryClose()
-{
-    /* Do not try to close window if restricted: */
-    if (machineLogic()->isPreventAutoClose())
-        return;
-
-#if 0
-    // TODO: Is that really needed?
-    /* This thing here is from Qt3.
-     * First close any open modal & popup widgets.
-     * Use a single shot with timeout 0 to allow the widgets to cleanly close and test then again.
-     * If all open widgets are closed destroy ourself: */
-    QWidget *pWidget = QApplication::activeModalWidget() ? QApplication::activeModalWidget() :
-                       QApplication::activePopupWidget() ? QApplication::activePopupWidget() : 0;
-    if (pWidget)
-    {
-        pWidget->close();
-        QTimer::singleShot(0, this, SLOT(sltTryClose()));
-    }
-    else
-#endif
-
-    close();
-}
-
 UIMachineWindow::UIMachineWindow(UIMachineLogic *pMachineLogic, ulong uScreenId)
     : QIWithRetranslateUI2<QMainWindow>(0, windowFlags(pMachineLogic->visualStateType()))
@@ -218 +193 @@
     if (m_uScreenId == 0)
         vboxGlobal().setMainWindow(this);
-}
-
-UIMachineWindow::~UIMachineWindow()
-{
-#if 0
-    // TODO: Is that really needed?
-    /* This thing here is from Qt3.
-     * Close any opened modal & popup widgets: */
-    while (QWidget *pWidget = QApplication::activeModalWidget() ? QApplication::activeModalWidget() :
-                              QApplication::activePopupWidget() ? QApplication::activePopupWidget() : 0)
-    {
-        /* Set modal/popup window's parent to null early,
-         * because deleteLater() is synchronous
-         * and will be called later than this destructor: */
-        pWidget->setParent(0);
-        /* Close modal/popup window early to hide it
-         * because deleteLater() is synchronous
-         * and will be called later than this destructor: */
-        pWidget->close();
-        /* Delete modal/popup window synchronously (safe): */
-        pWidget->deleteLater();
-    }
-#endif
 }
 

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

@@ -65 +65 @@
     virtual void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
 
-    /* Slot to close machine-window: */
-    void sltTryClose();
-
 protected:
 
-    /* Constructor/destructor: */
+    /* Constructor: */
     UIMachineWindow(UIMachineLogic *pMachineLogic, ulong uScreenId);
-    ~UIMachineWindow();
 
     /* Show stuff: */

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

@@ -497 +497 @@
 void UISession::sltCloseVirtualSession()
 {
-    /* Recursively close all the usual modal & popup widgets... */
-    QWidget *widget = QApplication::activeModalWidget() ?
-                      QApplication::activeModalWidget() :
-                      QApplication::activePopupWidget() ?
-                      QApplication::activePopupWidget() : 0;
-    if (widget)
-    {
-        widget->hide();
+    /* First, we have to close/hide any opened modal & popup application widgets.
+     * We have to make sure such window is hidden even if close-event was rejected.
+     * We are re-throwing this slot if any widget present to test again.
+     * If all opened widgets are closed/hidden, we can try to close machine-window: */
+    QWidget *pWidget = QApplication::activeModalWidget() ? QApplication::activeModalWidget() :
+                       QApplication::activePopupWidget() ? QApplication::activePopupWidget() : 0;
+    if (pWidget)
+    {
+        /* Closing/hiding all we found: */
+        pWidget->close();
+        if (!pWidget->isHidden())
+            pWidget->hide();
         QTimer::singleShot(0, this, SLOT(sltCloseVirtualSession()));
         return;

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -604 +604 @@
 }
 
-void UISettingsDialog::closeEvent(QCloseEvent *pEvent)
-{
-    if (m_fLoaded)
-        QIMainDialog::closeEvent(pEvent);
-    else
-        pEvent->ignore();
-}
-
 void UISettingsDialog::assignValidator(UISettingsPage *pPage)
 {

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

@@ -119 +119 @@
     bool eventFilter(QObject *pObject, QEvent *pEvent);
     void showEvent(QShowEvent *pEvent);
-    void closeEvent(QCloseEvent *pEvent);
 
     void assignValidator(UISettingsPage *pPage);