Changeset 80545 in vbox for trunk/src

Timestamp:

Sep 2, 2019 11:22:27 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510: Some clean up.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.cpp (modified) (23 diffs)

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

@@ -161 +161 @@
     void setFontSize(int iFontSize);
     int  fontSize() const;
-    void setTextList(const QStringList &textList);
     const QStringList &textList() const;
 
@@ -190 +189 @@
 private:
 
-    virtual void computeFontSize();
     /** @name Drawing helper functions.
      * @{ */
@@ -210 +208 @@
     int m_iMarginTop;
     int m_iMarginBottom;
-    QStringList m_textList;
     QRect m_lineChartRect;
     int m_iPieChartRadius;
@@ -246 +243 @@
     setSelectionMode(QAbstractItemView::NoSelection);
 
-
     m_pTimer = new QTimer(this);
     if (m_pTimer)
@@ -253 +249 @@
         m_pTimer->start(5000);
     }
-
 
     retranslateUi();
@@ -331 +326 @@
         strResolution += m_strMonitorTurnedOff;
     }
-
     return strResolution;
 }
@@ -344 +338 @@
     ULONG uGuestScreens = m_machine.GetMonitorCount();
     m_screenResolutions.resize(uGuestScreens);
-
     if (iScreenID != -1 && iScreenID >= (int)uGuestScreens)
         return;
@@ -362 +355 @@
             removeRow(i);
     }
-
     for (ULONG iScreen = 0; iScreen < uGuestScreens; ++iScreen)
     {
@@ -455 +447 @@
     updateScreenInfo();
     updateUpTime();
-
 
     /* Determine virtualization attributes: */
@@ -537 +528 @@
 
     m_iMarginLeft = 1 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
-    m_iMarginRight = 6 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
+    m_iMarginRight = 9 * QFontMetrics(font()).width('X');
     m_iMarginTop = 0.3 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
     m_iMarginBottom = 2 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
 
     float fAppIconSize = qApp->style()->pixelMetric(QStyle::PM_LargeIconSize);
-    m_size = QSize(14 * fAppIconSize,  4 * fAppIconSize);
+    m_size = QSize(14 * fAppIconSize,  3.5 * fAppIconSize);
     m_iPieChartSpacing = 2;
     m_iPieChartRadius = m_size.height() - (m_iMarginTop + m_iMarginBottom + 2 * m_iPieChartSpacing);
@@ -557 +548 @@
 {
     return m_font.pixelSize();
-}
-
-void UIChart::setTextList(const QStringList &textList)
-{
-    m_textList = textList;
-    computeFontSize();
-}
-
-const QStringList &UIChart::textList() const
-{
-    return m_textList;
 }
 
@@ -638 +618 @@
     m_strGAWarning = QApplication::translate("UIVMInformationDialog", "No guest additions! This metric requires guest additions to work properly.");
     m_strResetActionLabel = QApplication::translate("UIVMInformationDialog", "Reset");
-}
-
-void UIChart::computeFontSize()
-{
-    int iFontSize = 24;
-    foreach (const QString &strText, m_textList)
-    {
-        m_font.setPixelSize(iFontSize);
-        do{
-            int iWidth = QFontMetrics(m_font).width(strText);
-            if (iWidth + m_iMarginLeft + m_iMarginRight > m_size.width())
-                --iFontSize;
-            else
-                break;
-            m_font.setPixelSize(iFontSize);
-        }while(iFontSize > 1);
-    }
 }
 
@@ -1178 +1141 @@
     iMaximum = qMax(iMaximum, m_strVMExitLabelTotal.length());
 
-
     /* Compute the maximum label string length and set it as a fixed width to labels to prevent always changing widths: */
     /* Add m_iDecimalCount plus 3 characters for the number and 3 for unit string: */
@@ -1193 +1155 @@
         }
     }
-
 }
 
@@ -1252 +1213 @@
     m_pRuntimeInfoWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
 
-
     QWidget *bottomSpacerWidget = new QWidget(this);
     bottomSpacerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
@@ -1265 +1225 @@
 void UIInformationRuntime::sltTimeout()
 {
-
     if (m_performanceMonitor.isNull())
         return;
@@ -1322 +1281 @@
     quint64 uNetworkTotalReceive = 0;
     quint64 uNetworkTotalTransmit = 0;
-
     quint64 uDiskIOTotalWritten = 0;
     quint64 uDiskIOTotalRead = 0;
-
-   quint64 uTotalVMExits = 0;
+    quint64 uTotalVMExits = 0;
 
     QVector<DebuggerMetricData> xmlData = getTotalCounterFromDegugger(m_strQueryString);
@@ -1482 +1439 @@
         m_strQueryString += iterator.value().queryString();
     }
-
 }
 
@@ -1655 +1611 @@
     if (m_charts.contains(m_strDiskIOMetricName))
         m_charts[m_strDiskIOMetricName]->update();
-
-}
-
+}
 
 void UIInformationRuntime::updateVMExitMetric(quint64 uTotalVMExits)
@@ -1665 +1619 @@
 
     UIMetric &VMExitMetric = m_subMetrics[m_strVMExitMetricName];
-
     quint64 iRate = uTotalVMExits - VMExitMetric.total(0);
-
     VMExitMetric.setTotal(0, uTotalVMExits);
-
     /* Do not set data and maximum if the metric has not been initialized  since we need to initialize totals "(t-1)" first: */
     if (!VMExitMetric.isInitialized())
@@ -1676 +1627 @@
         return;
     }
-
     VMExitMetric.addData(0, iRate);
     quint64 iMaximum = qMax(VMExitMetric.maximum(), iRate);
     VMExitMetric.setMaximum(iMaximum);
-
     if (m_infoLabels.contains(m_strVMExitMetricName)  && m_infoLabels[m_strVMExitMetricName])
     {
@@ -1713 +1662 @@
         return xmlData;
     CMachineDebugger debugger = m_console.GetDebugger();
-
     QString strStats = debugger.GetStats(strQuery, false);
     QXmlStreamReader xmlReader;
@@ -1740 +1688 @@
             else
                 xmlReader.skipCurrentElement();
-
         }
     }