Changeset 91589 in vbox for trunk/src/VBox

Timestamp:

Oct 6, 2021 10:43:27 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: UIWizardImportApp: Get rid of UIWizardImportAppDefs.h and appliance widget field.

Location:

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

Files:

• UIWizardImportApp.cpp (modified) (1 diff)
• UIWizardImportApp.h (modified) (1 diff)
• UIWizardImportAppDefs.h (deleted)
• UIWizardImportAppPageBasic1.cpp (modified) (1 diff)
• UIWizardImportAppPageBasic1.h (modified) (1 diff)
• UIWizardImportAppPageBasic2.cpp (modified) (4 diffs)
• UIWizardImportAppPageBasic2.h (modified) (4 diffs)
• UIWizardImportAppPageExpert.cpp (modified) (3 diffs)
• UIWizardImportAppPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp

@@ -315 +315 @@
     /* Translate wizard: */
     setWindowTitle(tr("Import Virtual Appliance"));
-    setButtonText(QWizard::CustomButton2, tr("Restore Defaults"));
     setButtonText(QWizard::FinishButton, tr("Import"));
-}
-
-void UIWizardImportApp::sltCurrentIdChanged(int iId)
-{
-    /* Call to base-class: */
-    UIWizard::sltCurrentIdChanged(iId);
-    /* Enable 2nd button (Reset to Defaults) for 2nd and Expert pages only! */
-    setOption(QWizard::HaveCustomButton2, (mode() == WizardMode_Basic && iId == Page2) ||
-                                          (mode() == WizardMode_Expert && iId == PageExpert));
-}
-
-void UIWizardImportApp::sltCustomButtonClicked(int iId)
-{
-    /* Call to base-class: */
-    UIWizard::sltCustomButtonClicked(iId);
-
-    /* Handle 2nd button: */
-    if (iId == CustomButton2)
-    {
-        /* Get appliance widget: */
-        ImportAppliancePointer pApplianceWidget = field("applianceWidget").value<ImportAppliancePointer>();
-        AssertMsg(!pApplianceWidget.isNull(), ("Appliance Widget is not set!\n"));
-        /* Reset it to default: */
-        pApplianceWidget->restoreDefaults();
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.h

@@ -81 +81 @@
     virtual void retranslateUi() /* override */;
 
-protected slots:
-
-    /** Handles change for page with @a iId. */
-    virtual void sltCurrentIdChanged(int iId) /* override */;
-    /** Handles custom button 2 click  for page with @a iId. */
-    virtual void sltCustomButtonClicked(int iId) /* override */;
-
 private:
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp

@@ -42 +42 @@
 /* COM includes: */
 #include "CStringArray.h"
+#include "CVirtualSystemDescription.h"
 
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.h

@@ -23 +23 @@
 
 /* GUI includes: */
-#include "UIWizardImportAppDefs.h"
 #include "UIWizardPage.h"
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp

@@ -27 +27 @@
 /* GUI includes: */
 #include "QIRichTextLabel.h"
+#include "UIApplianceImportEditorWidget.h"
 #include "UIApplianceUnverifiedCertificateViewer.h"
 #include "UICommon.h"
 #include "UIFilePathSelector.h"
+#include "UIFormEditorWidget.h"
 #include "UIMessageCenter.h"
 #include "UIWizardImportApp.h"
@@ -47 +49 @@
 UIWizardImportAppPage2::UIWizardImportAppPage2()
     : m_pSettingsCntLayout(0)
+    , m_pApplianceWidget(0)
     , m_pLabelImportFilePath(0)
     , m_pEditorImportFilePath(0)
@@ -53 +56 @@
     , m_pLabelAdditionalOptions(0)
     , m_pCheckboxImportHDsAsVDI(0)
+    , m_pFormEditor(0)
 {
 }
@@ -267 +271 @@
             this, &UIWizardImportAppPageBasic2::sltHandleMACImportPolicyChange);
 
-    /* Register classes: */
-    qRegisterMetaType<ImportAppliancePointer>();
     /* Register fields: */
-    registerField("applianceWidget", this, "applianceWidget");
     registerField("macAddressImportPolicy", this, "macAddressImportPolicy");
     registerField("importHDsAsVDI", this, "importHDsAsVDI");

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.h

@@ -23 +23 @@
 
 /* GUI includes: */
-#include "UIFormEditorWidget.h"
 #include "UIWizardImportApp.h"
-#include "UIWizardImportAppDefs.h"
 #include "UIWizardPage.h"
 
 /* Forward declarations: */
+class QCheckBox;
 class QComboBox;
 class QLabel;
 class QStackedLayout;
 class QIRichTextLabel;
+class UIApplianceImportEditorWidget;
 class UIFilePathSelector;
+class UIFormEditorWidget;
 
 /** UIWizardPageBase extension for 2nd page of the Import Appliance wizard. */
@@ -55 +56 @@
     void refreshFormPropertiesTable();
 
-    /** Returns appliance widget instance. */
-    ImportAppliancePointer applianceWidget() const { return m_pApplianceWidget; }
-
     /** Returns MAC address import policy. */
     MACAddressImportPolicy macAddressImportPolicy() const;
@@ -70 +68 @@
 
     /** Holds the appliance widget instance. */
-    ImportAppliancePointer  m_pApplianceWidget;
+    UIApplianceImportEditorWidget *m_pApplianceWidget;
     /** Holds the import file-path label instance. */
-    QLabel                 *m_pLabelImportFilePath;
+    QLabel                        *m_pLabelImportFilePath;
     /** Holds the import file-path editor instance. */
-    UIFilePathSelector     *m_pEditorImportFilePath;
+    UIFilePathSelector            *m_pEditorImportFilePath;
     /** Holds the MAC address label instance. */
-    QLabel                 *m_pLabelMACImportPolicy;
+    QLabel                        *m_pLabelMACImportPolicy;
     /** Holds the MAC address combo instance. */
-    QComboBox              *m_pComboMACImportPolicy;
+    QComboBox                     *m_pComboMACImportPolicy;
     /** Holds the additional options label instance. */
-    QLabel                 *m_pLabelAdditionalOptions;
+    QLabel                        *m_pLabelAdditionalOptions;
     /** Holds the 'import HDs as VDI' checkbox instance. */
-    QCheckBox              *m_pCheckboxImportHDsAsVDI;
+    QCheckBox                     *m_pCheckboxImportHDsAsVDI;
 
     /** Holds the Form Editor widget instance. */
-    UIFormEditorWidgetPointer  m_pFormEditor;
+    UIFormEditorWidget *m_pFormEditor;
 };
 
