Changeset 103207 in vbox

Timestamp:

Feb 5, 2024 3:48:15 PM (14 months ago)

Author:

vboxsync

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

161474

Message:

FE/Qt: bugref:10501. Some more ironing.

Location:

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

Files:

• overview/UIVMActivityOverviewWidget.cpp (modified) (19 diffs)
• vmactivity/UIVMActivityMonitor.cpp (modified) (5 diffs)

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

@@ -114 +114 @@
 };
 
-/** A simple container to store host related performance values. */
-
 
 /*********************************************************************************************************************************
 *   Class UIVMActivityOverviewHostStats definition.                                                                              *
 *********************************************************************************************************************************/
-
+/** A simple container to store host related performance values. */
 class UIVMActivityOverviewHostStats
 {
@@ -222 +220 @@
 };
 
-/** Each instance of UIActivityOverviewItem corresponds to a running vm whose stats are displayed.
-  * they are owned my the model. */
+
 /*********************************************************************************************************************************
  *   Class UIActivityOverviewItem definition.                                                                           *
  *********************************************************************************************************************************/
+/** Each instance of UIActivityOverviewItem corresponds to a vm. they are owned my the model. */
 class UIActivityOverviewItem : public QObject
 {
@@ -242 +240 @@
     const QUuid &machineId() const;
 
-
     virtual QString machineStateString() const = 0;
     virtual bool isRunning() const = 0;
@@ -255 +252 @@
     float    m_fRAMUsagePercentage;
 
-    quint64  m_uNetworkDownTotal;
-    quint64  m_uNetworkUpTotal;
-
-    quint64 m_uDiskWriteTotal;
-    quint64 m_uDiskReadTotal;
-
 protected:
 
@@ -269 +260 @@
       * instead of model's data function to know the string length earlier. */
     QMap<int, QString> m_columnData;
-
-private:
-
 };
 
@@ -279 +267 @@
  *   Class UIActivityOverviewItemLocal definition.                                                                           *
  *********************************************************************************************************************************/
+/* A UIActivityOverviewItem derivation to show local vms in the table view: */
 class UIActivityOverviewItemLocal : public UIActivityOverviewItem
 {
@@ -285 +274 @@
 
     UIActivityOverviewItemLocal(QObject *pParent, const QUuid &uid, const QString &strVMName);
-
     UIActivityOverviewItemLocal();
     ~UIActivityOverviewItemLocal();
@@ -298 +286 @@
     virtual void setMachineState(int iState) override;
 
-protected:
-
 private:
 
-    CSession m_comSession;
-    CGuest   m_comGuest;
-    KMachineState m_enmMachineState;
-
-    quint64 m_uVMExitTotal;
+    CSession         m_comSession;
+    CGuest           m_comGuest;
+    KMachineState    m_enmMachineState;
+    quint64          m_uVMExitTotal;
+    quint64          m_uDiskWriteTotal;
+    quint64          m_uDiskReadTotal;
+    quint64          m_uNetworkDownTotal;
+    quint64          m_uNetworkUpTotal;
     CMachineDebugger m_comDebugger;
 };
@@ -313 +302 @@
  *   Class UIActivityOverviewItemCloud definition.                                                                           *
  *********************************************************************************************************************************/
