Changeset 91259 in vbox

Timestamp:

Sep 15, 2021 6:47:38 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: Export Appliance wizard: Move custom button click handling from wizard to particular page; This will help us to get rid of public appliance widget reference.

Location:

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

Files:

• UIWizardExportApp.cpp (modified) (1 diff)
• UIWizardExportApp.h (modified) (1 diff)
• UIWizardExportAppPageBasic3.cpp (modified) (2 diffs)
• UIWizardExportAppPageBasic3.h (modified) (2 diffs)
• UIWizardExportAppPageExpert.cpp (modified) (2 diffs)
• UIWizardExportAppPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

@@ -187 +187 @@
     setOption(QWizard::HaveCustomButton2,    (mode() == WizardMode_Basic && iId == Page3)
                                           || (mode() == WizardMode_Expert && iId == PageExpert));
-}
-
-void UIWizardExportApp::sltCustomButtonClicked(int iId)
-{
-    /* Call to base-class: */
-    UIWizard::sltCustomButtonClicked(iId);
-
-    /* Handle 2nd button: */
-    if (iId == CustomButton2)
-    {
-        /* Get appliance widget and make sure it's valid: */
-        ExportAppliancePointer pApplianceWidget = field("applianceWidget").value<ExportAppliancePointer>();
-        AssertMsg(!pApplianceWidget.isNull(), ("Appliance Widget is not set!\n"));
-        /* Reset it to default: */
-        pApplianceWidget->restoreDefaults();
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.h

@@ -65 +65 @@
     virtual void sltCurrentIdChanged(int iId) /* override */;
 
-    /** Handles custom button @a iId click. */
-    virtual void sltCustomButtonClicked(int iId) /* override */;
-
 protected:
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp

@@ -201 +201 @@
     else
         refreshApplianceSettingsWidget();
+
+    /* Listen for custom button clicks: */
+    connect(wizard(), &UIWizard::customButtonClicked,
+            this, &UIWizardExportAppPageBasic3::sltHandleCustomButtonClicked,
+            Qt::UniqueConnection);
+}
+
+void UIWizardExportAppPageBasic3::cleanupPage()
+{
+    /* Call to base-class: */
+    UIWizardPage::cleanupPage();
+
+    /* Stop listen for custom button clicks: */
+    disconnect(wizard(), &UIWizard::customButtonClicked,
+               this, &UIWizardExportAppPageBasic3::sltHandleCustomButtonClicked);
 }
 
@@ -265 +280 @@
     }
 }
+
+void UIWizardExportAppPageBasic3::sltHandleCustomButtonClicked(int iId)
+{
+    /* Handle 2nd button: */
+    if (iId == QWizard::CustomButton2)
+    {
+        /* Reset widget to default: */
+        AssertPtrReturnVoid(m_pApplianceWidget.data());
+        m_pApplianceWidget->restoreDefaults();
+    }
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.h

@@ -92 +92 @@
     /** Performs page initialization. */
     virtual void initializePage() /* override */;
+    /** Performs page cleanup. */
+    virtual void cleanupPage() /* override */;
 
     /** Performs page validation. */
@@ -98 +100 @@
     /** Updates page appearance. */
     virtual void updatePageAppearance() /* override */;
+
+private slots:
+
+    /** Handles custom button clicked.
+      * @param  iId  Brings clicked button id. */
+    void sltHandleCustomButtonClicked(int iId);
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp

@@ -561 +561 @@
     /* Choose default cloud export option: */
     m_pRadioExportThenAsk->setChecked(true);
+
+    /* Listen for custom button clicks: */
+    connect(wizard(), &UIWizard::customButtonClicked,
+            this, &UIWizardExportAppPageExpert::sltHandleCustomButtonClicked,
+            Qt::UniqueConnection);
 }
 
 void UIWizardExportAppPageExpert::cleanupPage()
 {
-    /* Do nothing, we don't want field values to be reseted. */
+    /* Do not pass call to base-class, we don't want field values to be reseted. */
+
+    /* Stop listen for custom button clicks: */
+    disconnect(wizard(), &UIWizard::customButtonClicked,
+               this, &UIWizardExportAppPageExpert::sltHandleCustomButtonClicked);
 }
 
@@ -696 +705 @@
 }
 
+void UIWizardExportAppPageExpert::sltHandleCustomButtonClicked(int iId)
+{
+    /* Handle 2nd button: */
+    if (iId == QWizard::CustomButton2)
+    {
+        /* Reset widget to default: */
+        m_pApplianceWidget->restoreDefaults();
+    }
+}
+
 void UIWizardExportAppPageExpert::sltHandleProfileComboChange()
 {

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h

@@ -96 +96 @@
     void sltHandleMACAddressExportPolicyComboChange();
 
+    /** Handles custom button clicked.
+      * @param  iId  Brings clicked button id. */
+    void sltHandleCustomButtonClicked(int iId);
+
     /** Handles change in profile combo-box. */
     void sltHandleProfileComboChange();