Changeset 91499 in vbox for trunk/src/VBox

Timestamp:

Sep 30, 2021 2:39:22 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: Cleanup for unused stuff in UIWizardNewCloudVM.

Location:

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

Files:

• UIWizardNewCloudVM.cpp (modified) (7 diffs)
• UIWizardNewCloudVM.h (modified) (4 diffs)
• UIWizardNewCloudVMPageExpert.cpp (modified) (6 diffs)
• UIWizardNewCloudVMPageExpert.h (modified) (2 diffs)
• UIWizardNewCloudVMPageProperties.h (modified) (1 diff)
• UIWizardNewCloudVMPageSource.cpp (modified) (4 diffs)
• UIWizardNewCloudVMPageSource.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVM.cpp

@@ -16 +16 @@
  */
 
-/* Qt includes: */
-#include <QPushButton>
-
 /* GUI includes: */
-#include "UICommon.h"
 #include "UIMessageCenter.h"
 #include "UINotificationCenter.h"
@@ -35 +31 @@
 
 UIWizardNewCloudVM::UIWizardNewCloudVM(QWidget *pParent,
-                                       const QString &strFullGroupName /* = QString() */,
-                                       const CCloudClient &comClient /* = CCloudClient() */,
-                                       const CVirtualSystemDescription &comVSD /* = CVirtualSystemDescription() */,
-                                       WizardMode enmMode /* = WizardMode_Auto */)
-    : UINativeWizard(pParent, WizardType_NewCloudVM, enmMode)
-    , m_comClient(comClient)
-    , m_comVSD(comVSD)
-    , m_fFullWizard(m_comClient.isNull() || m_comVSD.isNull())
-    , m_fFinalStepPrevented(false)
+                                       const QString &strFullGroupName /* = QString() */)
+    : UINativeWizard(pParent, WizardType_NewCloudVM)
 {
 #ifndef VBOX_WS_MAC
@@ -131 +120 @@
     bool fResult = false;
 
-    /* Do nothing if prevented: */
-    if (m_fFinalStepPrevented)
-    {
-        fResult = true;
-        return fResult;
-    }
-
     /* Acquire prepared client and description: */
     CCloudClient comClient = client();
@@ -163 +145 @@
 }
 
