From fd541e68dcdae4d8a17e08c19f9907e47f899b2a Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 10 Jul 2018 14:02:04 +0200 Subject: [PATCH] some fixes for issues reported by QA testing --- nymea-app/resources.qrc | 10 +++++----- nymea-app/ui/Nymea.qml | 4 ++-- nymea-app/ui/components/ColorIcon.qml | 2 ++ nymea-app/ui/delegates/ParamDescriptorDelegate.qml | 2 ++ nymea-app/ui/devicepages/ColorLightDevicePage.qml | 4 ++-- .../images/{mail-mark-important.svg => attention.svg} | 0 nymea-app/ui/images/{torch-off.svg => light-off.svg} | 0 nymea-app/ui/images/{torch-on.svg => light-on.svg} | 0 nymea-app/ui/magic/EditRulePage.qml | 3 +-- nymea-app/ui/mainviews/ScenesView.qml | 7 +++++++ 10 files changed, 21 insertions(+), 11 deletions(-) rename nymea-app/ui/images/{mail-mark-important.svg => attention.svg} (100%) rename nymea-app/ui/images/{torch-off.svg => light-off.svg} (100%) rename nymea-app/ui/images/{torch-on.svg => light-on.svg} (100%) diff --git a/nymea-app/resources.qrc b/nymea-app/resources.qrc index 44e94d12..7cca24d7 100644 --- a/nymea-app/resources.qrc +++ b/nymea-app/resources.qrc @@ -24,7 +24,8 @@ ui/devicelistpages/LightsDeviceListPage.qml ui/customviews/ExtendedVolumeController.qml ui/components/ColorIcon.qml - ui/images/torch-on.svg + ui/images/light-on.svg + ui/images/light-off.svg ui/images/media-preview-start.svg ui/MagicPage.qml ui/images/mediaplayer-app-symbolic.svg @@ -36,8 +37,8 @@ ui/images/audio-speakers-muted-symbolic.svg ui/images/audio-speakers-symbolic.svg ui/images/media-playback-pause.svg - ui/images/media-playback-start.svg - ui/images/media-playback-stop.svg + ui/images/media-playback-start.svg + ui/images/media-playback-stop.svg ui/images/media-seek-backward.svg ui/images/media-seek-forward.svg ui/images/media-skip-backward.svg @@ -59,7 +60,6 @@ ui/images/weathericons/wind.svg ui/devicepages/WeatherDevicePage.qml ui/devicepages/ColorLightDevicePage.qml - ui/images/torch-off.svg ui/components/ThrottledSlider.qml ui/components/ColorPickerCt.qml ui/images/navigation-menu.svg @@ -130,7 +130,7 @@ ui/PushButtonAuthPage.qml ui/images/dialog-error-symbolic.svg ui/images/send.svg - ui/images/mail-mark-important.svg + ui/images/attention.svg ui/devicepages/InputTriggerDevicePage.qml ui/images/clock-app-symbolic.svg ui/devicepages/StateLogPage.qml diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml index 5c0b2c46..d7a0e680 100644 --- a/nymea-app/ui/Nymea.qml +++ b/nymea-app/ui/Nymea.qml @@ -185,7 +185,7 @@ ApplicationWindow { case "light": case "colorlight": case "dimmablelight": - return Qt.resolvedUrl("images/torch-on.svg") + return Qt.resolvedUrl("images/light-on.svg") case "sensor": case "temperaturesensor": case "humiditysensor": @@ -211,7 +211,7 @@ ApplicationWindow { case "connectable": return Qt.resolvedUrl("images/stock_link.svg") case "inputtrigger": - return Qt.resolvedUrl("images/mail-mark-important.svg") + return Qt.resolvedUrl("images/attention.svg") case "outputtrigger": return Qt.resolvedUrl("images/send.svg") case "shutter": diff --git a/nymea-app/ui/components/ColorIcon.qml b/nymea-app/ui/components/ColorIcon.qml index 0624a1e3..16e61690 100644 --- a/nymea-app/ui/components/ColorIcon.qml +++ b/nymea-app/ui/components/ColorIcon.qml @@ -76,6 +76,8 @@ Item { property int margins: 0 + property alias status: image.status + Image { id: image diff --git a/nymea-app/ui/delegates/ParamDescriptorDelegate.qml b/nymea-app/ui/delegates/ParamDescriptorDelegate.qml index 68a1286e..481b0307 100644 --- a/nymea-app/ui/delegates/ParamDescriptorDelegate.qml +++ b/nymea-app/ui/delegates/ParamDescriptorDelegate.qml @@ -24,6 +24,7 @@ ItemDelegate { case "bool": case "string": case "qstring": + case "color": return [qsTr("is"), qsTr("is not")]; case "int": case "double": @@ -73,6 +74,7 @@ ItemDelegate { return textFieldComponent; case "string": case "qstring": + case "color": if (paramType.allowedValues.length > 0) { return comboBoxComponent } diff --git a/nymea-app/ui/devicepages/ColorLightDevicePage.qml b/nymea-app/ui/devicepages/ColorLightDevicePage.qml index eccb95c0..41317395 100644 --- a/nymea-app/ui/devicepages/ColorLightDevicePage.qml +++ b/nymea-app/ui/devicepages/ColorLightDevicePage.qml @@ -28,7 +28,7 @@ DevicePageBase { height: width ColorIcon { anchors.fill: parent - name: "../images/torch-off.svg" + name: "../images/light-off.svg" color: powerRow.powerState.value === true ? keyColor : app.guhAccent } onClicked: { @@ -62,7 +62,7 @@ DevicePageBase { height: width ColorIcon { anchors.fill: parent - name: "../images/torch-on.svg" + name: "../images/light-on.svg" color: powerRow.powerState.value === true ? app.guhAccent : keyColor } onClicked: { diff --git a/nymea-app/ui/images/mail-mark-important.svg b/nymea-app/ui/images/attention.svg similarity index 100% rename from nymea-app/ui/images/mail-mark-important.svg rename to nymea-app/ui/images/attention.svg diff --git a/nymea-app/ui/images/torch-off.svg b/nymea-app/ui/images/light-off.svg similarity index 100% rename from nymea-app/ui/images/torch-off.svg rename to nymea-app/ui/images/light-off.svg diff --git a/nymea-app/ui/images/torch-on.svg b/nymea-app/ui/images/light-on.svg similarity index 100% rename from nymea-app/ui/images/torch-on.svg rename to nymea-app/ui/images/light-on.svg diff --git a/nymea-app/ui/magic/EditRulePage.qml b/nymea-app/ui/magic/EditRulePage.qml index b9a51ebb..76f7e0ea 100644 --- a/nymea-app/ui/magic/EditRulePage.qml +++ b/nymea-app/ui/magic/EditRulePage.qml @@ -335,8 +335,7 @@ Page { } } Repeater { - model: ["light-on", "light-off", "alarm-clock", "media-play", "media-stop", "lock", "unlock", "notification", "sensors", "garage", "home", "warning", "eye"] - + model: ["light-on", "light-off", "alarm-clock", "media-play", "network-secure", "notification", "sensors", "shutter-10", "attention", "eye"] delegate: Item { Layout.fillWidth: true Layout.preferredHeight: app.iconSize + app.margins diff --git a/nymea-app/ui/mainviews/ScenesView.qml b/nymea-app/ui/mainviews/ScenesView.qml index 62714156..2011dea0 100644 --- a/nymea-app/ui/mainviews/ScenesView.qml +++ b/nymea-app/ui/mainviews/ScenesView.qml @@ -63,6 +63,13 @@ Item { Layout.alignment: Qt.AlignHCenter name: scenesDelegate.iconTag ? "../images/" + scenesDelegate.iconTag.value + ".svg" : "../images/slideshow.svg"; color: scenesDelegate.colorTag ? scenesDelegate.colorTag.value : app.guhAccent; + + ColorIcon { + anchors.fill: parent + name: "../images/slideshow.svg" + color: app.guhAccent + visible: parent.status === Image.Error + } } Label {