Changeset 86609 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 16, 2020 2:30:20 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Allow to perform Cloud List Machines task without VM being refreshed.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICloudNetworkingStuff.cpp (modified) (1 diff)
• globals/UICloudNetworkingStuff.h (modified) (1 diff)
• manager/UITaskCloudListMachines.cpp (modified) (2 diffs)
• manager/UITaskCloudListMachines.h (modified) (3 diffs)
• manager/chooser/UIChooserAbstractModel.cpp (modified) (1 diff)
• manager/chooser/UIChooserModel.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.cpp

@@ -368 +368 @@
         else
             return comCloudClient.GetCloudMachineList();
+    }
+    /* Return empty list by default: */
+    return QVector<CCloudMachine>();
+}
+
+QVector<CCloudMachine> UICloudNetworkingStuff::listCloudMachineStubs(CCloudClient comCloudClient,
+                                                                     QWidget *pParent /* = 0 */)
+{
+    /* Execute ReadCloudMachineStubList async method: */
+    CProgress comProgress = comCloudClient.ReadCloudMachineStubList();
+    if (!comCloudClient.isOk())
+        msgCenter().cannotAcquireCloudClientParameter(comCloudClient, pParent);
+    else
+    {
+        /* Show "Read cloud machine stubs" progress: */
+        msgCenter().showModalProgressDialog(comProgress,
+                                            QString(),
+                                            ":/progress_reading_appliance_90px.png", pParent, 0);
+        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+            msgCenter().cannotAcquireCloudClientParameter(comProgress, pParent);
+        else
+            return comCloudClient.GetCloudMachineStubList();
+    }
+    /* Return empty list by default: */
+    return QVector<CCloudMachine>();
+}
+
+QVector<CCloudMachine> UICloudNetworkingStuff::listCloudMachineStubs(CCloudClient comCloudClient,
+                                                                     QString &strErrorMessage)
+{
+    /* Execute ReadCloudMachineStubList async method: */
+    CProgress comProgress = comCloudClient.ReadCloudMachineStubList();
+    if (!comCloudClient.isOk())
+        strErrorMessage = UIErrorString::formatErrorInfo(comCloudClient);
+    else
+    {
+        /* Show "Read cloud machine stubs" progress: */
+        comProgress.WaitForCompletion(-1);
+        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+            strErrorMessage = UIErrorString::formatErrorInfo(comProgress);
+        else
+            return comCloudClient.GetCloudMachineStubList();
     }
     /* Return empty list by default: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.h

@@ -116 +116 @@
     SHARED_LIBRARY_STUFF QVector<CCloudMachine> listCloudMachines(CCloudClient comCloudClient,
                                                                   QString &strErrorMessage);
+    /** Acquires cloud machine stubs of certain @a comCloudClient, using @a pParent to show messages according to. */
+    SHARED_LIBRARY_STUFF QVector<CCloudMachine> listCloudMachineStubs(CCloudClient comCloudClient,
+                                                                      QWidget *pParent = 0);
+    /** Acquires cloud machine stubs of certain @a comCloudClient, using @a strErrorMessage to store messages to. */
+    SHARED_LIBRARY_STUFF QVector<CCloudMachine> listCloudMachineStubs(CCloudClient comCloudClient,
+                                                                      QString &strErrorMessage);
 
     /** Acquires @a comCloudMachine ID as a @a uResult, using @a pParent to show messages according to. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UITaskCloudListMachines.cpp

@@ -24 +24 @@
 
 
-UITaskCloudListMachines::UITaskCloudListMachines(const QString &strProviderShortName, const QString &strProfileName)
+UITaskCloudListMachines::UITaskCloudListMachines(const QString &strProviderShortName,
+                                                 const QString &strProfileName,
+                                                 bool fWithRefresh)
     : UITask(Type_CloudListMachines)
     , m_strProviderShortName(strProviderShortName)
     , m_strProfileName(strProfileName)
+    , m_fWithRefresh(fWithRefresh)
 {
 }
@@ -52 +55 @@
     CCloudClient comCloudClient = cloudClientByName(m_strProviderShortName, m_strProfileName, m_strErrorInfo);
     if (m_strErrorInfo.isNull())
-        m_result = listCloudMachines(comCloudClient, m_strErrorInfo);
+        m_result = m_fWithRefresh
+                 ? listCloudMachines(comCloudClient, m_strErrorInfo)
+                 : listCloudMachineStubs(comCloudClient, m_strErrorInfo);
     m_mutex.unlock();
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UITaskCloudListMachines.h

@@ -41 +41 @@
     /** Constructs task taking @a strProviderShortName and @a strProfileName as data.
       * @param  strProviderShortName  Brings the provider short name.
-      * @param  strProfileName        Brings the profile name. */
-    UITaskCloudListMachines(const QString &strProviderShortName, const QString &strProfileName);
+      * @param  strProfileName        Brings the profile name.
+      * @param  fWithRefresh          Brings whether the task includes refresh. */
+    UITaskCloudListMachines(const QString &strProviderShortName,
+                            const QString &strProfileName,
+                            bool fWithRefresh);
 
     /** Returns provider short name. */
@@ -48 +51 @@
     /** Returns profile name. */
     QString profileName() const { return m_strProfileName; }
+    /** Returns whether the task includes refresh. */
+    bool withRefresh() const { return m_fWithRefresh; }
 
     /** Returns error info. */
@@ -69 +74 @@
     /** Holds the profile name. */
     const QString  m_strProfileName;
+    /** Holds whether the task includes refresh. */
+    const bool     m_fWithRefresh;
 
     /** Holds the error info. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

@@ -981 +981 @@
             /* Create list cloud machines task: */
             UITaskCloudListMachines *pTask = new UITaskCloudListMachines(strProviderShortName,
-                                                                         strProfileName);
+                                                                         strProfileName,
+                                                                         true /* with refresh? */);
             if (pTask)
                 uiCommon().threadPoolCloud()->enqueueTask(pTask);

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -923 +923 @@
                 AssertPtrReturnVoid(pParentOfParent);
                 UITaskCloudListMachines *pTask = new UITaskCloudListMachines(pParentOfParent->name(),
-                                                                             pParent->name());
+                                                                             pParent->name(),
+                                                                             true /* with refresh? */);
                 AssertPtrReturnVoid(pTask);
                 uiCommon().threadPoolCloud()->enqueueTask(pTask);