Changeset 80249 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 13, 2019 11:43:59 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510: Getting rid of some hard coded color strings

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information

Files:

• UIPerformanceMonitor.cpp (modified) (2 diffs)
• UIPerformanceMonitor.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIPerformanceMonitor.cpp

@@ -801 +801 @@
     {
         QString strInfo;
+        QString strReceiveColor;
         if (m_infoLabels[m_strNetMetricName]->isEnabled())
-            strInfo = QString("<b>%1</b></b><br/><font color=\"#FF0000\">%2: %3</font><br/><font color=\"#0000FF\">%4: %5</font><br/>%6: %7").arg(m_strNetInfoLabelTitle)
+            strInfo = QString("<b>%1</b></b><br/><font color=\"%2\">%3: %4</font><br/><font color=\"%5\">%6: %7</font><br/>%8: %9")
+                .arg(m_strNetInfoLabelTitle)
+                .arg(dataColorString(m_strNetMetricName, 0))
                 .arg(m_strNetInfoLabelReceived).arg(uiCommon().formatSize((quint64)iReceiveRate, iDecimalCount))
+                .arg(dataColorString(m_strNetMetricName, 1))
                 .arg(m_strNetInfoLabelTransmitted).arg(uiCommon().formatSize((quint64)iTransmitRate, iDecimalCount))
                 .arg(m_strNetInfoLabelMaximum).arg(uiCommon().formatSize((quint64)iMaximum, iDecimalCount));
@@ -815 +819 @@
 }
 
+QString UIPerformanceMonitor::dataColorString(const QString &strChartName, int iDataIndex)
+{
+    if (!m_charts.contains(strChartName))
+        return QColor(Qt::red).name(QColor::HexRgb);
+    UIChart *pChart = m_charts[strChartName];
+    if (!pChart)
+        return QColor(Qt::red).name(QColor::HexRgb);
+    return pChart->dataSeriesColor(iDataIndex).name(QColor::HexRgb);
+}
 #include "UIPerformanceMonitor.moc"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIPerformanceMonitor.h

@@ -110 +110 @@
     void updateRAMGraphsAndMetric(quint64 iTotalRAM, quint64 iFreeRAM);
     void updateNewGraphsAndMetric(ULONG iReceiveRate, ULONG iTransmitRate);
+    QString dataColorString(const QString &strChartName, int iDataIndex);
 
     bool m_fGuestAdditionsAvailable;