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

CompilerExplorer: Use StyledBar

Browse Source 
Change-Id: I9f80a025a6ed3a4732794b4715a25ce3b90f6d43
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Alessandro Portale
2023-10-11 15:42:33 +02:00
parent c044f6104b
commit b265e0906c
1 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/plugins/compilerexplorer/compilerexplorereditor.cpp
View File

@@ -28,6 +28,7 @@
#include <utils/mimetypes2/mimetype.h> #include <utils/mimetypes2/mimetype.h>
#include <utils/mimeutils.h> #include <utils/mimeutils.h>
#include <utils/store.h> #include <utils/store.h>
#include <utils/styledbar.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
#include <QCompleter> #include <QCompleter>
@@ -201,6 +202,8 @@ SourceEditorWidget::SourceEditorWidget(const std::shared_ptr<SourceSettings> &se
QUndoStack *undoStack) QUndoStack *undoStack)
: m_sourceSettings(settings) : m_sourceSettings(settings)
{ {
auto toolBar = new StyledBar;
m_codeEditor = new CodeEditorWidget(m_sourceSettings, undoStack); m_codeEditor = new CodeEditorWidget(m_sourceSettings, undoStack);
connect(m_codeEditor, &CodeEditorWidget::gotFocus, this, &SourceEditorWidget::gotFocus); connect(m_codeEditor, &CodeEditorWidget::gotFocus, this, &SourceEditorWidget::gotFocus);
@@ -215,28 +218,32 @@ SourceEditorWidget::SourceEditorWidget(const std::shared_ptr<SourceSettings> &se
m_codeEditor->setTextDocument(document); m_codeEditor->setTextDocument(document);
m_codeEditor->updateHighlighter(); m_codeEditor->updateHighlighter();
auto addCompilerButton = new QPushButton; auto addCompilerButton = new QToolButton;
addCompilerButton->setText(Tr::tr("Add Compiler")); addCompilerButton->setText(Tr::tr("Add Compiler"));
connect(addCompilerButton, connect(addCompilerButton,
&QPushButton::clicked, &QToolButton::clicked,
&settings->compilers, &settings->compilers,
&AspectList::createAndAddItem); &AspectList::createAndAddItem);
auto removeSourceButton = new QPushButton; auto removeSourceButton = new QToolButton;
removeSourceButton->setIcon(Utils::Icons::EDIT_CLEAR.icon()); removeSourceButton->setIcon(Utils::Icons::CLOSE_TOOLBAR.icon());
removeSourceButton->setToolTip(Tr::tr("Remove Source")); removeSourceButton->setToolTip(Tr::tr("Remove Source"));
connect(removeSourceButton, &QPushButton::clicked, this, &SourceEditorWidget::remove); connect(removeSourceButton, &QToolButton::clicked, this, &SourceEditorWidget::remove);
// clang-format off // clang-format off
using namespace Layouting; using namespace Layouting;
Row {
settings->languageId,
addCompilerButton,
removeSourceButton,
customMargin({6, 0, 0, 0}), spacing(0),
}.attachTo(toolBar);
Column { Column {
Row { toolBar,
settings->languageId,
addCompilerButton,
removeSourceButton,
},
m_codeEditor, m_codeEditor,
noMargin(), spacing(0),
}.attachTo(this); }.attachTo(this);
// clang-format on // clang-format on
@@ -272,6 +279,8 @@ CompilerWidget::CompilerWidget(const std::shared_ptr<SourceSettings> &sourceSett
m_delayTimer, m_delayTimer,
qOverload<>(&QTimer::start)); qOverload<>(&QTimer::start));
auto toolBar = new StyledBar;
m_asmEditor = new AsmEditorWidget(undoStack); m_asmEditor = new AsmEditorWidget(undoStack);
m_asmDocument = QSharedPointer<TextDocument>(new TextDocument); m_asmDocument = QSharedPointer<TextDocument>(new TextDocument);
m_asmDocument->setFilePath("asm.asm"); m_asmDocument->setFilePath("asm.asm");
@@ -281,7 +290,7 @@ CompilerWidget::CompilerWidget(const std::shared_ptr<SourceSettings> &sourceSett
connect(m_asmEditor, &AsmEditorWidget::gotFocus, this, &CompilerWidget::gotFocus); connect(m_asmEditor, &AsmEditorWidget::gotFocus, this, &CompilerWidget::gotFocus);
auto advButton = new QPushButton; auto advButton = new QToolButton;
QSplitter *splitter{nullptr}; QSplitter *splitter{nullptr};
auto advDlg = new QAction; auto advDlg = new QAction;
@@ -297,13 +306,13 @@ CompilerWidget::CompilerWidget(const std::shared_ptr<SourceSettings> &sourceSett
dlg->setGeometry(rect); dlg->setGeometry(rect);
}); });
connect(advButton, &QPushButton::clicked, advDlg, &QAction::trigger); connect(advButton, &QToolButton::clicked, advDlg, &QAction::trigger);
advButton->setIcon(advDlg->icon()); advButton->setIcon(advDlg->icon());
auto removeCompilerBtn = new QPushButton; auto removeCompilerBtn = new QToolButton;
removeCompilerBtn->setIcon(Utils::Icons::EDIT_CLEAR.icon()); removeCompilerBtn->setIcon(Utils::Icons::CLOSE_TOOLBAR.icon());
removeCompilerBtn->setToolTip(Tr::tr("Remove Compiler")); removeCompilerBtn->setToolTip(Tr::tr("Remove Compiler"));
connect(removeCompilerBtn, &QPushButton::clicked, this, &CompilerWidget::remove); connect(removeCompilerBtn, &QToolButton::clicked, this, &CompilerWidget::remove);
compile(m_sourceSettings->source()); compile(m_sourceSettings->source());
@@ -312,17 +321,22 @@ CompilerWidget::CompilerWidget(const std::shared_ptr<SourceSettings> &sourceSett
}); });
// clang-format off // clang-format off
Row {
m_compilerSettings->compiler,
advButton,
removeCompilerBtn,
customMargin({6, 0, 0, 0}), spacing(0),
}.attachTo(toolBar);
Column { Column {
Row { toolBar,
m_compilerSettings->compiler,
advButton,
removeCompilerBtn,
},
Splitter { Splitter {
bindTo(&splitter), bindTo(&splitter),
m_asmEditor, m_asmEditor,
createTerminal() createTerminal()
} },
noMargin(), spacing(0),
}.attachTo(this); }.attachTo(this);
// clang-format on // clang-format on