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

Timestamp:

Apr 9, 2019 1:42:47 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: A bit of cleanup for r129879.

Location:

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

Files:

• exportappliance/UIWizardExportAppPageBasic2.cpp (modified) (1 diff)
• importappliance/UIWizardImportAppPageBasic1.cpp (modified) (7 diffs)
• importappliance/UIWizardImportAppPageBasic1.h (modified) (3 diffs)

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

@@ -500 +500 @@
 void UIWizardExportAppPage2::updatePageAppearance()
 {
-    /* Update page appearance according to chosen storage-type: */
+    /* Update page appearance according to chosen format: */
     m_pSettingsWidget->setCurrentIndex((int)isFormatCloudOne());
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp

@@ -54 +54 @@
 UIWizardImportAppPage1::UIWizardImportAppPage1()
     : m_pSourceLabel(0)
-    , m_pSourceSelector(0)
+    , m_pSourceComboBox(0)
     , m_pStackedLayout(0)
     , m_pFileSelector(0)
@@ -80 +80 @@
         }
 
-        /* Create source selector layout: */
-        QHBoxLayout *pSourceSelectorLayout = new QHBoxLayout;
-        if (pSourceSelectorLayout)
+        /* Create source layout: */
+        QHBoxLayout *pSourceLayout = new QHBoxLayout;
+        if (pSourceLayout)
         {
             /* Create source label: */
@@ -93 +93 @@
 
                 /* Add into layout: */
-                pSourceSelectorLayout->addWidget(m_pSourceLabel);
+                pSourceLayout->addWidget(m_pSourceLabel);
             }
 
             /* Create source selector: */
-            m_pSourceSelector = new QIComboBox(this);
-            if (m_pSourceSelector)
-            {
-                m_pSourceLabel->setBuddy(m_pSourceSelector);
-                m_pSourceSelector->hide();
-                m_pSourceSelector->addItem(QString(), QVariant::fromValue(ImportSourceType_Local));
-                m_pSourceSelector->addItem(QString(), QVariant::fromValue(ImportSourceType_Cloud));
-                connect(m_pSourceSelector, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated),
-                        this, static_cast<void(UIWizardImportAppPageBasic1::*)(int)>(&UIWizardImportAppPageBasic1::sltHandleSourceChange));
-
-                /* Add into layout: */
-                pSourceSelectorLayout->addWidget(m_pSourceSelector);
+            m_pSourceComboBox = new QIComboBox(this);
+            if (m_pSourceComboBox)
+            {
+                m_pSourceLabel->setBuddy(m_pSourceComboBox);
+                m_pSourceComboBox->hide();
+                m_pSourceComboBox->addItem(QString(), QVariant::fromValue(ImportSourceType_Local));
+                m_pSourceComboBox->addItem(QString(), QVariant::fromValue(ImportSourceType_Cloud));
+                connect(m_pSourceComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated),
+                        this, &UIWizardImportAppPageBasic1::sltHandleSourceChange);
+
+                /* Add into layout: */
+                pSourceLayout->addWidget(m_pSourceComboBox);
             }
 
             /* Add into layout: */
-            pMainLayout->addLayout(pSourceSelectorLayout);
+            pMainLayout->addLayout(pSourceLayout);
         }
 
@@ -182 +182 @@
 }
 
-void UIWizardImportAppPageBasic1::sltHandleSourceChange(int iIndex)
-{
-    m_pStackedLayout->setCurrentIndex(m_stackedLayoutIndexMap.value(m_pSourceSelector->itemData(iIndex).value<ImportSourceType>()));
-}
-
 void UIWizardImportAppPageBasic1::retranslateUi()
 {
@@ -197 +192 @@
                                             "To continue, select the file to import below.</p>"));
 
-    /* Translate source selector: */
-    m_pSourceLabel->setText(tr("Source:"));
-    for (int i = 0; i < m_pSourceSelector->count(); ++i)
-        m_pSourceSelector->setItemText(i, ImportSourceTypeConverter::toString(m_pSourceSelector->itemData(i).value<ImportSourceType>()));
+    /* Translate source label: */
+    m_pSourceLabel->setText(tr("&Source:"));
+    /* Translate received values of Source combo-box.
+     * We are enumerating starting from 0 for simplicity: */
+    for (int i = 0; i < m_pSourceComboBox->count(); ++i)
+        m_pSourceComboBox->setItemText(i, ImportSourceTypeConverter::toString(m_pSourceComboBox->itemData(i).value<ImportSourceType>()));
 
     /* Translate file selector: */
@@ -210 +207 @@
 void UIWizardImportAppPageBasic1::initializePage()
 {
+    /* Translate page: */
     retranslateUi();
 }
@@ -239 +237 @@
     return pImportApplianceWidget->isValid();
 }
+
+void UIWizardImportAppPageBasic1::sltHandleSourceChange(int iIndex)
+{
+    m_pStackedLayout->setCurrentIndex(m_stackedLayoutIndexMap.value(m_pSourceComboBox->itemData(iIndex).value<ImportSourceType>()));
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.h

@@ -50 +50 @@
     /** Holds the source type label instance. */
     QLabel     *m_pSourceLabel;
-    /** Holds the source type selector instance. */
-    QIComboBox *m_pSourceSelector;
+    /** Holds the source type combo-box instance. */
+    QIComboBox *m_pSourceComboBox;
 
     /** Holds the stacked layout instance. */
@@ -72 +72 @@
     UIWizardImportAppPageBasic1();
 
-private slots:
-
-    /** Handles change of import source to one with specified @a iIndex. */
-    void sltHandleSourceChange(int iIndex);
-
-private:
+protected:
 
     /** Handles translation event. */
@@ -91 +86 @@
     virtual bool validatePage() /* override */;
 
+private slots:
+
+    /** Handles change of import source to one with specified @a iIndex. */
+    void sltHandleSourceChange(int iIndex);
+
+private:
+
     /** Holds the label instance. */
     QIRichTextLabel *m_pLabel;