From 72a3ff75b3cf5162925b01eb44749b3478a79e57 Mon Sep 17 00:00:00 2001 From: Krzysztof Chrusciel Date: Tue, 8 Apr 2025 14:40:08 +0200 Subject: [PATCH] Lua: Add possibility to insert action to toolbar Change-Id: I04ccfdcc28ed33e03f8a3c531d775741d35fac7f Reviewed-by: Marcus Tillmanns Reviewed-by: David Schulz --- src/plugins/lua/bindings/texteditor.cpp | 7 +++++++ src/plugins/texteditor/texteditor.cpp | 17 +++++++++++++++++ src/plugins/texteditor/texteditor.h | 1 + 3 files changed, 25 insertions(+) diff --git a/src/plugins/lua/bindings/texteditor.cpp b/src/plugins/lua/bindings/texteditor.cpp index 0a22c15a5a1..71d66e7ba60 100644 --- a/src/plugins/lua/bindings/texteditor.cpp +++ b/src/plugins/lua/bindings/texteditor.cpp @@ -427,6 +427,13 @@ void setupTextEditorModule() QTC_ASSERT(textEditor, throw sol::error("TextEditor is not valid")); textEditor->editorWidget()->insertExtraToolBarWidget(side, toWidget(widget)); }, + "insertExtraToolBarAction", + [](const TextEditorPtr &textEditor, + TextEditorWidget::Side side, + QAction* action) { + QTC_ASSERT(textEditor, throw sol::error("TextEditor is not valid")); + textEditor->editorWidget()->insertExtraToolBarAction(side, action); + }, "setRefactorMarker", [pluginSpec, activeMarkers]( const TextEditorPtr &textEditor, diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index fda0ad9c604..02ccb8b06f1 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -9887,6 +9887,23 @@ QAction * TextEditorWidget::insertExtraToolBarWidget(TextEditorWidget::Side side } } +void TextEditorWidget::insertExtraToolBarAction(TextEditorWidget::Side side, QAction *action) +{ + if (side == Left) { + auto findLeftMostAction = [this](QAction *action) { + if (d->m_toolbarOutlineAction && action == d->m_toolbarOutlineAction) + return false; + return d->m_toolBar->widgetForAction(action) != nullptr; + }; + QAction *before = Utils::findOr(d->m_toolBar->actions(), + d->m_fileEncodingLabelAction, + findLeftMostAction); + d->m_toolBar->insertAction(before, action); + } else { + d->m_toolBar->insertAction(d->m_fileLineEndingAction, action); + } +} + void TextEditorWidget::setToolbarOutline(QWidget *widget) { if (d->m_toolbarOutlineAction) { diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h index 506b28f621b..76bf06ab102 100644 --- a/src/plugins/texteditor/texteditor.h +++ b/src/plugins/texteditor/texteditor.h @@ -351,6 +351,7 @@ public: enum Side { Left, Right }; QAction *insertExtraToolBarWidget(Side side, QWidget *widget); + void insertExtraToolBarAction(Side side, QAction *action); void setToolbarOutline(QWidget* widget); const QWidget *toolbarOutlineWidget();