@@ -92 +90 @@
 {
     Q_OBJECT;
-    Q_PROPERTY(ImportAppliancePointer applianceWidget READ applianceWidget);
     Q_PROPERTY(MACAddressImportPolicy macAddressImportPolicy READ macAddressImportPolicy);
     Q_PROPERTY(bool importHDsAsVDI READ importHDsAsVDI);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp

@@ -34 +34 @@
 #include "UIEmptyFilePathSelector.h"
 #include "UIFilePathSelector.h"
+#include "UIFormEditorWidget.h"
 #include "UIIconPool.h"
 #include "UIMessageCenter.h"
@@ -285 +286 @@
             this, &UIWizardImportAppPageExpert::sltHandleMACImportPolicyChange);
 
-    /* Register classes: */
-    qRegisterMetaType<ImportAppliancePointer>();
     /* Register fields: */
     registerField("isSourceCloudOne", this, "isSourceCloudOne");
@@ -293 +292 @@
     registerField("vsdForm", this, "vsdForm");
     registerField("machineId", this, "machineId");
-    registerField("applianceWidget", this, "applianceWidget");
     registerField("macAddressImportPolicy", this, "macAddressImportPolicy");
     registerField("importHDsAsVDI", this, "importHDsAsVDI");

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.h

@@ -40 +40 @@
     Q_PROPERTY(CVirtualSystemDescriptionForm vsdForm READ vsdForm);
     Q_PROPERTY(QString machineId READ machineId);
-    Q_PROPERTY(ImportAppliancePointer applianceWidget READ applianceWidget);
     Q_PROPERTY(MACAddressImportPolicy macAddressImportPolicy READ macAddressImportPolicy);
     Q_PROPERTY(bool importHDsAsVDI READ importHDsAsVDI);