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()
{
const Id menuId = "ArtisticStyle.Menu";
Core::ActionContainer *menu = Core::ActionManager::createMenu(menuId);
menu->menu()->setTitle(Tr::tr("&Artistic Style"));
Core::MenuBuilder(menuId)
.setTitle(Tr::tr("&Artistic Style"))
.addToContainer(Constants::MENU_ID);
Core::ActionBuilder formatFile(this, "ArtisticStyle.FormatFile");
formatFile.setText(msgFormatCurrentFile());
formatFile.bindContextAction(&m_formatFile);
formatFile.addToContainer(menuId);
formatFile.addOnTriggered(this, [this] { this->formatFile(); });
Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu);
Core::ActionBuilder(this, "ArtisticStyle.FormatFile")
.setText(msgFormatCurrentFile())
.bindContextAction(&m_formatFile)
.addToContainer(menuId)
.addOnTriggered(this, &ArtisticStyle::formatFile);
connect(&settings().supportedMimeTypes, &Utils::BaseAspect::changed,
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
{
ActionContainer *menu = ActionManager::createMenu(Constants::MENU_ID);
menu->menu()->setTitle(Tr::tr("Bea&utifier"));
menu->setOnAllDisabledBehavior(ActionContainer::Show);
ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu);
MenuBuilder(Constants::MENU_ID)
.setTitle(Tr::tr("Bea&utifier"))
.setOnAllDisabledBehavior(ActionContainer::Show)
.addToContainer(Core::Constants::M_TOOLS);
setupArtisticStyle();
setupClangFormat();

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

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

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

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