Changeset 103138 in vbox

Timestamp:

Jan 31, 2024 10:36:12 AM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10501. Updating cloud vm state correctly.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview

Files:

• UIVMActivityOverviewWidget.cpp (modified) (9 diffs)
• UIVMActivityOverviewWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp

@@ -247 +247 @@
     virtual bool isCloudVM() const = 0;
     virtual void updateColumnData() = 0;
+    virtual void setMachineState(int iState) = 0;
 
     QString columnData(int iColumnIndex) const;
@@ -302 +303 @@
     virtual void updateColumnData() override;
     virtual QString machineStateString() const override;
-    void setMachineState(KMachineState enmState);
+    virtual void setMachineState(int iState) override;
 
 protected:
@@ -332 +333 @@
     UIActivityOverviewItemCloud();
     ~UIActivityOverviewItemCloud();
+    void updateMachineState();
     virtual bool isRunning() const override;
     virtual bool isCloudVM() const override;
     virtual void updateColumnData() override;
     virtual QString machineStateString() const override;
+    virtual void setMachineState(int iState) override;
 
 protected:
@@ -348 +351 @@
     QTimer *m_pTimer;
     CCloudMachine m_comCloudMachine;
+    KCloudMachineState m_enmMachineState;
 };
 
@@ -950 +954 @@
     , m_comCloudMachine(comCloudMachine)
 {
+    m_enmMachineState = comCloudMachine.GetState();
     m_pTimer = new QTimer(this);
     if (m_pTimer)
@@ -968 +973 @@
 }
 
+void UIActivityOverviewItemCloud::updateMachineState()
+{
+    if (m_comCloudMachine.isOk())
+        setMachineState(m_comCloudMachine.GetState());
+}
+
 bool UIActivityOverviewItemCloud::isRunning() const
 {
-    if (!m_comCloudMachine.isOk())
-        return false;
-    return m_comCloudMachine.GetState() == KCloudMachineState_Running;
+    return m_enmMachineState == KCloudMachineState_Running;
 }
 
@@ -1002 +1011 @@
 void UIActivityOverviewItemCloud::sltTimeout()
 {
+}
+
+void UIActivityOverviewItemCloud::setMachineState(int iState)
+{
+    if (iState <= KCloudMachineState_Invalid || iState >= KCloudMachineState_Max)
+        return;
+    KCloudMachineState enmState = static_cast<KCloudMachineState>(iState);
+    if (m_enmMachineState == enmState)
+        return;
+    m_enmMachineState = enmState;
 }
 
@@ -1062 +1081 @@
 }
 
-void UIActivityOverviewItemLocal::setMachineState(KMachineState enmState)
-{
+void UIActivityOverviewItemLocal::setMachineState(int iState)
+{
+    if (iState <= KMachineState_Null || iState >= KMachineState_Max)
+        return;
+    KMachineState enmState = static_cast<KMachineState>(iState);
+    if (m_enmMachineState == enmState)
+        return;
     m_enmMachineState = enmState;
     if (m_enmMachineState == KMachineState_Running)
         resetDebugger();
 }
-
 
 void UIActivityOverviewItemLocal::updateMetricData()
@@ -1369 +1392 @@
         if (!fFound)
             m_itemList.append(new UIActivityOverviewItemCloud(this, id, comMachine.GetName(), comMachine));
+    }
+
+    /* Update cloud machine states: */
+    for (int i = 0; i < m_itemList.size(); ++i)
+    {
+        if (!m_itemList[i] || !m_itemList[i]->isCloudVM())
+            continue;
+        UIActivityOverviewItemCloud *pItem = qobject_cast<UIActivityOverviewItemCloud*>(m_itemList[i]);
+        if (!pItem)
+            continue;
+        pItem->updateMachineState();
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.h

@@ -74 +74 @@
     bool isCurrentTool() const;
     void setIsCurrentTool(bool fIsCurrentTool);
-
     void setCloudMachineItems(const QList<UIVirtualMachineItemCloud*> &cloudItems);