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

Timestamp:

Apr 26, 2018 11:50:13 AM (7 years ago)

Author:

vboxsync

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

122334

Message:

FE/Qt: ​bugref:9072 Add a button to reset the settings of log viewer

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerSettingsPanel.cpp (modified) (5 diffs)
• UIVMLogViewerSettingsPanel.h (modified) (2 diffs)
• UIVMLogViewerWidget.cpp (modified) (3 diffs)
• UIVMLogViewerWidget.h (modified) (1 diff)

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

@@ -44 +44 @@
     , m_pFontSizeSpinBox(0)
     , m_pFontSizeLabel(0)
-    , m_pOpenFontDialog(0)
+    , m_pOpenFontDialogButton(0)
+    , m_pResetToDefaultsButton(0)
     , m_iDefaultFontSize(9)
 {
@@ -111 +112 @@
     }
 
-    m_pOpenFontDialog = new QIToolButton;
-    if (m_pOpenFontDialog)
+    m_pOpenFontDialogButton = new QIToolButton;
+    if (m_pOpenFontDialogButton)
     {
-        mainLayout()->addWidget(m_pOpenFontDialog, 0);
-        m_pOpenFontDialog->setIcon(UIIconPool::iconSet(":/log_viewer_goto_selected_bookmark_16px.png"));
-        m_pOpenFontDialog->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        mainLayout()->addWidget(m_pOpenFontDialogButton, 0);
+        m_pOpenFontDialogButton->setIcon(UIIconPool::iconSet(":/log_viewer_goto_selected_bookmark_16px.png"));
     }
 
-
+    m_pResetToDefaultsButton = new QIToolButton;
+    if (m_pResetToDefaultsButton)
+    {
+        mainLayout()->addWidget(m_pResetToDefaultsButton, 0);
+        m_pResetToDefaultsButton->setIcon(UIIconPool::iconSet(":/log_viewer_goto_selected_bookmark_16px.png"));
+    }
     mainLayout()->addStretch(2);
 }
@@ -131 +136 @@
     if (m_pFontSizeSpinBox)
         connect(m_pFontSizeSpinBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
-                this, &UIVMLogViewerSettingsPanel::sigFontSizeInPoints);
-    if (m_pOpenFontDialog)
-        connect(m_pOpenFontDialog, &QIToolButton::clicked, this, &UIVMLogViewerSettingsPanel::sltOpenFontDialog);
-
+                this, &UIVMLogViewerSettingsPanel::sigChangeFontSizeInPoints);
+    if (m_pOpenFontDialogButton)
+        connect(m_pOpenFontDialogButton, &QIToolButton::clicked, this, &UIVMLogViewerSettingsPanel::sltOpenFontDialog);
+    if (m_pResetToDefaultsButton)
+        connect(m_pResetToDefaultsButton, &QIToolButton::clicked, this, &UIVMLogViewerSettingsPanel::sigResetToDefaults);
 }
 
@@ -158 +164 @@
     }
 
-    if (m_pOpenFontDialog)
-    {
-        m_pOpenFontDialog->setToolTip(UIVMLogViewerWidget::tr("Open a font dialog to select font face for the logviewer"));
-        m_pOpenFontDialog->setText(UIVMLogViewerWidget::tr("Select Font"));
-    }
+    if (m_pOpenFontDialogButton)
+        m_pOpenFontDialogButton->setToolTip(UIVMLogViewerWidget::tr("Open a font dialog to select font face for the logviewer"));
 
+    if (m_pResetToDefaultsButton)
+        m_pResetToDefaultsButton->setToolTip(UIVMLogViewerWidget::tr("Reset settings to application defaults"));
 }
 
@@ -179 +184 @@
 
     if (ok)
-        emit sigFontFace(font);
+        emit sigChangeFont(font);
 }

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

@@ -38 +38 @@
     void sigShowLineNumbers(bool show);
     void sigWrapLines(bool show);
-    void sigFontSizeInPoints(int size);
-    void sigFontFace(QFont font);
+    void sigChangeFontSizeInPoints(int size);
+    void sigChangeFont(QFont font);
+    void sigResetToDefaults();
 
 public:
@@ -70 +71 @@
     QSpinBox     *m_pFontSizeSpinBox;
     QLabel       *m_pFontSizeLabel;
-    QIToolButton *m_pOpenFontDialog;
+    QIToolButton *m_pOpenFontDialogButton;
+    QIToolButton *m_pResetToDefaultsButton;
 
     /** Default font size in points. */

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

@@ -387 +387 @@
 }
 
-void UIVMLogViewerWidget::sltFontFace(QFont font)
+void UIVMLogViewerWidget::sltChangeFont(QFont font)
 {
     if (m_font == font)
@@ -397 +397 @@
         if (pLogPage)
             pLogPage->setCurrentFont(m_font);
+    }
+}
+void UIVMLogViewerWidget::sltResetSettingsToDefault()
+{
+    sltShowLineNumbers(true);
+    sltWrapLines(false);
+    sltChangeFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
+
+    if (m_pSettingsPanel)
+    {
+        m_pSettingsPanel->setShowLineNumbers(true);
+        m_pSettingsPanel->setWrapLines(false);
+        m_pSettingsPanel->setFontSizeInPoints(m_font.pointSize());
     }
 }
@@ -502 +515 @@
         connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigShowLineNumbers, this, &UIVMLogViewerWidget::sltShowLineNumbers);
         connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigWrapLines, this, &UIVMLogViewerWidget::sltWrapLines);
-        connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigFontSizeInPoints, this, &UIVMLogViewerWidget::sltFontSizeChanged);
-        connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigFontFace, this, &UIVMLogViewerWidget::sltFontFace);
+        connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigChangeFontSizeInPoints, this, &UIVMLogViewerWidget::sltFontSizeChanged);
+        connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigChangeFont, this, &UIVMLogViewerWidget::sltChangeFont);
+        connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigResetToDefaults, this, &UIVMLogViewerWidget::sltResetSettingsToDefault);
     }
 }

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

@@ -120 +120 @@
         void sltWrapLines(bool bWrapLine);
         void sltFontSizeChanged(int fontSize);
-        void sltFontFace(QFont font);
+        void sltChangeFont(QFont font);
+        void sltResetSettingsToDefault();
     /** @} */