Changeset 100936 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 22, 2023 1:01:35 PM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10496, bugref:9072. Some refactoring and renaming.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/logviewer/UIVMLogViewerBookmarksWidget.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerBookmarksPanel.cpp ) (12 diffs)
• src/logviewer/UIVMLogViewerBookmarksWidget.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerBookmarksPanel.h ) (4 diffs)
• src/logviewer/UIVMLogViewerFilterWidget.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.cpp ) (17 diffs)
• src/logviewer/UIVMLogViewerFilterWidget.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.h ) (4 diffs)
• src/logviewer/UIVMLogViewerPanel.cpp (modified) (5 diffs)
• src/logviewer/UIVMLogViewerPanel.h (modified) (4 diffs)
• src/logviewer/UIVMLogViewerPreferencesWidget.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerOptionsPanel.cpp ) (8 diffs)
• src/logviewer/UIVMLogViewerPreferencesWidget.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerOptionsPanel.h ) (4 diffs)
• src/logviewer/UIVMLogViewerSearchWidget.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.cpp ) (20 diffs)
• src/logviewer/UIVMLogViewerSearchWidget.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.h ) (4 diffs)
• src/logviewer/UIVMLogViewerWidget.cpp (modified) (5 diffs)
• src/logviewer/UIVMLogViewerWidget.h (modified) (3 diffs)

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

@@ -851 +851 @@
         src/helpbrowser/UIHelpBrowserWidget.h \
         src/logviewer/UIVMLogPage.h \
-        src/logviewer/UIVMLogViewerBookmarksPanel.h \
+        src/logviewer/UIVMLogViewerBookmarksWidget.h \
         src/logviewer/UIVMLogViewerDialog.h \
-        src/logviewer/UIVMLogViewerFilterPanel.h \
-        src/logviewer/UIVMLogViewerOptionsPanel.h \
+        src/logviewer/UIVMLogViewerFilterWidget.h \
+        src/logviewer/UIVMLogViewerPreferencesWidget.h \
         src/logviewer/UIVMLogViewerPanel.h \
-        src/logviewer/UIVMLogViewerSearchPanel.h \
+        src/logviewer/UIVMLogViewerSearchWidget.h \
         src/logviewer/UIVMLogViewerTextEdit.h \
         src/logviewer/UIVMLogViewerWidget.h \
@@ -1065 +1065 @@
         src/helpbrowser/UIHelpViewer.cpp \
         src/helpbrowser/UIHelpBrowserWidget.cpp \
-        src/logviewer/UIVMLogViewerFilterPanel.cpp \
+        src/logviewer/UIVMLogViewerFilterWidget.cpp \
         src/logviewer/UIVMLogViewerTextEdit.cpp \
         src/logviewer/UIVMLogViewerWidget.cpp \
@@ -1428 +1428 @@
         src/helpbrowser/UIHelpBrowserWidget.cpp \
         src/logviewer/UIVMLogPage.cpp \
-        src/logviewer/UIVMLogViewerBookmarksPanel.cpp \
+        src/logviewer/UIVMLogViewerBookmarksWidget.cpp \
         src/logviewer/UIVMLogViewerDialog.cpp \
-        src/logviewer/UIVMLogViewerFilterPanel.cpp \
-        src/logviewer/UIVMLogViewerOptionsPanel.cpp \
+        src/logviewer/UIVMLogViewerFilterWidget.cpp \
+        src/logviewer/UIVMLogViewerPreferencesWidget.cpp \
         src/logviewer/UIVMLogViewerPanel.cpp \
-        src/logviewer/UIVMLogViewerSearchPanel.cpp \
+        src/logviewer/UIVMLogViewerSearchWidget.cpp \
         src/logviewer/UIVMLogViewerTextEdit.cpp \
         src/logviewer/UIVMLogViewerWidget.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerBookmarksWidget.cpp

@@ -37 +37 @@
 #include "QIToolButton.h"
 #include "UIIconPool.h"
-#include "UIVMLogViewerBookmarksPanel.h"
+#include "UIVMLogViewerBookmarksWidget.h"
 #include "UIVMLogViewerWidget.h"
 
@@ -43 +43 @@
 #include <iprt/assert.h>
 
-UIVMLogViewerBookmarksPanel::UIVMLogViewerBookmarksPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer)
+UIVMLogViewerBookmarksWidget::UIVMLogViewerBookmarksWidget(QWidget *pParent, UIVMLogViewerWidget *pViewer)
     : UIVMLogViewerPanel(pParent, pViewer)
     , m_iMaxBookmarkTextLength(60)
@@ -57 +57 @@
 }
 
-void UIVMLogViewerBookmarksPanel::updateBookmarkList(const QVector<UIVMLogBookmark>& bookmarkList)
+void UIVMLogViewerBookmarksWidget::updateBookmarkList(const QVector<UIVMLogBookmark>& bookmarkList)
 {
     if (!m_pBookmarksComboBox || !viewer())
@@ -84 +84 @@
 }
 
-void UIVMLogViewerBookmarksPanel::disableEnableBookmarking(bool flag)
+void UIVMLogViewerBookmarksWidget::disableEnableBookmarking(bool flag)
 {
     m_pBookmarksComboBox->setEnabled(flag);
@@ -94 +94 @@
 }
 
-void UIVMLogViewerBookmarksPanel::setBookmarkIndex(int index)
+void UIVMLogViewerBookmarksWidget::setBookmarkIndex(int index)
 {
     if (!m_pBookmarksComboBox)
@@ -108 +108 @@
 }
 
-void UIVMLogViewerBookmarksPanel::prepareWidgets()
+void UIVMLogViewerBookmarksWidget::prepareWidgets()
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
@@ -181 +181 @@
 }
 
