Add zoom buttons and use editor font in build system output

in Projects mode.

Change-Id: I4adee900651192c83de5b3a851c1766f3cb35200
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2021-06-21 11:30:51 +02:00
parent c70d4ae243
commit 6261e9917f

View File

@@ -58,6 +58,9 @@
#include <utils/treemodel.h> #include <utils/treemodel.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
#include <texteditor/fontsettings.h>
#include <texteditor/texteditorsettings.h>
#include <QApplication> #include <QApplication>
#include <QComboBox> #include <QComboBox>
#include <QDockWidget> #include <QDockWidget>
@@ -100,6 +103,8 @@ private:
QAction *m_filterActionRegexp; QAction *m_filterActionRegexp;
QAction *m_filterActionCaseSensitive; QAction *m_filterActionCaseSensitive;
QAction *m_invertFilterAction; QAction *m_invertFilterAction;
QAction *m_zoomIn;
QAction *m_zoomOut;
}; };
BuildSystemOutputWindow::BuildSystemOutputWindow() BuildSystemOutputWindow::BuildSystemOutputWindow()
@@ -140,6 +145,26 @@ BuildSystemOutputWindow::BuildSystemOutputWindow()
Core::ActionManager::registerAction(m_invertFilterAction, Core::ActionManager::registerAction(m_invertFilterAction,
kInvertActionId, kInvertActionId,
Context(Constants::C_PROJECTEXPLORER)); Context(Constants::C_PROJECTEXPLORER));
connect(TextEditor::TextEditorSettings::instance(),
&TextEditor::TextEditorSettings::fontSettingsChanged,
this,
[this] { setBaseFont(TextEditor::TextEditorSettings::fontSettings().font()); });
setBaseFont(TextEditor::TextEditorSettings::fontSettings().font());
m_zoomIn = new QAction;
m_zoomIn->setIcon(Utils::Icons::PLUS_TOOLBAR.icon());
connect(m_zoomIn, &QAction::triggered, this, [this] { zoomIn(); });
ActionManager::registerAction(m_zoomIn,
Core::Constants::ZOOM_IN,
Context(kBuildSystemOutputContext));
m_zoomOut = new QAction;
m_zoomOut->setIcon(Utils::Icons::MINUS.icon());
connect(m_zoomOut, &QAction::triggered, this, [this] { zoomOut(); });
ActionManager::registerAction(m_zoomOut,
Core::Constants::ZOOM_OUT,
Context(kBuildSystemOutputContext));
} }
QWidget *BuildSystemOutputWindow::toolBar() QWidget *BuildSystemOutputWindow::toolBar()
@@ -171,12 +196,19 @@ QWidget *BuildSystemOutputWindow::toolBar()
popup->show(); popup->show();
}); });
auto zoomInButton = new CommandButton(Core::Constants::ZOOM_IN);
zoomInButton->setDefaultAction(m_zoomIn);
auto zoomOutButton = new CommandButton(Core::Constants::ZOOM_OUT);
zoomOutButton->setDefaultAction(m_zoomOut);
auto layout = new QHBoxLayout; auto layout = new QHBoxLayout;
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0); layout->setSpacing(0);
m_toolBar->setLayout(layout); m_toolBar->setLayout(layout);
layout->addWidget(clearButton); layout->addWidget(clearButton);
layout->addWidget(m_filterOutputLineEdit); layout->addWidget(m_filterOutputLineEdit);
layout->addWidget(zoomInButton);
layout->addWidget(zoomOutButton);
layout->addStretch(); layout->addStretch();
} }
return m_toolBar; return m_toolBar;