From ad7c42c9b367705eaafe606682638f598db3662f Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 15 Nov 2018 23:26:49 +0200 Subject: [PATCH] SerialTerminal: Use monospace font MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iea42d55c348959adf57936fe0141c5bd5673efbd Reviewed-by: Benjamin Balga Reviewed-by: Orgad Shaneh Reviewed-by: André Hartmann --- src/plugins/serialterminal/serialoutputpane.cpp | 10 ++++++++++ src/plugins/serialterminal/serialterminal.qbs | 1 + .../serialterminal/serialterminal_dependencies.pri | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/plugins/serialterminal/serialoutputpane.cpp b/src/plugins/serialterminal/serialoutputpane.cpp index ad655f0f76b..776d3fd879f 100644 --- a/src/plugins/serialterminal/serialoutputpane.cpp +++ b/src/plugins/serialterminal/serialoutputpane.cpp @@ -36,6 +36,8 @@ #include #include #include +#include +#include #include #include @@ -304,6 +306,14 @@ void SerialOutputPane::createNewOutputWindow(SerialControl *rc) Core::Id contextId = Core::Id(Constants::C_SERIAL_OUTPUT).withSuffix(counter++); Core::Context context(contextId); Core::OutputWindow *ow = new Core::OutputWindow(context, m_tabWidget); + using TextEditor::TextEditorSettings; + auto fontSettingsChanged = [ow] { + ow->setBaseFont(TextEditorSettings::fontSettings().font()); + }; + + connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged, + this, fontSettingsChanged); + fontSettingsChanged(); ow->setWindowTitle(tr("Serial Terminal Window")); ow->setFormatter(formatter); // TODO: wordwrap, maxLineCount, zoom/wheelZoom (add to settings) diff --git a/src/plugins/serialterminal/serialterminal.qbs b/src/plugins/serialterminal/serialterminal.qbs index 193bd1278f6..e8fb4822bed 100644 --- a/src/plugins/serialterminal/serialterminal.qbs +++ b/src/plugins/serialterminal/serialterminal.qbs @@ -5,6 +5,7 @@ QtcPlugin { condition: Qt.serialport.present Depends { name: "Core" } + Depends { name: "TextEditor" } Depends { name: "Utils" } Depends { name: "Qt.serialport"; required: false } diff --git a/src/plugins/serialterminal/serialterminal_dependencies.pri b/src/plugins/serialterminal/serialterminal_dependencies.pri index 6bc09c0cfd0..9e173784b71 100644 --- a/src/plugins/serialterminal/serialterminal_dependencies.pri +++ b/src/plugins/serialterminal/serialterminal_dependencies.pri @@ -3,4 +3,5 @@ QTC_LIB_DEPENDS += \ extensionsystem \ utils QTC_PLUGIN_DEPENDS += \ - coreplugin + coreplugin \ + texteditor