ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix default scene icons

Browse Source
This commit is contained in:
Michael Zanetti 2021-02-25 23:13:14 +01:00
parent bef59fbdd7
commit 26bd9facd7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nymea-app/ui/MagicPage.qml
View File

@ -140,8 +140,8 @@ Page {
delegate: NymeaSwipeDelegate { delegate: NymeaSwipeDelegate {
id: ruleDelegate id: ruleDelegate
width: parent.width width: parent.width
iconName: "../images/" + (model.executable ? (iconTag.value.length > 0 ? iconTag.value : "slideshow") : "magic") + ".svg" iconName: "../images/" + (model.executable ? (iconTag && iconTag.value.length > 0 ? iconTag.value : "slideshow") : "magic") + ".svg"
iconColor: model.executable ? (colorTag.value.length > 0 ? colorTag.value : Style.accentColor) : !model.enabled ? "red" : (model.active ? Style.accentColor : "grey") iconColor: model.executable ? (colorTag && colorTag.value.length > 0 ? colorTag.value : Style.accentColor) : !model.enabled ? "red" : (model.active ? Style.accentColor : "grey")
text: model.name text: model.name
canDelete: true canDelete: true

2
nymea-app/ui/mainviews/ScenesView.qml
View File

@ -58,7 +58,7 @@ MainViewBase {
height: interfacesGridView.cellHeight height: interfacesGridView.cellHeight
iconName: iconTag ? "../images/" + iconTag.value + ".svg" : "../images/slideshow.svg"; iconName: iconTag ? "../images/" + iconTag.value + ".svg" : "../images/slideshow.svg";
fallbackIconName: "../images/slideshow.svg" fallbackIconName: "../images/slideshow.svg"
iconColor: colorTag.value.length > 0 ? colorTag.value : Style.accentColor; iconColor: colorTag && colorTag.value.length > 0 ? colorTag.value : Style.accentColor;
text: model.name.toUpperCase() text: model.name.toUpperCase()
property var colorTag: engine.tagsManager.tags.findRuleTag(model.id, "color") property var colorTag: engine.tagsManager.tags.findRuleTag(model.id, "color")