Changeset 83163 in vbox

Timestamp:

Feb 26, 2020 2:56:44 PM (5 years ago)

Author:

vboxsync

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

136284

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Update UIVirtualMachineItemCloud on the basis on internal UICloudMachine wrapper, not ourselves as before; Besides that, update selected tool contents on state-change signals received after that.

Location:

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

Files:

• UITaskCloudGetInstanceInfo.cpp (modified) (2 diffs)
• UITaskCloudGetInstanceInfo.h (modified) (3 diffs)
• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• UIVirtualMachineItemCloud.cpp (modified) (5 diffs)
• UIVirtualMachineItemCloud.h (modified) (2 diffs)

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

@@ -17 +17 @@
 
 /* GUI includes: */
-#include "UICloudNetworkingStuff.h"
 #include "UITaskCloudGetInstanceInfo.h"
 
 
-UITaskCloudGetInstanceInfo::UITaskCloudGetInstanceInfo(const CCloudClient &comCloudClient, const QString &strId)
+UITaskCloudGetInstanceInfo::UITaskCloudGetInstanceInfo(const UICloudMachine &guiCloudMachine)
     : UITask(Type_CloudGetInstanceState)
-    , m_comCloudClient(comCloudClient)
-    , m_strId(strId)
+    , m_guiCloudMachine(guiCloudMachine)
 {
-}
-
-QMap<KVirtualSystemDescriptionType, QString> UITaskCloudGetInstanceInfo::result() const
-{
-    m_mutex.lock();
-    const QMap<KVirtualSystemDescriptionType, QString> resultMap = m_resultMap;
-    m_mutex.unlock();
-    return resultMap;
 }
 
@@ -47 +37 @@
 {
     m_mutex.lock();
-    m_resultMap = getInstanceInfo(m_comCloudClient, m_strId);
+    m_guiCloudMachine.refresh();
     m_mutex.unlock();
 }

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

@@ -27 +27 @@
 
 /* GUI includes: */
+#include "UICloudMachine.h"
 #include "UITask.h"
 
 /* COM includes: */
-#include "COMEnums.h"
-#include "CCloudClient.h"
 #include "CVirtualBoxErrorInfo.h"
 
@@ -42 +41 @@
 public:
 
-    /** Constructs task taking @a comCloudClient and @a strId as data.
-      * @param  comCloudClient  Brings the cloud client object.
-      * @param  strId           Brings the cloud VM id. */
-    UITaskCloudGetInstanceInfo(const CCloudClient &comCloudClient, const QString &strId);
+    /** Constructs task taking @a guiCloudMachine as data.
+      * @param  guiCloudMachine  Brings the cloud VM wrapper. */
+    UITaskCloudGetInstanceInfo(const UICloudMachine &guiCloudMachine);
 
     /** Returns error info. */
     CVirtualBoxErrorInfo errorInfo();
-
-    /** Returns the task result. */
-    QMap<KVirtualSystemDescriptionType, QString> result() const;
 
 protected:
@@ -60 +55 @@
 private:
 
-    /** Holds the mutex to access result. */
+    /** Holds the mutex to access m_guiCloudMachine member. */
     mutable QMutex  m_mutex;
 
     /** Holds the cloud client object. */
-    CCloudClient  m_comCloudClient;
-    /** Holds the cloud VM id. */
-    QString       m_strId;
+    UICloudMachine  m_guiCloudMachine;
 
     /** Holds the error info object. */
     CVirtualBoxErrorInfo  m_comErrorInfo;
-
-    /** Holds the task result. */
-    QMap<KVirtualSystemDescriptionType, QString>  m_resultMap;
 };
 

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

