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

Beautifier: Use MenuBuilder

Browse Source 
... and simplify ActionBuilder use.

Change-Id: I95ae851a978e7c1fce62510bba29ed2ba447a89a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2024-01-29 12:54:30 +01:00
parent a19d19733e
commit d723c74858
4 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/beautifier/artisticstyle/artisticstyle.cpp
View File

@@ -240,16 +240,15 @@ public:
ArtisticStyle() ArtisticStyle()
{ {
const Id menuId = "ArtisticStyle.Menu"; const Id menuId = "ArtisticStyle.Menu";
Core::ActionContainer *menu = Core::ActionManager::createMenu(menuId); Core::MenuBuilder(menuId)
menu->menu()->setTitle(Tr::tr("&Artistic Style")); .setTitle(Tr::tr("&Artistic Style"))
.addToContainer(Constants::MENU_ID);
Core::ActionBuilder formatFile(this, "ArtisticStyle.FormatFile"); Core::ActionBuilder(this, "ArtisticStyle.FormatFile")
formatFile.setText(msgFormatCurrentFile()); .setText(msgFormatCurrentFile())
formatFile.bindContextAction(&m_formatFile); .bindContextAction(&m_formatFile)
formatFile.addToContainer(menuId); .addToContainer(menuId)
formatFile.addOnTriggered(this, [this] { this->formatFile(); }); .addOnTriggered(this, &ArtisticStyle::formatFile);
Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu);
connect(&settings().supportedMimeTypes, &Utils::BaseAspect::changed, connect(&settings().supportedMimeTypes, &Utils::BaseAspect::changed,
this, [this] { updateActions(Core::EditorManager::currentEditor()); }); this, [this] { updateActions(Core::EditorManager::currentEditor()); });

8
src/plugins/beautifier/beautifierplugin.cpp
View File

@@ -62,10 +62,10 @@ class BeautifierPlugin final : public ExtensionSystem::IPlugin
void initialize() final void initialize() final
{ {
ActionContainer *menu = ActionManager::createMenu(Constants::MENU_ID); MenuBuilder(Constants::MENU_ID)
menu->menu()->setTitle(Tr::tr("Bea&utifier")); .setTitle(Tr::tr("Bea&utifier"))
menu->setOnAllDisabledBehavior(ActionContainer::Show); .setOnAllDisabledBehavior(ActionContainer::Show)
ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu); .addToContainer(Core::Constants::M_TOOLS);
setupArtisticStyle(); setupArtisticStyle();
setupClangFormat(); setupClangFormat();

47
src/plugins/beautifier/clangformat/clangformat.cpp
View File

@@ -316,34 +316,33 @@ public:
ClangFormat() ClangFormat()
{ {
const Id menuId = "ClangFormat.Menu"; const Id menuId = "ClangFormat.Menu";
Core::ActionContainer *menu = Core::ActionManager::createMenu(menuId); Core::MenuBuilder(menuId)
menu->menu()->setTitle(Tr::tr("&ClangFormat")); .setTitle(Tr::tr("&ClangFormat"))
.addToContainer(Constants::MENU_ID);
Core::ActionBuilder formatFile(this, "ClangFormat.FormatFile"); Core::ActionBuilder(this, "ClangFormat.FormatFile")
formatFile.setText(msgFormatCurrentFile()); .setText(msgFormatCurrentFile())
formatFile.bindContextAction(&m_formatFile); .bindContextAction(&m_formatFile)
formatFile.addToContainer(menuId); .addToContainer(menuId)
formatFile.addOnTriggered(this, [this] { this->formatFile(); }); .addOnTriggered(this, &ClangFormat::formatFile);
Core::ActionBuilder formatLines(this, "ClangFormat.FormatLines"); Core::ActionBuilder(this, "ClangFormat.FormatLines")
formatLines.setText(msgFormatLines()); .setText(msgFormatLines())
formatLines.bindContextAction(&m_formatLines); .bindContextAction(&m_formatLines)
formatLines.addToContainer(menuId); .addToContainer(menuId)
formatLines.addOnTriggered(this, [this] { this->formatLines(); }); .addOnTriggered(this, &ClangFormat::formatLines);
Core::ActionBuilder formatAtCursor(this, "ClangFormat.FormatAtCursor"); Core::ActionBuilder(this, "ClangFormat.FormatAtCursor")
formatAtCursor.setText(msgFormatAtCursor()); .setText(msgFormatAtCursor())
formatAtCursor.bindContextAction(&m_formatRange); .bindContextAction(&m_formatRange)
formatAtCursor.addToContainer(menuId); .addToContainer(menuId)
formatAtCursor.addOnTriggered(this, [this] { this->formatAtCursor(); }); .addOnTriggered(this, &ClangFormat::formatAtCursor);
Core::ActionBuilder formatDisable(this, "ClangFormat.DisableFormattingSelectedText"); Core::ActionBuilder(this, "ClangFormat.DisableFormattingSelectedText")
formatDisable.setText(msgDisableFormattingSelectedText()); .setText(msgDisableFormattingSelectedText())
formatDisable.bindContextAction(&m_disableFormattingSelectedText); .bindContextAction(&m_disableFormattingSelectedText)
formatDisable.addToContainer(menuId); .addToContainer(menuId)
formatDisable.addOnTriggered(this, [this] { disableFormattingSelectedText(); }); .addOnTriggered(this, &ClangFormat::disableFormattingSelectedText);
Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu);
connect(&settings().supportedMimeTypes, &BaseAspect::changed, connect(&settings().supportedMimeTypes, &BaseAspect::changed,
this, [this] { updateActions(Core::EditorManager::currentEditor()); }); this, [this] { updateActions(Core::EditorManager::currentEditor()); });

27
src/plugins/beautifier/uncrustify/uncrustify.cpp
View File

@@ -236,22 +236,21 @@ public:
Uncrustify() Uncrustify()
{ {
const Id menuId = "Uncrustify.Menu"; const Id menuId = "Uncrustify.Menu";
Core::ActionContainer *menu = Core::ActionManager::createMenu(menuId); Core::MenuBuilder(menuId)
menu->menu()->setTitle(Tr::tr("&Uncrustify")); .setTitle(Tr::tr("&Uncrustify"))
.addToContainer(Constants::MENU_ID);
Core::ActionBuilder formatFile(this, "Uncrustify.FormatFile"); Core::ActionBuilder(this, "Uncrustify.FormatFile")
formatFile.setText(msgFormatCurrentFile()); .setText(msgFormatCurrentFile())
formatFile.bindContextAction(&m_formatFile); .bindContextAction(&m_formatFile)
formatFile.addToContainer(menuId); .addToContainer(menuId)
formatFile.addOnTriggered(this, [this] { this->formatFile(); }); .addOnTriggered(this, &Uncrustify::formatFile);
Core::ActionBuilder formatRange(this, "Uncrustify.FormatSelectedText"); Core::ActionBuilder(this, "Uncrustify.FormatSelectedText")
formatRange.setText(msgFormatSelectedText()); .setText(msgFormatSelectedText())
formatRange.bindContextAction(&m_formatRange); .bindContextAction(&m_formatRange)
formatRange.addToContainer(menuId); .addToContainer(menuId)
formatRange.addOnTriggered(this, [this] { this->formatSelectedText(); }); .addOnTriggered(this, &Uncrustify::formatSelectedText);
Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu);
connect(&settings().supportedMimeTypes, &Utils::BaseAspect::changed, connect(&settings().supportedMimeTypes, &Utils::BaseAspect::changed,
this, [this] { updateActions(Core::EditorManager::currentEditor()); }); this, [this] { updateActions(Core::EditorManager::currentEditor()); });