Changeset 104458 in vbox for trunk/src

Timestamp:

Apr 30, 2024 8:36:19 AM (13 months ago)

Author:

vboxsync

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

162971

Message:

FE/Qt. bugref:9510. Some refactoring to add preferences pane to the widget in runtime UI as well.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/activity/vmactivity/UIVMActivityMonitor.cpp (modified) (3 diffs)
• src/activity/vmactivity/UIVMActivityMonitorContainer.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitorPaneContainer.cpp ) (3 diffs)
• src/activity/vmactivity/UIVMActivityMonitorContainer.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitorPaneContainer.h ) (4 diffs)
• src/activity/vmactivity/UIVMActivityToolWidget.cpp (modified) (10 diffs)
• src/activity/vmactivity/UIVMActivityToolWidget.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk ¶

@@ -858 +858 @@
         src/logviewer/UIVMLogViewerWidget.h \
         src/activity/vmactivity/UIVMActivityMonitor.h \
-        src/activity/vmactivity/UIVMActivityMonitorPaneContainer.h \
+        src/activity/vmactivity/UIVMActivityMonitorContainer.h \
         src/activity/UIMonitorCommon.h \
         src/medium/UIFDCreationDialog.h \
@@ -1439 +1439 @@
         src/activity/UIMonitorCommon.cpp \
         src/activity/vmactivity/UIVMActivityMonitor.cpp \
-        src/activity/vmactivity/UIVMActivityMonitorPaneContainer.cpp \
+        src/activity/vmactivity/UIVMActivityMonitorContainer.cpp \
         src/medium/UIFDCreationDialog.cpp \
         src/medium/UIMedium.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp ¶

@@ -240 +240 @@
     m_pMouseOverLabel->hide();
     m_pMouseOverLabel->setFrameStyle(QFrame::Box);
-    m_pMouseOverLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
     m_pMouseOverLabel->setAutoFillBackground(true);
     m_pMouseOverLabel->setMargin(0.1 * QStyle::PM_HeaderMargin);
@@ -424 +424 @@
         else
         {
+
             QString strToolTip = toolTipText();
             QPoint pos = mapFromGlobal(QCursor::pos());
@@ -432 +433 @@
                 m_pMouseOverLabel->move(QPoint(pos.x(), pos.y() - m_pMouseOverLabel->height()));
                 m_pMouseOverLabel->setVisible(true);
+                m_pMouseOverLabel->adjustSize();
             }
             else

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitorContainer.cpp ¶

@@ -37 +37 @@
 #include <QPushButton>
 #include <QStyle>
+#include <QTabWidget>
 
 /* GUI includes: */
+#include "UIActionPool.h"
+#include "UIExtraDataManager.h"
+#include "UIGlobalSession.h"
 #include "UITranslationEventListener.h"
-#include "UIVMActivityMonitorPaneContainer.h"
+#include "UIVMActivityMonitor.h"
+#include "UIVMActivityMonitorContainer.h"
 
 /* Other includes: */
 #include "iprt/assert.h"
 
-UIVMActivityMonitorPaneContainer::UIVMActivityMonitorPaneContainer(QWidget *pParent,
-                                                                   EmbedTo enmEmbedTo /* = EmbedTo_Stack */)
-    : UIPaneContainer(pParent, enmEmbedTo, false /* detach not allowed */)
+
+/*********************************************************************************************************************************
+*   UIVMActivityMonitorPaneContainer implementation.                                                                             *
+*********************************************************************************************************************************/
+
+
+UIVMActivityMonitorPaneContainer::UIVMActivityMonitorPaneContainer(QWidget *pParent)
+    : UIPaneContainer(pParent)
     , m_pColorLabel{0, 0}
     , m_pColorChangeButton{0, 0}
@@ -93 +103 @@
     connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
             this, &UIVMActivityMonitorPaneContainer::sltRetranslateUI);
+
 }
 
@@ -166 +177 @@
     setDataSeriesColor(1, QApplication::palette().color(QPalette::Link));
 }
