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

Allow designeractions to target specific views

Browse Source 
This is needed for the "connect signal to event dialog" which resides in
a different plugin but needs to be opened from the connection editor.

Change-Id: I9e200791831fa46d65e5f833e14a0d893fc29432
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Knud Dollereder
2020-12-17 13:06:15 +01:00
parent b11d8aa92a
commit 7c1e210d2c
4 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/components/componentcore/actioninterface.h
View File

@@ -53,6 +53,11 @@ public:
LowestPriority = ComponentCoreConstants::priorityLast
};
enum class Target {
Undefined,
ConnectionEditor
};
virtual ~ActionInterface() = default;
virtual QAction *action() const = 0;
@@ -61,6 +66,7 @@ public:
virtual int priority() const = 0;
virtual Type type() const = 0;
virtual void currentContextChanged(const SelectionContext &selectionState) = 0;
virtual Target target() const { return Target::Undefined; }
};

10
src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
View File

@@ -1461,6 +1461,16 @@ void DesignerActionManager::addCreatorCommand(Core::Command *command, const QByt
addDesignerAction(new CommandAction(command, category, priority, overrideIcon));
}
QList<QSharedPointer<ActionInterface> > DesignerActionManager::actionsForTarget(const ActionInterface::Target &target)
{
QList<QSharedPointer<ActionInterface> > out;
for (auto interface : m_designerActions)
if (interface->target() == target)
out << interface;
return out;
}
QList<ActionInterface* > DesignerActionManager::designerActions() const
{
return Utils::transform(m_designerActions, [](const QSharedPointer<ActionInterface> &pointer) {

3
src/plugins/qmldesigner/components/componentcore/designeractionmanager.h
View File

@@ -106,6 +106,9 @@ public:
void addDesignerAction(ActionInterface *newAction);
void addCreatorCommand(Core::Command *command, const QByteArray &category, int priority,
const QIcon &overrideIcon = QIcon());
QList<QSharedPointer<ActionInterface>> actionsForTarget(const ActionInterface::Target &target);
QList<ActionInterface* > designerActions() const;
void createDefaultDesignerActions();

10
src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp
View File

@@ -172,6 +172,16 @@ void ConnectionViewWidget::contextMenuEvent(QContextMenuEvent *event)
m_connectionEditor->updateWindowName();
});
QMap<QString, QVariant> data;
data["ModelNode"] = index.siblingAtColumn(ConnectionModel::TargetModelNodeRow).data();
data["Signal"] = index.siblingAtColumn(ConnectionModel::TargetPropertyNameRow).data();
DesignerActionManager &designerActionManager = QmlDesignerPlugin::instance()->designerActionManager();
for (auto actionInterface : designerActionManager.actionsForTarget(ActionInterface::Target::ConnectionEditor)) {
auto *action = actionInterface->action();
action->setData(data);
menu.addAction(action);
}
menu.exec(event->globalPos());
}
break;