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

Timestamp:

Jul 10, 2018 11:44:12 AM (7 years ago)

Author:

vboxsync

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

123586

Message:

FE/Qt: bugref:9152: Export Appliance wizard: Storage and Expert page: Adding provider profile combo.

Location:

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

Files:

• UIWizardExportAppPageBasic3.cpp (modified) (9 diffs)
• UIWizardExportAppPageBasic3.h (modified) (4 diffs)
• UIWizardExportAppPageExpert.cpp (modified) (6 diffs)
• UIWizardExportAppPageExpert.h (modified) (1 diff)

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

@@ -55 +55 @@
     , m_pProviderComboBoxLabel(0)
     , m_pProviderComboBox(0)
+    , m_pProfileComboBoxLabel(0)
+    , m_pProfileComboBox(0)
 {
 }
@@ -100 +102 @@
 }
 
+void UIWizardExportAppPage3::populateProfiles()
+{
+    /* Acquire profile list: */
+    // Here goes the experiamental list with
+    // arbitrary contents for testing purposes.
+    QStringList profiles;
+    profiles << "Profile 1";
+    profiles << "Profile 2";
+    profiles << "Profile 3";
+    profiles << "Profile 4";
+    m_pProfileComboBox->clear();
+    m_pProfileComboBox->addItems(profiles);
+
+    /* Duplicate non-translated names to data fields: */
+    for (int i = 0; i < m_pProfileComboBox->count(); ++i)
+        m_pProfileComboBox->setItemData(i, m_pProfileComboBox->itemText(i));
+}
+
 void UIWizardExportAppPage3::updatePageAppearance()
 {
@@ -234 +254 @@
     AssertMsg(iIndex != -1, ("Field not found!"));
     m_pProviderComboBox->setCurrentIndex(iIndex);
+}
+
+QString UIWizardExportAppPage3::profile() const
+{
+    const int iIndex = m_pProfileComboBox->currentIndex();
+    return m_pProfileComboBox->itemData(iIndex).toString();
+}
+
+void UIWizardExportAppPage3::setProfile(const QString &strProfile)
+{
+    const int iIndex = m_pProfileComboBox->findData(strProfile);
+    AssertMsg(iIndex != -1, ("Field not found!"));
+    m_pProfileComboBox->setCurrentIndex(iIndex);
 }
 
@@ -372 +405 @@
                     }
 
+                    /* Create profile combo-box: */
+                    m_pProfileComboBox = new QComboBox;
+                    if (m_pProfileComboBox)
+                    {
+                        /* Add into layout: */
+                        pSettingsLayout2->addWidget(m_pProfileComboBox, 1, 1);
+                    }
+                    /* Create profile label: */
+                    m_pProfileComboBoxLabel = new QLabel;
+                    if (m_pProfileComboBoxLabel)
+                    {
+                        m_pProfileComboBoxLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+                        m_pProfileComboBoxLabel->setBuddy(m_pProviderComboBox);
+
+                        /* Add into layout: */
+                        pSettingsLayout2->addWidget(m_pProfileComboBoxLabel, 1, 0);
+                    }
+
                     /* Create placeholder: */
                     QWidget *pPlaceholder = new QWidget;
@@ -377 +428 @@
                     {
                         /* Add into layout: */
-                        pSettingsLayout2->addWidget(pPlaceholder, 1, 0, 1, 2);
+                        pSettingsLayout2->addWidget(pPlaceholder, 2, 0, 1, 2);
                     }
                 }
@@ -397 +448 @@
     /* Populate providers: */
     populateProviders();
+    /* Populate profiles: */
+    populateProfiles();
 
     /* Setup connections: */
@@ -404 +457 @@
     connect(m_pProviderComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &UIWizardExportAppPageBasic3::sltHandleProviderComboChange);
+    connect(m_pProfileComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &UIWizardExportAppPageBasic3::sltHandleProfileComboChange);
 
     /* Register fields: */
