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

Merge PR #795: Small ventilation interfaces fixes

Browse Source
This commit is contained in:
Jenkins nymea 2022-03-25 21:00:08 +01:00
commit cf391fea5c
4 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libnymea-app/types/interfaces.cpp
View File

@ -292,6 +292,7 @@ Interfaces::Interfaces(QObject *parent) : QAbstractListModel(parent)
addStateType("thermostat", "targetTemperature", QVariant::Double, true, tr("Target temperature"), tr("Target temperature changed"), tr("Set target temperature")); addStateType("thermostat", "targetTemperature", QVariant::Double, true, tr("Target temperature"), tr("Target temperature changed"), tr("Set target temperature"));
addInterface("ventilation", tr("Ventilation"), {"power"}); addInterface("ventilation", tr("Ventilation"), {"power"});
addStateType("ventilation", "flowRate", QVariant::Int, true, tr("Air flow rate"), tr("Air flow rate changed"), tr("Set air flow rate"));
addInterface("volumecontroller", tr("Speakers")); addInterface("volumecontroller", tr("Speakers"));
addStateType("volumecontroller", "mute", QVariant::Bool, true, tr("Mute"), tr("Muted"), tr("Mute")); addStateType("volumecontroller", "mute", QVariant::Bool, true, tr("Mute"), tr("Muted"), tr("Mute"));

2
nymea-app/resources.qrc
View File

@ -192,7 +192,7 @@
<file>ui/components/SettingsPageSectionHeader.qml</file> <file>ui/components/SettingsPageSectionHeader.qml</file>
<file>ui/grouping/GroupInterfacesPage.qml</file> <file>ui/grouping/GroupInterfacesPage.qml</file>
<file>ui/connection/CertificateErrorDialog.qml</file> <file>ui/connection/CertificateErrorDialog.qml</file>
<file>ui/devicepages/VentilationDevicePage.qml</file> <file>ui/devicepages/VentilationThingPage.qml</file>
<file>ui/thingconfiguration/ThingClassDetailsPage.qml</file> <file>ui/thingconfiguration/ThingClassDetailsPage.qml</file>
<file>ui/components/ClosablesControlLarge.qml</file> <file>ui/components/ClosablesControlLarge.qml</file>
<file>ui/devicepages/BarcodeScannerThingPage.qml</file> <file>ui/devicepages/BarcodeScannerThingPage.qml</file>

0
nymea-app/ui/devicepages/VentilationDevicePage.qml → nymea-app/ui/devicepages/VentilationThingPage.qml
View File

2
nymea-app/ui/utils/NymeaUtils.qml
View File

@ -62,7 +62,7 @@ Item {
} else if (interfaceList.indexOf("irrigation") >= 0) { } else if (interfaceList.indexOf("irrigation") >= 0) {
page = "IrrigationDevicePage.qml"; page = "IrrigationDevicePage.qml";
} else if (interfaceList.indexOf("ventilation") >= 0) { } else if (interfaceList.indexOf("ventilation") >= 0) {
page = "VentilationDevicePage.qml"; page = "VentilationThingPage.qml";
} else if (interfaceList.indexOf("barcodescanner") >= 0) { } else if (interfaceList.indexOf("barcodescanner") >= 0) {
page = "BarcodeScannerThingPage.qml"; page = "BarcodeScannerThingPage.qml";
} else if (interfaceList.indexOf("cleaningrobot") >= 0) { } else if (interfaceList.indexOf("cleaningrobot") >= 0) {