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

Timestamp:

Jan 31, 2024 8:19:21 AM (13 months ago)

Author:

vboxsync

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

161376

Message:

FE/Qt: bugref:10501. Deriving UIActivityOverviewItem from QObject so that it can have slots.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/overview/UIVMActivityOverviewWidget.cpp (modified) (13 diffs)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)

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

@@ -227 +227 @@
  *   Class UIActivityOverviewItem definition.                                                                           *
  *********************************************************************************************************************************/
-class UIActivityOverviewItem
-{
+class UIActivityOverviewItem : public QObject
+{
+
+    Q_OBJECT;
 
 public:
 
-    UIActivityOverviewItem(const QUuid &uid, const QString &strVMName);
+    UIActivityOverviewItem(QObject *pParent, const QUuid &uid, const QString &strVMName);
 
     UIActivityOverviewItem();
@@ -289 +291 @@
 public:
 
-    UIActivityOverviewItemLocal(const QUuid &uid, const QString &strVMName);
+    UIActivityOverviewItemLocal(QObject *pParent, const QUuid &uid, const QString &strVMName);
 
     UIActivityOverviewItemLocal();
@@ -326 +328 @@
 public:
 
-    UIActivityOverviewItemCloud(const QUuid &uid, const QString &strVMName, CCloudMachine &comCloudMachine);
+    UIActivityOverviewItemCloud(QObject *pParent, const QUuid &uid, const QString &strVMName, CCloudMachine &comCloudMachine);
 
     UIActivityOverviewItemCloud();
@@ -340 +342 @@
 
 private:
-
+    QTimer m_pTimer;
     CCloudMachine m_comCloudMachine;
 };
@@ -854 +856 @@
 *   Class UIActivityOverviewItem implementation.                                                                                 *
 *********************************************************************************************************************************/
-UIActivityOverviewItem::UIActivityOverviewItem(const QUuid &uid, const QString &strVMName)
-    : m_uCPUGuestLoad(0)
+UIActivityOverviewItem::UIActivityOverviewItem(QObject *pParent, const QUuid &uid, const QString &strVMName)
+    : QObject(pParent)
+    , m_uCPUGuestLoad(0)
     , m_uTotalRAM(0)
     , m_uFreeRAM(0)
@@ -871 +874 @@
     , m_strVMName(strVMName)
 {
+    m_columnData[VMActivityOverviewColumn_Name] = m_strVMName;
 }
 
 UIActivityOverviewItem::UIActivityOverviewItem()
-    : m_uCPUGuestLoad(0)
+    : QObject()
+    , m_uCPUGuestLoad(0)
     , m_uTotalRAM(0)
     , m_uUsedRAM(0)
@@ -937 +942 @@
 *********************************************************************************************************************************/
 
-UIActivityOverviewItemCloud::UIActivityOverviewItemCloud(const QUuid &uid, const QString &strVMName, CCloudMachine &comCloudMachine)
-    : UIActivityOverviewItem(uid, strVMName)
+UIActivityOverviewItemCloud::UIActivityOverviewItemCloud(QObject *pParent, const QUuid &uid, const QString &strVMName, CCloudMachine &comCloudMachine)
+    : UIActivityOverviewItem(pParent, uid, strVMName)
     , m_comCloudMachine(comCloudMachine)
 {
+    /*    m_pTimer = new QTimer(this);
+    if (m_pTimer)
+    {
+        connect(m_pTimer, &QTimer::timeout, this, &UIActivityOverviewItemCloud::sltTimeout);
+        m_pTimer->setInterval(60 * 1000);
+    }
+    if (isRunning() && m_pTimer)
+    m_pTimer->start();*/
 }
 
@@ -973 +986 @@
     //int iDecimalCount = 2;
 
-    m_columnData[VMActivityOverviewColumn_Name] = m_strVMName;
+
 }
 
@@ -987 +1000 @@
 *   Class UIActivityOverviewItemLocal implementation.                                                                            *
 *********************************************************************************************************************************/
-UIActivityOverviewItemLocal::UIActivityOverviewItemLocal(const QUuid &uid, const QString &strVMName)
-    : UIActivityOverviewItem(uid, strVMName)
+UIActivityOverviewItemLocal::UIActivityOverviewItemLocal(QObject *pParent, const QUuid &uid, const QString &strVMName)
+    : UIActivityOverviewItem(pParent, uid, strVMName)
     , m_uCPUVMMLoad(0)
     , m_uVMExitRate(0)
@@ -1084 +1097 @@
     int iDecimalCount = 2;
 
-    m_columnData[VMActivityOverviewColumn_Name] = m_strVMName;
     m_columnData[VMActivityOverviewColumn_CPUGuestLoad] =
         QString("%1%").arg(QString::number(m_uCPUGuestLoad));
@@ -1318 +1330 @@
         newIds << id;
     }
+    QVector<UIActivityOverviewItem*> originalItemList = m_itemList;
 
     /* Remove m_itemList items that are not in @cloudItems: */
@@ -1347 +1360 @@
         }
         if (!fFound)
-            m_itemList.append(new UIActivityOverviewItemCloud(id, comMachine.GetName(), comMachine));
+            m_itemList.append(new UIActivityOverviewItemCloud(this, id, comMachine.GetName(), comMachine));
     }
 }
@@ -1593 +1606 @@
 void UIActivityOverviewModel::addItem(const QUuid& uMachineId, const QString& strMachineName, KMachineState enmState)
 {
-    UIActivityOverviewItemLocal *pItem = new UIActivityOverviewItemLocal(uMachineId, strMachineName);
+    UIActivityOverviewItemLocal *pItem = new UIActivityOverviewItemLocal(this, uMachineId, strMachineName);
     pItem->setMachineState(enmState);
     m_itemList.append(pItem);

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

@@ -1199 +1199 @@
          * if Activity Overview tool currently chosen (even if VMs are not selected): */
         if (UIToolStuff::isTypeOfClass(enmType, UIToolClass_Global))
-            m_pPaneChooser->setKeepCloudNodesUpdated(enmType == UIToolType_VMActivityOverview);
+        {
+            bool fActivityOverviewActive = enmType == UIToolType_VMActivityOverview;
+            m_pPaneChooser->setKeepCloudNodesUpdated(fActivityOverviewActive);
+            if (fActivityOverviewActive)
+                m_pPaneToolsGlobal->setCloudMachineItems(m_pPaneChooser->cloudMachineItems());
+        }
     }
     /* If Machine tools currently chosen: */