feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Add font settings and zoom to output pane

Browse Source 
Change-Id: I2848bce2a851d9db953d1c218f1694877874e7df
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2019-03-30 08:07:31 +01:00
committed by André Hartmann
parent 48073b2990
commit b2700d2da4
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/vcsbase/vcsoutputwindow.cpp
View File

@@ -33,6 +33,9 @@
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/outputformatter.h> #include <utils/outputformatter.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <texteditor/behaviorsettings.h>
#include <texteditor/fontsettings.h>
#include <texteditor/texteditorsettings.h>
#include <utils/theme/theme.h> #include <utils/theme/theme.h>
#include <QAction> #include <QAction>
@@ -74,6 +77,8 @@ namespace Internal {
const char C_VCS_OUTPUT_PANE[] = "Vcs.OutputPane"; const char C_VCS_OUTPUT_PANE[] = "Vcs.OutputPane";
const char zoomSettingsKey[] = "Vcs/OutputPane/Zoom";
// Store repository along with text blocks // Store repository along with text blocks
class RepositoryUserData : public QTextBlockUserData class RepositoryUserData : public QTextBlockUserData
{ {
@@ -109,7 +114,7 @@ private:
}; };
OutputWindowPlainTextEdit::OutputWindowPlainTextEdit(QWidget *parent) : 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); setReadOnly(true);
setUndoRedoEnabled(false); setUndoRedoEnabled(false);
@@ -285,6 +290,26 @@ VcsOutputWindow::VcsOutputWindow()
d->passwordRegExp = QRegExp("://([^@:]+):([^@]+)@"); d->passwordRegExp = QRegExp("://([^@:]+):([^@]+)@");
Q_ASSERT(d->passwordRegExp.isValid()); Q_ASSERT(d->passwordRegExp.isValid());
m_instance = this; 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) static QString filterPasswordFromUrls(const QString &input)
@@ -314,11 +339,6 @@ QWidget *VcsOutputWindow::outputWidget(QWidget *parent)
return &d->widget; return &d->widget;
} }
QList<QWidget *> VcsOutputWindow::toolBarWidgets() const
{
return {};
}
QString VcsOutputWindow::displayName() const QString VcsOutputWindow::displayName() const
{ {
return tr("Version Control"); return tr("Version Control");

1
src/plugins/vcsbase/vcsoutputwindow.h
View File

@@ -41,7 +41,6 @@ class VCSBASE_EXPORT VcsOutputWindow : public Core::IOutputPane
public: public:
QWidget *outputWidget(QWidget *parent) override; QWidget *outputWidget(QWidget *parent) override;
QList<QWidget *> toolBarWidgets() const override;
QString displayName() const override; QString displayName() const override;
int priorityInStatusBar() const override; int priorityInStatusBar() const override;