diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-11-15 23:26:49 +0200 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2018-11-16 08:45:07 +0000 |
commit | ad7c42c9b367705eaafe606682638f598db3662f (patch) | |
tree | 08f4236694bce76950d6476fbf4de7863fa7c9bd | |
parent | bd9c2f04c00dfb6b80a28c70281f618f9650c0d9 (diff) | |
download | qt-creator-ad7c42c9b367705eaafe606682638f598db3662f.tar.gz |
SerialTerminal: Use monospace font
Change-Id: Iea42d55c348959adf57936fe0141c5bd5673efbd
Reviewed-by: Benjamin Balga <balga.benjamin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
-rw-r--r-- | src/plugins/serialterminal/serialoutputpane.cpp | 10 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialterminal.qbs | 1 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialterminal_dependencies.pri | 3 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/plugins/serialterminal/serialoutputpane.cpp b/src/plugins/serialterminal/serialoutputpane.cpp index ad655f0f76..776d3fd879 100644 --- a/src/plugins/serialterminal/serialoutputpane.cpp +++ b/src/plugins/serialterminal/serialoutputpane.cpp @@ -36,6 +36,8 @@ #include <coreplugin/icontext.h> #include <coreplugin/icore.h> #include <coreplugin/outputwindow.h> +#include <texteditor/fontsettings.h> +#include <texteditor/texteditorsettings.h> #include <utils/algorithm.h> #include <utils/icon.h> @@ -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 193bd1278f..e8fb4822be 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 6bc09c0cfd..9e173784b7 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 |