diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml index 9dec10a3..d74231fd 100644 --- a/nymea-app/ui/Nymea.qml +++ b/nymea-app/ui/Nymea.qml @@ -358,16 +358,12 @@ ApplicationWindow { return Qt.resolvedUrl("images/ev-charger.svg") case "doorbell": return Qt.resolvedUrl("images/notification.svg") - case "connectable": - return Qt.resolvedUrl("images/stock_link.svg") case "irrigation": return Qt.resolvedUrl("images/irrigation.svg") case "ventilation": return Qt.resolvedUrl("images/ventilation.svg") case "power": return Qt.resolvedUrl("images/system-shutdown.svg") - case "account": - return Qt.resolvedUrl("images/account.svg") case "smartlock": return Qt.resolvedUrl("images/smartlock.svg") case "navigationpad": @@ -383,6 +379,12 @@ ApplicationWindow { return Qt.resolvedUrl("images/qrcode.svg") case "cleaningrobot": return Qt.resolvedUrl("images/cleaning-robot.svg") + case "account": + return Qt.resolvedUrl("images/account.svg") + case "wirelessconnectable": + return Qt.resolvedUrl("images/connections/network-wifi.svg") + case "connectable": + return Qt.resolvedUrl("images/stock_link.svg") default: console.warn("InterfaceToIcon: Unhandled interface", name) } diff --git a/nymea-app/ui/StyleBase.qml b/nymea-app/ui/StyleBase.qml index 4a19abae..31c8cc4c 100644 --- a/nymea-app/ui/StyleBase.qml +++ b/nymea-app/ui/StyleBase.qml @@ -26,6 +26,7 @@ Item { readonly property int smallDelegateHeight: 50 readonly property int delegateHeight: 60 + readonly property int largeDelegateHeight: 80 readonly property int smallIconSize: 16 readonly property int iconSize: 24 diff --git a/nymea-app/ui/magic/EditRulePage.qml b/nymea-app/ui/magic/EditRulePage.qml index 544fde3d..51143101 100644 --- a/nymea-app/ui/magic/EditRulePage.qml +++ b/nymea-app/ui/magic/EditRulePage.qml @@ -752,6 +752,7 @@ Page { } delegate: NymeaSwipeDelegate { Layout.fillWidth: true + Layout.preferredHeight: Style.largeDelegateHeight iconName: model.iconName text: model.text progressive: true @@ -802,6 +803,7 @@ Page { } delegate: NymeaSwipeDelegate { Layout.fillWidth: true + Layout.preferredHeight: Style.largeDelegateHeight iconName: model.iconName text: model.text progressive: true @@ -865,6 +867,7 @@ Page { } delegate: NymeaSwipeDelegate { Layout.fillWidth: true + Layout.preferredHeight: Style.largeDelegateHeight iconName: model.iconName text: model.text progressive: true diff --git a/nymea-app/ui/magic/StateEvaluatorDelegate.qml b/nymea-app/ui/magic/StateEvaluatorDelegate.qml index 267b73cb..6c0a66e7 100644 --- a/nymea-app/ui/magic/StateEvaluatorDelegate.qml +++ b/nymea-app/ui/magic/StateEvaluatorDelegate.qml @@ -154,6 +154,7 @@ ItemDelegate { } delegate: NymeaSwipeDelegate { Layout.fillWidth: true + Layout.preferredHeight: Style.largeDelegateHeight iconName: model.iconName text: model.text progressive: true