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

QmlDesigner: Fix Connections status in ContextMenu

Browse Source 
Task-number: QDS-8521
Change-Id: Id0b835fb14b18563d4ecc0c1b2039b9bb181c32c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Aleksei German
2022-12-06 14:42:29 +01:00
parent 6dfe325083
commit e9e67d897b
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@
#include <QImageReader> #include <QImageReader>
#include <QMessageBox> #include <QMessageBox>
#include <QMimeData> #include <QMimeData>
#include <QScopeGuard>
#include <exception> #include <exception>
@@ -610,31 +611,29 @@ public:
{ {
menu()->clear(); menu()->clear();
menu()->setEnabled(true);
const auto selection = selectionContext(); const auto selection = selectionContext();
bool showMenu = false;
auto cleanup = qScopeGuard([&]{ menu()->setEnabled(showMenu); });
if (!selection.isValid()) if (!selection.isValid())
return; return;
if (!selection.singleNodeIsSelected()) if (!selection.singleNodeIsSelected())
return; return;
if (!action()->isEnabled())
return;
ModelNode currentNode = selection.currentSingleSelectedNode(); ModelNode currentNode = selection.currentSingleSelectedNode();
if (!currentNode.isValid()) if (!currentNode.isValid())
return; return;
if (!currentNode.hasId())
return;
showMenu = true;
QmlObjectNode currentObjectNode(currentNode); QmlObjectNode currentObjectNode(currentNode);
QStringList signalsList = getSignalsList(currentNode); QStringList signalsList = getSignalsList(currentNode);
QList<SlotList> slotsLists = getSlotsLists(currentNode); QList<SlotList> slotsLists = getSlotsLists(currentNode);
if (!currentNode.hasId()) {
menu()->setEnabled(false);
return;
}
for (const ModelNode &connectionNode : currentObjectNode.getAllConnections()) { for (const ModelNode &connectionNode : currentObjectNode.getAllConnections()) {
for (const AbstractProperty &property : connectionNode.properties()) { for (const AbstractProperty &property : connectionNode.properties()) {
if (property.isSignalHandlerProperty() && property.name() != "target") { if (property.isSignalHandlerProperty() && property.name() != "target") {