@@ -286 +286 @@
 void UIVirtualBoxManagerWidget::sltHandleCloudMachineStateChange(const QString &strId)
 {
+    /* If that is machine or group item selected: */
+    if (isMachineItemSelected() || isGroupItemSelected())
+    {
+        /* Recache current item info: */
+        recacheCurrentItemInformation();
+    }
+
     /* Acquire current item: */
     UIVirtualMachineItem *pItem = currentItem();
 
-    /* repeat the task only if we are still on the same item: */
+    /* Repeat the task only if we are still on the same item: */
     if (pItem && pItem->id() == strId)
         pItem->toCloud()->updateInfoAsync(true /* delayed? */);

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

@@ -54 +54 @@
 }
 
-void UIVirtualMachineItemCloud::updateInfo(QWidget *pParent)
-{
-    /* Make sure item is of real cloud type and is initialized: */
-    AssertReturnVoid(itemType() == ItemType_CloudReal);
-
-    /* Acquire info: */
-    const QMap<KVirtualSystemDescriptionType, QString> infoMap = getInstanceInfo(m_guiCloudMachine.client(),
-                                                                                 m_strId,
-                                                                                 pParent);
-
-    /* Update info: */
-    updateInfo(infoMap);
-}
-
 void UIVirtualMachineItemCloud::updateInfoAsync(bool fDelayed)
 {
@@ -116 +102 @@
 {
     /* Determine attributes which are always available: */
-    if (itemType() == ItemType_CloudReal)
+    if (!m_guiCloudMachine.isNull())
     {
         m_strId = m_guiCloudMachine.id();
@@ -130 +116 @@
 
         /* Determine own VM attributes: */
-        if (   itemType() == ItemType_CloudFake
-            || m_strOSTypeId.isNull())
-            m_strOSTypeId = "Other";
+        m_strOSTypeId = !m_guiCloudMachine.isNull()
+                      ? m_guiCloudMachine.osType()
+                      : "Other";
 
         /* Determine VM states: */
-        if (   itemType() == ItemType_CloudFake
-            || m_enmMachineState == KMachineState_Null)
-            m_enmMachineState = KMachineState_PoweredOff;
+        m_enmMachineState = !m_guiCloudMachine.isNull()
+                          ? m_guiCloudMachine.machineState()
+                          : KMachineState_PoweredOff;
         m_strMachineStateName = gpConverter->toString(m_enmMachineState);
         if (itemType() == ItemType_CloudFake)
@@ -300 +286 @@
     if (!m_pTask)
     {
-        m_pTask = new UITaskCloudGetInstanceInfo(m_guiCloudMachine.client(), m_strId);
+        m_pTask = new UITaskCloudGetInstanceInfo(m_guiCloudMachine);
         connect(m_pTask, &UITask::sigComplete,
                 this, &UIVirtualMachineItemCloud::sltHandleGetCloudInstanceInfoDone);
@@ -316 +302 @@
     m_pTask = 0;
 
-    /* Cast task to corresponding sub-class: */
-    UITaskCloudGetInstanceInfo *pInfoTask = static_cast<UITaskCloudGetInstanceInfo*>(pTask);
-
-    /* Update info: */
-    updateInfo(pInfoTask->result());
-}
-
-void UIVirtualMachineItemCloud::updateInfo(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
-{
-    /* Update info: */
-    m_strOSTypeId = fetchOsType(infoMap);
-    m_enmMachineState = fetchMachineState(infoMap);
-
     /* Recache: */
     recache();

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

@@ -69 +69 @@
         FakeCloudItemState fakeCloudItemState() const { return m_enmFakeCloudItemState; }
 
-        /** Updates cloud VM info.
-          * @param  pWidget  Brings parent widget to show messages according to. */
-        void updateInfo(QWidget *pParent);
-
         /** Updates cloud VM info async way, @a fDelayed if requested or instant otherwise. */
         void updateInfoAsync(bool fDelayed);
@@ -133 +129 @@
 private:
 
-    /** @name Data attributes.
-      * @{ */
-        /** Updates cloud VM info on the basis of @a infoMap value. */
-        void updateInfo(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
-    /** @} */
-
     /** @name Arguments.
       * @{ */