From fa2030dfeff8c745bdd952deb44f030b23dcf3ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 19 Jul 2018 10:04:59 +0200 Subject: [PATCH] Update lit delegate --- nymea-app/ui/components/MeaListItemDelegate.qml | 4 +++- nymea-app/ui/delegates/ThingDelegate.qml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nymea-app/ui/components/MeaListItemDelegate.qml b/nymea-app/ui/components/MeaListItemDelegate.qml index 72054b05..bc116490 100644 --- a/nymea-app/ui/components/MeaListItemDelegate.qml +++ b/nymea-app/ui/components/MeaListItemDelegate.qml @@ -72,10 +72,12 @@ SwipeDelegate { } ColorIcon { + id: secondaryIcon Layout.preferredHeight: app.iconSize * .6 Layout.preferredWidth: height - name: "../images/next.svg" + name: root.secondaryIconName.length > 0 ? root.secondaryIconName : "../images/next.svg" visible: root.progressive + color: root.secondaryIconColor } } diff --git a/nymea-app/ui/delegates/ThingDelegate.qml b/nymea-app/ui/delegates/ThingDelegate.qml index c5b4d904..2d132f34 100644 --- a/nymea-app/ui/delegates/ThingDelegate.qml +++ b/nymea-app/ui/delegates/ThingDelegate.qml @@ -10,8 +10,8 @@ MeaListItemDelegate { iconName: deviceClass ? app.interfacesToIcon(deviceClass.interfaces) : "" text: device.name progressive: true - batteryCritical: deviceClass && deviceClass.interfaces.indexOf("battery") >= 0 ? device.stateValue(deviceClass.stateTypes.findByName("batteryCritical").id) === true : false - disconnected: deviceClass && deviceClass.interfaces.indexOf("connectable") >= 0 ? device.stateValue(deviceClass.stateTypes.findByName("connected").id) === false : false + property bool batteryCritical: deviceClass && deviceClass.interfaces.indexOf("battery") >= 0 ? device.stateValue(deviceClass.stateTypes.findByName("batteryCritical").id) === true : false + property bool disconnected: deviceClass && deviceClass.interfaces.indexOf("connectable") >= 0 ? device.stateValue(deviceClass.stateTypes.findByName("connected").id) === false : false property var device: null