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

Timestamp:

Apr 28, 2024 10:31:01 AM (12 months ago)

Author:

vboxsync

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

162959

Message:

FE/Qt. bugref:9510. Saving data series colors to extra data.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/overview/UIVMActivityToolWidget.cpp (modified) (4 diffs)
• activity/overview/UIVMActivityToolWidget.h (modified) (2 diffs)
• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (2 diffs)

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

@@ -35 +35 @@
 #include "QIToolBar.h"
 #include "UIActionPoolManager.h"
+#include "UIExtraDataManager.h"
 #include "UIGlobalSession.h"
 #include "UIVMActivityMonitor.h"
@@ -63 +64 @@
     , m_pTabWidget(0)
 {
-    m_dataSeriesColor[0] = QApplication::palette().color(QPalette::LinkVisited);
-    m_dataSeriesColor[1] = QApplication::palette().color(QPalette::Link);
+    loadSettings();
     prepare();
     prepareActions();
     prepareToolBar();
     sltCurrentTabChanged(0);
+}
+
+void UIVMActivityToolWidget::loadSettings()
+{
+    QStringList colorList = gEDataManager->VMActivityMonitorDataSeriesColors();
+    if (colorList.size() == 2)
+    {
+        for (int i = 0; i < 2; ++i)
+        {
+            QColor color(colorList[i]);
+            if (color.isValid())
+                m_dataSeriesColor[i] = color;
+        }
+    }
+    if (!m_dataSeriesColor[0].isValid())
+        m_dataSeriesColor[0] = QApplication::palette().color(QPalette::LinkVisited);
+    if (!m_dataSeriesColor[1].isValid())
+        m_dataSeriesColor[1] = QApplication::palette().color(QPalette::Link);
+}
+
+void UIVMActivityToolWidget::saveSettings()
+{
+    QStringList colorList;
+    colorList << m_dataSeriesColor[0].name(QColor::HexArgb);
+    colorList << m_dataSeriesColor[1].name(QColor::HexArgb);
+    gEDataManager->setVMActivityMonitorDataSeriesColors(colorList);
 }
 
@@ -182 +208 @@
 }
 
-void UIVMActivityToolWidget::loadSettings()
-{
-}
-
 void UIVMActivityToolWidget::removeTabs(const QVector<QUuid> &machineIdsToRemove)
 {
@@ -275 +297 @@
             m_dataSeriesColor[iIndex] = color;
     }
+    saveSettings();
 }
 

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

@@ -82 +82 @@
 private:
 
+    void loadSettings();
+    void saveSettings();
     void setMachines(const QList<UIVirtualMachineItem*> &machines);
     /** @name Prepare/cleanup cascade.
@@ -89 +91 @@
         void prepareActions();
         void updateColumnsMenu();
-        void loadSettings();
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -268 +268 @@
 const char *UIExtraDataDefs::GUI_VMActivityOverview_HiddenColumns = "GUI/VMActivityOverviewHiddenColumns";
 const char *UIExtraDataDefs::GUI_VMActivityOverview_ShowAllMachines = "GUI/VMActivityOverviewShowAllMachines";
+const char *UIExtraDataDefs::GUI_VMActivityMonitor_DataSeriesColors = "GUI/VMActivityMonitorDataSeriesColors";
 
 const char *UIExtraDataDefs::GUI_MediumSelector_DialogGeometry = "GUI/MediumSelector/DialogGeometry";

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -472 +472 @@
     /** @} */
 
-    /** @name Manager UI: VM Activity Overview Related stuff
+    /** @name Manager UI: VM Activity Monitor and Overview Related stuff
       * @{ */
         SHARED_LIBRARY_STUFF extern const char *GUI_VMActivityOverview_HiddenColumns;
         SHARED_LIBRARY_STUFF extern const char *GUI_VMActivityOverview_ShowAllMachines;
+        SHARED_LIBRARY_STUFF extern const char *GUI_VMActivityMonitor_DataSeriesColors;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -4807 +4807 @@
 }
 
+void UIExtraDataManager::setVMActivityMonitorDataSeriesColors(const QStringList &colorList)
+{
+    setExtraDataStringList(GUI_VMActivityMonitor_DataSeriesColors, colorList);
+}
+
+QStringList UIExtraDataManager::VMActivityMonitorDataSeriesColors()
+{
+    return extraDataStringList(GUI_VMActivityMonitor_DataSeriesColors);
+}
+
 QRect UIExtraDataManager::mediumSelectorDialogGeometry(QWidget *pWidget, QWidget *pParentWidget, const QRect &defaultGeometry)
 {

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -868 +868 @@
     /** @} */
 
-    /** @name Manager UI: VM Activity Overview
+    /** @name Manager UI: VM Activity Monitor and Overview
       * @{ */
         void setVMActivityOverviewHiddenColumnList(const QStringList &hiddenColumnList);
@@ -874 +874 @@
         bool VMActivityOverviewShowAllMachines();
         void setVMActivityOverviewShowAllMachines(bool fShow);
+        void setVMActivityMonitorDataSeriesColors(const QStringList &colorList);
+        QStringList VMActivityMonitorDataSeriesColors();
     /** @} */