From 30b1ee6580c578c0d1b81383b18060fc391c113f Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sat, 26 May 2018 21:14:10 +0200 Subject: [PATCH 1/2] fix input trigger view --- mea/ui/devicepages/InputTriggerDevicePage.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mea/ui/devicepages/InputTriggerDevicePage.qml b/mea/ui/devicepages/InputTriggerDevicePage.qml index 08c38248..2fb038e9 100644 --- a/mea/ui/devicepages/InputTriggerDevicePage.qml +++ b/mea/ui/devicepages/InputTriggerDevicePage.qml @@ -8,11 +8,12 @@ import "../customviews" GenericDevicePage { id: root - GenericTypeLogView { anchors.fill: parent text: qsTr("This event has appeared %1 times in the last 24 hours.") + device: root.device + onAddRuleClicked: { var rule = Engine.ruleManager.createNewRule(); var eventDescriptor = rule.eventDescriptors.createNewEventDescriptor(); From 2f05d6e8928430bdf1067a3d6ca90d2ea18c5156 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 28 May 2018 10:33:19 +0200 Subject: [PATCH 2/2] fix broken import after last refactoring --- mea/ui/magic/SelectStateDescriptorParamsPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mea/ui/magic/SelectStateDescriptorParamsPage.qml b/mea/ui/magic/SelectStateDescriptorParamsPage.qml index c1e29bfa..c85c7924 100644 --- a/mea/ui/magic/SelectStateDescriptorParamsPage.qml +++ b/mea/ui/magic/SelectStateDescriptorParamsPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" -import "../paramdescriptordelegates" +import "../delegates" import Mea 1.0 Page {