Changeset 99194 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 28, 2023 11:43:51 AM (22 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6669: Advance UINativeWizard interface to support non-modal way of running wizards.

Location:

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

Files:

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

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

@@ -93 +93 @@
                                WizardMode enmMode /* = WizardMode_Auto */,
                                const QString &strHelpTag /* = QString() */)
-    : QIWithRetranslateUI<QDialog>(pParent)
+    : QIWithRetranslateUI2<QDialog>(pParent, Qt::Window)
     , m_enmType(enmType)
     , m_enmMode(enmMode == WizardMode_Auto ? gEDataManager->modeForWizardType(m_enmType) : enmMode)
     , m_strHelpHashtag(strHelpTag)
     , m_iLastIndex(-1)
+    , m_fClosed(false)
     , m_pLabelPixmap(0)
     , m_pLayoutRight(0)
@@ -136 +137 @@
 
     /* Call to base-class: */
-    return QIWithRetranslateUI<QDialog>::exec();
+    return QIWithRetranslateUI2<QDialog>::exec();
+}
+
+void UINativeWizard::show()
+{
+    /* Init wizard: */
+    init();
+
+    /* Call to base-class: */
+    return QIWithRetranslateUI2<QDialog>::show();
 }
 
@@ -241 +251 @@
     pButtonCancel->setText(tr("&Cancel"));
     pButtonCancel->setToolTip(tr("Cancel wizard execution."));
+}
+
+void UINativeWizard::keyPressEvent(QKeyEvent *pEvent)
+{
+    /* Different handling depending on current modality: */
+    const Qt::WindowModality enmModality = windowHandle()->modality();
+
+    /* For non-modal case: */
+    if (enmModality == Qt::NonModal)
+    {
+        /* Special pre-processing for some keys: */
+        switch (pEvent->key())
+        {
+            case Qt::Key_Escape:
+            {
+                close();
+                return;
+            }
+            default:
+                break;
+        }
+    }
+
+    /* Call to base-class: */
+    return QIWithRetranslateUI2<QDialog>::keyPressEvent(pEvent);
+}
+
+void UINativeWizard::closeEvent(QCloseEvent *pEvent)
+{
+    /* Different handling depending on current modality: */
+    const Qt::WindowModality enmModality = windowHandle()->modality();
+
+    /* For non-modal case: */
+    if (enmModality == Qt::NonModal)
+    {
+        /* Ignore event initially: */
+        pEvent->ignore();
+
+        /* Tell the listener to close us (once): */
+        if (!m_fClosed)
+        {
+            m_fClosed = true;
+            emit sigClose(m_enmType);
+        }
+
+        return;
+    }
+
+    /* Call to base-class: */
+    QIWithRetranslateUI2<QDialog>::closeEvent(pEvent);
 }
 
@@ -513 +573 @@
                         this, &UINativeWizard::sltNext);
                 connect(wizardButton(WizardButtonType_Cancel), &QPushButton::clicked,
-                        this, &UINativeWizard::reject);
+                        this, &UINativeWizard::close);
             }
 

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

@@ -83 +83 @@
 
 /** QDialog extension with advanced functionality emulating QWizard behavior. */
-class SHARED_LIBRARY_STUFF UINativeWizard : public QIWithRetranslateUI<QDialog>
+class SHARED_LIBRARY_STUFF UINativeWizard : public QIWithRetranslateUI2<QDialog>
 {
     Q_OBJECT;
+
+signals:
+
+    /** Notifies listeners about dialog should be closed. */
+    void sigClose(WizardType enmType);
 
 public:
@@ -113 +118 @@
       * @note You shouldn't have to override it! */
     virtual int exec() /* final */;
+    /** Shows wizard in non-mode.
+      * @note You shouldn't have to override it! */
+    virtual void show() /* final */;
 
 protected:
@@ -141 +149 @@
     /** Handles translation event. */
     virtual void retranslateUi() RT_OVERRIDE;
+
+    /** Handles key-press @a pEvent. */
+    virtual void keyPressEvent(QKeyEvent *pEvent) RT_OVERRIDE;
+    /** Handles close @a pEvent. */
+    virtual void closeEvent(QCloseEvent *pEvent) RT_OVERRIDE;
 
     /** Performs wizard-specific cleanup in case of wizard-mode change
@@ -199 +212 @@
     /** Holds the set of invisible pages. */
     QSet<int>   m_invisiblePages;
+    /** Holds whether the dialod had emitted signal to be closed. */
+    bool        m_fClosed;
 
     /** Holds the pixmap label instance. */