Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp (revision 83684) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp (revision 83685) @@ -2835,5 +2835,6 @@ /** Constructs action passing @a pParent to the base-class. */ UIActionMenuSelectorVMResourceMonitorToggleColumns(UIActionPool *pParent) - : UIActionMenu(pParent, ":/exit_16px.png") + : UIActionMenu(pParent, + ":/cloud_profile_try_32px.png", ":/cloud_profile_try_16px.png") {} Index: /trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp (revision 83684) +++ /trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp (revision 83685) @@ -63,5 +63,5 @@ }; -///#define DEBUG_BACKGROUND +/** Draws a doughnut shaped chart for the passed data values and can have a text drawn in the center. */ @@ -99,4 +99,6 @@ }; +/** A simple container to store host related performance values. */ + /********************************************************************************************************************************* @@ -118,4 +120,6 @@ quint64 m_iFSFree; }; + +/** A container QWidget to layout host stats. related widgets. */ @@ -170,5 +174,5 @@ * Class UIVMResourceMonitorTableView definition. * *********************************************************************************************************************************/ - +/** A QTableView extension so manage the column width a bit better than what Qt offers out of box. */ class UIVMResourceMonitorTableView : public QTableView { @@ -191,9 +195,12 @@ private: - void resizeHeader(); + /** Resizes all the columns in response to resizeEvent. Columns cannot be narrower than m_minimumColumnWidths values. */ + void resizeHeaders(); /** Value is in pixels. Columns cannot be narrower than this width. */ QMap m_minimumColumnWidths; }; +/** Each instance of UIVMResourceMonitorItem corresponds to a running vm whose stats are displayed. + * they are owned my the model. */ /********************************************************************************************************************************* * Class UIVMResourceMonitorItem definition. * @@ -240,23 +247,4 @@ void setupPerformanceCollector(); -}; - -/********************************************************************************************************************************* - * Class UIVMResourceMonitorCheckBox definition. * - *********************************************************************************************************************************/ - -class UIVMResourceMonitorCheckBox : public QCheckBox -{ - Q_OBJECT; - -public: - - UIVMResourceMonitorCheckBox(QWidget *parent = 0); - void setData(const QVariant& data); - const QVariant data() const; - -private: - - QVariant m_data; }; @@ -356,5 +344,4 @@ * Class UIVMResourceMonitorDoughnutChart implementation. * *********************************************************************************************************************************/ - UIVMResourceMonitorDoughnutChart::UIVMResourceMonitorDoughnutChart(QWidget *pParent /* = 0 */) :QWidget(pParent) @@ -441,10 +428,4 @@ prepare(); retranslateUi(); -#ifdef DEBUG_BACKGROUND - QPalette pal = palette(); - pal.setColor(QPalette::Background, Qt::red); - setAutoFillBackground(true); - setPalette(pal); -#endif } @@ -466,5 +447,5 @@ { quint64 iUsedRamPer = 100 * (iUsedRAM / (float) m_hostStats.m_iRAMTotal); - QString strCenter = QString("%1%\n%2").arg(iUsedRamPer).arg(tr("Used")); + QString strCenter = QString("%1%\n%2").arg(iUsedRamPer).arg(UIResourceMonitorWidget::tr("Used")); m_pHostRAMChart->setChartCenterString(strCenter); } @@ -478,5 +459,5 @@ { quint64 iUsedRamPer = 100 * (iUsedFS / (float) m_hostStats.m_iFSTotal); - QString strCenter = QString("%1%\n%2").arg(iUsedRamPer).arg(tr("Used")); + QString strCenter = QString("%1%\n%2").arg(iUsedRamPer).arg(UIResourceMonitorWidget::tr("Used")); m_pHostFSChart->setChartCenterString(strCenter); } @@ -510,11 +491,4 @@ QWidget *pCPULabelContainer = new QWidget; pCPULabelContainer->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); - -#ifdef DEBUG_BACKGROUND - QPalette pal = pCPULabelContainer->palette(); - pal.setColor(QPalette::Background, Qt::yellow); - pCPULabelContainer->setAutoFillBackground(true); - pCPULabelContainer->setPalette(pal); -#endif pLayout->addWidget(pCPULabelContainer); QVBoxLayout *pCPULabelsLayout = new QVBoxLayout; @@ -603,24 +577,24 @@ { if (m_pCPUTitleLabel) - m_pCPUTitleLabel->setText(QString("%1").arg(tr("Host CPU Load"))); + m_pCPUTitleLabel->setText(QString("%1").arg(UIResourceMonitorWidget::tr("Host CPU Load"))); if (m_pCPUUserLabel) { QString strColor = QColor(m_CPUUserColor).name(QColor::HexRgb); - m_pCPUUserLabel->setText(QString("%2: %3%").arg(strColor).arg(tr("User")).arg(QString::number(m_hostStats.m_iCPUUserLoad))); + m_pCPUUserLabel->setText(QString("%2: %3%").arg(strColor).arg(UIResourceMonitorWidget::tr("User")).arg(QString::number(m_hostStats.m_iCPUUserLoad))); } if (m_pCPUKernelLabel) { QString strColor = QColor(m_CPUKernelColor).name(QColor::HexRgb); - m_pCPUKernelLabel->setText(QString("%2: %3%").arg(strColor).arg(tr("Kernel")).arg(QString::number(m_hostStats.m_iCPUKernelLoad))); + m_pCPUKernelLabel->setText(QString("%2: %3%").arg(strColor).arg(UIResourceMonitorWidget::tr("Kernel")).arg(QString::number(m_hostStats.m_iCPUKernelLoad))); } if (m_pCPUTotalLabel) - m_pCPUTotalLabel->setText(QString("%1: %2%").arg(tr("Total")).arg(m_hostStats.m_iCPUUserLoad + m_hostStats.m_iCPUKernelLoad)); + m_pCPUTotalLabel->setText(QString("%1: %2%").arg(UIResourceMonitorWidget::tr("Total")).arg(m_hostStats.m_iCPUUserLoad + m_hostStats.m_iCPUKernelLoad)); if (m_pRAMTitleLabel) - m_pRAMTitleLabel->setText(QString("%1").arg(tr("Host RAM Usage"))); + m_pRAMTitleLabel->setText(QString("%1").arg(UIResourceMonitorWidget::tr("Host RAM Usage"))); if (m_pRAMFreeLabel) { QString strRAM = uiCommon().formatSize(m_hostStats.m_iRAMFree); QString strColor = QColor(m_RAMFreeColor).name(QColor::HexRgb); - m_pRAMFreeLabel->setText(QString("%2: %3").arg(strColor).arg(tr("Free")).arg(strRAM)); + m_pRAMFreeLabel->setText(QString("%2: %3").arg(strColor).arg(UIResourceMonitorWidget::tr("Free")).arg(strRAM)); } if (m_pRAMUsedLabel) @@ -628,18 +602,18 @@ QString strRAM = uiCommon().formatSize(m_hostStats.m_iRAMTotal - m_hostStats.m_iRAMFree); QString strColor = QColor(m_RAMUsedColor).name(QColor::HexRgb); - m_pRAMUsedLabel->setText(QString("%2: %3").arg(strColor).arg(tr("Used")).arg(strRAM)); + m_pRAMUsedLabel->setText(QString("%2: %3").arg(strColor).arg(UIResourceMonitorWidget::tr("Used")).arg(strRAM)); } if (m_pRAMTotalLabel) { QString strRAM = uiCommon().formatSize(m_hostStats.m_iRAMTotal); - m_pRAMTotalLabel->setText(QString("%1: %2").arg(tr("Total")).arg(strRAM)); + m_pRAMTotalLabel->setText(QString("%1: %2").arg(UIResourceMonitorWidget::tr("Total")).arg(strRAM)); } if (m_pFSTitleLabel) - m_pFSTitleLabel->setText(QString("%1").arg(tr("Host File System"))); + m_pFSTitleLabel->setText(QString("%1").arg(UIResourceMonitorWidget::tr("Host File System"))); if (m_pFSFreeLabel) { QString strFS = uiCommon().formatSize(m_hostStats.m_iFSFree); QString strColor = QColor(m_RAMFreeColor).name(QColor::HexRgb); - m_pFSFreeLabel->setText(QString("%2: %3").arg(strColor).arg(tr("Free")).arg(strFS)); + m_pFSFreeLabel->setText(QString("%2: %3").arg(strColor).arg(UIResourceMonitorWidget::tr("Free")).arg(strFS)); } if (m_pFSUsedLabel) @@ -647,10 +621,10 @@ QString strFS = uiCommon().formatSize(m_hostStats.m_iFSTotal - m_hostStats.m_iFSFree); QString strColor = QColor(m_RAMUsedColor).name(QColor::HexRgb); - m_pFSUsedLabel->setText(QString("%2: %3").arg(strColor).arg(tr("Used")).arg(strFS)); + m_pFSUsedLabel->setText(QString("%2: %3").arg(strColor).arg(UIResourceMonitorWidget::tr("Used")).arg(strFS)); } if (m_pFSTotalLabel) { QString strFS = uiCommon().formatSize(m_hostStats.m_iFSTotal); - m_pFSTotalLabel->setText(QString("%1: %2").arg(tr("Total")).arg(strFS)); + m_pFSTotalLabel->setText(QString("%1: %2").arg(UIResourceMonitorWidget::tr("Total")).arg(strFS)); } } @@ -670,5 +644,5 @@ { m_minimumColumnWidths = widths; - resizeHeader(); + resizeHeaders(); } @@ -690,14 +664,14 @@ pHeader->showSection(i); } - resizeHeader(); + resizeHeaders(); } void UIVMResourceMonitorTableView::resizeEvent(QResizeEvent *pEvent) { - resizeHeader(); + resizeHeaders(); QTableView::resizeEvent(pEvent); } -void UIVMResourceMonitorTableView::resizeHeader() +void UIVMResourceMonitorTableView::resizeHeaders() { QHeaderView* pHeader = horizontalHeader(); @@ -820,23 +794,4 @@ , m_iFSFree(0) { -} - - -/********************************************************************************************************************************* -* Class UIVMResourceMonitorCheckBox implementation. * -*********************************************************************************************************************************/ - -UIVMResourceMonitorCheckBox::UIVMResourceMonitorCheckBox(QWidget *parent /* = 0 */) - :QCheckBox(parent) -{ -} -void UIVMResourceMonitorCheckBox::setData(const QVariant& data) -{ - m_data = data; -} - -const QVariant UIVMResourceMonitorCheckBox::data() const -{ - return m_data; } @@ -1048,5 +1003,5 @@ arg(uiCommon().formatSize(_1K * m_itemList[i].m_uTotalRAM, iDecimalCount)); else - m_itemList[i].m_columnData[VMResourceMonitorColumn_RAMUsedAndTotal] = tr("N/A"); + m_itemList[i].m_columnData[VMResourceMonitorColumn_RAMUsedAndTotal] = UIResourceMonitorWidget::tr("N/A"); if (m_itemList[i].isWithGuestAdditions()) @@ -1054,5 +1009,5 @@ QString("%1%").arg(QString::number(m_itemList[i].m_fRAMUsagePercentage, 'f', 2)); else - m_itemList[i].m_columnData[VMResourceMonitorColumn_RAMUsedPercentage] = tr("N/A"); + m_itemList[i].m_columnData[VMResourceMonitorColumn_RAMUsedPercentage] = UIResourceMonitorWidget::tr("N/A"); m_itemList[i].m_columnData[VMResourceMonitorColumn_NetworkUpRate] = @@ -1277,18 +1232,18 @@ void UIResourceMonitorWidget::retranslateUi() { - m_columnTitles[VMResourceMonitorColumn_Name] = tr("VM Name"); - m_columnTitles[VMResourceMonitorColumn_CPUGuestLoad] = tr("CPU Guest"); - m_columnTitles[VMResourceMonitorColumn_CPUVMMLoad] = tr("CPU VMM"); - m_columnTitles[VMResourceMonitorColumn_RAMUsedAndTotal] = tr("RAM Used/Total"); - m_columnTitles[VMResourceMonitorColumn_RAMUsedPercentage] = tr("RAM %"); - m_columnTitles[VMResourceMonitorColumn_NetworkUpRate] = tr("Network Up Rate"); - m_columnTitles[VMResourceMonitorColumn_NetworkDownRate] = tr("Network Down Rate"); - m_columnTitles[VMResourceMonitorColumn_NetworkUpTotal] = tr("Network Up Total"); - m_columnTitles[VMResourceMonitorColumn_NetworkDownTotal] = tr("Network Down Total"); - m_columnTitles[VMResourceMonitorColumn_DiskIOReadRate] = tr("Disk Read Rate"); - m_columnTitles[VMResourceMonitorColumn_DiskIOWriteRate] = tr("Disk Write Rate"); - m_columnTitles[VMResourceMonitorColumn_DiskIOReadTotal] = tr("Disk Read Total"); - m_columnTitles[VMResourceMonitorColumn_DiskIOWriteTotal] = tr("Disk Write Total"); - m_columnTitles[VMResourceMonitorColumn_VMExits] = tr("VM Exits"); + m_columnTitles[VMResourceMonitorColumn_Name] = UIResourceMonitorWidget::tr("VM Name"); + m_columnTitles[VMResourceMonitorColumn_CPUGuestLoad] = UIResourceMonitorWidget::tr("CPU Guest"); + m_columnTitles[VMResourceMonitorColumn_CPUVMMLoad] = UIResourceMonitorWidget::tr("CPU VMM"); + m_columnTitles[VMResourceMonitorColumn_RAMUsedAndTotal] = UIResourceMonitorWidget::tr("RAM Used/Total"); + m_columnTitles[VMResourceMonitorColumn_RAMUsedPercentage] = UIResourceMonitorWidget::tr("RAM %"); + m_columnTitles[VMResourceMonitorColumn_NetworkUpRate] = UIResourceMonitorWidget::tr("Network Up Rate"); + m_columnTitles[VMResourceMonitorColumn_NetworkDownRate] = UIResourceMonitorWidget::tr("Network Down Rate"); + m_columnTitles[VMResourceMonitorColumn_NetworkUpTotal] = UIResourceMonitorWidget::tr("Network Up Total"); + m_columnTitles[VMResourceMonitorColumn_NetworkDownTotal] = UIResourceMonitorWidget::tr("Network Down Total"); + m_columnTitles[VMResourceMonitorColumn_DiskIOReadRate] = UIResourceMonitorWidget::tr("Disk Read Rate"); + m_columnTitles[VMResourceMonitorColumn_DiskIOWriteRate] = UIResourceMonitorWidget::tr("Disk Write Rate"); + m_columnTitles[VMResourceMonitorColumn_DiskIOReadTotal] = UIResourceMonitorWidget::tr("Disk Read Total"); + m_columnTitles[VMResourceMonitorColumn_DiskIOWriteTotal] = UIResourceMonitorWidget::tr("Disk Write Total"); + m_columnTitles[VMResourceMonitorColumn_VMExits] = UIResourceMonitorWidget::tr("VM Exits"); if (m_pModel) m_pModel->setColumnCaptions(m_columnTitles); @@ -1538,5 +1493,5 @@ void UIResourceMonitor::retranslateUi() { - setWindowTitle(tr("VM Resource Monitor")); + setWindowTitle(UIResourceMonitorWidget::tr("VM Resource Monitor")); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.h (revision 83684) +++ /trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.h (revision 83685) @@ -48,7 +48,4 @@ { Q_OBJECT; - -signals: - public: @@ -122,6 +119,4 @@ QMap m_columnVisible; UIVMResourceMonitorHostStatsWidget *m_pHostStatsWidget; - - /** @} */ /** Indicates if this widget's host tool is current tool. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (revision 83684) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (revision 83685) @@ -91,5 +91,5 @@ # undef FocusIn # endif /* KeyPress */ -# include +//# include #endif /* VBOX_WS_X11 */