VirtualBox

Changeset 83685 in vbox for trunk


Ignore:
Timestamp:
Apr 14, 2020 8:51:31 AM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
137183
Message:

FE/Qt: bugref:9686. Some cleanup.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

    r83616 r83685  
    28352835    /** Constructs action passing @a pParent to the base-class. */
    28362836    UIActionMenuSelectorVMResourceMonitorToggleColumns(UIActionPool *pParent)
    2837         : UIActionMenu(pParent, ":/exit_16px.png")
     2837        : UIActionMenu(pParent,
     2838                       ":/cloud_profile_try_32px.png", ":/cloud_profile_try_16px.png")
    28382839    {}
    28392840

  • trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp

    r83616 r83685  
    6363};
    6464
    65 ///#define DEBUG_BACKGROUND
     65/** Draws a doughnut shaped chart for the passed data values and can have a text drawn in the center. */
    6666
    6767
    … …  
    9999};
    100100
     101/** A simple container to store host related performance values. */
     102
    101103
    102104/*********************************************************************************************************************************
    … …  
    118120    quint64 m_iFSFree;
    119121};
     122
     123/** A container QWidget to layout host stats. related widgets. */
    120124
    121125
    … …  
    170174*   Class UIVMResourceMonitorTableView definition.                                                                               *
    171175*********************************************************************************************************************************/
    172 
     176/** A QTableView extension so manage the column width a bit better than what Qt offers out of box. */
    173177class UIVMResourceMonitorTableView : public QTableView
    174178{
    … …  
    191195private:
    192196
    193     void resizeHeader();
     197    /** Resizes all the columns in response to resizeEvent. Columns cannot be narrower than m_minimumColumnWidths values. */
     198    void resizeHeaders();
    194199    /** Value is in pixels. Columns cannot be narrower than this width. */
    195200    QMap<int, int> m_minimumColumnWidths;
    196201};
    197202
     203/** Each instance of UIVMResourceMonitorItem corresponds to a running vm whose stats are displayed.
     204  * they are owned my the model. */
    198205/*********************************************************************************************************************************
    199206 *   Class UIVMResourceMonitorItem definition.                                                                           *
    … …  
    240247
    241248    void setupPerformanceCollector();
    242 };
    243 
    244 /*********************************************************************************************************************************
    245  *   Class UIVMResourceMonitorCheckBox definition.                                                                           *
    246  *********************************************************************************************************************************/
    247 
    248 class UIVMResourceMonitorCheckBox : public QCheckBox
    249 {
    250     Q_OBJECT;
    251 
    252 public:
    253 
    254     UIVMResourceMonitorCheckBox(QWidget *parent = 0);
    255     void setData(const QVariant& data);
    256     const QVariant data() const;
    257 
    258 private:
    259 
    260     QVariant m_data;
    261249};
    262250
    … …  
    356344*   Class UIVMResourceMonitorDoughnutChart implementation.                                                                       *
    357345*********************************************************************************************************************************/
    358 
    359346UIVMResourceMonitorDoughnutChart::UIVMResourceMonitorDoughnutChart(QWidget *pParent /* = 0 */)
    360347    :QWidget(pParent)
    … …  
    441428    prepare();
    442429    retranslateUi();
    443 #ifdef DEBUG_BACKGROUND
    444     QPalette pal = palette();
    445     pal.setColor(QPalette::Background, Qt::red);
    446     setAutoFillBackground(true);
    447     setPalette(pal);
    448 #endif
    449430}
    450431
    … …  
    466447        {
    467448            quint64 iUsedRamPer = 100 * (iUsedRAM / (float) m_hostStats.m_iRAMTotal);
    468             QString strCenter = QString("%1%\n%2").arg(iUsedRamPer).arg(tr("Used"));
     449            QString strCenter = QString("%1%\n%2").arg(iUsedRamPer).arg(UIResourceMonitorWidget::tr("Used"));
    469450            m_pHostRAMChart->setChartCenterString(strCenter);
    470451        }
    … …  
    478459        {
    479460            quint64 iUsedRamPer = 100 * (iUsedFS / (float) m_hostStats.m_iFSTotal);
    480             QString strCenter = QString("%1%\n%2").arg(iUsedRamPer).arg(tr("Used"));
     461            QString strCenter = QString("%1%\n%2").arg(iUsedRamPer).arg(UIResourceMonitorWidget::tr("Used"));
    481462            m_pHostFSChart->setChartCenterString(strCenter);
    482463        }
    … …  
    510491        QWidget *pCPULabelContainer = new QWidget;
    511492        pCPULabelContainer->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
    512 
    513 #ifdef DEBUG_BACKGROUND
    514         QPalette pal = pCPULabelContainer->palette();
    515         pal.setColor(QPalette::Background, Qt::yellow);
    516         pCPULabelContainer->setAutoFillBackground(true);
    517         pCPULabelContainer->setPalette(pal);
    518 #endif
    519493        pLayout->addWidget(pCPULabelContainer);
    520494        QVBoxLayout *pCPULabelsLayout = new QVBoxLayout;
    … …  
    603577{
    604578    if (m_pCPUTitleLabel)
    605         m_pCPUTitleLabel->setText(QString("<b>%1</b>").arg(tr("Host CPU Load")));
     579        m_pCPUTitleLabel->setText(QString("<b>%1</b>").arg(UIResourceMonitorWidget::tr("Host CPU Load")));
    606580    if (m_pCPUUserLabel)
    607581    {
    608582        QString strColor = QColor(m_CPUUserColor).name(QColor::HexRgb);
    609         m_pCPUUserLabel->setText(QString("<font color=\"%1\">%2: %3%</font>").arg(strColor).arg(tr("User")).arg(QString::number(m_hostStats.m_iCPUUserLoad)));
     583        m_pCPUUserLabel->setText(QString("<font color=\"%1\">%2: %3%</font>").arg(strColor).arg(UIResourceMonitorWidget::tr("User")).arg(QString::number(m_hostStats.m_iCPUUserLoad)));
    610584    }
    611585    if (m_pCPUKernelLabel)
    612586    {
    613587        QString strColor = QColor(m_CPUKernelColor).name(QColor::HexRgb);
    614         m_pCPUKernelLabel->setText(QString("<font color=\"%1\">%2: %3%</font>").arg(strColor).arg(tr("Kernel")).arg(QString::number(m_hostStats.m_iCPUKernelLoad)));
     588        m_pCPUKernelLabel->setText(QString("<font color=\"%1\">%2: %3%</font>").arg(strColor).arg(UIResourceMonitorWidget::tr("Kernel")).arg(QString::number(m_hostStats.m_iCPUKernelLoad)));
    615589    }
    616590    if (m_pCPUTotalLabel)
    617         m_pCPUTotalLabel->setText(QString("%1: %2%").arg(tr("Total")).arg(m_hostStats.m_iCPUUserLoad + m_hostStats.m_iCPUKernelLoad));
     591        m_pCPUTotalLabel->setText(QString("%1: %2%").arg(UIResourceMonitorWidget::tr("Total")).arg(m_hostStats.m_iCPUUserLoad + m_hostStats.m_iCPUKernelLoad));
    618592    if (m_pRAMTitleLabel)
    619         m_pRAMTitleLabel->setText(QString("<b>%1</b>").arg(tr("Host RAM Usage")));
     593        m_pRAMTitleLabel->setText(QString("<b>%1</b>").arg(UIResourceMonitorWidget::tr("Host RAM Usage")));
    620594    if (m_pRAMFreeLabel)
    621595    {
    622596        QString strRAM = uiCommon().formatSize(m_hostStats.m_iRAMFree);
    623597        QString strColor = QColor(m_RAMFreeColor).name(QColor::HexRgb);
    624         m_pRAMFreeLabel->setText(QString("<font color=\"%1\">%2: %3</font>").arg(strColor).arg(tr("Free")).arg(strRAM));
     598        m_pRAMFreeLabel->setText(QString("<font color=\"%1\">%2: %3</font>").arg(strColor).arg(UIResourceMonitorWidget::tr("Free")).arg(strRAM));
    625599    }
    626600    if (m_pRAMUsedLabel)
    … …  
    628602        QString strRAM = uiCommon().formatSize(m_hostStats.m_iRAMTotal - m_hostStats.m_iRAMFree);
    629603        QString strColor = QColor(m_RAMUsedColor).name(QColor::HexRgb);
    630         m_pRAMUsedLabel->setText(QString("<font color=\"%1\">%2: %3</font>").arg(strColor).arg(tr("Used")).arg(strRAM));
     604        m_pRAMUsedLabel->setText(QString("<font color=\"%1\">%2: %3</font>").arg(strColor).arg(UIResourceMonitorWidget::tr("Used")).arg(strRAM));
    631605    }
    632606    if (m_pRAMTotalLabel)
    633607    {
    634608        QString strRAM = uiCommon().formatSize(m_hostStats.m_iRAMTotal);
    635         m_pRAMTotalLabel->setText(QString("%1: %2").arg(tr("Total")).arg(strRAM));
     609        m_pRAMTotalLabel->setText(QString("%1: %2").arg(UIResourceMonitorWidget::tr("Total")).arg(strRAM));
    636610    }
    637611    if (m_pFSTitleLabel)
    638         m_pFSTitleLabel->setText(QString("<b>%1</b>").arg(tr("Host File System")));
     612        m_pFSTitleLabel->setText(QString("<b>%1</b>").arg(UIResourceMonitorWidget::tr("Host File System")));
    639613    if (m_pFSFreeLabel)
    640614    {
    641615        QString strFS = uiCommon().formatSize(m_hostStats.m_iFSFree);
    642616        QString strColor = QColor(m_RAMFreeColor).name(QColor::HexRgb);
    643         m_pFSFreeLabel->setText(QString("<font color=\"%1\">%2: %3</font>").arg(strColor).arg(tr("Free")).arg(strFS));
     617        m_pFSFreeLabel->setText(QString("<font color=\"%1\">%2: %3</font>").arg(strColor).arg(UIResourceMonitorWidget::tr("Free")).arg(strFS));
    644618    }
    645619    if (m_pFSUsedLabel)
    … …  
    647621        QString strFS = uiCommon().formatSize(m_hostStats.m_iFSTotal - m_hostStats.m_iFSFree);
    648622        QString strColor = QColor(m_RAMUsedColor).name(QColor::HexRgb);
    649         m_pFSUsedLabel->setText(QString("<font color=\"%1\">%2: %3</font>").arg(strColor).arg(tr("Used")).arg(strFS));
     623        m_pFSUsedLabel->setText(QString("<font color=\"%1\">%2: %3</font>").arg(strColor).arg(UIResourceMonitorWidget::tr("Used")).arg(strFS));
    650624    }
    651625    if (m_pFSTotalLabel)
    652626    {
    653627        QString strFS = uiCommon().formatSize(m_hostStats.m_iFSTotal);
    654         m_pFSTotalLabel->setText(QString("%1: %2").arg(tr("Total")).arg(strFS));
     628        m_pFSTotalLabel->setText(QString("%1: %2").arg(UIResourceMonitorWidget::tr("Total")).arg(strFS));
    655629    }
    656630}
    … …  
    670644{
    671645    m_minimumColumnWidths = widths;
    672     resizeHeader();
     646    resizeHeaders();
    673647}
    674648
    … …  
    690664            pHeader->showSection(i);
    691665    }
    692     resizeHeader();
     666    resizeHeaders();
    693667}
    694668
    695669void UIVMResourceMonitorTableView::resizeEvent(QResizeEvent *pEvent)
    696670{
    697     resizeHeader();
     671    resizeHeaders();
    698672    QTableView::resizeEvent(pEvent);
    699673}
    700674
    701 void UIVMResourceMonitorTableView::resizeHeader()
     675void UIVMResourceMonitorTableView::resizeHeaders()
    702676{
    703677    QHeaderView* pHeader = horizontalHeader();
    … …  
    820794    , m_iFSFree(0)
    821795{
    822 }
    823 
    824 
    825 /*********************************************************************************************************************************
    826 *   Class UIVMResourceMonitorCheckBox implementation.                                                                            *
    827 *********************************************************************************************************************************/
    828 
    829 UIVMResourceMonitorCheckBox::UIVMResourceMonitorCheckBox(QWidget *parent /* = 0 */)
    830     :QCheckBox(parent)
    831 {
    832 }
    833 void UIVMResourceMonitorCheckBox::setData(const QVariant& data)
    834 {
    835     m_data = data;
    836 }
    837 
    838 const QVariant UIVMResourceMonitorCheckBox::data() const
    839 {
    840     return m_data;
    841796}
    842797
    … …  
    10481003                arg(uiCommon().formatSize(_1K * m_itemList[i].m_uTotalRAM, iDecimalCount));
    10491004        else
    1050             m_itemList[i].m_columnData[VMResourceMonitorColumn_RAMUsedAndTotal] = tr("N/A");
     1005            m_itemList[i].m_columnData[VMResourceMonitorColumn_RAMUsedAndTotal] = UIResourceMonitorWidget::tr("N/A");
    10511006
    10521007        if (m_itemList[i].isWithGuestAdditions())
    … …  
    10541009                QString("%1%").arg(QString::number(m_itemList[i].m_fRAMUsagePercentage, 'f', 2));
    10551010        else
    1056             m_itemList[i].m_columnData[VMResourceMonitorColumn_RAMUsedPercentage] = tr("N/A");
     1011            m_itemList[i].m_columnData[VMResourceMonitorColumn_RAMUsedPercentage] = UIResourceMonitorWidget::tr("N/A");
    10571012
    10581013        m_itemList[i].m_columnData[VMResourceMonitorColumn_NetworkUpRate] =
    … …  
    12771232void UIResourceMonitorWidget::retranslateUi()
    12781233{
    1279     m_columnTitles[VMResourceMonitorColumn_Name] = tr("VM Name");
    1280     m_columnTitles[VMResourceMonitorColumn_CPUGuestLoad] = tr("CPU Guest");
    1281     m_columnTitles[VMResourceMonitorColumn_CPUVMMLoad] = tr("CPU VMM");
    1282     m_columnTitles[VMResourceMonitorColumn_RAMUsedAndTotal] = tr("RAM Used/Total");
    1283     m_columnTitles[VMResourceMonitorColumn_RAMUsedPercentage] = tr("RAM %");
    1284     m_columnTitles[VMResourceMonitorColumn_NetworkUpRate] = tr("Network Up Rate");
    1285     m_columnTitles[VMResourceMonitorColumn_NetworkDownRate] = tr("Network Down Rate");
    1286     m_columnTitles[VMResourceMonitorColumn_NetworkUpTotal] = tr("Network Up Total");
    1287     m_columnTitles[VMResourceMonitorColumn_NetworkDownTotal] = tr("Network Down Total");
    1288     m_columnTitles[VMResourceMonitorColumn_DiskIOReadRate] = tr("Disk Read Rate");
    1289     m_columnTitles[VMResourceMonitorColumn_DiskIOWriteRate] = tr("Disk Write Rate");
    1290     m_columnTitles[VMResourceMonitorColumn_DiskIOReadTotal] = tr("Disk Read Total");
    1291     m_columnTitles[VMResourceMonitorColumn_DiskIOWriteTotal] = tr("Disk Write Total");
    1292     m_columnTitles[VMResourceMonitorColumn_VMExits] = tr("VM Exits");
     1234    m_columnTitles[VMResourceMonitorColumn_Name] = UIResourceMonitorWidget::tr("VM Name");
     1235    m_columnTitles[VMResourceMonitorColumn_CPUGuestLoad] = UIResourceMonitorWidget::tr("CPU Guest");
     1236    m_columnTitles[VMResourceMonitorColumn_CPUVMMLoad] = UIResourceMonitorWidget::tr("CPU VMM");
     1237    m_columnTitles[VMResourceMonitorColumn_RAMUsedAndTotal] = UIResourceMonitorWidget::tr("RAM Used/Total");
     1238    m_columnTitles[VMResourceMonitorColumn_RAMUsedPercentage] = UIResourceMonitorWidget::tr("RAM %");
     1239    m_columnTitles[VMResourceMonitorColumn_NetworkUpRate] = UIResourceMonitorWidget::tr("Network Up Rate");
     1240    m_columnTitles[VMResourceMonitorColumn_NetworkDownRate] = UIResourceMonitorWidget::tr("Network Down Rate");
     1241    m_columnTitles[VMResourceMonitorColumn_NetworkUpTotal] = UIResourceMonitorWidget::tr("Network Up Total");
     1242    m_columnTitles[VMResourceMonitorColumn_NetworkDownTotal] = UIResourceMonitorWidget::tr("Network Down Total");
     1243    m_columnTitles[VMResourceMonitorColumn_DiskIOReadRate] = UIResourceMonitorWidget::tr("Disk Read Rate");
     1244    m_columnTitles[VMResourceMonitorColumn_DiskIOWriteRate] = UIResourceMonitorWidget::tr("Disk Write Rate");
     1245    m_columnTitles[VMResourceMonitorColumn_DiskIOReadTotal] = UIResourceMonitorWidget::tr("Disk Read Total");
     1246    m_columnTitles[VMResourceMonitorColumn_DiskIOWriteTotal] = UIResourceMonitorWidget::tr("Disk Write Total");
     1247    m_columnTitles[VMResourceMonitorColumn_VMExits] = UIResourceMonitorWidget::tr("VM Exits");
    12931248    if (m_pModel)
    12941249        m_pModel->setColumnCaptions(m_columnTitles);
    … …  
    15381493void UIResourceMonitor::retranslateUi()
    15391494{
    1540     setWindowTitle(tr("VM Resource Monitor"));
     1495    setWindowTitle(UIResourceMonitorWidget::tr("VM Resource Monitor"));
    15411496}
    15421497

  • trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.h

    r83616 r83685  
    4848{
    4949    Q_OBJECT;
    50 
    51 signals:
    52 
    5350
    5451public:
    … …  
    122119        QMap<int, bool>                     m_columnVisible;
    123120        UIVMResourceMonitorHostStatsWidget *m_pHostStatsWidget;
    124 
    125 
    126121    /** @} */
    127122    /** Indicates if this widget's host tool is current tool. */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

    r82968 r83685  
    9191#  undef FocusIn
    9292# endif /* KeyPress */
    93 # include <xcb/xcb.h>
     93//# include <xcb/xcb.h>
    9494#endif /* VBOX_WS_X11 */
    9595
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette