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

Timestamp:

Jul 9, 2018 4:00:42 PM (7 years ago)

Author:

vboxsync

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

123566

Message:

FE/Qt: bugref:9152: Export Appliance wizard: Expert page: forgot something in r123559.

Location:

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

Files:

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

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

@@ -60 +60 @@
 void UIWizardExportAppPage3::populateProviders()
 {
+    AssertReturnVoid(m_pProviderComboBox->count() == 0);
+
     /* Acquire provider list: */
     // Here goes the experiamental list with
@@ -391 +393 @@
     m_strDefaultApplianceName = UIWizardExportApp::tr("Appliance");
 
-    /* Translate File selector: */
+    /* Translate file selector: */
     m_pFileSelectorLabel->setText(UIWizardExportApp::tr("&File:"));
     m_pFileSelector->setChooseButtonToolTip(tr("Choose a file to export the virtual appliance to..."));
@@ -421 +423 @@
             m_pProviderComboBox->setItemText(i, UIWizardExportApp::tr("Oracle Cloud Infrastructure"));
             m_pProviderComboBox->setItemData(i, UIWizardExportApp::tr("Write to Oracle Cloud Infrastructure"), Qt::ToolTipRole);
+        }
+        else
+        {
+            m_pProviderComboBox->setItemData(i, UIWizardExportApp::tr("Write to %1").arg(m_pProviderComboBox->itemText(i)), Qt::ToolTipRole);
         }
     }

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

@@ -204 +204 @@
                     pSettingsLayout->addWidget(m_pManifestCheckbox, 6, 1);
                 }
+
+                /* Create provider combo-box: */
+                m_pProviderComboBox = new QComboBox;
+                if (m_pProviderComboBox)
+                {
+                    /* Hide it for now: */
+                    m_pProviderComboBox->hide();
+
+                    /* Add into layout: */
+                    pSettingsLayout->addWidget(m_pProviderComboBox, 7, 1);
+                }
+                /* Create provider label: */
+                m_pProviderComboBoxLabel = new QLabel;
+                if (m_pProviderComboBoxLabel)
+                {
+                    /* Hide it for now: */
+                    m_pProviderComboBoxLabel->hide();
+
+                    m_pProviderComboBoxLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+                    m_pProviderComboBoxLabel->setBuddy(m_pProviderComboBox);
+
+                    /* Add into layout: */
+                    pSettingsLayout->addWidget(m_pProviderComboBoxLabel, 7, 0);
+                }
             }
 
@@ -215 +239 @@
     /* Choose default storage type: */
     chooseDefaultStorageType();
+    /* Populate providers: */
+    populateProviders();
     /* Choose default settings: */
     chooseDefaultSettings();
@@ -225 +251 @@
     connect(m_pFormatComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &UIWizardExportAppPageExpert::sltHandleFormatComboChange);
+    connect(m_pProviderComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &UIWizardExportAppPageExpert::sltHandleProviderComboChange);
 
     /* Register classes: */
@@ -268 +296 @@
     m_pManifestCheckbox->setText(UIWizardExportApp::tr("Write &Manifest file"));
 
+    /* Translate Provider combo-box: */
+    m_pProviderComboBoxLabel->setText(UIWizardExportApp::tr("&Cloud Service Provider:"));
+    for (int i = 0; i < m_pProviderComboBox->count(); ++i)
+    {
+        if (m_pProviderComboBox->itemText(i) == "OCI")
+        {
+            m_pProviderComboBox->setItemText(i, UIWizardExportApp::tr("Oracle Cloud Infrastructure"));
+            m_pProviderComboBox->setItemData(i, UIWizardExportApp::tr("Write to Oracle Cloud Infrastructure"), Qt::ToolTipRole);
+        }
+        else
+        {
+            m_pProviderComboBox->setItemData(i, UIWizardExportApp::tr("Write to %1").arg(m_pProviderComboBox->itemText(i)), Qt::ToolTipRole);
+        }
+    }
+
     /* Refresh current settings: */
     refreshCurrentSettings();
@@ -365 +408 @@
     updateFormatComboToolTip();
 }
+
+void UIWizardExportAppPageExpert::sltHandleProviderComboChange()
+{
+    /* Refresh current settings: */
+    refreshCurrentSettings();
+    updateProviderComboToolTip();
+}

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

@@ -84 +84 @@
     void sltHandleFormatComboChange();
 
+    /** Handles change in provider combo-box. */
+    void sltHandleProviderComboChange();
+
 private: