From 8857e84add023eda785da8a393c11bab08039c84 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 8 May 2020 15:23:30 +0200 Subject: [PATCH] Improve attached properties in scripting code completion --- libnymea-app/scripting/codecompletion.cpp | 2 +- libnymea-app/scripting/completionmodel.cpp | 2 +- nymea-app/ui/magic/scripting/CompletionBox.qml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libnymea-app/scripting/codecompletion.cpp b/libnymea-app/scripting/codecompletion.cpp index a6102796..20b986cc 100644 --- a/libnymea-app/scripting/codecompletion.cpp +++ b/libnymea-app/scripting/codecompletion.cpp @@ -513,7 +513,7 @@ void CodeCompletion::update() } // Always append attached class names foreach (const QString &s, m_attachedClasses.keys()) { - entries.append(CompletionModel::Entry(s, s, "type")); + entries.append(CompletionModel::Entry(s, s, "attachedProperty")); } // Add generic qml syntax diff --git a/libnymea-app/scripting/completionmodel.cpp b/libnymea-app/scripting/completionmodel.cpp index 87ebfeb8..45d6619a 100644 --- a/libnymea-app/scripting/completionmodel.cpp +++ b/libnymea-app/scripting/completionmodel.cpp @@ -138,7 +138,7 @@ bool CompletionProxyModel::lessThan(const QModelIndex &source_left, const QModel CompletionModel::Entry left = m_model->get(source_left.row()); CompletionModel::Entry right = m_model->get(source_right.row()); - static QStringList ordering = {"property", "method", "event", "type", "keyword" }; + static QStringList ordering = {"property", "method", "event", "type", "attachedProperty", "keyword" }; int leftOrder = ordering.indexOf(left.decoration); int rightOrder = ordering.indexOf(right.decoration); diff --git a/nymea-app/ui/magic/scripting/CompletionBox.qml b/nymea-app/ui/magic/scripting/CompletionBox.qml index 91bbe1b4..92ef3972 100644 --- a/nymea-app/ui/magic/scripting/CompletionBox.qml +++ b/nymea-app/ui/magic/scripting/CompletionBox.qml @@ -142,6 +142,8 @@ Rectangle { return "yellow"; case "property": return "#ff5555"; + case "attachedProperty": + return "orange" case "method": return "blue"; case "event":