-void UIVMLogViewerBookmarksPanel::prepareConnections()
+void UIVMLogViewerBookmarksWidget::prepareConnections()
 {
     connect(m_pBookmarksComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-            this, &UIVMLogViewerBookmarksPanel::sltBookmarkSelected);
-
-    connect(m_pGotoSelectedBookmark, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksPanel::sltGotoSelectedBookmark);
-    connect(m_pNextButton, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksPanel::sltGotoNextBookmark);
-    connect(m_pPreviousButton, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksPanel::sltGotoPreviousBookmark);
-
-    connect(m_pDeleteAllButton, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksPanel::sigDeleteAllBookmarks);
-    connect(m_pDeleteCurrentButton, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksPanel::sltDeleteCurrentBookmark);
-}
-
-
-void UIVMLogViewerBookmarksPanel::retranslateUi()
+            this, &UIVMLogViewerBookmarksWidget::sltBookmarkSelected);
+
+    connect(m_pGotoSelectedBookmark, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksWidget::sltGotoSelectedBookmark);
+    connect(m_pNextButton, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksWidget::sltGotoNextBookmark);
+    connect(m_pPreviousButton, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksWidget::sltGotoPreviousBookmark);
+
+    connect(m_pDeleteAllButton, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksWidget::sigDeleteAllBookmarks);
+    connect(m_pDeleteCurrentButton, &QIToolButton::clicked, this, &UIVMLogViewerBookmarksWidget::sltDeleteCurrentBookmark);
+}
+
+
+void UIVMLogViewerBookmarksWidget::retranslateUi()
 {
     UIVMLogViewerPanel::retranslateUi();
@@ -206 +206 @@
 }
 
-void UIVMLogViewerBookmarksPanel::sltDeleteCurrentBookmark()
+void UIVMLogViewerBookmarksWidget::sltDeleteCurrentBookmark()
 {
     if (!m_pBookmarksComboBox)
@@ -216 +216 @@
 }
 
-void UIVMLogViewerBookmarksPanel::sltBookmarkSelected(int index)
+void UIVMLogViewerBookmarksWidget::sltBookmarkSelected(int index)
 {
     /* Do nothing if the index is 0, that is combo-box title item: */
@@ -225 +225 @@
 
 
-void UIVMLogViewerBookmarksPanel::sltGotoNextBookmark()
+void UIVMLogViewerBookmarksWidget::sltGotoNextBookmark()
 {
     /* go to next bookmark or wrap around to the beginning of the list: */
@@ -235 +235 @@
 
 
-void UIVMLogViewerBookmarksPanel::sltGotoPreviousBookmark()
+void UIVMLogViewerBookmarksWidget::sltGotoPreviousBookmark()
 {
     /* go to previous bookmark or wrap around to the end of the list: */
@@ -244 +244 @@
 }
 
-void UIVMLogViewerBookmarksPanel::sltGotoSelectedBookmark()
+void UIVMLogViewerBookmarksWidget::sltGotoSelectedBookmark()
 {
     if (!m_pBookmarksComboBox || m_pBookmarksComboBox->count() <= 1)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerBookmarksWidget.h

@@ -26 +26 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerBookmarksPanel_h
-#define FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerBookmarksPanel_h
+#ifndef FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerBookmarksWidget_h
+#define FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerBookmarksWidget_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -43 +43 @@
 /** UIVMLogViewerPanel extension providing GUI for bookmark management. Show a list of bookmarks currently set
  *  for displayed log page. It has controls to navigate and clear bookmarks. */
-class UIVMLogViewerBookmarksPanel : public UIVMLogViewerPanel
+class UIVMLogViewerBookmarksWidget : public UIVMLogViewerPanel
 {
     Q_OBJECT;
@@ -49 +49 @@
 public:
 
-    UIVMLogViewerBookmarksPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer);
+    UIVMLogViewerBookmarksWidget(QWidget *pParent, UIVMLogViewerWidget *pViewer);
 
     /** Adds a single bookmark to an existing list of bookmarks. Possibly called
@@ -97 +97 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerBookmarksPanel_h */
+#endif /* !FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerBookmarksWidget_h */

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterWidget.cpp

@@ -44 +44 @@
 #include "UIIconPool.h"
 #include "UIVMLogPage.h"
-#include "UIVMLogViewerFilterPanel.h"
+#include "UIVMLogViewerFilterWidget.h"
 #include "UIVMLogViewerWidget.h"
 #ifdef VBOX_WS_MAC
@@ -258 +258 @@
 
 /*********************************************************************************************************************************
-*   UIVMLogViewerFilterPanel implementation.                                                                                     *
+*   UIVMLogViewerFilterWidget implementation.                                                                                     *
 *********************************************************************************************************************************/
 
-UIVMLogViewerFilterPanel::UIVMLogViewerFilterPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer)
+UIVMLogViewerFilterWidget::UIVMLogViewerFilterWidget(QWidget *pParent, UIVMLogViewerWidget *pViewer)
     : UIVMLogViewerPanel(pParent, pViewer)
     , m_pFilterLabel(0)
@@ -280 +280 @@
 }
 
-void UIVMLogViewerFilterPanel::applyFilter()
+void UIVMLogViewerFilterWidget::applyFilter()
 {
     if (isVisible())
@@ -290 +290 @@
 }
 
-void UIVMLogViewerFilterPanel::filter()
+void UIVMLogViewerFilterWidget::filter()
 {
     if (!viewer())
@@ -337 +337 @@
 }
 
-void UIVMLogViewerFilterPanel::resetFiltering()
+void UIVMLogViewerFilterWidget::resetFiltering()
 {
     UIVMLogPage *logPage = viewer()->currentLogPage();
@@ -350 +350 @@
 }
 
-bool UIVMLogViewerFilterPanel::applyFilterTermsToString(const QString& string)
+bool UIVMLogViewerFilterWidget::applyFilterTermsToString(const QString& string)
 {
     /* Number of the filter terms contained with the @p string: */
@@ -385 +385 @@
 
 
-void UIVMLogViewerFilterPanel::sltAddFilterTerm()
+void UIVMLogViewerFilterWidget::sltAddFilterTerm()
 {
     if (!m_pFilterComboBox)
@@ -406 +406 @@
 }
 
-void UIVMLogViewerFilterPanel::sltClearFilterTerms()
+void UIVMLogViewerFilterWidget::sltClearFilterTerms()
 {
     if (m_filterTermSet.empty())
@@ -416 +416 @@
 }
 
-void UIVMLogViewerFilterPanel::sltOperatorButtonChanged(QAbstractButton *pButton)
+void UIVMLogViewerFilterWidget::sltOperatorButtonChanged(QAbstractButton *pButton)
 {
     int buttonId = m_pButtonGroup->id(pButton);
@@ -425 +425 @@
 }
 
-void UIVMLogViewerFilterPanel::sltRemoveFilterTerm(const QString &termString)
+void UIVMLogViewerFilterWidget::sltRemoveFilterTerm(const QString &termString)
 {
     m_filterTermSet.remove(termString);
@@ -431 +431 @@
 }
 
-void UIVMLogViewerFilterPanel::prepareWidgets()
+void UIVMLogViewerFilterWidget::prepareWidgets()
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
@@ -492 +492 @@
 }
 
-void UIVMLogViewerFilterPanel::prepareRadioButtonGroup(QVBoxLayout *pLayout)
+void UIVMLogViewerFilterWidget::prepareRadioButtonGroup(QVBoxLayout *pLayout)
 {
     /* Create radio-button container: */
@@ -555 +555 @@
 }
 
-void UIVMLogViewerFilterPanel::prepareConnections()
-{
-    connect(m_pAddFilterTermButton, &QIToolButton::clicked, this,  &UIVMLogViewerFilterPanel::sltAddFilterTerm);
+void UIVMLogViewerFilterWidget::prepareConnections()
+{
+    connect(m_pAddFilterTermButton, &QIToolButton::clicked, this,  &UIVMLogViewerFilterWidget::sltAddFilterTerm);
     connect(m_pButtonGroup, static_cast<void (QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
-            this, &UIVMLogViewerFilterPanel::sltOperatorButtonChanged);
+            this, &UIVMLogViewerFilterWidget::sltOperatorButtonChanged);
     connect(m_pFilterComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-            this, &UIVMLogViewerFilterPanel::sltAddFilterTerm);
+            this, &UIVMLogViewerFilterWidget::sltAddFilterTerm);
     connect(m_pFilterTermsLineEdit, &UIVMFilterLineEdit::sigFilterTermRemoved,
-            this, &UIVMLogViewerFilterPanel::sltRemoveFilterTerm);
+            this, &UIVMLogViewerFilterWidget::sltRemoveFilterTerm);
     connect(m_pFilterTermsLineEdit, &UIVMFilterLineEdit::sigClearAll,
-            this, &UIVMLogViewerFilterPanel::sltClearFilterTerms);
-}
-
-
-void UIVMLogViewerFilterPanel::retranslateUi()
+            this, &UIVMLogViewerFilterWidget::sltClearFilterTerms);
+}
+
+
+void UIVMLogViewerFilterWidget::retranslateUi()
 {
     UIVMLogViewerPanel::retranslateUi();
@@ -581 +581 @@
 }
 
-bool UIVMLogViewerFilterPanel::eventFilter(QObject *pObject, QEvent *pEvent)
+bool UIVMLogViewerFilterWidget::eventFilter(QObject *pObject, QEvent *pEvent)
 {
     /* Handle only events sent to viewer(): */
@@ -619 +619 @@
 
 /** Handles the Qt show @a pEvent. */
-void UIVMLogViewerFilterPanel::showEvent(QShowEvent *pEvent)
+void UIVMLogViewerFilterWidget::showEvent(QShowEvent *pEvent)
 {
     UIVMLogViewerPanel::showEvent(pEvent);
@@ -627 +627 @@
 }
 
-void UIVMLogViewerFilterPanel::hideEvent(QHideEvent *pEvent)
+void UIVMLogViewerFilterWidget::hideEvent(QHideEvent *pEvent)
 {
     UIVMLogViewerPanel::hideEvent(pEvent);
@@ -633 +633 @@
 }
 
-#include "UIVMLogViewerFilterPanel.moc"
+#include "UIVMLogViewerFilterWidget.moc"

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterWidget.h

@@ -26 +26 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerFilterPanel_h
-#define FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerFilterPanel_h
+#ifndef FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerFilterWidget_h
+#define FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerFilterWidget_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -53 +53 @@
 /** QWidget extension
   * providing GUI for filter panel in VM Log Viewer. */
-class UIVMLogViewerFilterPanel : public UIVMLogViewerPanel
+class UIVMLogViewerFilterWidget : public UIVMLogViewerPanel
 {
     Q_OBJECT;
@@ -65 +65 @@
     /** Constructs the filter-panel by passing @a pParent to the QWidget base-class constructor.
       * @param  pViewer  Specifies reference to the VM Log-Viewer this filter-panel belongs to. */
-    UIVMLogViewerFilterPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer);
+    UIVMLogViewerFilterWidget(QWidget *pParent, UIVMLogViewerWidget *pViewer);
 
 public slots:
@@ -123 +123 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerFilterPanel_h */
+#endif /* !FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerFilterWidget_h */

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPanel.cpp

@@ -36 +36 @@
 #include "UIVMLogViewerPanel.h"
 #include "UIVMLogViewerWidget.h"
-#include "UIVMLogViewerSearchPanel.h"
-#include "UIVMLogViewerFilterPanel.h"
-#include "UIVMLogViewerBookmarksPanel.h"
+#include "UIVMLogViewerSearchWidget.h"
+#include "UIVMLogViewerFilterWidget.h"
+#include "UIVMLogViewerBookmarksWidget.h"
+#include "UIVMLogViewerPreferencesWidget.h"
 
 #ifdef VBOX_WS_MAC
@@ -50 +51 @@
     , m_pFilterWidget(0)
     , m_pBookmarksWidget(0)
+    , m_pPreferencesWidget(0)
 {
     prepare();
@@ -57 +59 @@
 {
     /* Search tab: */
-    m_pSearchWidget = new UIVMLogViewerSearchPanel(0, m_pViewer);
+    m_pSearchWidget = new UIVMLogViewerSearchWidget(0, m_pViewer);
     insertTab(Page_Search, m_pSearchWidget);
 
-    connect(m_pSearchWidget, &UIVMLogViewerSearchPanel::sigHighlightingUpdated,
+    connect(m_pSearchWidget, &UIVMLogViewerSearchWidget::sigHighlightingUpdated,
             this, &UIVMLogViewerPanelNew::sigHighlightingUpdated);
-    connect(m_pSearchWidget, &UIVMLogViewerSearchPanel::sigSearchUpdated,
+    connect(m_pSearchWidget, &UIVMLogViewerSearchWidget::sigSearchUpdated,
             this, &UIVMLogViewerPanelNew::sigSearchUpdated);
 
     /* Filter tab: */
-    m_pFilterWidget = new UIVMLogViewerFilterPanel(0, m_pViewer);
+    m_pFilterWidget = new UIVMLogViewerFilterWidget(0, m_pViewer);
     insertTab(Page_Filter, m_pFilterWidget);
 
-    connect(m_pFilterWidget, &UIVMLogViewerFilterPanel::sigFilterApplied,
+    connect(m_pFilterWidget, &UIVMLogViewerFilterWidget::sigFilterApplied,
             this, &UIVMLogViewerPanelNew::sigFilterApplied);
 
     /* Bookmark tab: */
-    m_pBookmarksWidget = new UIVMLogViewerBookmarksPanel(0, m_pViewer);
+    m_pBookmarksWidget = new UIVMLogViewerBookmarksWidget(0, m_pViewer);
     insertTab(Page_Bookmark, m_pBookmarksWidget);
 
-    connect(m_pBookmarksWidget, &UIVMLogViewerBookmarksPanel::sigDeleteBookmarkByIndex,
+    connect(m_pBookmarksWidget, &UIVMLogViewerBookmarksWidget::sigDeleteBookmarkByIndex,
             this, &UIVMLogViewerPanelNew::sigDeleteBookmarkByIndex);
-    connect(m_pBookmarksWidget, &UIVMLogViewerBookmarksPanel::sigDeleteAllBookmarks,
+    connect(m_pBookmarksWidget, &UIVMLogViewerBookmarksWidget::sigDeleteAllBookmarks,
             this, &UIVMLogViewerPanelNew::sigDeleteAllBookmarks);
-    connect(m_pBookmarksWidget, &UIVMLogViewerBookmarksPanel::sigBookmarkSelected,
+    connect(m_pBookmarksWidget, &UIVMLogViewerBookmarksWidget::sigBookmarkSelected,
             this, &UIVMLogViewerPanelNew::sigBookmarkSelected);
+
+    /* Preferences tab: */
+    m_pPreferencesWidget = new UIVMLogViewerPreferencesWidget(0, m_pViewer);
+    insertTab(Page_Preferences, m_pPreferencesWidget);
+
+    connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigShowLineNumbers,
+            this, &UIVMLogViewerPanelNew::sigShowLineNumbers);
+    connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigWrapLines,
+            this, &UIVMLogViewerPanelNew::sigWrapLines);
+    connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigChangeFontSizeInPoints,
+            this, &UIVMLogViewerPanelNew::sigChangeFontSizeInPoints);
+    connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigChangeFont,
+            this, &UIVMLogViewerPanelNew::sigChangeFont);
+    connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigResetToDefaults,
+            this, &UIVMLogViewerPanelNew::sigResetToDefaults);
 
     retranslateUi();
@@ -124 +141 @@
 }
 
+void UIVMLogViewerPanelNew::setShowLineNumbers(bool bShowLineNumbers)
+{
+    if (m_pPreferencesWidget)
+        m_pPreferencesWidget->setShowLineNumbers(bShowLineNumbers);
+}
+
+void UIVMLogViewerPanelNew::setWrapLines(bool bWrapLines)
+{
+    if (m_pPreferencesWidget)
+        m_pPreferencesWidget->setWrapLines(bWrapLines);
+}
+
+void UIVMLogViewerPanelNew::setFontSizeInPoints(int fontSizeInPoints)
+{
+    if (m_pPreferencesWidget)
+        m_pPreferencesWidget->setFontSizeInPoints(fontSizeInPoints);
+}
+
 void UIVMLogViewerPanelNew::retranslateUi()
 {
@@ -129 +164 @@
     setTabText(Page_Filter, "Filter");
     setTabText(Page_Bookmark, "Bookmarks");
+    setTabText(Page_Preferences, "Preferences");
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPanel.h

@@ -40 +40 @@
 class QTextDocument;
 class UIVMLogViewerWidget;
-class UIVMLogViewerSearchPanel;
-class UIVMLogViewerFilterPanel;
-class UIVMLogViewerBookmarksPanel;
+class UIVMLogViewerSearchWidget;
+class UIVMLogViewerFilterWidget;
+class UIVMLogViewerBookmarksWidget;
+class UIVMLogViewerPreferencesWidget;
 
 class UIVMLogViewerPanelNew : public QIWithRetranslateUI<UIDialogPanelBase>
@@ -56 +57 @@
     void sigDeleteAllBookmarks();
     void sigBookmarkSelected(int index);
+
+    void sigShowLineNumbers(bool show);
+    void sigWrapLines(bool show);
+    void sigChangeFontSizeInPoints(int size);
+    void sigChangeFont(QFont font);
+    void sigResetToDefaults();
 
 public:
@@ -80 +87 @@
     /** @} */
 
+    /** @name Preferences page pass through functions
+      * @{ */
+        void setShowLineNumbers(bool bShowLineNumbers);
+        void setWrapLines(bool bWrapLines);
+        void setFontSizeInPoints(int fontSizeInPoints);
+    /** @} */
+
     enum Page
     {
@@ -98 +112 @@
     void prepare() override;
 
-    UIVMLogViewerWidget *m_pViewer;
-
-    UIVMLogViewerSearchPanel *m_pSearchWidget;
-    UIVMLogViewerFilterPanel *m_pFilterWidget;
-    UIVMLogViewerBookmarksPanel *m_pBookmarksWidget;
+    UIVMLogViewerWidget             *m_pViewer;
+    UIVMLogViewerSearchWidget        *m_pSearchWidget;
+    UIVMLogViewerFilterWidget       *m_pFilterWidget;
+    UIVMLogViewerBookmarksWidget     *m_pBookmarksWidget;
+    UIVMLogViewerPreferencesWidget  *m_pPreferencesWidget;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPreferencesWidget.cpp

@@ -37 +37 @@
 #include "QIToolButton.h"
 #include "UIIconPool.h"
-#include "UIVMLogViewerOptionsPanel.h"
+#include "UIVMLogViewerPreferencesWidget.h"
 #include "UIVMLogViewerWidget.h"
 
-
-UIVMLogViewerOptionsPanel::UIVMLogViewerOptionsPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer)
+/* Other VBox includes: */
+#include <iprt/assert.h>
+
+
+UIVMLogViewerPreferencesWidget::UIVMLogViewerPreferencesWidget(QWidget *pParent, UIVMLogViewerWidget *pViewer)
     : UIVMLogViewerPanel(pParent, pViewer)
     , m_pLineNumberCheckBox(0)
@@ -53 +56 @@
     prepareWidgets();
     prepareConnections();
-}
-
-void UIVMLogViewerOptionsPanel::setShowLineNumbers(bool bShowLineNumbers)
+    retranslateUi();
+}
+
+void UIVMLogViewerPreferencesWidget::setShowLineNumbers(bool bShowLineNumbers)
 {
     if (!m_pLineNumberCheckBox)
@@ -64 +68 @@
 }
 
-void UIVMLogViewerOptionsPanel::setWrapLines(bool bWrapLines)
+void UIVMLogViewerPreferencesWidget::setWrapLines(bool bWrapLines)
 {
     if (!m_pWrapLinesCheckBox)
@@ -73 +77 @@
 }
 
-void UIVMLogViewerOptionsPanel::setFontSizeInPoints(int fontSizeInPoints)
+void UIVMLogViewerPreferencesWidget::setFontSizeInPoints(int fontSizeInPoints)
 {
     if (!m_pFontSizeSpinBox)
@@ -82 +86 @@
 }
 
-void UIVMLogViewerOptionsPanel::prepareWidgets()
-{
-    QHBoxLayout *pMainLayout = new QHBoxLayout(this);
+void UIVMLogViewerPreferencesWidget::prepareWidgets()
+{
+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+    AssertReturnVoid(pMainLayout);
+
+    QHBoxLayout *pContainerLayout = new QHBoxLayout;
 
     /* Create line-number check-box: */
     m_pLineNumberCheckBox = new QCheckBox;
-    if (m_pLineNumberCheckBox)
-    {
-        m_pLineNumberCheckBox->setChecked(true);
-        pMainLayout->addWidget(m_pLineNumberCheckBox, 0, Qt::AlignLeft);
-    }
+    AssertReturnVoid(m_pLineNumberCheckBox);
+    m_pLineNumberCheckBox->setChecked(true);
+    pContainerLayout->addWidget(m_pLineNumberCheckBox, 0, Qt::AlignLeft);
+
 
     /* Create wrap-lines check-box: */
     m_pWrapLinesCheckBox = new QCheckBox;
-    if (m_pWrapLinesCheckBox)
-    {
-        m_pWrapLinesCheckBox->setChecked(false);
-        pMainLayout->addWidget(m_pWrapLinesCheckBox, 0, Qt::AlignLeft);
-    }
+    AssertReturnVoid(m_pWrapLinesCheckBox);
+    m_pWrapLinesCheckBox->setChecked(false);
+    pContainerLayout->addWidget(m_pWrapLinesCheckBox, 0, Qt::AlignLeft);
 
     /* Create font-size spin-box: */
     m_pFontSizeSpinBox = new QSpinBox;
-    if (m_pFontSizeSpinBox)
-    {
-        pMainLayout->addWidget(m_pFontSizeSpinBox, 0, Qt::AlignLeft);
-        m_pFontSizeSpinBox->setValue(m_iDefaultFontSize);
-        m_pFontSizeSpinBox->setMaximum(44);
-        m_pFontSizeSpinBox->setMinimum(6);
-    }
+    AssertReturnVoid(m_pFontSizeSpinBox);
+    pContainerLayout->addWidget(m_pFontSizeSpinBox, 0, Qt::AlignLeft);
+    m_pFontSizeSpinBox->setValue(m_iDefaultFontSize);
+    m_pFontSizeSpinBox->setMaximum(44);
+    m_pFontSizeSpinBox->setMinimum(6);
+
 
     /* Create font-size label: */
@@ -116 +119 @@
     if (m_pFontSizeLabel)
     {
-        pMainLayout->addWidget(m_pFontSizeLabel, 0, Qt::AlignLeft);
+        pContainerLayout->addWidget(m_pFontSizeLabel, 0, Qt::AlignLeft);
         if (m_pFontSizeSpinBox)
             m_pFontSizeLabel->setBuddy(m_pFontSizeSpinBox);
@@ -144 +147 @@
         }
 
-        pMainLayout->addLayout(pButtonLayout);
+        pContainerLayout->addLayout(pButtonLayout);
     }
 
-    pMainLayout->addStretch(2);
-}
-
-void UIVMLogViewerOptionsPanel::prepareConnections()
+    pContainerLayout->addStretch(1);
+    pMainLayout->addLayout(pContainerLayout);
+    pMainLayout->addStretch(1);
+}
+
+void UIVMLogViewerPreferencesWidget::prepareConnections()
 {
     if (m_pLineNumberCheckBox)
-        connect(m_pLineNumberCheckBox, &QCheckBox::toggled, this, &UIVMLogViewerOptionsPanel::sigShowLineNumbers);
+        connect(m_pLineNumberCheckBox, &QCheckBox::toggled, this, &UIVMLogViewerPreferencesWidget::sigShowLineNumbers);
     if (m_pWrapLinesCheckBox)
-        connect(m_pWrapLinesCheckBox, &QCheckBox::toggled, this, &UIVMLogViewerOptionsPanel::sigWrapLines);
+        connect(m_pWrapLinesCheckBox, &QCheckBox::toggled, this, &UIVMLogViewerPreferencesWidget::sigWrapLines);
     if (m_pFontSizeSpinBox)
         connect(m_pFontSizeSpinBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
-                this, &UIVMLogViewerOptionsPanel::sigChangeFontSizeInPoints);
+                this, &UIVMLogViewerPreferencesWidget::sigChangeFontSizeInPoints);
     if (m_pOpenFontDialogButton)
-        connect(m_pOpenFontDialogButton, &QIToolButton::clicked, this, &UIVMLogViewerOptionsPanel::sltOpenFontDialog);
+        connect(m_pOpenFontDialogButton, &QIToolButton::clicked, this, &UIVMLogViewerPreferencesWidget::sltOpenFontDialog);
     if (m_pResetToDefaultsButton)
-        connect(m_pResetToDefaultsButton, &QIToolButton::clicked, this, &UIVMLogViewerOptionsPanel::sigResetToDefaults);
-}
-
-void UIVMLogViewerOptionsPanel::retranslateUi()
+        connect(m_pResetToDefaultsButton, &QIToolButton::clicked, this, &UIVMLogViewerPreferencesWidget::sigResetToDefaults);
+}
+
+void UIVMLogViewerPreferencesWidget::retranslateUi()
 {
     UIVMLogViewerPanel::retranslateUi();
@@ -182 +187 @@
 }
 
-void UIVMLogViewerOptionsPanel::sltOpenFontDialog()
+void UIVMLogViewerPreferencesWidget::sltOpenFontDialog()
 {
     QFont currentFont;

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPreferencesWidget.h

@@ -26 +26 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerOptionsPanel_h
-#define FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerOptionsPanel_h
+#ifndef FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerPreferencesWidget_h
+#define FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerPreferencesWidget_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -43 +43 @@
 
 /** UIVMLogViewerPanel extension providing GUI to manage logviewer options. */
-class UIVMLogViewerOptionsPanel : public UIVMLogViewerPanel
+class UIVMLogViewerPreferencesWidget : public UIVMLogViewerPanel
 {
     Q_OBJECT;
@@ -57 +57 @@
 public:
 
-    UIVMLogViewerOptionsPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer);
+    UIVMLogViewerPreferencesWidget(QWidget *pParent, UIVMLogViewerWidget *pViewer);
 
     void setShowLineNumbers(bool bShowLineNumbers);
@@ -92 +92 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerOptionsPanel_h */
+#endif /* !FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerPreferencesWidget_h */

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchWidget.cpp

@@ -44 +44 @@
 #include "UISearchLineEdit.h"
 #include "UIVMLogPage.h"
-#include "UIVMLogViewerSearchPanel.h"
+#include "UIVMLogViewerSearchWidget.h"
 #include "UIVMLogViewerWidget.h"
 #ifdef VBOX_WS_MAC
@@ -53 +53 @@
 #include <iprt/assert.h>
 
-UIVMLogViewerSearchPanel::UIVMLogViewerSearchPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer)
+UIVMLogViewerSearchWidget::UIVMLogViewerSearchWidget(QWidget *pParent, UIVMLogViewerWidget *pViewer)
     : UIVMLogViewerPanel(pParent, pViewer)
     , m_pSearchEditor(0)
@@ -68 +68 @@
 }
 
-void UIVMLogViewerSearchPanel::refreshSearch()
+void UIVMLogViewerSearchWidget::refreshSearch()
 {
     /* We start the search from the end of the doc. assuming log's end is more interesting: */
@@ -79 +79 @@
 }
 
-void UIVMLogViewerSearchPanel::reset()
+void UIVMLogViewerSearchWidget::reset()
 {
     m_iSelectedMatchIndex = 0;
@@ -89 +89 @@
 }
 
-const QVector<float> &UIVMLogViewerSearchPanel::matchLocationVector() const
+const QVector<float> &UIVMLogViewerSearchWidget::matchLocationVector() const
 {
     return m_matchLocationVector;
 }
 
-int UIVMLogViewerSearchPanel::matchCount() const
+int UIVMLogViewerSearchWidget::matchCount() const
 {
     return m_matchedCursorPosition.size();
 }
 
-void UIVMLogViewerSearchPanel::hideEvent(QHideEvent *pEvent)
+void UIVMLogViewerSearchWidget::hideEvent(QHideEvent *pEvent)
 {
     /* Get focus-widget: */
@@ -112 +112 @@
 }
 
-void UIVMLogViewerSearchPanel::sltSearchTextChanged(const QString &strSearchString)
+void UIVMLogViewerSearchWidget::sltSearchTextChanged(const QString &strSearchString)
 {
     /* Enable/disable Next-Previous buttons as per search-string validity: */
@@ -148 +148 @@
 }
 
-void UIVMLogViewerSearchPanel::sltHighlightAllCheckBox()
+void UIVMLogViewerSearchWidget::sltHighlightAllCheckBox()
 {
     if (!viewer())
@@ -170 +170 @@
 }
 
-void UIVMLogViewerSearchPanel::sltCaseSentitiveCheckBox()
+void UIVMLogViewerSearchWidget::sltCaseSentitiveCheckBox()
 {
     refreshSearch();
 }
 
-void UIVMLogViewerSearchPanel::sltMatchWholeWordCheckBox()
+void UIVMLogViewerSearchWidget::sltMatchWholeWordCheckBox()
 {
     refreshSearch();
 }
 
-void UIVMLogViewerSearchPanel::sltSelectNextPreviousMatch()
+void UIVMLogViewerSearchWidget::sltSelectNextPreviousMatch()
 {
     moveSelection(sender() == m_pNextButton);
 }
 
-void UIVMLogViewerSearchPanel::prepareWidgets()
+void UIVMLogViewerSearchWidget::prepareWidgets()
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
@@ -248 +248 @@
 }
 
-void UIVMLogViewerSearchPanel::prepareConnections()
-{
-    connect(m_pSearchEditor, &UISearchLineEdit::textChanged, this, &UIVMLogViewerSearchPanel::sltSearchTextChanged);
-    connect(m_pNextButton, &QIToolButton::clicked, this, &UIVMLogViewerSearchPanel::sltSelectNextPreviousMatch);
-    connect(m_pPreviousButton, &QIToolButton::clicked, this, &UIVMLogViewerSearchPanel::sltSelectNextPreviousMatch);
+void UIVMLogViewerSearchWidget::prepareConnections()
+{
+    connect(m_pSearchEditor, &UISearchLineEdit::textChanged, this, &UIVMLogViewerSearchWidget::sltSearchTextChanged);
+    connect(m_pNextButton, &QIToolButton::clicked, this, &UIVMLogViewerSearchWidget::sltSelectNextPreviousMatch);
+    connect(m_pPreviousButton, &QIToolButton::clicked, this, &UIVMLogViewerSearchWidget::sltSelectNextPreviousMatch);
 
     connect(m_pHighlightAllCheckBox, &QCheckBox::stateChanged,
-            this, &UIVMLogViewerSearchPanel::sltHighlightAllCheckBox);
+            this, &UIVMLogViewerSearchWidget::sltHighlightAllCheckBox);
     connect(m_pCaseSensitiveCheckBox, &QCheckBox::stateChanged,
-            this, &UIVMLogViewerSearchPanel::sltCaseSentitiveCheckBox);
+            this, &UIVMLogViewerSearchWidget::sltCaseSentitiveCheckBox);
     connect(m_pMatchWholeWordCheckBox, &QCheckBox::stateChanged,
-            this, &UIVMLogViewerSearchPanel::sltMatchWholeWordCheckBox);
-}
-
-void UIVMLogViewerSearchPanel::retranslateUi()
+            this, &UIVMLogViewerSearchWidget::sltMatchWholeWordCheckBox);
+}
+
+void UIVMLogViewerSearchWidget::retranslateUi()
 {
     UIVMLogViewerPanel::retranslateUi();
@@ -280 +280 @@
 }
 
-void UIVMLogViewerSearchPanel::keyPressEvent(QKeyEvent *pEvent)
+void UIVMLogViewerSearchWidget::keyPressEvent(QKeyEvent *pEvent)
 {
     switch (pEvent->key())
@@ -305 +305 @@
 }
 
-bool UIVMLogViewerSearchPanel::handleSearchRelatedEvents(QObject *pObject, QEvent *pEvent)
+bool UIVMLogViewerSearchWidget::handleSearchRelatedEvents(QObject *pObject, QEvent *pEvent)
 {
     /* Handle only events sent to viewer(): */
@@ -370 +370 @@
 }
 
-void UIVMLogViewerSearchPanel::showEvent(QShowEvent *pEvent)
+void UIVMLogViewerSearchWidget::showEvent(QShowEvent *pEvent)
 {
     /* Call to base-class: */
@@ -384 +384 @@
 }
 
-void UIVMLogViewerSearchPanel::performSearch(SearchDirection , bool )
+void UIVMLogViewerSearchWidget::performSearch(SearchDirection , bool )
 {
     QPlainTextEdit *pTextEdit = textEdit();
@@ -413 +413 @@
 }
 
-void UIVMLogViewerSearchPanel::clearHighlighting()
+void UIVMLogViewerSearchWidget::clearHighlighting()
 {
     QPlainTextEdit *pTextEdit = textEdit();
@@ -421 +421 @@
 }
 
-void UIVMLogViewerSearchPanel::highlightAll(const QString &searchString)
+void UIVMLogViewerSearchWidget::highlightAll(const QString &searchString)
 {
     clearHighlighting();
@@ -447 +447 @@
 }
 
-void UIVMLogViewerSearchPanel::findAll(QTextDocument *pDocument, const QString &searchString)
+void UIVMLogViewerSearchWidget::findAll(QTextDocument *pDocument, const QString &searchString)
 {
     if (!pDocument)
@@ -473 +473 @@
 }
 
-void UIVMLogViewerSearchPanel::selectMatch(int iMatchIndex, const QString &searchString)
+void UIVMLogViewerSearchWidget::selectMatch(int iMatchIndex, const QString &searchString)
 {
     if (!textEdit())
@@ -491 +491 @@
 }
 
-void UIVMLogViewerSearchPanel::moveSelection(bool fForward)
+void UIVMLogViewerSearchWidget::moveSelection(bool fForward)
 {
     if (matchCount() == 0)
@@ -504 +504 @@
 }
 
-int UIVMLogViewerSearchPanel::countMatches(QTextDocument *pDocument, const QString &searchString) const
+int UIVMLogViewerSearchWidget::countMatches(QTextDocument *pDocument, const QString &searchString) const
 {
     if (!pDocument)
@@ -523 +523 @@
 }
 
