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

Merge PR #140: Small fixes in the main page delegates (inline controls)

Browse Source
This commit is contained in:
Jenkins 2019-02-05 23:11:54 +01:00
commit e7f36c55e7
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nymea-app/ui/mainviews/DevicesPageDelegate.qml
View File

@ -194,6 +194,7 @@ MainPageTile {
default: default:
console.warn("DevicesPageDelegate, inlineButtonControl image: Unhandled interface", model.name) console.warn("DevicesPageDelegate, inlineButtonControl image: Unhandled interface", model.name)
} }
return ""
} }
} }
@ -216,7 +217,7 @@ MainPageTile {
var actionType = deviceClass.actionTypes.findByName("open"); var actionType = deviceClass.actionTypes.findByName("open");
engine.deviceManager.executeAction(device.id, actionType.id) engine.deviceManager.executeAction(device.id, actionType.id)
} }
break;
default: default:
console.warn("DevicesPageDelegate, inlineButtonControl clicked: Unhandled interface", model.name) console.warn("DevicesPageDelegate, inlineButtonControl clicked: Unhandled interface", model.name)
} }
@ -248,6 +249,7 @@ MainPageTile {
default: default:
console.warn("DevicesPageDelegate, inlineButtonControl image: Unhandled interface", model.name) console.warn("DevicesPageDelegate, inlineButtonControl image: Unhandled interface", model.name)
} }
return "";
} }
} }
@ -433,6 +435,8 @@ MainPageTile {
ListElement { ifaceName: "smartmeterconsumer"; stateName: "totalEnergyConsumed" } ListElement { ifaceName: "smartmeterconsumer"; stateName: "totalEnergyConsumed" }
ListElement { ifaceName: "smartmeterproducer"; stateName: "totalEnergyProduced" } ListElement { ifaceName: "smartmeterproducer"; stateName: "totalEnergyProduced" }
ListElement { ifaceName: "thermostat"; stateName: "targetTemperature" } ListElement { ifaceName: "thermostat"; stateName: "targetTemperature" }
ListElement { ifaceName: "heating"; stateName: "power" }
ListElement { ifaceName: "extendedHeating"; stateName: "percentage" }
} }
function findSensors(deviceClass) { function findSensors(deviceClass) {
var ret = [] var ret = []
@ -444,7 +448,9 @@ MainPageTile {
return ret; return ret;
} }
property StateType shownStateType: deviceClass.stateTypes.findByName(shownSensors[currentSensor].stateName) property StateType shownStateType: shownSensors.length > currentSensor && currentSensor >= 0
? deviceClass.stateTypes.findByName(shownSensors[currentSensor].stateName)
: null
function nextSensor() { function nextSensor() {
var newSensorIndex = sensorsRoot.currentSensor + 1; var newSensorIndex = sensorsRoot.currentSensor + 1;
@ -481,8 +487,8 @@ MainPageTile {
ColorIcon { ColorIcon {
Layout.preferredHeight: app.iconSize Layout.preferredHeight: app.iconSize
Layout.preferredWidth: app.iconSize Layout.preferredWidth: app.iconSize
name: app.interfaceToIcon(sensorsRoot.shownSensors[sensorsRoot.currentSensor].ifaceName) name: sensorsRoot.currentSensor >= 0 && sensorsRoot.shownSensors.length > sensorsRoot.currentSensor ? app.interfaceToIcon(sensorsRoot.shownSensors[sensorsRoot.currentSensor].ifaceName) : ""
color: app.interfaceToColor(sensorsRoot.shownSensors[sensorsRoot.currentSensor].ifaceName) color: sensorsRoot.currentSensor >= 0 && sensorsRoot.shownSensors.length > sensorsRoot.currentSensor ? app.interfaceToColor(sensorsRoot.shownSensors[sensorsRoot.currentSensor].ifaceName) : keyColor
} }
ColumnLayout { ColumnLayout {
@ -499,14 +505,14 @@ MainPageTile {
: "" : ""
// font.pixelSize: app.smallFont // font.pixelSize: app.smallFont
Layout.fillWidth: true Layout.fillWidth: true
visible: sensorsRoot.shownStateType.type.toLowerCase() !== "bool" visible: sensorsRoot.shownStateType && sensorsRoot.shownStateType.type.toLowerCase() !== "bool"
elide: Text.ElideRight elide: Text.ElideRight
} }
Led { Led {
Layout.preferredHeight: app.iconSize * .5 Layout.preferredHeight: app.iconSize * .5
Layout.preferredWidth: height Layout.preferredWidth: height
on: sensorsRoot.device.stateValue(sensorsRoot.shownStateType.id) === true on: sensorsRoot.shownStateType && sensorsRoot.device.stateValue(sensorsRoot.shownStateType.id) === true
visible: sensorsRoot.shownStateType.type.toLowerCase() === "bool" visible: sensorsRoot.shownStateType && sensorsRoot.shownStateType.type.toLowerCase() === "bool"
} }
} }
} }