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

Merge PR #217: Support the upcoming powerswitch interface

Browse Source
This commit is contained in:
Jenkins 2019-07-05 01:25:33 +02:00
commit d8ffaff23d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-common/types/deviceclass.cpp
View File

@ -145,7 +145,7 @@ QString DeviceClass::baseInterface() const
if (m_interfaces.contains("media")) { if (m_interfaces.contains("media")) {
return "media"; return "media";
} }
if (m_interfaces.contains("button")) { if (m_interfaces.contains("button") || m_interfaces.contains("powerswitch")) {
return "button"; return "button";
} }
if (m_interfaces.contains("notifications")) { if (m_interfaces.contains("notifications")) {

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

@ -81,6 +81,7 @@ ApplicationWindow {
case "media": case "media":
return qsTr("Media") return qsTr("Media")
case "button": case "button":
case "powerswitch":
return qsTr("Switches") return qsTr("Switches")
case "gateway": case "gateway":
return qsTr("Gateways") return qsTr("Gateways")
@ -182,6 +183,7 @@ ApplicationWindow {
case "longpressbutton": case "longpressbutton":
case "simplemultibutton": case "simplemultibutton":
case "longpressmultibutton": case "longpressmultibutton":
case "powerswitch":
return Qt.resolvedUrl("images/system-shutdown.svg") return Qt.resolvedUrl("images/system-shutdown.svg")
case "weather": case "weather":
return Qt.resolvedUrl("images/weather-app-symbolic.svg") return Qt.resolvedUrl("images/weather-app-symbolic.svg")
@ -298,6 +300,8 @@ ApplicationWindow {
page = "MediaDevicePage.qml"; page = "MediaDevicePage.qml";
} else if (interfaceList.indexOf("button") >= 0) { } else if (interfaceList.indexOf("button") >= 0) {
page = "ButtonDevicePage.qml"; page = "ButtonDevicePage.qml";
} else if (interfaceList.indexOf("powerswitch") >= 0) {
page = "ButtonDevicePage.qml";
} else if (interfaceList.indexOf("weather") >= 0) { } else if (interfaceList.indexOf("weather") >= 0) {
page = "WeatherDevicePage.qml"; page = "WeatherDevicePage.qml";
} else if (interfaceList.indexOf("heating") >= 0 || interfaceList.indexOf("thermostat") >= 0) { } else if (interfaceList.indexOf("heating") >= 0 || interfaceList.indexOf("thermostat") >= 0) {