Changeset 73025 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 10, 2018 10:00:15 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123577

Message:

FE/Qt: bugref:9152: Export Appliance wizard: Storage and Expert pages: Populate storage formats same way as other combos.

Location:

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

Files:

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

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

@@ -58 +58 @@
 }
 
+void UIWizardExportAppPage3::populateFormats()
+{
+    AssertReturnVoid(m_pFormatComboBox->count() == 0);
+
+    /* Apply hardcoded format list: */
+    QStringList formats;
+    formats << "ovf-0.9";
+    formats << "ovf-1.0";
+    formats << "ovf-2.0";
+    formats << "opc-1.0";
+    m_pFormatComboBox->addItems(formats);
+
+    /* Duplicate non-translated names to data fields: */
+    for (int i = 0; i < m_pFormatComboBox->count(); ++i)
+        m_pFormatComboBox->setItemData(i, m_pFormatComboBox->itemText(i));
+
+    /* Set default: */
+    setFormat("ovf-1.0");
+}
+
 void UIWizardExportAppPage3::populateProviders()
 {
@@ -75 +95 @@
     for (int i = 0; i < m_pProviderComboBox->count(); ++i)
         m_pProviderComboBox->setItemData(i, m_pProviderComboBox->itemText(i));
-}
-
-void UIWizardExportAppPage3::chooseDefaultSettings()
-{
-    /* Choose defaults: */
-    setFormat("ovf-1.0");
+
+    /* Set default: */
     setProvider("OCI");
 }
@@ -263 +279 @@
                     if (m_pFormatComboBox)
                     {
-                        const QString strFormatOVF09("ovf-0.9");
-                        const QString strFormatOVF10("ovf-1.0");
-                        const QString strFormatOVF20("ovf-2.0");
-                        const QString strFormatOPC10("opc-1.0");
-                        m_pFormatComboBox->addItem(strFormatOVF09, strFormatOVF09);
-                        m_pFormatComboBox->addItem(strFormatOVF10, strFormatOVF10);
-                        m_pFormatComboBox->addItem(strFormatOVF20, strFormatOVF20);
-                        m_pFormatComboBox->addItem(strFormatOPC10, strFormatOPC10);
-
                         /* Add into layout: */
                         pSettingsLayout1->addWidget(m_pFormatComboBox, 1, 1);
@@ -367 +374 @@
     }
 
+    /* Populate formats: */
+    populateFormats();
     /* Populate providers: */
     populateProviders();
-    /* Choose default settings: */
-    chooseDefaultSettings();
 
     /* Setup connections: */
@@ -516 +523 @@
 void UIWizardExportAppPageBasic3::sltHandleFormatComboChange()
 {
+    /* Update tool-tip: */
+    updateFormatComboToolTip();
+
+    /* Refresh current settings: */
     refreshCurrentSettings();
-    updateFormatComboToolTip();
 }
 
 void UIWizardExportAppPageBasic3::sltHandleProviderComboChange()
 {
+    /* Update tool-tip: */
+    updateProviderComboToolTip();
+
+    /* Refresh current settings: */
     refreshCurrentSettings();
-    updateProviderComboToolTip();
-}
+}

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

@@ -43 +43 @@
     UIWizardExportAppPage3();
 
+    /** Populates formats. */
+    void populateFormats();
     /** Populates providers. */
     void populateProviders();
-
-    /** Chooses default settings. */
-    void chooseDefaultSettings();
 
     /** Updates page appearance. */

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

@@ -189 +189 @@
                             if (m_pFormatComboBox)
                             {
-                                const QString strFormatOVF09("ovf-0.9");
-                                const QString strFormatOVF10("ovf-1.0");
-                                const QString strFormatOVF20("ovf-2.0");
-                                const QString strFormatOPC10("opc-1.0");
-                                m_pFormatComboBox->addItem(strFormatOVF09, strFormatOVF09);
-                                m_pFormatComboBox->addItem(strFormatOVF10, strFormatOVF10);
-                                m_pFormatComboBox->addItem(strFormatOVF20, strFormatOVF20);
-                                m_pFormatComboBox->addItem(strFormatOPC10, strFormatOPC10);
-
                                 /* Add into layout: */
                                 pSettingsLayout1->addWidget(m_pFormatComboBox, 1, 1);
@@ -304 +295 @@
     /* Choose default storage type: */
     chooseDefaultStorageType();
+    /* Populate formats: */
+    populateFormats();
     /* Populate providers: */
     populateProviders();
-    /* Choose default settings: */
-    chooseDefaultSettings();
 
     /* Setup connections: */
@@ -387 +378 @@
     /* Refresh current settings: */
     refreshCurrentSettings();
+
+    /* Update tool-tips: */
     updateFormatComboToolTip();
     updateProviderComboToolTip();
@@ -398 +391 @@
     /* Refresh current settings: */
     refreshCurrentSettings();
+    /* Refresh appliance settings: */
     refreshApplianceSettingsWidget();
 }
@@ -478 +472 @@
 void UIWizardExportAppPageExpert::sltHandleFormatComboChange()
 {
+    /* Update tool-tip: */
+    updateFormatComboToolTip();
+
     /* Refresh current settings: */
     refreshCurrentSettings();
-    updateFormatComboToolTip();
 }
 
 void UIWizardExportAppPageExpert::sltHandleProviderComboChange()
 {
+    /* Update tool-tip: */
+    updateProviderComboToolTip();
+
     /* Refresh current settings: */
     refreshCurrentSettings();
-    updateProviderComboToolTip();
-}
+}