From b2700d2da499b60b52706ce8dd47fbc739a5aee1 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Sat, 30 Mar 2019 08:07:31 +0100 Subject: VCS: Add font settings and zoom to output pane Change-Id: I2848bce2a851d9db953d1c218f1694877874e7df Reviewed-by: Orgad Shaneh --- src/plugins/vcsbase/vcsoutputwindow.cpp | 32 ++++++++++++++++++++++++++------ src/plugins/vcsbase/vcsoutputwindow.h | 1 - 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp index 98af90bdf8..58609f42c0 100644 --- a/src/plugins/vcsbase/vcsoutputwindow.cpp +++ b/src/plugins/vcsbase/vcsoutputwindow.cpp @@ -33,6 +33,9 @@ #include #include #include +#include +#include +#include #include #include @@ -74,6 +77,8 @@ namespace Internal { const char C_VCS_OUTPUT_PANE[] = "Vcs.OutputPane"; +const char zoomSettingsKey[] = "Vcs/OutputPane/Zoom"; + // Store repository along with text blocks class RepositoryUserData : public QTextBlockUserData { @@ -109,7 +114,7 @@ private: }; OutputWindowPlainTextEdit::OutputWindowPlainTextEdit(QWidget *parent) : - Core::OutputWindow(Core::Context(C_VCS_OUTPUT_PANE), QString(), parent) + Core::OutputWindow(Core::Context(C_VCS_OUTPUT_PANE), zoomSettingsKey, parent) { setReadOnly(true); setUndoRedoEnabled(false); @@ -285,6 +290,26 @@ VcsOutputWindow::VcsOutputWindow() d->passwordRegExp = QRegExp("://([^@:]+):([^@]+)@"); Q_ASSERT(d->passwordRegExp.isValid()); m_instance = this; + + auto updateFontSettings = [] { + d->widget.setBaseFont(TextEditor::TextEditorSettings::fontSettings().font()); + }; + + auto updateBehaviorSettings = [] { + d->widget.setWheelZoomEnabled( + TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming); + }; + + setZoomButtonsEnabled(true); + updateFontSettings(); + updateBehaviorSettings(); + + connect(this, &IOutputPane::zoomIn, &d->widget, &Core::OutputWindow::zoomIn); + connect(this, &IOutputPane::zoomOut, &d->widget, &Core::OutputWindow::zoomOut); + connect(TextEditor::TextEditorSettings::instance(), &TextEditor::TextEditorSettings::fontSettingsChanged, + this, updateFontSettings); + connect(TextEditor::TextEditorSettings::instance(), &TextEditor::TextEditorSettings::behaviorSettingsChanged, + this, updateBehaviorSettings); } static QString filterPasswordFromUrls(const QString &input) @@ -314,11 +339,6 @@ QWidget *VcsOutputWindow::outputWidget(QWidget *parent) return &d->widget; } -QList VcsOutputWindow::toolBarWidgets() const -{ - return {}; -} - QString VcsOutputWindow::displayName() const { return tr("Version Control"); diff --git a/src/plugins/vcsbase/vcsoutputwindow.h b/src/plugins/vcsbase/vcsoutputwindow.h index f87a5309c5..9de4e41576 100644 --- a/src/plugins/vcsbase/vcsoutputwindow.h +++ b/src/plugins/vcsbase/vcsoutputwindow.h @@ -41,7 +41,6 @@ class VCSBASE_EXPORT VcsOutputWindow : public Core::IOutputPane public: QWidget *outputWidget(QWidget *parent) override; - QList toolBarWidgets() const override; QString displayName() const override; int priorityInStatusBar() const override; -- cgit v1.2.3