diff --git a/components/widgets/DcInputWidget.qml b/components/widgets/DcInputWidget.qml index 7c9de144c..10d8cba1a 100644 --- a/components/widgets/DcInputWidget.qml +++ b/components/widgets/DcInputWidget.qml @@ -36,7 +36,6 @@ OverviewWidget { onClicked: { if (root.inputs.count === 1) { Global.pageManager.pushPage(root.detailUrl, { - "title": root.inputs.firstObject.name, "bindPrefix": root.inputs.firstObject.serviceUid }) } else { @@ -83,7 +82,6 @@ OverviewWidget { onClicked: { Global.pageManager.pushPage(root.detailUrl, { - "title": model.device.name, "bindPrefix": model.device.serviceUid }) } diff --git a/components/widgets/DcLoadsWidget.qml b/components/widgets/DcLoadsWidget.qml index 460940a05..805d7413f 100644 --- a/components/widgets/DcLoadsWidget.qml +++ b/components/widgets/DcLoadsWidget.qml @@ -13,10 +13,10 @@ OverviewWidget { function _showSettingsPage(device) { if (BackendConnection.serviceTypeFromUid(device.serviceUid) === "dcdc") { Global.pageManager.pushPage("/pages/settings/devicelist/dc-in/PageDcDcConverter.qml", - { "title": device.name, "bindPrefix": device.serviceUid }) + { "bindPrefix": device.serviceUid }) } else { Global.pageManager.pushPage("/pages/settings/devicelist/dc-in/PageDcMeter.qml", - { "title": device.name, "bindPrefix": device.serviceUid }) + { "bindPrefix": device.serviceUid }) } } diff --git a/components/widgets/InverterChargerWidget.qml b/components/widgets/InverterChargerWidget.qml index b0cc1d77d..c665848ad 100644 --- a/components/widgets/InverterChargerWidget.qml +++ b/components/widgets/InverterChargerWidget.qml @@ -20,12 +20,12 @@ OverviewWidget { if (Global.inverterChargers.chargerDevices.count) { const charger = Global.inverterChargers.chargerDevices.firstObject Global.pageManager.pushPage("/pages/settings/devicelist/PageAcCharger.qml", - { "bindPrefix": charger.serviceUid, "title": charger.name }) + { "bindPrefix": charger.serviceUid }) } else { // Show page for inverter, vebus and acsystem services const device = Global.inverterChargers.firstObject Global.pageManager.pushPage("/pages/invertercharger/OverviewInverterChargerPage.qml", - { "serviceUid": device.serviceUid, "title": device.name }) + { "serviceUid": device.serviceUid }) } } } diff --git a/pages/battery/BatteryListPage.qml b/pages/battery/BatteryListPage.qml index 2053ca2d9..68dfac273 100644 --- a/pages/battery/BatteryListPage.qml +++ b/pages/battery/BatteryListPage.qml @@ -139,7 +139,6 @@ Page { }) } else if (batteryDelegate.serviceType === "genset") { Global.pageManager.pushPage("/pages/settings/devicelist/ac-in/PageAcIn.qml", { - "title": genericDevice.customName, "bindPrefix": batteryDelegate.device.serviceUid }) } else { @@ -149,11 +148,6 @@ Page { } } } - - Device { - id: genericDevice - serviceUid: batteryDelegate.device.instance >= 0 ? batteryDelegate.device.serviceUid : "" - } } } diff --git a/pages/invertercharger/InverterChargerListPage.qml b/pages/invertercharger/InverterChargerListPage.qml index 6a14fd2a2..b7b2d2a8c 100644 --- a/pages/invertercharger/InverterChargerListPage.qml +++ b/pages/invertercharger/InverterChargerListPage.qml @@ -30,11 +30,11 @@ Page { // Show page for chargers if (model.device.serviceUid.indexOf('charger') >= 0) { Global.pageManager.pushPage("/pages/settings/devicelist/PageAcCharger.qml", - { "bindPrefix": model.device.serviceUid, "title": model.device.name }) + { "bindPrefix": model.device.serviceUid }) } else { // Show page for inverter, vebus and acsystem services Global.pageManager.pushPage("/pages/invertercharger/OverviewInverterChargerPage.qml", - { "serviceUid": model.device.serviceUid, "title": model.device.name }) + { "serviceUid": model.device.serviceUid }) } } diff --git a/pages/invertercharger/OverviewInverterChargerPage.qml b/pages/invertercharger/OverviewInverterChargerPage.qml index 5e3c17297..d5ed6731a 100644 --- a/pages/invertercharger/OverviewInverterChargerPage.qml +++ b/pages/invertercharger/OverviewInverterChargerPage.qml @@ -13,6 +13,13 @@ Page { property string serviceUid readonly property string serviceType: BackendConnection.serviceTypeFromUid(serviceUid) + title: device.name + + Device { + id: device + serviceUid: root.serviceUid + } + VeQuickItem { id: dcCurrent diff --git a/pages/settings/devicelist/PageAcCharger.qml b/pages/settings/devicelist/PageAcCharger.qml index c58401b97..2f38c4d81 100644 --- a/pages/settings/devicelist/PageAcCharger.qml +++ b/pages/settings/devicelist/PageAcCharger.qml @@ -11,6 +11,13 @@ Page { property string bindPrefix + title: device.name + + Device { + id: device + serviceUid: root.bindPrefix + } + GradientListView { model: ObjectModel { ListSwitch { diff --git a/pages/settings/devicelist/PageGenset.qml b/pages/settings/devicelist/PageGenset.qml index 4f326e3ac..e4b8993eb 100644 --- a/pages/settings/devicelist/PageGenset.qml +++ b/pages/settings/devicelist/PageGenset.qml @@ -19,6 +19,13 @@ Page { } } + title: device.name + + Device { + id: device + serviceUid: root.bindPrefix + } + VeQuickItem { id: productIdDataItem diff --git a/pages/settings/devicelist/PageMeteo.qml b/pages/settings/devicelist/PageMeteo.qml index 719a8eb4e..d1e5f2fa4 100644 --- a/pages/settings/devicelist/PageMeteo.qml +++ b/pages/settings/devicelist/PageMeteo.qml @@ -12,6 +12,13 @@ Page { property string bindPrefix readonly property string settingsPrefix: Global.systemSettings.serviceUid + "/Settings/Service/meteo/" + deviceInstance.value + title: device.name + + Device { + id: device + serviceUid: root.bindPrefix + } + VeQuickItem { id: deviceInstance uid: bindPrefix + "/DeviceInstance" diff --git a/pages/settings/devicelist/PageMotorDrive.qml b/pages/settings/devicelist/PageMotorDrive.qml index 9a0b0ecaf..98473832c 100644 --- a/pages/settings/devicelist/PageMotorDrive.qml +++ b/pages/settings/devicelist/PageMotorDrive.qml @@ -11,6 +11,13 @@ Page { property string bindPrefix + title: device.name + + Device { + id: device + serviceUid: root.bindPrefix + } + GradientListView { model: ObjectModel { ListQuantity { diff --git a/pages/settings/devicelist/ac-in/PageAcInModel.qml b/pages/settings/devicelist/ac-in/PageAcInModel.qml index 3b7e0cce5..62bc126b6 100644 --- a/pages/settings/devicelist/ac-in/PageAcInModel.qml +++ b/pages/settings/devicelist/ac-in/PageAcInModel.qml @@ -145,7 +145,7 @@ ObjectModel { ListNavigation { text: CommonWords.device_info_title onClicked: { - Global.pageManager.pushPage(deviceInfoComponent, { "title": text }) + Global.pageManager.pushPage(deviceInfoComponent) } Component { diff --git a/pages/settings/devicelist/dc-in/PageAlternator.qml b/pages/settings/devicelist/dc-in/PageAlternator.qml index f62c5b293..bb56b1877 100644 --- a/pages/settings/devicelist/dc-in/PageAlternator.qml +++ b/pages/settings/devicelist/dc-in/PageAlternator.qml @@ -11,6 +11,13 @@ Page { property string bindPrefix + title: device.name + + Device { + id: device + serviceUid: root.bindPrefix + } + VeQuickItem { id: productIdDataItem diff --git a/pages/settings/devicelist/dc-in/PageDcDcConverter.qml b/pages/settings/devicelist/dc-in/PageDcDcConverter.qml index d77a0d519..175d10134 100644 --- a/pages/settings/devicelist/dc-in/PageDcDcConverter.qml +++ b/pages/settings/devicelist/dc-in/PageDcDcConverter.qml @@ -11,6 +11,13 @@ Page { property string bindPrefix + title: device.name + + Device { + id: device + serviceUid: root.bindPrefix + } + GradientListView { model: ObjectModel { ListSwitch { diff --git a/pages/settings/devicelist/dc-in/PageDcMeter.qml b/pages/settings/devicelist/dc-in/PageDcMeter.qml index ebb3df0dd..dfadbfbf8 100644 --- a/pages/settings/devicelist/dc-in/PageDcMeter.qml +++ b/pages/settings/devicelist/dc-in/PageDcMeter.qml @@ -11,6 +11,13 @@ Page { property alias bindPrefix: dcMeterMode.bindPrefix + title: device.name + + Device { + id: device + serviceUid: root.bindPrefix + } + GradientListView { model: PageDcMeterModel { id: dcMeterMode diff --git a/pages/settings/devicelist/delegates/DcMeterDeviceListDelegate.qml b/pages/settings/devicelist/delegates/DcMeterDeviceListDelegate.qml index 0aba034e5..54b20c2fc 100644 --- a/pages/settings/devicelist/delegates/DcMeterDeviceListDelegate.qml +++ b/pages/settings/devicelist/delegates/DcMeterDeviceListDelegate.qml @@ -17,7 +17,7 @@ DeviceListDelegate { onClicked: { Global.pageManager.pushPage("/pages/settings/devicelist/dc-in/PageDcMeter.qml", - { "title": text, bindPrefix : root.device.serviceUid }) + { bindPrefix : root.device.serviceUid }) } VeQuickItem { diff --git a/pages/settings/devicelist/delegates/DeviceListDelegate_alternator.qml b/pages/settings/devicelist/delegates/DeviceListDelegate_alternator.qml index 2490a1a6b..96e35996e 100644 --- a/pages/settings/devicelist/delegates/DeviceListDelegate_alternator.qml +++ b/pages/settings/devicelist/delegates/DeviceListDelegate_alternator.qml @@ -17,7 +17,7 @@ DeviceListDelegate { onClicked: { Global.pageManager.pushPage("/pages/settings/devicelist/dc-in/PageAlternator.qml", - { "title": text, bindPrefix : root.device.serviceUid }) + { bindPrefix : root.device.serviceUid }) } VeQuickItem { diff --git a/pages/settings/devicelist/delegates/DeviceListDelegate_charger.qml b/pages/settings/devicelist/delegates/DeviceListDelegate_charger.qml index 0c309db06..314566829 100644 --- a/pages/settings/devicelist/delegates/DeviceListDelegate_charger.qml +++ b/pages/settings/devicelist/delegates/DeviceListDelegate_charger.qml @@ -13,7 +13,7 @@ DeviceListDelegate { onClicked: { Global.pageManager.pushPage("/pages/settings/devicelist/PageAcCharger.qml", - { "title": text, bindPrefix : root.device.serviceUid }) + { bindPrefix : root.device.serviceUid }) } VeQuickItem { diff --git a/pages/settings/devicelist/delegates/DeviceListDelegate_digitalinput.qml b/pages/settings/devicelist/delegates/DeviceListDelegate_digitalinput.qml index 6e5601b9b..05ca18276 100644 --- a/pages/settings/devicelist/delegates/DeviceListDelegate_digitalinput.qml +++ b/pages/settings/devicelist/delegates/DeviceListDelegate_digitalinput.qml @@ -14,7 +14,7 @@ DeviceListDelegate { onClicked: { Global.pageManager.pushPage("/pages/settings/devicelist/PageDigitalInput.qml", - { "title": text, bindPrefix : root.device.serviceUid }) + { bindPrefix : root.device.serviceUid }) } VeQuickItem { diff --git a/pages/settings/devicelist/delegates/DeviceListDelegate_meteo.qml b/pages/settings/devicelist/delegates/DeviceListDelegate_meteo.qml index 507cde4b5..510f64bad 100644 --- a/pages/settings/devicelist/delegates/DeviceListDelegate_meteo.qml +++ b/pages/settings/devicelist/delegates/DeviceListDelegate_meteo.qml @@ -15,7 +15,7 @@ DeviceListDelegate { onClicked: { Global.pageManager.pushPage("/pages/settings/devicelist/PageMeteo.qml", - { "title": text, bindPrefix : root.device.serviceUid }) + { bindPrefix : root.device.serviceUid }) } VeQuickItem { diff --git a/pages/settings/devicelist/delegates/DeviceListDelegate_motordrive.qml b/pages/settings/devicelist/delegates/DeviceListDelegate_motordrive.qml index 2d7e73dcc..d67fadb4b 100644 --- a/pages/settings/devicelist/delegates/DeviceListDelegate_motordrive.qml +++ b/pages/settings/devicelist/delegates/DeviceListDelegate_motordrive.qml @@ -15,7 +15,7 @@ DeviceListDelegate { onClicked: { Global.pageManager.pushPage("/pages/settings/devicelist/PageMotorDrive.qml", - { "title": text, bindPrefix : root.device.serviceUid }) + { bindPrefix : root.device.serviceUid }) } VeQuickItem { diff --git a/pages/settings/devicelist/delegates/DeviceListDelegate_pulsemeter.qml b/pages/settings/devicelist/delegates/DeviceListDelegate_pulsemeter.qml index 63f404616..c5214e801 100644 --- a/pages/settings/devicelist/delegates/DeviceListDelegate_pulsemeter.qml +++ b/pages/settings/devicelist/delegates/DeviceListDelegate_pulsemeter.qml @@ -15,7 +15,7 @@ DeviceListDelegate { onClicked: { Global.pageManager.pushPage("/pages/settings/devicelist/pulsemeter/PagePulseCounter.qml", - { "title": text, bindPrefix : root.device.serviceUid }) + { bindPrefix : root.device.serviceUid }) } VeQuickItem { diff --git a/pages/settings/devicelist/delegates/DeviceListDelegate_tank.qml b/pages/settings/devicelist/delegates/DeviceListDelegate_tank.qml index ca498f33e..d75881cca 100644 --- a/pages/settings/devicelist/delegates/DeviceListDelegate_tank.qml +++ b/pages/settings/devicelist/delegates/DeviceListDelegate_tank.qml @@ -23,7 +23,7 @@ DeviceListDelegate { onClicked: { Global.pageManager.pushPage("/pages/settings/devicelist/tank/PageTankSensor.qml", - { "title": text, bindPrefix : root.device.serviceUid }) + { bindPrefix : root.device.serviceUid }) } VeQuickItem { diff --git a/pages/settings/devicelist/delegates/DeviceListDelegate_temperature.qml b/pages/settings/devicelist/delegates/DeviceListDelegate_temperature.qml index 25562c0c6..b75bffcde 100644 --- a/pages/settings/devicelist/delegates/DeviceListDelegate_temperature.qml +++ b/pages/settings/devicelist/delegates/DeviceListDelegate_temperature.qml @@ -22,7 +22,7 @@ DeviceListDelegate { onClicked: { Global.pageManager.pushPage("/pages/settings/devicelist/temperature/PageTemperatureSensor.qml", - { "title": text, bindPrefix : root.device.serviceUid }) + { bindPrefix : root.device.serviceUid }) } VeQuickItem { diff --git a/pages/settings/devicelist/delegates/GensetDeviceListDelegate.qml b/pages/settings/devicelist/delegates/GensetDeviceListDelegate.qml index 022208b52..434ccf443 100644 --- a/pages/settings/devicelist/delegates/GensetDeviceListDelegate.qml +++ b/pages/settings/devicelist/delegates/GensetDeviceListDelegate.qml @@ -19,7 +19,7 @@ DeviceListDelegate { onClicked: { Global.pageManager.pushPage("/pages/settings/devicelist/PageGenset.qml", - { "title": text, bindPrefix : root.device.serviceUid }) + { bindPrefix : root.device.serviceUid }) } VeQuickItem { diff --git a/pages/settings/devicelist/pulsemeter/PagePulseCounter.qml b/pages/settings/devicelist/pulsemeter/PagePulseCounter.qml index d97d81d9b..1d0c86aa1 100644 --- a/pages/settings/devicelist/pulsemeter/PagePulseCounter.qml +++ b/pages/settings/devicelist/pulsemeter/PagePulseCounter.qml @@ -11,6 +11,13 @@ Page { property string bindPrefix + title: device.name + + Device { + id: device + serviceUid: root.bindPrefix + } + GradientListView { model: ObjectModel { ListQuantity { diff --git a/pages/settings/devicelist/rs/PageMultiRs.qml b/pages/settings/devicelist/rs/PageMultiRs.qml index ee78fb709..ff074e6ae 100644 --- a/pages/settings/devicelist/rs/PageMultiRs.qml +++ b/pages/settings/devicelist/rs/PageMultiRs.qml @@ -13,6 +13,13 @@ Page { readonly property bool multiPhase: numberOfPhases.isValid && numberOfPhases.value >= 2 && !_phase.isValid readonly property int trackerCount: numberOfTrackers.value || 0 + title: device.name + + Device { + id: device + serviceUid: root.bindPrefix + } + VeQuickItem { id: numberOfPhases uid: root.bindPrefix + "/Ac/NumberOfPhases" diff --git a/pages/settings/devicelist/rs/PageRsSystemDevices.qml b/pages/settings/devicelist/rs/PageRsSystemDevices.qml index f21f7979d..fcee7fcf4 100644 --- a/pages/settings/devicelist/rs/PageRsSystemDevices.qml +++ b/pages/settings/devicelist/rs/PageRsSystemDevices.qml @@ -57,7 +57,7 @@ Page { onClicked: { Global.pageManager.pushPage("/pages/settings/devicelist/rs/PageMultiRs.qml", - { "title": text, "bindPrefix": device.serviceUid }) + { "bindPrefix": device.serviceUid }) } } } diff --git a/pages/settings/devicelist/temperature/PageTemperatureSensor.qml b/pages/settings/devicelist/temperature/PageTemperatureSensor.qml index d03f29c03..2f840174a 100644 --- a/pages/settings/devicelist/temperature/PageTemperatureSensor.qml +++ b/pages/settings/devicelist/temperature/PageTemperatureSensor.qml @@ -11,6 +11,13 @@ Page { property string bindPrefix + title: device.name + + Device { + id: device + serviceUid: root.bindPrefix + } + VeQuickItem { id: temperatureType uid: bindPrefix + "/TemperatureType"