more work on ruleactionparams and rules in general

libnymea-common/types/rules.cpp

@@ -1,6 +1,8 @@
 #include "rules.h"
 #include "rule.h"
 
+#include <QDebug>
+
 Rules::Rules(QObject *parent) : QAbstractListModel(parent)
 {
 
@@ -51,6 +53,9 @@ void Rules::insert(Rule *rule)
     rule->setParent(this);
     beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
     m_list.append(rule);
+    connect(rule, &Rule::enabledChanged, this, &Rules::ruleChanged);
+    connect(rule, &Rule::activeChanged, this, &Rules::ruleChanged);
+    connect(rule, &Rule::nameChanged, this, &Rules::ruleChanged);
     endInsertRows();
     emit countChanged();
 }
@@ -85,3 +90,18 @@ Rule *Rules::getRule(const QUuid &ruleId) const
     }
     return nullptr;
 }
+
+void Rules::ruleChanged()
+{
+    Rule *rule = dynamic_cast<Rule*>(sender());
+    if (!rule) {
+        return;
+    }
+    int idx = m_list.indexOf(rule);
+    if (idx < 0) {
+        qDebug() << "Rule not found in list. Discarding changed event.";
+        return;
+    }
+    QModelIndex modelIndex = index(idx);
+    emit dataChanged(modelIndex, modelIndex, {RoleActive, RoleEnabled, RoleName});
+}

libnymea-common/types/rules.h

@@ -33,6 +33,9 @@ public:
 signals:
     void countChanged();
 
+private slots:
+    void ruleChanged();
+
 private:
     QList<Rule*> m_list;
 };

mea/rulemanager.cpp

@@ -112,6 +112,7 @@ void RuleManager::getRulesReply(const QVariantMap &params)
         qWarning() << "Error getting rules:" << params.value("error").toString();
         return;
     }
+    qDebug() << "Get Rules reply" << params;
     foreach (const QVariant &ruleDescriptionVariant, params.value("params").toMap().value("ruleDescriptions").toList()) {
         QUuid ruleId = ruleDescriptionVariant.toMap().value("id").toUuid();
         QString name = ruleDescriptionVariant.toMap().value("name").toString();

mea/ui/MagicPage.qml

@@ -56,7 +56,7 @@ Page {
                     height: app.iconSize
                     width: height
                     name: "../images/magic.svg"
-                    color: !model.enabled ? "gray" : (model.active ? "red" : app.guhAccent)
+                    color: !model.enabled ? "red" : (model.active ? app.guhAccent : "grey")
                 }
 
                 Label {

mea/ui/magic/SelectRuleActionParamsPage.qml

@@ -26,8 +26,14 @@ Page {
         onBackPressed: root.backPressed();
     }
 
-    ColumnLayout {
+    Flickable {
         anchors.fill: parent
+        contentHeight: contentCol.height
+
+        ColumnLayout {
+            id: contentCol
+            width: parent.width
+
             Repeater {
                 id: delegateRepeater
                 model: root.actionType.paramTypes
@@ -92,6 +98,8 @@ Page {
                             text: eventDescriptorParamsFilterModel.device.name + " - " + eventDescriptorParamsFilterModel.eventType.displayName + " - " + eventDescriptorParamsFilterModel.paramDescriptor.displayName
                         }
                     }
+
+                    ThinDivider {}
                 }
             }
             Item {
@@ -117,4 +125,6 @@ Page {
                 }
             }
         }
+    }
+
 }

mea/ui/main.qml

@@ -142,7 +142,7 @@ ApplicationWindow {
             return Qt.resolvedUrl("images/mediaplayer-app-symbolic.svg")
         case "button":
         case "longpressbutton":
-        case "multibutton":
+        case "simplemultibutton":
         case "longpressmultibutton":
             return Qt.resolvedUrl("images/system-shutdown.svg")
         case "weather":

mea/ui/paramdescriptordelegates/ParamDescriptorDelegateBase.qml

@@ -61,7 +61,7 @@ ItemDelegate {
                 Layout.fillWidth: true
 
                 sourceComponent: {
-                    print("Datatye is:", paramType.type, paramType.minValue, paramType.maxValue)
+                    print("Datatye is:", paramType.type, paramType.minValue, paramType.maxValue, paramType.allowedValues)
                     switch (paramType.type.toLowerCase()) {
                     case "bool":
                         return boolComponent;
@@ -158,8 +158,7 @@ ItemDelegate {
         id: comboBoxComponent
         ComboBox {
             model: paramType.allowedValues
-            currentIndex: root.paramType.value
+            onCurrentIndexChanged: {
-            onActivated: {
                 root.value = paramType.allowedValues[index]
             }
         }