+/* A UIActivityOverviewItem derivation to show cloud vms in the table view: */
 class UIActivityOverviewItemCloud : public UIActivityOverviewItem
 {
@@ -404 +394 @@
     bool isVMRunning(int rowIndex) const;
     bool isCloudVM(int rowIndex) const;
-    void setDefaultViewFont(const QFont &font);
-    void setDefaultViewFontColor(const QColor &color);
     void setCloudMachineItems(const QList<UIVirtualMachineItemCloud*> &cloudItems);
 
@@ -436 +424 @@
     QMap<int, bool> m_columnVisible;
     UIVMActivityOverviewHostStats m_hostStats;
-    QFont m_defaultViewFont;
-    QColor m_defaultViewFontColor;
     /** Maximum length of string length of data displayed in column. Updated in UIActivityOverviewModel::data(..). */
     mutable QMap<int, int> m_columnDataMaxLength;
@@ -863 +849 @@
     , m_uUsedRAM(0)
     , m_fRAMUsagePercentage(0)
-    , m_uNetworkDownTotal(0)
-    , m_uNetworkUpTotal(0)
-    , m_uDiskWriteTotal(0)
-    , m_uDiskReadTotal(0)
     , m_VMuid(uid)
     , m_strVMName(strVMName)
@@ -878 +860 @@
     , m_uUsedRAM(0)
     , m_fRAMUsagePercentage(0)
-    , m_uNetworkDownTotal(0)
-    , m_uNetworkUpTotal(0)
-    , m_uDiskWriteTotal(0)
-    , m_uDiskReadTotal(0)
     , m_VMuid(QUuid())
 {
@@ -1111 +1089 @@
     : UIActivityOverviewItem(pParent, uid, strVMName)
     , m_uVMExitTotal(0)
+    , m_uDiskWriteTotal(0)
+    , m_uDiskReadTotal(0)
+    , m_uNetworkDownTotal(0)
+    , m_uNetworkUpTotal(0)
 {
     if (m_enmMachineState == KMachineState_Running)
@@ -1118 +1100 @@
 UIActivityOverviewItemLocal::UIActivityOverviewItemLocal()
     : m_uVMExitTotal(0)
+    , m_uDiskWriteTotal(0)
+    , m_uDiskReadTotal(0)
+    , m_uNetworkDownTotal(0)
+    , m_uNetworkUpTotal(0)
 {
 }
@@ -1409 +1395 @@
 }
 
-void UIActivityOverviewModel::setDefaultViewFont(const QFont &font)
-{
-    m_defaultViewFont = font;
-}
-
-void UIActivityOverviewModel::setDefaultViewFontColor(const QColor &color)
-{
-    m_defaultViewFontColor = color;
-}
-
 void UIActivityOverviewModel::setCloudMachineItems(const QList<UIVirtualMachineItemCloud*> &cloudItems)
 {
@@ -1482 +1458 @@
         if (role == Qt::FontRole)
         {
-            QFont font(m_defaultViewFont);
+            QFont font = qApp->font();
             font.setItalic(true);
             return font;
@@ -1636 +1612 @@
 
     QVector<LONG> returnData = m_performanceCollector.QueryMetricsData(m_nameList,
-                                                                     m_objectList,
-                                                                     aReturnNames,
-                                                                     aReturnObjects,
-                                                                     aReturnUnits,
-                                                                     aReturnScales,
-                                                                     aReturnSequenceNumbers,
-                                                                     aReturnDataIndices,
-                                                                     aReturnDataLengths);
+                                                                       m_objectList,
+                                                                       aReturnNames,
+                                                                       aReturnObjects,
+                                                                       aReturnUnits,
+                                                                       aReturnScales,
+                                                                       aReturnSequenceNumbers,
+                                                                       aReturnDataIndices,
+                                                                       aReturnDataLengths);
     /* Parse the result we get from CPerformanceCollector to get respective values: */
     for (int i = 0; i < aReturnNames.size(); ++i)
@@ -1897 +1873 @@
         m_pTableView->setSortingEnabled(true);
         m_pTableView->sortByColumn(0, Qt::AscendingOrder);
-        /* Store the default font and its color of the table on the view. They are used in ::data(..): */
-        m_pModel->setDefaultViewFont(m_pTableView->font());
-        m_pModel->setDefaultViewFontColor(m_pTableView->palette().color(QPalette::Active, QPalette::WindowText));
 
         connect(m_pModel, &UIActivityOverviewModel::sigDataUpdate,

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -53 +53 @@
 #include "CPerformanceCollector.h"
 #include "CPerformanceMetric.h"
+#include <iprt/path.h>
 #include <iprt/string.h>
 
@@ -1144 +1145 @@
 {
     QString strStartFileName = QString("%1/%2_%3").
-        arg(QFileInfo(defaultMachineFolder()).absolutePath()).
+        arg(defaultMachineFolder()).
         arg(machineName()).
         arg(QDateTime::currentDateTime().toString("dd-MM-yyyy_hh-mm-ss"));
@@ -1152 +1153 @@
                                                                                 .arg(machineName()));
     QFile dataFile(strFileName);
+
     if (dataFile.open(QFile::WriteOnly | QFile::Truncate))
     {
@@ -1412 +1414 @@
 {
     if (m_comMachine.isOk())
-        return m_comMachine.GetSettingsFilePath();
+        return m_comMachine.GetLogFolder();
     else
         return QString();
@@ -2036 +2038 @@
 QString UIVMActivityMonitorCloud::defaultMachineFolder() const
 {
-    /** @todo */
-    return QString();
-}
+    char szPath[RTPATH_MAX];
+    int rc = RTPathUserDocuments(szPath, sizeof(szPath));
+    if (RT_SUCCESS(rc))
+        return QString(szPath);
+    return uiCommon().virtualBox().GetHomeFolder();
+}
+
 void UIVMActivityMonitorCloud::reset()
 {