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

Macros: Move plugin class definition to .cpp

Browse Source 
Change-Id: I7ac41e64dd4b3b52876aaafd77218c330e220f67
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-11-10 15:23:16 +01:00
parent d74a85bbac
commit 65bb9e3505
4 changed files with 56 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/macros/CMakeLists.txt
View File

@@ -11,7 +11,7 @@ add_qtc_plugin(Macros
macrooptionspage.cpp macrooptionspage.h macrooptionspage.cpp macrooptionspage.h
macros.qrc macros.qrc
macrosconstants.h macrosconstants.h
macrosplugin.cpp macrosplugin.h macrosplugin.cpp
macrotextfind.cpp macrotextfind.h macrotextfind.cpp macrotextfind.h
macrostr.h macrostr.h
texteditormacrohandler.cpp texteditormacrohandler.h texteditormacrohandler.cpp texteditormacrohandler.h

1
src/plugins/macros/macros.qbs
View File

@@ -30,7 +30,6 @@ QtcPlugin {
"macros.qrc", "macros.qrc",
"macrosconstants.h", "macrosconstants.h",
"macrosplugin.cpp", "macrosplugin.cpp",
"macrosplugin.h",
"macrostr.h", "macrostr.h",
"macrotextfind.cpp", "macrotextfind.cpp",
"macrotextfind.h", "macrotextfind.h",

100
src/plugins/macros/macrosplugin.cpp
View File

@@ -1,16 +1,12 @@
// Copyright (C) 2016 Nicolas Arnaud-Cormos // Copyright (C) 2016 Nicolas Arnaud-Cormos
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "macrosplugin.h"
#include "macrolocatorfilter.h" #include "macrolocatorfilter.h"
#include "macromanager.h" #include "macromanager.h"
#include "macrooptionspage.h" #include "macrooptionspage.h"
#include "macrosconstants.h" #include "macrosconstants.h"
#include "macrostr.h" #include "macrostr.h"
#include <texteditor/texteditorconstants.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
@@ -18,14 +14,17 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
#include <extensionsystem/iplugin.h>
#include <texteditor/texteditorconstants.h>
#include <QAction> #include <QAction>
#include <QKeySequence> #include <QKeySequence>
#include <QMenu> #include <QMenu>
namespace Macros { namespace Macros::Internal {
namespace Internal {
class MacrosPluginPrivate class MacrosPluginPrivate final
{ {
public: public:
MacroManager macroManager; MacroManager macroManager;
@@ -33,50 +32,61 @@ public:
MacroLocatorFilter locatorFilter; MacroLocatorFilter locatorFilter;
}; };
MacrosPlugin::~MacrosPlugin() class MacrosPlugin final : public ExtensionSystem::IPlugin
{ {
delete d; Q_OBJECT
} Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Macros.json")
void MacrosPlugin::initialize() public:
{ ~MacrosPlugin() final
d = new MacrosPluginPrivate; {
delete d;
}
Core::Context textContext(TextEditor::Constants::C_TEXTEDITOR); void initialize() final
{
d = new MacrosPluginPrivate;
// Menus Core::Context textContext(TextEditor::Constants::C_TEXTEDITOR);
Core::ActionContainer *mtools = Core::ActionManager::actionContainer(Core::Constants::M_TOOLS);
Core::ActionContainer *mmacrotools = Core::ActionManager::createMenu(Constants::M_TOOLS_MACRO);
QMenu *menu = mmacrotools->menu();
menu->setTitle(Tr::tr("Text Editing &Macros"));
menu->setEnabled(true);
mtools->addMenu(mmacrotools);
QAction *startMacro = new QAction(Tr::tr("Record Macro"), this); // Menus
Core::Command *command = Core::ActionManager::registerAction(startMacro, Constants::START_MACRO, textContext); Core::ActionContainer *mtools = Core::ActionManager::actionContainer(Core::Constants::M_TOOLS);
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Ctrl+[") : Tr::tr("Alt+["))); Core::ActionContainer *mmacrotools = Core::ActionManager::createMenu(Constants::M_TOOLS_MACRO);
mmacrotools->addAction(command); QMenu *menu = mmacrotools->menu();
connect(startMacro, &QAction::triggered, &d->macroManager, &MacroManager::startMacro); menu->setTitle(Tr::tr("Text Editing &Macros"));
menu->setEnabled(true);
mtools->addMenu(mmacrotools);
QAction *endMacro = new QAction(Tr::tr("Stop Recording Macro"), this); QAction *startMacro = new QAction(Tr::tr("Record Macro"), this);
endMacro->setEnabled(false); Core::Command *command = Core::ActionManager::registerAction(startMacro, Constants::START_MACRO, textContext);
command = Core::ActionManager::registerAction(endMacro, Constants::END_MACRO); command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Ctrl+[") : Tr::tr("Alt+[")));
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Ctrl+]") : Tr::tr("Alt+]"))); mmacrotools->addAction(command);
mmacrotools->addAction(command); connect(startMacro, &QAction::triggered, &d->macroManager, &MacroManager::startMacro);
connect(endMacro, &QAction::triggered, &d->macroManager, &MacroManager::endMacro);
QAction *executeLastMacro = new QAction(Tr::tr("Play Last Macro"), this); QAction *endMacro = new QAction(Tr::tr("Stop Recording Macro"), this);
command = Core::ActionManager::registerAction(executeLastMacro, Constants::EXECUTE_LAST_MACRO, textContext); endMacro->setEnabled(false);
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+R") : Tr::tr("Alt+R"))); command = Core::ActionManager::registerAction(endMacro, Constants::END_MACRO);
mmacrotools->addAction(command); command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Ctrl+]") : Tr::tr("Alt+]")));
connect(executeLastMacro, &QAction::triggered, &d->macroManager, &MacroManager::executeLastMacro); mmacrotools->addAction(command);
connect(endMacro, &QAction::triggered, &d->macroManager, &MacroManager::endMacro);
QAction *saveLastMacro = new QAction(Tr::tr("Save Last Macro"), this); QAction *executeLastMacro = new QAction(Tr::tr("Play Last Macro"), this);
saveLastMacro->setEnabled(false); command = Core::ActionManager::registerAction(executeLastMacro, Constants::EXECUTE_LAST_MACRO, textContext);
command = Core::ActionManager::registerAction(saveLastMacro, Constants::SAVE_LAST_MACRO, textContext); command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+R") : Tr::tr("Alt+R")));
mmacrotools->addAction(command); mmacrotools->addAction(command);
connect(saveLastMacro, &QAction::triggered, &d->macroManager, &MacroManager::saveLastMacro); connect(executeLastMacro, &QAction::triggered, &d->macroManager, &MacroManager::executeLastMacro);
}
} // Internal QAction *saveLastMacro = new QAction(Tr::tr("Save Last Macro"), this);
} // Macros saveLastMacro->setEnabled(false);
command = Core::ActionManager::registerAction(saveLastMacro, Constants::SAVE_LAST_MACRO, textContext);
mmacrotools->addAction(command);
connect(saveLastMacro, &QAction::triggered, &d->macroManager, &MacroManager::saveLastMacro);
}
private:
MacrosPluginPrivate *d = nullptr;
};
} // Macros::Internal
#include "macrosplugin.moc"

26
src/plugins/macros/macrosplugin.h
View File

@@ -1,26 +0,0 @@
// Copyright (C) 2016 Nicolas Arnaud-Cormos
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once
#include <extensionsystem/iplugin.h>
namespace Macros {
namespace Internal {
class MacrosPlugin final : public ExtensionSystem::IPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Macros.json")
public:
~MacrosPlugin() final;
void initialize() final;
private:
class MacrosPluginPrivate *d = nullptr;
};
} // namespace Internal
} // namespace Macros