From e12aefa33a8236f9b212ac6c865480e17f6f3cef Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 15 Sep 2020 17:52:29 +0200 Subject: [PATCH] QmlDesigner: Add menuIds to TransitionEditorActions Change-Id: I33c94e99404952c461cd548cce2e741a496de538 Reviewed-by: Knud Dollereder Reviewed-by: Thomas Hartmann --- .../components/formeditor/transitiontool.cpp | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/transitiontool.cpp b/src/plugins/qmldesigner/components/formeditor/transitiontool.cpp index e8222e8ac8a..6419cf94024 100644 --- a/src/plugins/qmldesigner/components/formeditor/transitiontool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/transitiontool.cpp @@ -73,17 +73,17 @@ static bool isTransitionTarget(const QmlItemNode &node) class TransitionToolAction : public AbstractAction { public: - TransitionToolAction(const QString &name) : AbstractAction(name) {} + TransitionToolAction(const QByteArray &menuId, const QString &name) + : AbstractAction(name) + , m_menuId(menuId) + {} QByteArray category() const override { return QByteArray(); } - QByteArray menuId() const override - { - return "TransitionTool"; - } + QByteArray menuId() const override { return m_menuId; } int priority() const override { @@ -111,12 +111,17 @@ protected: { return isVisible(selectionContext); } + +private: + QByteArray m_menuId; }; class TransitionCustomAction : public TransitionToolAction { public: - TransitionCustomAction(const QString &name) : TransitionToolAction(name) {} + TransitionCustomAction(const QByteArray &menuId, const QString &name) + : TransitionToolAction(menuId, name) + {} QByteArray category() const override { @@ -154,14 +159,15 @@ void static setToBoundingRect(QGraphicsRectItem *rect, FormEditorItem *item) TransitionTool::TransitionTool() : QObject(), AbstractCustomTool() { - - TransitionToolAction *transitionToolAction = new TransitionToolAction(tr("Add Transition")); + TransitionToolAction *transitionToolAction = new TransitionToolAction("AddTransition", + tr("Add Transition")); QmlDesignerPlugin::instance()->designerActionManager().addDesignerAction(transitionToolAction); connect(transitionToolAction->action(), &QAction::triggered, this, &TransitionTool::activateTool); - TransitionCustomAction *removeAction = new TransitionCustomAction(tr("Remove Transitions")); + TransitionCustomAction *removeAction = new TransitionCustomAction("RemoveTransition", + tr("Remove Transitions")); QmlDesignerPlugin::instance()->designerActionManager().addDesignerAction(removeAction); connect(removeAction->action(), &QAction::triggered, @@ -176,7 +182,8 @@ TransitionTool::TransitionTool() }); }); - TransitionCustomAction *removeAllTransitionsAction = new TransitionCustomAction(tr("Remove All Transitions")); + TransitionCustomAction *removeAllTransitionsAction = new TransitionCustomAction( + "RemoveAllTransitions", tr("Remove All Transitions")); QmlDesignerPlugin::instance()->designerActionManager().addDesignerAction(removeAllTransitionsAction); connect(removeAllTransitionsAction->action(), &QAction::triggered, @@ -197,7 +204,8 @@ TransitionTool::TransitionTool() }); }); - TransitionCustomAction *removeDanglingTransitionAction = new TransitionCustomAction(tr("Remove Dangling Transitions")); + TransitionCustomAction *removeDanglingTransitionAction = new TransitionCustomAction( + "RemoveDanglindTransitions", tr("Remove Dangling Transitions")); QmlDesignerPlugin::instance()->designerActionManager().addDesignerAction(removeDanglingTransitionAction); connect(removeDanglingTransitionAction->action(), &QAction::triggered,