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

Timestamp:

Aug 5, 2024 2:09:31 PM (7 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

164260

Message:

FE/Qt: bugref:10665: UINativeWizard: Make sure wizard is cleanup up if aborted (by Escape key or Cancel button).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards

Files:

• UINativeWizard.cpp (modified) (7 diffs)
• UINativeWizard.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2009-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -99 +99 @@
     , m_strHelpKeyword(strHelpKeyword)
     , m_iLastIndex(-1)
+    , m_fAborted(false)
     , m_fClosed(false)
     , m_pLabelPixmap(0)
@@ -234 +235 @@
 void UINativeWizard::keyPressEvent(QKeyEvent *pEvent)
 {
+    // WORKAROUND:
+    // In non-modal case we'll have to handle Escape button ourselves.
+    // In modal case QDialog does this itself internally by unwinding the event-loop.
+
     /* Different handling depending on current modality: */
     const Qt::WindowModality enmModality = windowHandle()->modality();
@@ -245 +250 @@
             case Qt::Key_Escape:
             {
-                close();
+                sltAbort();
                 return;
             }
@@ -276 +281 @@
         {
             m_fClosed = true;
+            if (m_fAborted)
+                cleanWizard();
             emit sigClose(m_enmType);
         }
@@ -378 +385 @@
             accept();
     }
+}
+
+void UINativeWizard::sltAbort()
+{
+    cleanWizard();
+    close();
 }
 
@@ -539 +552 @@
                         this, &UINativeWizard::sltNext);
                 connect(wizardButton(WizardButtonType_Cancel), &QPushButton::clicked,
-                        this, &UINativeWizard::close);
+                        this, &UINativeWizard::sltAbort);
             }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2009-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -155 +155 @@
 
 protected slots:
+
     /** Handles translation event. */
     virtual void sltRetranslateUI();
@@ -169 +170 @@
     /** Switches to next page. */
     void sltNext();
+    /** Aborts wizard. */
+    void sltAbort();
 
     /** Handle help request*/
@@ -210 +213 @@
     /** Holds the set of invisible pages. */
     QSet<int>   m_invisiblePages;
+    /** Holds whether user has requested to abort wizard. */
+    bool        m_fAborted;
     /** Holds whether the dialod had emitted signal to be closed. */
     bool        m_fClosed;