-QTextDocument::FindFlags UIVMLogViewerSearchPanel::constructFindFlags(SearchDirection eDirection) const
+QTextDocument::FindFlags UIVMLogViewerSearchWidget::constructFindFlags(SearchDirection eDirection) const
 {
    QTextDocument::FindFlags findFlags;

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchWidget.h

@@ -26 +26 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerSearchPanel_h
-#define FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerSearchPanel_h
+#ifndef FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerSearchWidget_h
+#define FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerSearchWidget_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -49 +49 @@
 /** UIVMLogViewerPanel extension
   * providing GUI for search-panel in VM Log-Viewer. */
-class UIVMLogViewerSearchPanel : public UIVMLogViewerPanel
+class UIVMLogViewerSearchWidget : public UIVMLogViewerPanel
 {
     Q_OBJECT;
@@ -62 +62 @@
     /** Constructs search-panel by passing @a pParent to the QWidget base-class constructor.
       * @param  pViewer  Specifies instance of VM Log-Viewer. */
-    UIVMLogViewerSearchPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer);
+    UIVMLogViewerSearchWidget(QWidget *pParent, UIVMLogViewerWidget *pViewer);
     /** Resets the search position and starts a new search. */
     void refreshSearch();
@@ -133 +133 @@
 
 
-#endif /* !FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerSearchPanel_h */
+#endif /* !FEQT_INCLUDED_SRC_logviewer_UIVMLogViewerSearchWidget_h */

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -59 +59 @@
 #include "UIVMLogPage.h"
 #include "UIVMLogViewerWidget.h"
-#include "UIVMLogViewerBookmarksPanel.h"
-#include "UIVMLogViewerOptionsPanel.h"
+#include "UIVMLogViewerPanel.h"
 
 /* COM includes: */
@@ -212 +211 @@
     , m_fIsPolished(false)
     , m_pTabWidget(0)
-    , m_pOptionsPanel(0)
     , m_pMainLayout(0)
     , m_pToolBar(0)
@@ -643 +641 @@
     sltChangeFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
 
-    if (m_pOptionsPanel)
-    {
-        m_pOptionsPanel->setShowLineNumbers(true);
-        m_pOptionsPanel->setWrapLines(false);
-        m_pOptionsPanel->setFontSizeInPoints(m_font.pointSize());
-    }
+    // if (m_pOptionsPanel)
+    // {
+    //     m_pOptionsPanel->setShowLineNumbers(true);
+    //     m_pOptionsPanel->setWrapLines(false);
+    //     m_pOptionsPanel->setFontSizeInPoints(m_font.pointSize());
+    // }
     saveOptions();
 }
@@ -758 +756 @@
     // /* Configure panel: */
     // m_pOptionsPanel->hide();
-    // m_pOptionsPanel->setShowLineNumbers(m_bShowLineNumbers);
-    // m_pOptionsPanel->setWrapLines(m_bWrapLines);
-    // m_pOptionsPanel->setFontSizeInPoints(m_font.pointSize());
-    // connect(m_pOptionsPanel, &UIVMLogViewerOptionsPanel::sigShowLineNumbers, this, &UIVMLogViewerWidget::sltShowLineNumbers);
-    // connect(m_pOptionsPanel, &UIVMLogViewerOptionsPanel::sigWrapLines, this, &UIVMLogViewerWidget::sltWrapLines);
-    // connect(m_pOptionsPanel, &UIVMLogViewerOptionsPanel::sigChangeFontSizeInPoints, this, &UIVMLogViewerWidget::sltFontSizeChanged);
-    // connect(m_pOptionsPanel, &UIVMLogViewerOptionsPanel::sigChangeFont, this, &UIVMLogViewerWidget::sltChangeFont);
-    // connect(m_pOptionsPanel, &UIVMLogViewerOptionsPanel::sigResetToDefaults, this, &UIVMLogViewerWidget::sltResetOptionsToDefault);
 
     // m_pMainLayout->addWidget(m_pOptionsPanel);
@@ -773 +763 @@
     installEventFilter(m_pPanel);
     m_pPanel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+    m_pPanel->setShowLineNumbers(m_bShowLineNumbers);
+    m_pPanel->setWrapLines(m_bWrapLines);
+    m_pPanel->setFontSizeInPoints(m_font.pointSize());
+    // connect(m_pPanel, &UIVMLogViewerPanelNew::sigShowLineNumbers, this, &UIVMLogViewerWidget::sltShowLineNumbers);
+    // connect(m_pPanel, &UIVMLogViewerPanelNew::sigWrapLines, this, &UIVMLogViewerWidget::sltWrapLines);
+    // connect(m_pPanel, &UIVMLogViewerPanelNew::sigChangeFontSizeInPoints, this, &UIVMLogViewerWidget::sltFontSizeChanged);
+    // connect(m_pPanel, &UIVMLogViewerPanelNew::sigChangeFont, this, &UIVMLogViewerWidget::sltChangeFont);
+    // connect(m_pPanel, &UIVMLogViewerPanelNew::sigResetToDefaults, this, &UIVMLogViewerWidget::sltResetOptionsToDefault);
 
     connect(m_pPanel, &UIVMLogViewerPanelNew::sigHighlightingUpdated,

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -57 +57 @@
 class UIVMLogViewerPanelNew;
 class UIVMLogViewerFilterPanel;
-class UIVMLogViewerOptionsPanel;
 class UIVMLogViewerPanel;
 class CMachine;
@@ -227 +226 @@
     /** @name Panel instances and a QMap for mapping panel instances to related actions.
       * @{ */
-        UIVMLogViewerOptionsPanel   *m_pOptionsPanel;
         QList<UIDialogPanel*>          m_visiblePanelsList;
     /** @} */
@@ -253 +251 @@
     UIVMLogViewerPanelNew *m_pPanel;
 
-    friend class UIVMLogViewerFilterPanel;
+    friend class UIVMLogViewerFilterWidget;
     friend class UIVMLogViewerPanel;
     friend class UIVMLogViewerDialog;