Changeset 73007 in vbox

Timestamp:

Jul 9, 2018 12:02:55 PM (7 years ago)

Author:

vboxsync

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

123559

Message:

FE/Qt: bugref:9152: Export Appliance wizard: Storage page: Adding cloud storage provider combo.

Location:

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

Files:

• UIWizardExportAppPageBasic2.cpp (modified) (1 diff)
• UIWizardExportAppPageBasic3.cpp (modified) (11 diffs)
• UIWizardExportAppPageBasic3.h (modified) (6 diffs)
• UIWizardExportAppPageExpert.cpp (modified) (1 diff)

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

@@ -135 +135 @@
                                             "or on one of cloud servers you have registered."));
     m_pTypeLocalFilesystem->setText(UIWizardExportApp::tr("&This computer"));
-    m_pTypeCloudServiceProvider->setText(UIWizardExportApp::tr("&Cloud Service Provider"));
+    m_pTypeCloudServiceProvider->setText(UIWizardExportApp::tr("&Cloud service provider"));
 }
 

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

@@ -48 +48 @@
 }
 
+void UIWizardExportAppPage3::populateProviders()
+{
+    /* Acquire provider list: */
+    // Here goes the experiamental list with
+    // arbitrary contents for testing purposes.
+    QStringList providers;
+    providers << "OCI";
+    providers << "Amazon";
+    providers << "Google";
+    providers << "Microsoft";
+    m_pProviderComboBox->addItems(providers);
+
+    /* Duplicate non-translated names to data fields: */
+    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");
+    setProvider("OCI");
 }
 
@@ -68 +86 @@
             m_pAdditionalLabel->setVisible(true);
             m_pManifestCheckbox->setVisible(true);
+            m_pProviderComboBoxLabel->setVisible(false);
+            m_pProviderComboBox->setVisible(false);
             break;
         }
@@ -78 +98 @@
             m_pAdditionalLabel->setVisible(false);
             m_pManifestCheckbox->setVisible(false);
+            m_pProviderComboBoxLabel->setVisible(true);
+            m_pProviderComboBox->setVisible(true);
             break;
         }
@@ -135 +157 @@
 }
 
+void UIWizardExportAppPage3::updateProviderComboToolTip()
+{
+    const int iCurrentIndex = m_pProviderComboBox->currentIndex();
+    const QString strCurrentToolTip = m_pProviderComboBox->itemData(iCurrentIndex, Qt::ToolTipRole).toString();
+    AssertMsg(!strCurrentToolTip.isEmpty(), ("Data not found!"));
+    m_pProviderComboBox->setToolTip(strCurrentToolTip);
+}
+
 QString UIWizardExportAppPage3::path() const
 {
@@ -166 +196 @@
 {
     m_pManifestCheckbox->setChecked(fChecked);
+}
+
+QString UIWizardExportAppPage3::provider() const
+{
+    const int iIndex = m_pProviderComboBox->currentIndex();
+    return m_pProviderComboBox->itemData(iIndex).toString();
+}
+
+void UIWizardExportAppPage3::setProvider(const QString &strProvider)
+{
+    const int iIndex = m_pProviderComboBox->findData(strProvider);
+    AssertMsg(iIndex != -1, ("Field not found!"));
+    m_pProviderComboBox->setCurrentIndex(iIndex);
 }
 
@@ -261 +304 @@
             }
 
+            /* Create provider combo-box: */
+            m_pProviderComboBox = new QComboBox;
+            if (m_pProviderComboBox)
+            {
+                /* Add into layout: */
+                pSettingsLayout->addWidget(m_pProviderComboBox, 7, 1);
+            }
+            /* Create provider label: */
+            m_pProviderComboBoxLabel = new QLabel;
+            if (m_pProviderComboBoxLabel)
+            {
+                m_pProviderComboBoxLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+                m_pProviderComboBoxLabel->setBuddy(m_pProviderComboBox);
+
+                /* Add into layout: */
+                pSettingsLayout->addWidget(m_pProviderComboBoxLabel, 7, 0);
+            }
+
             /* Add into layout: */
             pMainLayout->addLayout(pSettingsLayout);
@@ -269 +330 @@
     }
 
+    /* Populate providers: */
+    populateProviders();
     /* Choose default settings: */
     chooseDefaultSettings();
@@ -276 +339 @@
     connect(m_pFormatComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &UIWizardExportAppPageBasic3::sltHandleFormatComboChange);
+    connect(m_pProviderComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &UIWizardExportAppPageBasic3::sltHandleProviderComboChange);
 
     /* Register fields: */
@@ -313 +378 @@
     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);
+        }
+    }
+
     /* Refresh current settings: */
     refreshCurrentSettings();
     updateFormatComboToolTip();
+    updateProviderComboToolTip();
 }
 
@@ -385 +462 @@
             m_pLabel->setText(tr("Please complete the additional fields and provide a filename for "
                                  "the OVF target."));
-            m_pLabel->setFocus(); /// @todo fix it!
+            m_pProviderComboBox->setFocus();
             break;
         }
@@ -396 +473 @@
     updateFormatComboToolTip();
 }
+
+void UIWizardExportAppPageBasic3::sltHandleProviderComboChange()
+{
+    refreshCurrentSettings();
+    updateProviderComboToolTip();
+}

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

@@ -42 +42 @@
     UIWizardExportAppPage3();
 
+    /** Populates providers. */
+    void populateProviders();
+
     /** Chooses default settings. */
     void chooseDefaultSettings();
@@ -50 +53 @@
     /** Updates format combo tool-tips. */
     virtual void updateFormatComboToolTip();
+    /** Updates provider combo tool-tips. */
+    virtual void updateProviderComboToolTip();
 
     /** Returns path. */
@@ -65 +70 @@
     /** Defines whether manifest @a fSelected. */
     void setManifestSelected(bool fChecked);
+
+    /** Returns provider. */
+    QString provider() const;
+    /** Defines @a strProvider. */
+    void setProvider(const QString &strProvider);
 
     /** Holds the default appliance name. */
@@ -83 +93 @@
     /** Holds the manifest check-box instance. */
     QCheckBox *m_pManifestCheckbox;
+
+    /** Holds the provider combo-box label instance. */
+    QLabel    *m_pProviderComboBoxLabel;
+    /** Holds the provider combo-box instance. */
+    QComboBox *m_pProviderComboBox;
 };
 
@@ -93 +108 @@
     Q_PROPERTY(QString format READ format WRITE setFormat);
     Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
+    Q_PROPERTY(QString provider READ provider WRITE setProvider);
 
 public:
@@ -121 +137 @@
     void sltHandleFormatComboChange();
 
+    /** Handles change in provider combo-box. */
+    void sltHandleProviderComboChange();
+
 private:
 

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

@@ -271 +271 @@
     refreshCurrentSettings();
     updateFormatComboToolTip();
+    updateProviderComboToolTip();
 }