-void UIWizardNewCloudVM::scheduleAutoFinish()
-{
-    QMetaObject::invokeMethod(this, "sltTriggerFinishButton", Qt::QueuedConnection);
-}
-
 void UIWizardNewCloudVM::populatePages()
 {
@@ -175 +152 @@
         case WizardMode_Basic:
         {
-            if (m_fFullWizard)
-                addPage(new UIWizardNewCloudVMPageSource);
+            addPage(new UIWizardNewCloudVMPageSource);
             addPage(new UIWizardNewCloudVMPageProperties);
             break;
@@ -182 +158 @@
         case WizardMode_Expert:
         {
-            addPage(new UIWizardNewCloudVMPageExpert(m_fFullWizard));
+            addPage(new UIWizardNewCloudVMPageExpert);
             break;
         }
@@ -203 +179 @@
     //setButtonText(QWizard::FinishButton, tr("Create"));
 }
-
-void UIWizardNewCloudVM::sltTriggerFinishButton()
-{
-    wizardButton(WizardButtonType_Next)->click();
-}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVM.h

@@ -39 +39 @@
 
     /** Constructs New Cloud VM wizard passing @a pParent & @a enmMode to the base-class.
-      * @param  strFullGroupName  Brings full group name (/provider/profile) to create VM in.
-      * @param  comClient         Brings the Cloud Client object to work with.
-      * @param  comVSD            Brings the Virtual System Description object to use. */
-    UIWizardNewCloudVM(QWidget *pParent,
-                       const QString &strFullGroupName = QString(),
-                       const CCloudClient &comClient = CCloudClient(),
-                       const CVirtualSystemDescription &comVSD = CVirtualSystemDescription(),
-                       WizardMode enmMode = WizardMode_Auto);
-
-    /** Sets whether the final step is @a fPrevented. */
-    void setFinalStepPrevented(bool fPrevented) { m_fFinalStepPrevented = fPrevented; }
+      * @param  strFullGroupName  Brings full group name (/provider/profile) to create VM in. */
+    UIWizardNewCloudVM(QWidget *pParent, const QString &strFullGroupName);
 
     /** Defines @a strProviderShortName. */
@@ -82 +73 @@
     bool createCloudVM();
 
-    /** Schedules Finish button trigger for
-      * the next event-loop cicle. */
-    void scheduleAutoFinish();
-
 protected:
 
@@ -93 +80 @@
     /** Handles translation event. */
     virtual void retranslateUi() /* override final */;
-
-private slots:
-
-    /** Triggers Finish button. */
-    void sltTriggerFinishButton();
 
 private:
@@ -111 +93 @@
     /** Holds the Virtual System Description Form object reference. */
     CVirtualSystemDescriptionForm  m_comVSDForm;
-
-    /** Holds whether we want full wizard form or short one. */
-    bool  m_fFullWizard;
-    /** Holds whether the final step is prevented. */
-    bool  m_fFinalStepPrevented;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp

@@ -40 +40 @@
 
 
-UIWizardNewCloudVMPageExpert::UIWizardNewCloudVMPageExpert(bool fFullWizard)
-    : m_fFullWizard(fFullWizard)
-    , m_pCntLocation(0)
+UIWizardNewCloudVMPageExpert::UIWizardNewCloudVMPageExpert()
+    : m_pCntLocation(0)
     , m_pProviderComboBox(0)
     , m_pProfileComboBox(0)
@@ -63 +62 @@
         if (m_pCntLocation)
         {
-            /* There is no location container in short wizard form: */
-            if (!m_fFullWizard)
-                m_pCntLocation->setVisible(false);
-
             /* Prepare location layout: */
             QVBoxLayout *pLocationLayout = new QVBoxLayout(m_pCntLocation);
@@ -110 +105 @@
         if (m_pCntSource)
         {
-            /* There is no source table in short wizard form: */
-            if (!m_fFullWizard)
-                m_pCntSource->setVisible(false);
-
             /* Prepare source layout: */
             QVBoxLayout *pSourceLayout = new QVBoxLayout(m_pCntSource);
@@ -256 +247 @@
 void UIWizardNewCloudVMPageExpert::initializePage()
 {
-    if (m_fFullWizard)
-    {
-        /* Populate providers: */
-        populateProviders(m_pProviderComboBox);
-        /* Translate providers: */
-        retranslateUi();
-        /* Fetch it, asynchronously: */
-        QMetaObject::invokeMethod(this, "sltHandleProviderComboChange", Qt::QueuedConnection);
-        /* Make image list focused by default: */
-        m_pSourceImageList->setFocus();
-    }
-    else
-    {
-        /* Generate VSD form, asynchronously: */
-        QMetaObject::invokeMethod(this, "sltInitShortWizardForm", Qt::QueuedConnection);
-    }
+    /* Populate providers: */
+    populateProviders(m_pProviderComboBox);
+    /* Translate providers: */
+    retranslateUi();
+    /* Make image list focused by default: */
+    m_pSourceImageList->setFocus();
+    /* Fetch it, asynchronously: */
+    QMetaObject::invokeMethod(this, "sltHandleProviderComboChange", Qt::QueuedConnection);
 }
 
@@ -316 +299 @@
         {
             wizard()->setVSDForm(CVirtualSystemDescriptionForm());
-            sltInitShortWizardForm();
+            wizard()->createVSDForm();
+            updatePropertiesTable();
+            emit completeChanged();
         }
     }
@@ -351 +336 @@
 {
     updateSourceImage();
-    emit completeChanged();
-}
-
-void UIWizardNewCloudVMPageExpert::sltInitShortWizardForm()
-{
-    if (wizard()->vsdForm().isNull())
-        wizard()->createVSDForm();
-    updatePropertiesTable();
     emit completeChanged();
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h

@@ -39 +39 @@
 
     /** Constructs expert page. */
-    UIWizardNewCloudVMPageExpert(bool fFullWizard);
+    UIWizardNewCloudVMPageExpert();
 
 protected:
@@ -73 +73 @@
     /** Handles change in instance list. */
     void sltHandleSourceImageChange();
-
-    /** Initializes short wizard form. */
-    void sltInitShortWizardForm();
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageProperties.h

@@ -25 +25 @@
 #include "UINativeWizardPage.h"
 
-/* COM includes: */
-#include "CVirtualSystemDescriptionForm.h"
-
 /* Forward declarations: */
 class QIRichTextLabel;
 class UIFormEditorWidget;
 class UIWizardNewCloudVM;
+class CVirtualSystemDescriptionForm;
 
 /** Namespace for properties page of the New Cloud VM wizard. */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.cpp

@@ -17 +17 @@
 
 /* Qt includes: */
-#include <QHeaderView>
 #include <QGridLayout>
 #include <QLabel>
 #include <QListWidget>
 #include <QTabBar>
-#include <QTableWidget>
 #include <QVBoxLayout>
 
@@ -38 +36 @@
 
 /* COM includes: */
-#include "CAppliance.h"
 #include "CStringArray.h"
 
@@ -164 +161 @@
 }
 
-void UIWizardNewCloudVMSource::populateSourceImages(QListWidget *pList, QTabBar *pTabBar, const CCloudClient &comClient)
+void UIWizardNewCloudVMSource::populateSourceImages(QListWidget *pList,
+                                                    QTabBar *pTabBar,
+                                                    const CCloudClient &comClient)
 {
     /* Sanity check: */
@@ -217 +216 @@
 }
 
-void UIWizardNewCloudVMSource::populateFormProperties(CVirtualSystemDescription comVSD, QTabBar *pTabBar, const QString &strImageId)
+void UIWizardNewCloudVMSource::populateFormProperties(CVirtualSystemDescription comVSD,
+                                                      QTabBar *pTabBar,
+                                                      const QString &strImageId)
 {
     /* Sanity check: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.h

@@ -27 +27 @@
 /* COM includes: */
 #include "COMEnums.h"
-#include "CCloudClient.h"
 #include "CVirtualSystemDescription.h"
-#include "CVirtualSystemDescriptionForm.h"
 
 /* Forward declarations: */
@@ -40 +38 @@
 class QIToolButton;
 class UIWizardNewCloudVM;
+class CCloudClient;
 class CCloudProvider;