Changeset 78216 in vbox for trunk/src

Timestamp:

Apr 19, 2019 2:52:01 PM (6 years ago)

Author:

vboxsync

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

130153

Message:

FE/Qt: bugref:9434: Import Appliance wizard: 1st basic page: Passing chosen machine ID to next wizard page as field; Make sure at least one machine is selected if possible.

Location:

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

Files:

• UIWizardImportAppPageBasic1.cpp (modified) (5 diffs)
• UIWizardImportAppPageBasic1.h (modified) (2 diffs)

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

@@ -305 +305 @@
                 {
                     /* Push acquired names to list rows: */
-                    foreach (const QString &strName, comNames.GetValues())
+                    const QVector<QString> &names = comNames.GetValues();
+                    const QVector<QString> &ids = comIDs.GetValues();
+                    for (int i = 0; i < names.size(); ++i)
                     {
                         /* Create list item: */
-                        QListWidgetItem *pItem = new QListWidgetItem(strName, m_pAccountInstanceList);
+                        QListWidgetItem *pItem = new QListWidgetItem(names.at(i), m_pAccountInstanceList);
                         if (pItem)
                         {
-                            /* Make item non-editable: */
                             pItem->setFlags(pItem->flags() & ~Qt::ItemIsEditable);
+                            pItem->setData(Qt::UserRole, ids.at(i));
                         }
                     }
+                    /* Choose the 1st one by default if possible: */
+                    if (m_pAccountInstanceList->count())
+                        m_pAccountInstanceList->setCurrentRow(0);
                 }
             }
@@ -397 +402 @@
     const int iIndex = m_pAccountComboBox->currentIndex();
     return m_pAccountComboBox->itemData(iIndex, AccountData_ProfileName).toString();
+}
+
+QString UIWizardImportAppPage1::machineId() const
+{
+    QListWidgetItem *pItem = m_pAccountInstanceList->currentItem();
+    return pItem ? pItem->data(Qt::UserRole).toString() : QString();
 }
 
@@ -650 +661 @@
     connect(m_pAccountToolButton, &QIToolButton::clicked,
             this, &UIWizardImportAppPageBasic1::sltHandleAccountButtonClick);
+    connect(m_pAccountInstanceList, &QListWidget::currentRowChanged,
+            this, &UIWizardImportAppPageBasic1::completeChanged);
 
     /* Register fields: */
@@ -656 +669 @@
     registerField("profile", this, "profile");
     registerField("vsdForm", this, "vsdForm");
+    registerField("machineId", this, "machineId");
 }
 
@@ -754 +768 @@
                   || (   fCSP
                       && !m_comCloudProfile.isNull()
-                      && !m_comCloudClient.isNull());
+                      && !m_comCloudClient.isNull()
+                      && !machineId().isNull());
     }
 

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

@@ -97 +97 @@
     /** Returns profile name. */
     QString profileName() const;
+    /** Returns machine ID. */
+    QString machineId() const;
     /** Returns Cloud Profile object. */
     CCloudProfile profile() const;
@@ -157 +159 @@
     Q_PROPERTY(CCloudProfile profile READ profile);
     Q_PROPERTY(CVirtualSystemDescriptionForm vsdForm READ vsdForm);
+    Q_PROPERTY(QString machineId READ machineId);
 
 public: