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

Timestamp:

Apr 29, 2020 3:24:38 PM (5 years ago)

Author:

vboxsync

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

137670

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Do not show cloud profile loading messages at startup, set them to fake inaccessible cloud VM items instead; Add possibility to refresh fake inaccessible cloud VM item to reload cloud profile contents.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualMachineItemCloud.cpp (modified) (2 diffs)
• UIVirtualMachineItemCloud.h (modified) (2 diffs)
• chooser/UIChooserAbstractModel.cpp (modified) (2 diffs)
• chooser/UIChooserModel.cpp (modified) (2 diffs)

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

@@ -62 +62 @@
 }
 
+void UIVirtualMachineItemCloud::setFakeCloudItemErrorMessage(const QString &strErrorMessage)
+{
+    m_strFakeCloudItemErrorMessage = strErrorMessage;
+    recache();
+}
+
 void UIVirtualMachineItemCloud::updateInfoAsync(bool fDelayed)
 {
@@ -81 +87 @@
 
             /* Determine whether VM is accessible: */
-            m_fAccessible = true;
-            m_strAccessError = QString();
+            m_fAccessible = m_strFakeCloudItemErrorMessage.isNull();
+            m_strAccessError = m_strFakeCloudItemErrorMessage;
 
             /* Determine VM OS type: */

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

@@ -64 +64 @@
         UIFakeCloudVirtualMachineItemState fakeCloudItemState() const { return m_enmFakeCloudItemState; }
 
+        /** Defines fake cloud item @a strErrorMessage. */
+        void setFakeCloudItemErrorMessage(const QString &strErrorMessage);
+        /** Returns fake cloud item error message. */
+        QString fakeCloudItemErrorMessage() const { return m_strFakeCloudItemErrorMessage; }
+
         /** Updates cloud VM info async way, @a fDelayed if requested or instant otherwise. */
         void updateInfoAsync(bool fDelayed);
@@ -125 +130 @@
         /** Holds fake cloud item state. */
         UIFakeCloudVirtualMachineItemState  m_enmFakeCloudItemState;
+        /** Holds fake cloud item error message. */
+        QString                             m_strFakeCloudItemErrorMessage;
 
         /** Holds the info acquire task instance. */

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

@@ -445 +445 @@
     UITaskCloudListMachines *pAcquiringTask = static_cast<UITaskCloudListMachines*>(pTask);
 
-    /* Make sure there were no errors: */
-    if (!pAcquiringTask->errorInfo().isNull())
-        return msgCenter().cannotAcquireCloudInstanceList(pAcquiringTask->errorInfo());
-
     /* Search for profile node: */
     const QString strProfileNodeName = QString("/%1/%2").arg(pAcquiringTask->providerShortName(), pAcquiringTask->profileName());
@@ -482 +478 @@
         AssertPtrReturnVoid(pFakeCloudMachineItem);
         pFakeCloudMachineItem->setFakeCloudItemState(UIFakeCloudVirtualMachineItemState_Done);
+        pFakeCloudMachineItem->setFakeCloudItemErrorMessage(pAcquiringTask->errorInfo());
     }
 }

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

@@ -43 +43 @@
 #include "UIMessageCenter.h"
 #include "UIModalWindowManager.h"
-#include "UITask.h"
+#include "UITaskCloudListMachines.h"
+#include "UIThreadPool.h"
 #include "UIVirtualBoxManagerWidget.h"
 #include "UIVirtualMachineItemCloud.h"
@@ -1077 +1078 @@
                                                               UIChooserItemSearchFlag_ExactId);
                 }
+
+                break;
+            }
+            case UIVirtualMachineItemType_CloudFake:
+            {
+                /* Create list cloud machines task: */
+                UIChooserItem *pParent = pItem->parentItem();
+                AssertPtrReturnVoid(pParent);
+                UIChooserItem *pParentOfParent = pParent->parentItem();
+                AssertPtrReturnVoid(pParentOfParent);
+                UITaskCloudListMachines *pTask = new UITaskCloudListMachines(pParentOfParent->name(),
+                                                                             pParent->name());
+                AssertPtrReturnVoid(pTask);
+                uiCommon().threadPoolCloud()->enqueueTask(pTask);
 
                 break;