Changeset 91698 in vbox

Timestamp:

Oct 12, 2021 5:59:15 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: A bit of cleanup for redundant stuff in UIWizardNewCloudVM.

Location:

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

Files:

• UIWizardNewCloudVMPageExpert.cpp (modified) (4 diffs)
• UIWizardNewCloudVMPageExpert.h (modified) (1 diff)
• UIWizardNewCloudVMPageSource.cpp (modified) (4 diffs)
• UIWizardNewCloudVMPageSource.h (modified) (1 diff)

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

@@ -311 +311 @@
 void UIWizardNewCloudVMPageExpert::sltHandleProviderComboChange()
 {
-    updateProvider();
+    /* Update combo tool-tip: */
+    updateComboToolTip(m_pProviderComboBox);
+
+    /* Update wizard fields: */
+    wizard()->setProviderShortName(m_pProviderComboBox->currentData(ProviderData_ShortName).toString());
+
+    /* Update profiles: */
+    populateProfiles(m_pProfileComboBox, wizard()->providerShortName(), wizard()->profileName());
+    sltHandleProfileComboChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -317 +327 @@
 void UIWizardNewCloudVMPageExpert::sltHandleProfileComboChange()
 {
-    updateProfile();
+    /* Update wizard fields: */
+    wizard()->setProfileName(m_pProfileComboBox->currentData(ProfileData_Name).toString());
+    wizard()->setClient(cloudClientByName(wizard()->providerShortName(), wizard()->profileName(), wizard()));
+
+    /* Update source: */
+    sltHandleSourceTabBarChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -329 +346 @@
 void UIWizardNewCloudVMPageExpert::sltHandleSourceTabBarChange()
 {
-    updateSource();
+    /* Update source type: */
+    populateSourceImages(m_pSourceImageList, m_pSourceTabBar, wizard()->client());
+    sltHandleSourceImageChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -335 +356 @@
 void UIWizardNewCloudVMPageExpert::sltHandleSourceImageChange()
 {
-    updateSourceImage();
-    emit completeChanged();
-}
-
-void UIWizardNewCloudVMPageExpert::updateProvider()
-{
-    updateComboToolTip(m_pProviderComboBox);
-    wizard()->setProviderShortName(m_pProviderComboBox->currentData(ProviderData_ShortName).toString());
-    populateProfiles(m_pProfileComboBox, wizard()->providerShortName(), wizard()->profileName());
-    updateProfile();
-}
-
-void UIWizardNewCloudVMPageExpert::updateProfile()
-{
-    wizard()->setProfileName(m_pProfileComboBox->currentData(ProfileData_Name).toString());
-    wizard()->setClient(cloudClientByName(wizard()->providerShortName(), wizard()->profileName(), wizard()));
-    updateSource();
-}
-
-void UIWizardNewCloudVMPageExpert::updateSource()
-{
-    populateSourceImages(m_pSourceImageList, m_pSourceTabBar, wizard()->client());
-    updateSourceImage();
-}
-
-void UIWizardNewCloudVMPageExpert::updateSourceImage()
-{
+    /* Update source image & VSD form: */
     m_strSourceImageId = currentListWidgetData(m_pSourceImageList);
-    updateVSDForm();
-}
-
-void UIWizardNewCloudVMPageExpert::updateVSDForm()
-{
     wizard()->setVSD(createVirtualSystemDescription(wizard()));
     populateFormProperties(wizard()->vsd(), m_pSourceTabBar, m_strSourceImageId);
     wizard()->createVSDForm();
     updatePropertiesTable();
+
+    /* Notify about changes: */
+    emit completeChanged();
 }
 

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

@@ -76 +76 @@
 private:
 
-    /** Updates provider. */
-    void updateProvider();
-    /** Updates profile. */
-    void updateProfile();
-    /** Updates source. */
-    void updateSource();
-    /** Updates source image. */
-    void updateSourceImage();
-    /** Updates VSD form. */
-    void updateVSDForm();
     /** Updates properties table. */
     void updatePropertiesTable();

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

@@ -530 +530 @@
 void UIWizardNewCloudVMPageSource::sltHandleProviderComboChange()
 {
-    updateProvider();
+    /* Update combo tool-tip: */
+    updateComboToolTip(m_pProviderComboBox);
+
+    /* Update wizard fields: */
+    wizard()->setProviderShortName(m_pProviderComboBox->currentData(ProviderData_ShortName).toString());
+
+    /* Update profiles: */
+    populateProfiles(m_pProfileComboBox, wizard()->providerShortName(), wizard()->profileName());
+    sltHandleProfileComboChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -536 +546 @@
 void UIWizardNewCloudVMPageSource::sltHandleProfileComboChange()
 {
-    updateProfile();
+    /* Update wizard fields: */
+    wizard()->setProfileName(m_pProfileComboBox->currentData(ProfileData_Name).toString());
+    wizard()->setClient(cloudClientByName(wizard()->providerShortName(), wizard()->profileName(), wizard()));
+
+    /* Update source: */
+    sltHandleSourceTabBarChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -548 +565 @@
 void UIWizardNewCloudVMPageSource::sltHandleSourceTabBarChange()
 {
-    updateSource();
+    /* Update source type: */
+    populateSourceImages(m_pSourceImageList, m_pSourceTabBar, wizard()->client());
+    sltHandleSourceImageChange();
+
+    /* Notify about changes: */
     emit completeChanged();
 }
@@ -554 +575 @@
 void UIWizardNewCloudVMPageSource::sltHandleSourceImageChange()
 {
-    updateSourceImage();
+    /* Update source image: */
+    m_strSourceImageId = currentListWidgetData(m_pSourceImageList);
+
+    /* Notify about changes: */
     emit completeChanged();
 }
-
-void UIWizardNewCloudVMPageSource::updateProvider()
-{
-    updateComboToolTip(m_pProviderComboBox);
-    wizard()->setProviderShortName(m_pProviderComboBox->currentData(ProviderData_ShortName).toString());
-    populateProfiles(m_pProfileComboBox, wizard()->providerShortName(), wizard()->profileName());
-    updateProfile();
-}
-
-void UIWizardNewCloudVMPageSource::updateProfile()
-{
-    wizard()->setProfileName(m_pProfileComboBox->currentData(ProfileData_Name).toString());
-    wizard()->setClient(cloudClientByName(wizard()->providerShortName(), wizard()->profileName(), wizard()));
-    updateSource();
-}
-
-void UIWizardNewCloudVMPageSource::updateSource()
-{
-    populateSourceImages(m_pSourceImageList, m_pSourceTabBar, wizard()->client());
-    updateSourceImage();
-}
-
-void UIWizardNewCloudVMPageSource::updateSourceImage()
-{
-    m_strSourceImageId = currentListWidgetData(m_pSourceImageList);
-}

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

@@ -121 +121 @@
 private:
 
-    /** Updates provider. */
-    void updateProvider();
-    /** Updates profile. */
-    void updateProfile();
-    /** Updates source. */
-    void updateSource();
-    /** Updates source image. */
-    void updateSourceImage();
-
     /** Holds the image ID. */
     QString  m_strSourceImageId;