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

Timestamp:

May 30, 2019 1:42:02 PM (6 years ago)

Author:

vboxsync

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

130994

Message:

FE/Qt: bugref:9434: Import Appliance wizard: 1st page: List Stopped and Running instances both.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp (modified) (1 diff)

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

@@ -283 +283 @@
         else
         {
-            /* Read Cloud Client VM instances: */
-            CStringArray comNames;
-            CStringArray comIDs;
-            CProgress comProgress = m_comCloudClient.ListInstances(KCloudMachineState_Running, comNames, comIDs);
-
-            /* Show error message if necessary: */
-            if (!m_comCloudClient.isOk())
-                msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
-            else
-            {
+            /* Read Cloud Client VM instances.
+             * Please take into account that for now CCloudClient::ListInstances
+             * doesn't support OR-ed enum combinations, so we have to aquire
+             * Stopped and Running cloud VM instances separately.  That also means
+             * that there will be two subsequent progress dialogs shown. */
+            /// @todo rework when it's possible to do the right way
+            do
+            {
+                /* Stopped VM names and ids: */
+                CStringArray comNamesStopped;
+                CStringArray comIDsStopped;
+
+                /* Ask for Stopped cloud VMs: */
+                CProgress comProgressStopped = m_comCloudClient.ListInstances(KCloudMachineState_Stopped, comNamesStopped, comIDsStopped);
+                if (!m_comCloudClient.isOk())
+                {
+                    msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
+                    break;
+                }
+
                 /* Show "Acquire cloud instances" progress: */
-                msgCenter().showModalProgressDialog(comProgress,
-                                                    UIWizardImportApp::tr("Acquire cloud instances..."),
-                                                    ":/progress_reading_appliance_90px.png",
-                                                    0, 0);
-
-                /* Show error message if necessary: */
-                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                    msgCenter().cannotAcquireCloudClientParameter(comProgress);
-                else
+                msgCenter().showModalProgressDialog(comProgressStopped, UIWizardImportApp::tr("Acquire stopped cloud instances..."),
+                                                    ":/progress_reading_appliance_90px.png", 0, 0);
+                if (!comProgressStopped.isOk() || comProgressStopped.GetResultCode() != 0)
                 {
-                    /* Push acquired names to list rows: */
-                    const QVector<QString> &names = comNames.GetValues();
-                    const QVector<QString> &ids = comIDs.GetValues();
-                    for (int i = 0; i < names.size(); ++i)
+                    msgCenter().cannotAcquireCloudClientParameter(comProgressStopped);
+                    break;
+                }
+
+                /* Running VM names and ids: */
+                CStringArray comNamesRunning;
+                CStringArray comIDsRunning;
+
+                /* Ask for Running cloud VMs: */
+                CProgress comProgressRunning = m_comCloudClient.ListInstances(KCloudMachineState_Running, comNamesRunning, comIDsRunning);
+                if (!m_comCloudClient.isOk())
+                {
+                    msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
+                    break;
+                }
+
+                /* Show "Acquire cloud instances" progress: */
+                msgCenter().showModalProgressDialog(comProgressRunning, UIWizardImportApp::tr("Acquire running cloud instances..."),
+                                                    ":/progress_reading_appliance_90px.png", 0, 0);
+                if (!comProgressRunning.isOk() || comProgressRunning.GetResultCode() != 0)
+                {
+                    msgCenter().cannotAcquireCloudClientParameter(comProgressRunning);
+                    break;
+                }
+
+                /* Push acquired names to list rows: */
+                const QVector<QString> names = comNamesStopped.GetValues() + comNamesRunning.GetValues();
+                const QVector<QString> ids = comIDsStopped.GetValues() + comIDsRunning.GetValues();
+                for (int i = 0; i < names.size(); ++i)
+                {
+                    /* Create list item: */
+                    QListWidgetItem *pItem = new QListWidgetItem(names.at(i), m_pAccountInstanceList);
+                    if (pItem)
                     {
-                        /* Create list item: */
-                        QListWidgetItem *pItem = new QListWidgetItem(names.at(i), m_pAccountInstanceList);
-                        if (pItem)
-                        {
-                            pItem->setFlags(pItem->flags() & ~Qt::ItemIsEditable);
-                            pItem->setData(Qt::UserRole, ids.at(i));
-                        }
+                        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);
                 }
-            }
+                /* Choose the 1st one by default if possible: */
+                if (m_pAccountInstanceList->count())
+                    m_pAccountInstanceList->setCurrentRow(0);
+            }
+            while (0);
         }
     }