@@ -455 +510 @@
         }
     }
+
+    /* Translate Profile combo-box: */
+    m_pProfileComboBoxLabel->setText(UIWizardExportApp::tr("&Profile:"));
 
     /* Refresh file selector name: */
@@ -561 +619 @@
     /* Update tool-tip: */
     updateProviderComboToolTip();
-}
+
+    /* Refresh required settings: */
+    populateProfiles();
+}
+
+void UIWizardExportAppPageBasic3::sltHandleProfileComboChange()
+{
+}

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

@@ -47 +47 @@
     /** Populates providers. */
     void populateProviders();
+    /** Populates profiles. */
+    void populateProfiles();
 
     /** Updates page appearance. */
@@ -85 +87 @@
     void setProvider(const QString &strProvider);
 
+    /** Returns profile. */
+    QString profile() const;
+    /** Defines @a strProfile. */
+    void setProfile(const QString &strProfile);
+
     /** Holds the default appliance name. */
     QString  m_strDefaultApplianceName;
@@ -115 +122 @@
     /** Holds the provider combo-box instance. */
     QComboBox *m_pProviderComboBox;
+
+    /** Holds the profile combo-box label instance. */
+    QLabel    *m_pProfileComboBoxLabel;
+    /** Holds the profile combo-box instance. */
+    QComboBox *m_pProfileComboBox;
 };
 
@@ -157 +169 @@
     void sltHandleProviderComboChange();
 
+    /** Handles change in profile combo-box. */
+    void sltHandleProfileComboChange();
+
 private:
 

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

@@ -268 +268 @@
                             }
 
+                            /* Create profile combo-box: */
+                            m_pProfileComboBox = new QComboBox;
+                            if (m_pProfileComboBox)
+                            {
+                                /* Add into layout: */
+                                pSettingsLayout2->addWidget(m_pProfileComboBox, 1, 1);
+                            }
+                            /* Create profile label: */
+                            m_pProfileComboBoxLabel = new QLabel;
+                            if (m_pProfileComboBoxLabel)
+                            {
+                                m_pProfileComboBoxLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+                                m_pProfileComboBoxLabel->setBuddy(m_pProviderComboBox);
+
+                                /* Add into layout: */
+                                pSettingsLayout2->addWidget(m_pProfileComboBoxLabel, 1, 0);
+                            }
+
                             /* Create placeholder: */
                             QWidget *pPlaceholder = new QWidget;
@@ -273 +291 @@
                             {
                                 /* Add into layout: */
-                                pSettingsLayout2->addWidget(pPlaceholder, 1, 0, 1, 2);
+                                pSettingsLayout2->addWidget(pPlaceholder, 2, 0, 1, 2);
                             }
                         }
@@ -299 +317 @@
     /* Populate providers: */
     populateProviders();
+    /* Populate profiles: */
+    populateProfiles();
 
     /* Setup connections: */
@@ -309 +329 @@
     connect(m_pProviderComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &UIWizardExportAppPageExpert::sltHandleProviderComboChange);
+    connect(m_pProfileComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &UIWizardExportAppPageExpert::sltHandleProfileComboChange);
 
     /* Register classes: */
@@ -375 +397 @@
         }
     }
+
+    /* Translate Profile combo-box: */
+    m_pProfileComboBoxLabel->setText(UIWizardExportApp::tr("&Profile:"));
 
     /* Refresh file selector name: */
@@ -489 +514 @@
     /* Update tool-tip: */
     updateProviderComboToolTip();
-}
+
+    /* Refresh required settings: */
+    populateProfiles();
+}
+
+void UIWizardExportAppPageExpert::sltHandleProfileComboChange()
+{
+}

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

@@ -87 +87 @@
     void sltHandleProviderComboChange();
 
+    /** Handles change in profile combo-box. */
+    void sltHandleProfileComboChange();
+
 private: