Changeset 104445 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 26, 2024 2:09:35 PM (10 months ago)

Author:

vboxsync

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

162954

Message:

FE/Qt. bugref:9510. Adding a new pane container to activity monitor widget to host setting controls.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/activity/overview/UIVMActivityToolWidget.cpp (modified) (15 diffs)
• src/activity/overview/UIVMActivityToolWidget.h (modified) (4 diffs)
• src/activity/vmactivity/UIVMActivityMonitor.cpp (modified) (8 diffs)
• src/activity/vmactivity/UIVMActivityMonitor.h (modified) (2 diffs)
• src/activity/vmactivity/UIVMActivityMonitorPaneContainer.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPanel.cpp ) (2 diffs)
• src/activity/vmactivity/UIVMActivityMonitorPaneContainer.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPanel.h ) (4 diffs)
• src/globals/UIActionPool.cpp (modified) (3 diffs)
• src/globals/UIActionPool.h (modified) (1 diff)
• src/guestctrl/UIFileManager.cpp (modified) (1 diff)
• src/manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• src/widgets/UIPaneContainer.h (modified) (1 diff)

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/UIMonitorCommon.h \
         src/medium/UIFDCreationDialog.h \
@@ -1438 +1439 @@
         src/activity/UIMonitorCommon.cpp \
         src/activity/vmactivity/UIVMActivityMonitor.cpp \
+        src/activity/vmactivity/UIVMActivityMonitorPaneContainer.cpp \
         src/medium/UIFDCreationDialog.cpp \
         src/medium/UIMedium.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityToolWidget.cpp

@@ -28 +28 @@
 /* Qt includes: */
 #include <QApplication>
-#include <QHBoxLayout>
+#include <QVBoxLayout>
 #include <QStyle>
+#include <QTabWidget>
 
 /* GUI includes: */
+#include "QIToolBar.h"
 #include "UIActionPoolManager.h"
 #include "UIGlobalSession.h"
@@ -37 +39 @@
 #include "UIVMActivityToolWidget.h"
 #include "UIMessageCenter.h"
-#include "QIToolBar.h"
 #include "UIVirtualMachineItem.h"
 #include "UIVirtualMachineItemCloud.h"
 #include "UIVirtualMachineItemLocal.h"
-
+#include "UIVMActivityMonitorPaneContainer.h"
 #ifdef VBOX_WS_MAC
 # include "UIWindowMenuManager.h"
@@ -47 +48 @@
 
 /* COM includes: */
+#include "assert.h"
 #include "CMachine.h"
 
@@ -52 +54 @@
 UIVMActivityToolWidget::UIVMActivityToolWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
                                                  bool fShowToolbar /* = true */, QWidget *pParent /* = 0 */)
-    : QTabWidget(pParent)
+    : QWidget(pParent)
     , m_enmEmbedding(enmEmbedding)
     , m_pActionPool(pActionPool)
@@ -58 +60 @@
     , m_pToolBar(0)
     , m_pExportToFileAction(0)
-{
-    setTabPosition(QTabWidget::East);
+    , m_pPaneContainer(0)
+    , m_pTabWidget(0)
+{
     prepare();
     prepareActions();
@@ -83 +86 @@
 void UIVMActivityToolWidget::prepare()
 {
-    setTabBarAutoHide(true);
-    setLayout(new QHBoxLayout);
-
-    connect(this, &UIVMActivityToolWidget::currentChanged,
+    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);
 }
@@ -134 +146 @@
     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);
 }
 
@@ -167 +182 @@
 void UIVMActivityToolWidget::removeTabs(const QVector<QUuid> &machineIdsToRemove)
 {
+    AssertReturnVoid(m_pTabWidget);
     QVector<UIVMActivityMonitor*> removeList;
 
-    for (int i = count() - 1; i >= 0; --i)
-    {
-        UIVMActivityMonitor *pMonitor = qobject_cast<UIVMActivityMonitor*>(widget(i));
+    for (int i = m_pTabWidget->count() - 1; i >= 0; --i)
+    {
+        UIVMActivityMonitor *pMonitor = qobject_cast<UIVMActivityMonitor*>(m_pTabWidget->widget(i));
         if (!pMonitor)
             continue;
@@ -177 +193 @@
         {
             removeList << pMonitor;
-            removeTab(i);
+            m_pTabWidget->removeTab(i);
         }
     }
@@ -185 +201 @@
 void UIVMActivityToolWidget::addTabs(const QList<UIVirtualMachineItem*> &machines)
 {
+    AssertReturnVoid(m_pTabWidget);
     foreach (UIVirtualMachineItem* pMachine, machines)
     {
@@ -192 +209 @@
         {
             CMachine comMachine = pMachine->toLocal()->machine();
-            addTab(new UIVMActivityMonitorLocal(m_enmEmbedding, this, comMachine), comMachine.GetName());
+            m_pTabWidget->addTab(new UIVMActivityMonitorLocal(m_enmEmbedding, this, comMachine), comMachine.GetName());
             continue;
         }
@@ -200 +217 @@
             if (!comMachine.isOk())
                 continue;
-            addTab(new UIVMActivityMonitorCloud(m_enmEmbedding, this, comMachine), comMachine.GetName());
+            m_pTabWidget->addTab(new UIVMActivityMonitorCloud(m_enmEmbedding, this, comMachine), comMachine.GetName());
             continue;
         }
@@ -208 +225 @@
 void UIVMActivityToolWidget::sltExportToFile()
 {
-    UIVMActivityMonitor *pActivityMonitor = qobject_cast<UIVMActivityMonitor*>(currentWidget());
+    AssertReturnVoid(m_pTabWidget);
+    UIVMActivityMonitor *pActivityMonitor = qobject_cast<UIVMActivityMonitor*>(m_pTabWidget->currentWidget());
     if (pActivityMonitor)
         pActivityMonitor->sltExportMetricsToFile();
@@ -215 +233 @@
 void UIVMActivityToolWidget::sltCurrentTabChanged(int iIndex)
 {
+    AssertReturnVoid(m_pTabWidget);
     Q_UNUSED(iIndex);
-    UIVMActivityMonitor *pActivityMonitor = qobject_cast<UIVMActivityMonitor*>(currentWidget());
+    UIVMActivityMonitor *pActivityMonitor = qobject_cast<UIVMActivityMonitor*>(m_pTabWidget->currentWidget());
     if (pActivityMonitor)
     {
@@ -227 +246 @@
 }
 
+void UIVMActivityToolWidget::sltTogglePreferencesPane(bool fChecked)
+{
+    AssertReturnVoid(m_pPaneContainer);
+    m_pPaneContainer->setVisible(fChecked);
+}
+
 void UIVMActivityToolWidget::setExportActionEnabled(bool fEnabled)
 {

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityToolWidget.h

@@ -33 +33 @@
 
 /* Qt includes: */
-#include <QTabWidget>
+#include <QWidget>
 #include <QUuid>
 
@@ -40 +40 @@
 
 /* Forward declarations: */
+class CMachine;
+class QIToolBar;
+class QTabWidget;
 class UIActionPool;
-class QIToolBar;
 class UIVirtualMachineItem;
-class CMachine;
+class UIVMActivityMonitorPaneContainer;
+
 
 /** QTabWidget extension host machine activity widget(s) in the Manager UI. */
-class UIVMActivityToolWidget : public QTabWidget
+class UIVMActivityToolWidget : public QWidget
 {
     Q_OBJECT;
@@ -73 +76 @@
     void sltExportToFile();
     void sltCurrentTabChanged(int iIndex);
+    void sltTogglePreferencesPane(bool fChecked);
 
 private:
@@ -105 +109 @@
     QVector<QUuid> m_machineIds;
     QAction *m_pExportToFileAction;
+    UIVMActivityMonitorPaneContainer *m_pPaneContainer;
+    QTabWidget *m_pTabWidget;
 };
 

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

@@ -28 +28 @@
 /* Qt includes: */
 #include <QApplication>
+#include <QColorDialog>
 #include <QDateTime>
 #include <QLabel>
@@ -129 +130 @@
     void sltSetShowPieChart(bool fShowPieChart);
     void sltSetUseAreaChart(bool fUseAreaChart);
+    void sltSelectDataSeriesColor();
     void sltRetranslateUI();
 
@@ -182 +184 @@
     QString m_strPieChartToggleActionLabel;
     QString m_strAreaChartToggleActionLabel;
+    QString m_strSelectChartColor0;
+    QString m_strSelectChartColor1;
     bool    m_fDrawCurenValueIndicators;
     /** The width of the right margin in characters. */
@@ -369 +373 @@
     m_strPieChartToggleActionLabel = QApplication::translate("UIVMInformationDialog", "Show Pie Chart");
     m_strAreaChartToggleActionLabel = QApplication::translate("UIVMInformationDialog", "Draw Area Chart");
+    m_strSelectChartColor0 = QApplication::translate("UIVMInformationDialog", "Change 1st Dataseries' Color");
+    m_strSelectChartColor1 = QApplication::translate("UIVMInformationDialog", "Change 2nd Dataseries' Color");
     update();
 }
@@ -578 +584 @@
         if (m_fUseAreaChart && m_fIsAreaChartAllowed)
         {
-            painter.setOpacity(0.6);
-            painter.drawPixmap(rect(), areaPixmap);
+            painter.setOpacity(0.5);
+            painter.drawImage(rect(), areaPixmap.toImage());
             painter.setOpacity(1.0);
         }
-
         /* Draw a horizontal and vertical line on data point under the mouse cursor
          * and draw the value on the left hand side of the chart: */
@@ -844 +849 @@
         connect(pAreaChartToggle, &QAction::toggled, this, &UIChart::sltSetUseAreaChart);
     }
+    QAction *pSelectColor0 = menu.addAction(m_strSelectChartColor0);
+    pSelectColor0->setData(0);
+    connect(pSelectColor0, &QAction::triggered, this, &UIChart::sltSelectDataSeriesColor);
+
+    QAction *pSelectColor1 = menu.addAction(m_strSelectChartColor1);
+    pSelectColor1->setData(1);
+    connect(pSelectColor1, &QAction::triggered, this, &UIChart::sltSelectDataSeriesColor);
 
     menu.exec(mapToGlobal(point));
@@ -862 +874 @@
 {
     setUseAreaChart(fUseAreaChart);
+}
+
+void UIChart::sltSelectDataSeriesColor()
+{
+    QAction *pSenderAction = qobject_cast<QAction*>(sender());
+    if (!pSenderAction)
+        return;
+    int iIndex = pSenderAction->data().toInt();
+    if (iIndex < 0 || iIndex >= DATA_SERIES_SIZE)
+        return;
+
+    QColorDialog colorDialog(m_dataSeriesColor[iIndex], this);
+    if (colorDialog.exec() == QDialog::Rejected)
+        return;
+    QColor newColor = colorDialog.selectedColor();
+    if (m_dataSeriesColor[iIndex] == newColor)
+        return;
+    m_dataSeriesColor[iIndex] = newColor;
+    update();
 }
 
@@ -1827 +1858 @@
     resetRAMInfoLabel();
     connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI, this, &UIVMActivityMonitorCloud::sltRetranslateUI);
+
     /* Start the timer: */
     start();

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.h

@@ -160 +160 @@
 public slots:
 
-        void sltExportMetricsToFile();
+    void sltExportMetricsToFile();
 
 protected slots:
 
-        virtual void sltRetranslateUI();
+    virtual void sltRetranslateUI();
 
 protected:
@@ -235 +235 @@
     /** Holds the instance of layout we create. */
     QVBoxLayout *m_pMainLayout;
-
     EmbedTo m_enmEmbedding;
 };

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitorPaneContainer.cpp

@@ -27 +27 @@
 
 /* Qt includes: */
+#include <QApplication>
 #include <QHBoxLayout>
 #include <QPlainTextEdit>
@@ -32 +33 @@
 
 /* GUI includes: */
-#include "UIIconPool.h"
-#include "UIVMLogPage.h"
-#include "UIVMLogViewerPanel.h"
-#include "UIVMLogViewerWidget.h"
-#include "UIVMLogViewerSearchWidget.h"
-#include "UIVMLogViewerFilterWidget.h"
-#include "UIVMLogViewerBookmarksWidget.h"
-#include "UIVMLogViewerPreferencesWidget.h"
 #include "UITranslationEventListener.h"
-#ifdef VBOX_WS_MAC
-# include "VBoxUtils-darwin.h"
-#endif
+#include "UIVMActivityMonitorPaneContainer.h"
 
-UIVMLogViewerPaneContainer::UIVMLogViewerPaneContainer(QWidget *pParent,
-                                                       UIVMLogViewerWidget *pViewer,
-                                                       EmbedTo enmEmbedTo /* = EmbedTo_Stack */)
-    : UIPaneContainer(pParent, enmEmbedTo, true /* detach allowed */)
-    , m_pViewer(pViewer)
-    , m_pSearchWidget(0)
-    , m_pFilterWidget(0)
-    , m_pBookmarksWidget(0)
-    , m_pPreferencesWidget(0)
+UIVMActivityMonitorPaneContainer::UIVMActivityMonitorPaneContainer(QWidget *pParent,
+                                                                   EmbedTo enmEmbedTo /* = EmbedTo_Stack */)
+    : UIPaneContainer(pParent, enmEmbedTo, false /* detach not allowed */)
+    , m_pColorLabel0(0)
+    , m_pColorLabel1(0)
+    , m_pColorChangeButton0(0)
+    , m_pColorChangeButton1(0)
+    , m_pColorChangeReset0(0)
+    , m_pColorChangeReset1;
 {
     prepare();
 }
 
-void UIVMLogViewerPaneContainer::prepare()
+void UIVMActivityMonitorPaneContainer::prepare()
 {
-    /* Search tab: */
-    m_pSearchWidget = new UIVMLogViewerSearchWidget(0, m_pViewer);
-    insertTab(Page_Search, m_pSearchWidget);
+    sltRetranslateUI();
 
-    connect(m_pSearchWidget, &UIVMLogViewerSearchWidget::sigHighlightingUpdated,
-            this, &UIVMLogViewerPaneContainer::sigHighlightingUpdated);
-    connect(m_pSearchWidget, &UIVMLogViewerSearchWidget::sigSearchUpdated,
-            this, &UIVMLogViewerPaneContainer::sigSearchUpdated);
-    connect(m_pSearchWidget, &UIVMLogViewerSearchWidget::sigShowPane,
-            this, &UIVMLogViewerPaneContainer::sigShowSearchPane);
+    QWidget *pContainerWidget = new QWidget(this);
+    insertTab(0, pContainerWidget, m_strTabText);
 
-    /* Filter tab: */
-    m_pFilterWidget = new UIVMLogViewerFilterWidget(0, m_pViewer);
-    insertTab(Page_Filter, m_pFilterWidget);
-
-    connect(m_pFilterWidget, &UIVMLogViewerFilterWidget::sigFilterApplied,
-            this, &UIVMLogViewerPaneContainer::sigFilterApplied);
-
-    /* Bookmark tab: */
-    m_pBookmarksWidget = new UIVMLogViewerBookmarksWidget(0, m_pViewer);
-    insertTab(Page_Bookmark, m_pBookmarksWidget);
-
-    connect(m_pBookmarksWidget, &UIVMLogViewerBookmarksWidget::sigDeleteBookmarkByIndex,
-            this, &UIVMLogViewerPaneContainer::sigDeleteBookmarkByIndex);
-    connect(m_pBookmarksWidget, &UIVMLogViewerBookmarksWidget::sigDeleteAllBookmarks,
-            this, &UIVMLogViewerPaneContainer::sigDeleteAllBookmarks);
-    connect(m_pBookmarksWidget, &UIVMLogViewerBookmarksWidget::sigBookmarkSelected,
-            this, &UIVMLogViewerPaneContainer::sigBookmarkSelected);
-
-    /* Preferences tab: */
-    m_pPreferencesWidget = new UIVMLogViewerPreferencesWidget(0, m_pViewer);
-    insertTab(Page_Preferences, m_pPreferencesWidget);
-
-    connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigShowLineNumbers,
-            this, &UIVMLogViewerPaneContainer::sigShowLineNumbers);
-    connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigWrapLines,
-            this, &UIVMLogViewerPaneContainer::sigWrapLines);
-    connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigChangeFontSizeInPoints,
-            this, &UIVMLogViewerPaneContainer::sigChangeFontSizeInPoints);
-    connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigChangeFont,
-            this, &UIVMLogViewerPaneContainer::sigChangeFont);
-    connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigResetToDefaults,
-            this, &UIVMLogViewerPaneContainer::sigResetToDefaults);
-
-    sltRetranslateUI();
     connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