+
+/*********************************************************************************************************************************
+*   UIVMActivityMonitorContainer implementation.                                                                            *
+*********************************************************************************************************************************/
+
+UIVMActivityMonitorContainer::UIVMActivityMonitorContainer(QWidget *pParent, UIActionPool *pActionPool, EmbedTo enmEmbedding)
+    :QWidget(pParent)
+    , m_pPaneContainer(0)
+    , m_pTabWidget(0)
+    , m_pExportToFileAction(0)
+    , m_pActionPool(pActionPool)
+    , m_enmEmbedding(enmEmbedding)
+{
+    prepare();
+    loadSettings();
+    sltCurrentTabChanged(0);
+}
+
+void UIVMActivityMonitorContainer::removeTabs(const QVector<QUuid> &machineIdsToRemove)
+{
+    AssertReturnVoid(m_pTabWidget);
+    QVector<UIVMActivityMonitor*> removeList;
+
+    for (int i = m_pTabWidget->count() - 1; i >= 0; --i)
+    {
+        UIVMActivityMonitor *pMonitor = qobject_cast<UIVMActivityMonitor*>(m_pTabWidget->widget(i));
+        if (!pMonitor)
+            continue;
+        if (machineIdsToRemove.contains(pMonitor->machineId()))
+        {
+            removeList << pMonitor;
+            m_pTabWidget->removeTab(i);
+        }
+    }
+    qDeleteAll(removeList.begin(), removeList.end());
+}
+
+void UIVMActivityMonitorContainer::prepare()
+{
+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+    pMainLayout->setContentsMargins(0, 0, 0, 0);
+
+    m_pTabWidget = new QTabWidget(this);
+    m_pTabWidget->setTabPosition(QTabWidget::East);
+    m_pTabWidget->setTabBarAutoHide(true);
+
+    m_pPaneContainer = new UIVMActivityMonitorPaneContainer(this);
+    m_pPaneContainer->hide();
+
+    pMainLayout->addWidget(m_pTabWidget);
+    pMainLayout->addWidget(m_pPaneContainer);
+
+    connect(m_pTabWidget, &QTabWidget::currentChanged,
+            this, &UIVMActivityMonitorContainer::sltCurrentTabChanged);
+    connect(m_pPaneContainer, &UIVMActivityMonitorPaneContainer::sigColorChanged,
+            this, &UIVMActivityMonitorContainer::sltDataSeriesColorChanged);
+    m_pExportToFileAction = m_pActionPool->action(UIActionIndex_M_Activity_S_Export);
+    if (m_pExportToFileAction)
+        connect(m_pExportToFileAction, &QAction::triggered, this, &UIVMActivityMonitorContainer::sltExportToFile);
+
+    if (m_pActionPool->action(UIActionIndex_M_Activity_T_Preferences))
+        connect(m_pActionPool->action(UIActionIndex_M_Activity_T_Preferences), &QAction::toggled,
+                this, &UIVMActivityMonitorContainer::sltTogglePreferencesPane);
+}
+
+void UIVMActivityMonitorContainer::loadSettings()
+{
+    if (m_pPaneContainer)
+    {
+        QStringList colorList = gEDataManager->VMActivityMonitorDataSeriesColors();
+        if (colorList.size() == 2)
+        {
+            for (int i = 0; i < 2; ++i)
+            {
+                QColor color(colorList[i]);
+                if (color.isValid())
+                    m_pPaneContainer->setDataSeriesColor(i, color);
+            }
+        }
+        if (!m_pPaneContainer->dataSeriesColor(0).isValid())
+            m_pPaneContainer->setDataSeriesColor(0, QApplication::palette().color(QPalette::LinkVisited));
+        if (!m_pPaneContainer->dataSeriesColor(1).isValid())
+            m_pPaneContainer->setDataSeriesColor(1, QApplication::palette().color(QPalette::Link));
+    }
+}
+
+void UIVMActivityMonitorContainer::saveSettings()
+{
+    if (m_pPaneContainer)
+    {
+        QStringList colorList;
+        colorList << m_pPaneContainer->dataSeriesColor(0).name(QColor::HexArgb);
+        colorList << m_pPaneContainer->dataSeriesColor(1).name(QColor::HexArgb);
+        gEDataManager->setVMActivityMonitorDataSeriesColors(colorList);
+    }
+}
+
+void UIVMActivityMonitorContainer::sltCurrentTabChanged(int iIndex)
+{
+    AssertReturnVoid(m_pTabWidget);
+    Q_UNUSED(iIndex);
+    UIVMActivityMonitor *pActivityMonitor = qobject_cast<UIVMActivityMonitor*>(m_pTabWidget->currentWidget());
+    if (pActivityMonitor)
+    {
+        CMachine comMachine = gpGlobalSession->virtualBox().FindMachine(pActivityMonitor->machineId().toString());
+        if (!comMachine.isNull())
+        {
+            setExportActionEnabled(comMachine.GetState() == KMachineState_Running);
+        }
+    }
+}
+
+void UIVMActivityMonitorContainer::sltDataSeriesColorChanged(int iIndex, const QColor &color)
+{
+    for (int i = m_pTabWidget->count() - 1; i >= 0; --i)
+    {
+        UIVMActivityMonitor *pMonitor = qobject_cast<UIVMActivityMonitor*>(m_pTabWidget->widget(i));
+        if (!pMonitor)
+            continue;
+        pMonitor->setDataSeriesColor(iIndex, color);
+    }
+    saveSettings();
+}
+
+void UIVMActivityMonitorContainer::setExportActionEnabled(bool fEnabled)
+{
+    if (m_pExportToFileAction)
+        m_pExportToFileAction->setEnabled(fEnabled);
+}
+
+void UIVMActivityMonitorContainer::sltExportToFile()
+{
+    AssertReturnVoid(m_pTabWidget);
+    UIVMActivityMonitor *pActivityMonitor = qobject_cast<UIVMActivityMonitor*>(m_pTabWidget->currentWidget());
+    if (pActivityMonitor)
+        pActivityMonitor->sltExportMetricsToFile();
+}
+
+void UIVMActivityMonitorContainer::addLocalMachine(const CMachine &comMachine)
+{
+    AssertReturnVoid(m_pTabWidget);
+    if (!comMachine.isOk())
+        return;
+    UIVMActivityMonitorLocal *pActivityMonitor = new UIVMActivityMonitorLocal(m_enmEmbedding, this, comMachine);
+    if (m_pPaneContainer)
+    {
+        pActivityMonitor->setDataSeriesColor(0, m_pPaneContainer->dataSeriesColor(0));
+        pActivityMonitor->setDataSeriesColor(1, m_pPaneContainer->dataSeriesColor(1));
+    }
+    m_pTabWidget->addTab(pActivityMonitor, comMachine.GetName());
+}
+
+void UIVMActivityMonitorContainer::addCloudMachine(const CCloudMachine &comMachine)
+{
+    AssertReturnVoid(m_pTabWidget);
+    if (!comMachine.isOk())
+        return;
+    UIVMActivityMonitorCloud *pActivityMonitor = new UIVMActivityMonitorCloud(m_enmEmbedding, this, comMachine);
+    if (m_pPaneContainer)
+    {
+        pActivityMonitor->setDataSeriesColor(0, m_pPaneContainer->dataSeriesColor(0));
+        pActivityMonitor->setDataSeriesColor(1, m_pPaneContainer->dataSeriesColor(1));
+    }
+    m_pTabWidget->addTab(pActivityMonitor, comMachine.GetName());
+}
+
+void UIVMActivityMonitorContainer::sltTogglePreferencesPane(bool fChecked)
+{
+    AssertReturnVoid(m_pPaneContainer);
+    m_pPaneContainer->setVisible(fChecked);
+}

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitorContainer.h ¶

@@ -26 +26 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_activity_vmactivity_UIVMActivityMonitorPaneContainer_h
-#define FEQT_INCLUDED_SRC_activity_vmactivity_UIVMActivityMonitorPaneContainer_h
+#ifndef FEQT_INCLUDED_SRC_activity_vmactivity_UIVMActivityMonitorContainer_h
+#define FEQT_INCLUDED_SRC_activity_vmactivity_UIVMActivityMonitorContainer_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
 #endif
+
+/* Qt includes: */
+#include <QUuid>
 
 /* GUI includes: */
@@ -36 +39 @@
 #include "UIPaneContainer.h"
 
+class CCloudMachine;
+class CMachine;
 class QColor;
 class QLabel;
 class QPushButton;
+class QTabWidget;
+class UIActionPool;
 
+/** A pane container class for activity monitor widget. It hosts several controls
+   for activity monitor settings. */
 class SHARED_LIBRARY_STUFF UIVMActivityMonitorPaneContainer : public UIPaneContainer
 {
@@ -51 +60 @@
 public:
 
-    UIVMActivityMonitorPaneContainer(QWidget *pParent, EmbedTo enmEmbedTo = EmbedTo_Stack);
+    UIVMActivityMonitorPaneContainer(QWidget *pParent);
     void setDataSeriesColor(int iIndex, const QColor &color);
     QColor dataSeriesColor(int iIndex) const;
@@ -79 +88 @@
 };
 
+/** A QWidget extension to host a tab widget and UIVMActivityMonitorPaneContainer. The tab widget
+ hosts possibly multiple pages of UIVMActivityMonitor. */
+class SHARED_LIBRARY_STUFF UIVMActivityMonitorContainer : public QWidget
+{
 
+    Q_OBJECT;
 
+public:
 
-#endif /* !FEQT_INCLUDED_SRC_activity_vmactivity_UIVMActivityMonitorPaneContainer_h */
+    UIVMActivityMonitorContainer(QWidget *pParent, UIActionPool *pActionPool, EmbedTo enmEmbedding);
+    void removeTabs(const QVector<QUuid> &machineIdsToRemove);
+    void addLocalMachine(const CMachine &comMachine);
+    void addCloudMachine(const CCloudMachine &comMachine);
+
+private slots:
+
+    void sltCurrentTabChanged(int iIndex);
+    void sltDataSeriesColorChanged(int iIndex, const QColor &color);
+    void sltExportToFile();
+    void sltTogglePreferencesPane(bool fChecked);
+
+private:
+
+    void prepare();
+    void loadSettings();
+    void saveSettings();
+    void setExportActionEnabled(bool fEnabled);
+
+    UIVMActivityMonitorPaneContainer *m_pPaneContainer;
+    QTabWidget *m_pTabWidget;
+    QAction *m_pExportToFileAction;
+    UIActionPool *m_pActionPool;
+    EmbedTo m_enmEmbedding;
+};
+
+#endif /* !FEQT_INCLUDED_SRC_activity_vmactivity_UIVMActivityMonitorContainer_h */

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityToolWidget.cpp ¶

@@ -30 +30 @@
 #include <QVBoxLayout>
 #include <QStyle>
-#include <QTabWidget>
 
 /* GUI includes: */
 #include "QIToolBar.h"
 #include "UIActionPoolManager.h"
-#include "UIExtraDataManager.h"
-#include "UIGlobalSession.h"
 #include "UIVMActivityMonitor.h"
 #include "UIVMActivityToolWidget.h"
@@ -43 +40 @@
 #include "UIVirtualMachineItemCloud.h"
 #include "UIVirtualMachineItemLocal.h"
-#include "UIVMActivityMonitorPaneContainer.h"
+#include "UIVMActivityMonitorContainer.h"
 #ifdef VBOX_WS_MAC
 # include "UIWindowMenuManager.h"
@@ -49 +46 @@
 
 /* COM includes: */
-#include "assert.h"
 #include "CMachine.h"
-
 
 UIVMActivityToolWidget::UIVMActivityToolWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
@@ -60 +55 @@
     , m_fShowToolbar(fShowToolbar)
     , m_pToolBar(0)
-    , m_pExportToFileAction(0)
-    , m_pPaneContainer(0)
-    , m_pTabWidget(0)
+    , m_pMonitorContainer(0)
 {
     prepare();
-    loadSettings();
     prepareActions();
     prepareToolBar();
-    sltCurrentTabChanged(0);
 }
 
-void UIVMActivityToolWidget::loadSettings()
-{
-    if (m_pPaneContainer)
-    {
-        QStringList colorList = gEDataManager->VMActivityMonitorDataSeriesColors();
-        if (colorList.size() == 2)
-        {
-            for (int i = 0; i < 2; ++i)
-            {
-                QColor color(colorList[i]);
-                if (color.isValid())
-                    m_pPaneContainer->setDataSeriesColor(i, color);
-            }
-        }
-        if (!m_pPaneContainer->dataSeriesColor(0).isValid())
-            m_pPaneContainer->setDataSeriesColor(0, QApplication::palette().color(QPalette::LinkVisited));
-        if (!m_pPaneContainer->dataSeriesColor(1).isValid())
-            m_pPaneContainer->setDataSeriesColor(1, QApplication::palette().color(QPalette::Link));
-    }
-}
-
-void UIVMActivityToolWidget::saveSettings()
-{
-    if (m_pPaneContainer)
-    {
-        QStringList colorList;
-        colorList << m_pPaneContainer->dataSeriesColor(0).name(QColor::HexArgb);
-        colorList << m_pPaneContainer->dataSeriesColor(1).name(QColor::HexArgb);
-        gEDataManager->setVMActivityMonitorDataSeriesColors(colorList);
-    }
-}
 
 QMenu *UIVMActivityToolWidget::menu() const
@@ -121 +81 @@
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-
-    m_pTabWidget = new QTabWidget(this);
-    m_pTabWidget->setTabPosition(QTabWidget::East);
-    m_pTabWidget->setTabBarAutoHide(true);
-
-    pMainLayout->addWidget(m_pTabWidget);
-
-
-    m_pPaneContainer = new UIVMActivityMonitorPaneContainer(this, m_enmEmbedding);
-    m_pPaneContainer->hide();
-    pMainLayout->addWidget(m_pPaneContainer);
-    connect(m_pTabWidget, &QTabWidget::currentChanged,
-            this, &UIVMActivityToolWidget::sltCurrentTabChanged);
-    connect(m_pPaneContainer, &UIVMActivityMonitorPaneContainer::sigColorChanged,
-            this, &UIVMActivityToolWidget::sltDataSeriesColorChanged);
+    pMainLayout->setContentsMargins(0, 0, 0, 0);
+    m_pMonitorContainer = new UIVMActivityMonitorContainer(this, m_pActionPool, m_enmEmbedding);
+    pMainLayout->addWidget(m_pMonitorContainer);
 }
 
@@ -167 +115 @@
     m_machineIds = machineIds;
 
-    removeTabs(unselectedMachines);
+    m_pMonitorContainer->removeTabs(unselectedMachines);
     addTabs(newSelections);
 }
@@ -177 +125 @@
     if (pToResourcesAction)
         connect(pToResourcesAction, &QAction::triggered, this, &UIVMActivityToolWidget::sigSwitchToActivityOverviewPane);
-
-    m_pExportToFileAction =
-        m_pActionPool->action(UIActionIndex_M_Activity_S_Export);
-    if (m_pExportToFileAction)
-        connect(m_pExportToFileAction, &QAction::triggered, this, &UIVMActivityToolWidget::sltExportToFile);
-    if (m_pActionPool->action(UIActionIndex_M_Activity_T_Preferences))
-        connect(m_pActionPool->action(UIActionIndex_M_Activity_T_Preferences), &QAction::toggled,
-                this, &UIVMActivityToolWidget::sltTogglePreferencesPane);
 }
 
@@ -212 +152 @@
 }
 
-void UIVMActivityToolWidget::removeTabs(const QVector<QUuid> &machineIdsToRemove)
-{
-    AssertReturnVoid(m_pTabWidget);
-    QVector<UIVMActivityMonitor*> removeList;
-
-    for (int i = m_pTabWidget->count() - 1; i >= 0; --i)
-    {
-        UIVMActivityMonitor *pMonitor = qobject_cast<UIVMActivityMonitor*>(m_pTabWidget->widget(i));
-        if (!pMonitor)
-            continue;
-        if (machineIdsToRemove.contains(pMonitor->machineId()))
-        {
-            removeList << pMonitor;
-            m_pTabWidget->removeTab(i);
-        }
-    }
-    qDeleteAll(removeList.begin(), removeList.end());
-}
-
 void UIVMActivityToolWidget::addTabs(const QList<UIVirtualMachineItem*> &machines)
 {
-    AssertReturnVoid(m_pTabWidget);
+    AssertReturnVoid(m_pMonitorContainer);
     foreach (UIVirtualMachineItem* pMachine, machines)
     {
@@ -241 +162 @@
         {
             CMachine comMachine = pMachine->toLocal()->machine();
-            UIVMActivityMonitorLocal *pActivityMonitor = new UIVMActivityMonitorLocal(m_enmEmbedding, this, comMachine);
-            if (m_pPaneContainer)
-            {
-                pActivityMonitor->setDataSeriesColor(0, m_pPaneContainer->dataSeriesColor(0));
-                pActivityMonitor->setDataSeriesColor(1, m_pPaneContainer->dataSeriesColor(1));
-            }
-            m_pTabWidget->addTab(pActivityMonitor, comMachine.GetName());
+            if (!comMachine.isOk())
+                continue;
+            m_pMonitorContainer->addLocalMachine(comMachine);
             continue;
         }
@@ -255 +172 @@
             if (!comMachine.isOk())
                 continue;
-            UIVMActivityMonitorCloud *pActivityMonitor = new UIVMActivityMonitorCloud(m_enmEmbedding, this, comMachine);
-            if (m_pPaneContainer)
-            {
-                pActivityMonitor->setDataSeriesColor(0, m_pPaneContainer->dataSeriesColor(0));
-                pActivityMonitor->setDataSeriesColor(1, m_pPaneContainer->dataSeriesColor(1));
-            }
-             m_pTabWidget->addTab(pActivityMonitor, comMachine.GetName());
+            m_pMonitorContainer->addCloudMachine(comMachine);
             continue;
         }
     }
 }
-
-void UIVMActivityToolWidget::sltExportToFile()
-{
-    AssertReturnVoid(m_pTabWidget);
-    UIVMActivityMonitor *pActivityMonitor = qobject_cast<UIVMActivityMonitor*>(m_pTabWidget->currentWidget());
-    if (pActivityMonitor)
-        pActivityMonitor->sltExportMetricsToFile();
-}
-
-void UIVMActivityToolWidget::sltCurrentTabChanged(int iIndex)
-{
-    AssertReturnVoid(m_pTabWidget);
-    Q_UNUSED(iIndex);
-    UIVMActivityMonitor *pActivityMonitor = qobject_cast<UIVMActivityMonitor*>(m_pTabWidget->currentWidget());
-    if (pActivityMonitor)
-    {
-        CMachine comMachine = gpGlobalSession->virtualBox().FindMachine(pActivityMonitor->machineId().toString());
-        if (!comMachine.isNull())
-        {
-            setExportActionEnabled(comMachine.GetState() == KMachineState_Running);
-        }
-    }
-}
-
-void UIVMActivityToolWidget::sltTogglePreferencesPane(bool fChecked)
-{
-    AssertReturnVoid(m_pPaneContainer);
-    m_pPaneContainer->setVisible(fChecked);
-}
-
-void UIVMActivityToolWidget::sltDataSeriesColorChanged(int iIndex, const QColor &color)
-{
-    for (int i = m_pTabWidget->count() - 1; i >= 0; --i)
-    {
-        UIVMActivityMonitor *pMonitor = qobject_cast<UIVMActivityMonitor*>(m_pTabWidget->widget(i));
-        if (!pMonitor)
-            continue;
-        pMonitor->setDataSeriesColor(iIndex, color);
-    }
-    saveSettings();
-}
-
-void UIVMActivityToolWidget::setExportActionEnabled(bool fEnabled)
-{
-    if (m_pExportToFileAction)
-        m_pExportToFileAction->setEnabled(fEnabled);
-}

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityToolWidget.h ¶

@@ -41 +41 @@
 
 /* Forward declarations: */
-class CMachine;
 class QIToolBar;
-class QTabWidget;
 class UIActionPool;
 class UIVirtualMachineItem;
-class UIVMActivityMonitorPaneContainer;
-
+class UIVMActivityMonitorContainer;
 
 /** QTabWidget extension host machine activity widget(s) in the Manager UI. */
@@ -73 +70 @@
 #endif
 
-private slots:
-
-    void sltExportToFile();
-    void sltCurrentTabChanged(int iIndex);
-    void sltTogglePreferencesPane(bool fChecked);
-    void sltDataSeriesColorChanged(int iIndex, const QColor &color);
-
 private:
 
-    void loadSettings();
-    void saveSettings();
     void setMachines(const QList<UIVirtualMachineItem*> &machines);
     /** @name Prepare/cleanup cascade.
@@ -93 +81 @@
     /** @} */
 
-    /** Remove tabs conaining machine monitors with ids @machineIdsToRemove. */
-    void removeTabs(const QVector<QUuid> &machineIdsToRemove);
     /** Add new tabs for each QUuid in @machineIdsToAdd. Does not check for duplicates. */
     void addTabs(const QList<UIVirtualMachineItem*> &machines);
@@ -107 +93 @@
 
     QIToolBar *m_pToolBar;
-
     /** Indicates if this widget's host tool is current tool. */
     bool    m_fIsCurrentTool;
     QVector<QUuid> m_machineIds;
-    QAction *m_pExportToFileAction;
-    UIVMActivityMonitorPaneContainer *m_pPaneContainer;
-    QTabWidget *m_pTabWidget;
-    //QColor m_dataSeriesColor[2];
+    UIVMActivityMonitorContainer *m_pMonitorContainer;
 };