-            this, &UIVMLogViewerPaneContainer::sltRetranslateUI);
+            this, &UIVMActivityMonitorPaneContainer::sltRetranslateUI);
 }
 
-void UIVMLogViewerPaneContainer::refreshSearch()
+void UIVMActivityMonitorPaneContainer::sltRetranslateUI()
 {
-    if (m_pSearchWidget)
-        m_pSearchWidget->refreshSearch();
+    m_strTabText = QApplication::translate("UIVMActivityMonitorPaneContainer", "Preferences");
 }
-
-QVector<float> UIVMLogViewerPaneContainer::matchLocationVector() const
-{
-    if (!m_pSearchWidget)
-        return QVector<float>();
-    return m_pSearchWidget->matchLocationVector();
-}
-
-int UIVMLogViewerPaneContainer::matchCount() const
-{
-    if (!m_pSearchWidget)
-        return 0;
-    return m_pSearchWidget->matchCount();
-}
-
-void UIVMLogViewerPaneContainer::applyFilter()
-{
-    if (m_pFilterWidget)
-        m_pFilterWidget->applyFilter();
-}
-
-void UIVMLogViewerPaneContainer::updateBookmarkList(const QVector<UIVMLogBookmark>& bookmarkList)
-{
-    if (m_pBookmarksWidget)
-        m_pBookmarksWidget->updateBookmarkList(bookmarkList);
-}
-
-void UIVMLogViewerPaneContainer::disableEnableBookmarking(bool flag)
-{
-    if (m_pBookmarksWidget)
-        m_pBookmarksWidget->disableEnableBookmarking(flag);
-}
-
-void UIVMLogViewerPaneContainer::setShowLineNumbers(bool bShowLineNumbers)
-{
-    if (m_pPreferencesWidget)
-        m_pPreferencesWidget->setShowLineNumbers(bShowLineNumbers);
-}
-
-void UIVMLogViewerPaneContainer::setWrapLines(bool bWrapLines)
-{
-    if (m_pPreferencesWidget)
-        m_pPreferencesWidget->setWrapLines(bWrapLines);
-}
-
-void UIVMLogViewerPaneContainer::setFontSizeInPoints(int fontSizeInPoints)
-{
-    if (m_pPreferencesWidget)
-        m_pPreferencesWidget->setFontSizeInPoints(fontSizeInPoints);
-}
-
-void UIVMLogViewerPaneContainer::sltRetranslateUI()
-{
-    setTabText(Page_Search, UIVMLogViewerWidget::tr("Find"));
-    setTabText(Page_Filter, UIVMLogViewerWidget::tr("Filter"));
-    setTabText(Page_Bookmark, UIVMLogViewerWidget::tr("Bookmarks"));
-    setTabText(Page_Preferences, UIVMLogViewerWidget::tr("Preferences"));
-}
-
-bool UIVMLogViewerPaneContainer::eventFilter(QObject *pObject, QEvent *pEvent)
-{
-    /* Check if the search panel is interested in the event (most prob. key event): */
-    if (m_pSearchWidget && m_pSearchWidget->handleSearchRelatedEvents(pObject, pEvent))
-        return true;
-
-    return UIPaneContainer::eventFilter(pObject, pEvent);
-}
-
-
-/*********************************************************************************************************************************
-*   UIVMLogViewerPanel implementation.                                                                                           *
-*********************************************************************************************************************************/
-
-UIVMLogViewerPane::UIVMLogViewerPane(QWidget *pParent, UIVMLogViewerWidget *pViewer)
-    : QWidget(pParent)
-    , m_pViewer(pViewer)
-{
-}
-
-UIVMLogViewerWidget* UIVMLogViewerPane::viewer()
-{
-    return m_pViewer;
-}
-
-const UIVMLogViewerWidget* UIVMLogViewerPane::viewer() const
-{
-    return m_pViewer;
-}
-
-QTextDocument  *UIVMLogViewerPane::textDocument()
-{
-    QPlainTextEdit *pEdit = textEdit();
-    if (!pEdit)
-        return 0;
-    return textEdit()->document();
-}
-
-QPlainTextEdit *UIVMLogViewerPane::textEdit()
-{
-    if (!viewer())
-        return 0;
-    UIVMLogPage *logPage = viewer()->currentLogPage();
-    if (!logPage)
-        return 0;
-    return logPage->textEdit();
-}
-
-const QString* UIVMLogViewerPane::logString() const
-{
-    if (!viewer())
-        return 0;
-    const UIVMLogPage* const page = qobject_cast<const UIVMLogPage* const>(viewer()->currentLogPage());
-    if (!page)
-        return 0;
-    return &(page->logString());
-}

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitorPaneContainer.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIVMLogViewer class declaration.
+ * VBox Qt GUI - UIVMActivityMonitorPanel class declaration.
  */
 
@@ -26 +26 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerPanel_h
-#define FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerPanel_h
+#ifndef FEQT_INCLUDED_SRC_activity_vmactivity_UIVMActivityMonitorPaneContainer_h
+#define FEQT_INCLUDED_SRC_activity_vmactivity_UIVMActivityMonitorPaneContainer_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -33 +33 @@
 
 /* GUI includes: */
+#include "UILibraryDefs.h"
 #include "UIPaneContainer.h"
-#include "UIVMLogBookmark.h"
 
-/* Forward declarations: */
-class QPlainTextEdit;
-class QTextDocument;
-class UIVMLogViewerWidget;
-class UIVMLogViewerSearchWidget;
-class UIVMLogViewerFilterWidget;
-class UIVMLogViewerBookmarksWidget;
-class UIVMLogViewerPreferencesWidget;
 
-class UIVMLogViewerPaneContainer : public UIPaneContainer
+class SHARED_LIBRARY_STUFF UIVMActivityMonitorPaneContainer : public UIPaneContainer
 {
+
     Q_OBJECT;
-
-signals:
-
-    void sigHighlightingUpdated();
-    void sigSearchUpdated();
-    void sigFilterApplied();
-    void sigDeleteBookmarkByIndex(int bookmarkIndex);
-    void sigDeleteAllBookmarks();
-    void sigBookmarkSelected(int index);
-
-    void sigShowLineNumbers(bool show);
-    void sigWrapLines(bool show);
-    void sigChangeFontSizeInPoints(int size);
-    void sigChangeFont(QFont font);
-    void sigResetToDefaults();
-
-    void sigShowSearchPane();
 
 public:
 
-    UIVMLogViewerPaneContainer(QWidget *pParent,
-                               UIVMLogViewerWidget *pViewer,
-                               EmbedTo enmEmbedTo = EmbedTo_Stack);
-
-    /** @name Search page pass through functions
-      * @{ */
-        void refreshSearch();
-        QVector<float> matchLocationVector() const;
-        /** Returns the number of the matches to the current search. */
-        int matchCount() const;
-    /** @} */
-
-    /** @name Filter page pass through functions
-      * @{ */
-        void applyFilter();
-    /** @} */
-
-    /** @name Bookmark page pass through functions
-      * @{ */
-        void updateBookmarkList(const QVector<UIVMLogBookmark>& bookmarkList);
-        void disableEnableBookmarking(bool flag);
-    /** @} */
-
-    /** @name Preferences page pass through functions
-      * @{ */
-        void setShowLineNumbers(bool bShowLineNumbers);
-        void setWrapLines(bool bWrapLines);
-        void setFontSizeInPoints(int fontSizeInPoints);
-    /** @} */
-
-    enum Page
-    {
-        Page_Search = 0,
-        Page_Filter,
-        Page_Bookmark,
-        Page_Preferences,
-        Page_Max
-    };
-
-protected:
-
-    virtual bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
+    UIVMActivityMonitorPaneContainer(QWidget *pParent, EmbedTo enmEmbedTo = EmbedTo_Stack);
 
 private slots:
@@ -117 +52 @@
 private:
 
-    void prepare() RT_OVERRIDE;
-
-    UIVMLogViewerWidget             *m_pViewer;
-    UIVMLogViewerSearchWidget        *m_pSearchWidget;
-    UIVMLogViewerFilterWidget       *m_pFilterWidget;
-    UIVMLogViewerBookmarksWidget     *m_pBookmarksWidget;
-    UIVMLogViewerPreferencesWidget  *m_pPreferencesWidget;
+    void prepare();
+    QString m_strTabText;
 };
 
-/** UIDialonPanel extension acting as the base class for UIVMLogViewerXXXPanel widgets. */
-class UIVMLogViewerPane : public QWidget
-{
-    Q_OBJECT;
 
-public:
 
-    UIVMLogViewerPane(QWidget *pParent, UIVMLogViewerWidget *pViewer);
-
-protected:
-
-    virtual void prepareWidgets() = 0;
-    virtual void prepareConnections()  = 0;
-
-    /* Access functions for children classes. */
-    UIVMLogViewerWidget        *viewer();
-    const UIVMLogViewerWidget  *viewer() const;
-    QTextDocument  *textDocument();
-    QPlainTextEdit *textEdit();
-    /* Return the unmodified log. */
-    const QString *logString() const;
-
-private:
-
-    /** Holds the reference to VM Log-Viewer this panel belongs to. */
-    UIVMLogViewerWidget *m_pViewer;
-};
-
-#endif /* !FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerPanel_h */
+#endif /* !FEQT_INCLUDED_SRC_activity_vmactivity_UIVMActivityMonitorPaneContainer_h */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -3272 +3272 @@
 };
 
+/** Simple action extension, used as 'Toggle Pane Preferences' action class. */
+class UIActionMenuActivityPreferences : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuActivityPreferences(UIActionPool *pParent)
+        : UIActionToggle(pParent)
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+        setIcon(UIIconPool::iconSetFull(":/log_viewer_options_32px.png",          ":/log_viewer_options_16px.png",
+                                        ":/log_viewer_options_disabled_32px.png", ":/log_viewer_options_disabled_16px.png"));
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const RT_OVERRIDE
+    {
+        return QString("ToggleActivityMonitorPreferences");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE
+    {
+        return QKeySequence("");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() RT_OVERRIDE
+    {
+        setName(QApplication::translate("UIActionPool", "&Preferences"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Activity Monitor"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open pane with activity monitor preferences"));
+        setToolTip(  QApplication::translate("UIActionPool", "Open Preferences Pane")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
 
 /*********************************************************************************************************************************
@@ -3519 +3560 @@
     m_pool[UIActionIndex_M_Activity_S_Export] = new UIActionMenuSelectorActivityPerformExport(this);
     m_pool[UIActionIndex_M_Activity_S_ToVMActivityOverview] = new UIActionMenuSelectorActivityToVMActivityOverview(this);
+    m_pool[UIActionIndex_M_Activity_T_Preferences] = new UIActionMenuActivityPreferences(this);
 
     /* Create 'File Manager' actions: */
@@ -3994 +4036 @@
     pMenu->addAction(action(UIActionIndex_M_Activity_S_Export));
     pMenu->addAction(action(UIActionIndex_M_Activity_S_ToVMActivityOverview));
+    /* 'Preferences' action: */
+    pMenu->addAction(action(UIActionIndex_M_Activity_T_Preferences));
 
     /* Mark menu as valid: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

@@ -106 +106 @@
     UIActionIndex_M_Activity_S_Export,
     UIActionIndex_M_Activity_S_ToVMActivityOverview,
+    UIActionIndex_M_Activity_T_Preferences,
 
     /* File Manager actions: */

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp

@@ -230 +230 @@
         m_pFileTableSplitter->setCollapsible(i, false);
 
-    /** Vertical splitter has 3 widgets. Log panel as bottom most one, operations panel on top of it,
-     * and pTopWidget which contains everthing else: */
     m_pVerticalSplitter = new QSplitter;
     if (m_pVerticalSplitter)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -1032 +1032 @@
                 m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Activity_S_Export));
                 m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Activity_S_ToVMActivityOverview));
+                m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Activity_T_Preferences));
                 m_pToolBar->addSeparator();
                 m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPaneContainer.h

@@ -77 +77 @@
     EmbedTo  m_enmEmbedTo;
     bool     m_fDetachAllowed;
-
     QTabWidget *m_pTabWidget;
-
     QIDialogButtonBox *m_pButtonBox;
 };