From d5f54e2bdcdd8bf9df505b66658b93d97894430a Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Sat, 18 Feb 2023 22:49:27 +0100 Subject: [PATCH] Fixed master sliders --- DevicesSettingsPage.qml | 1 + HomePage.qml | 16 +++++----------- LightControlWindow.qml | 6 ++++++ LightSliderPane.qml | 10 +++++----- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/DevicesSettingsPage.qml b/DevicesSettingsPage.qml index 7234099..8c8d693 100644 --- a/DevicesSettingsPage.qml +++ b/DevicesSettingsPage.qml @@ -91,6 +91,7 @@ ColumnLayout { } Label { text: qsTr("Address:") } SpinBox { + to: 512 Layout.fillWidth: true value: listView.currentData ? listView.currentData.address : -1 onValueModified: listView.currentData.address = value diff --git a/HomePage.qml b/HomePage.qml index 88eeea7..76a05ae 100644 --- a/HomePage.qml +++ b/HomePage.qml @@ -7,12 +7,6 @@ import com.büro 1.0 Item { id: homePage - property alias masterDimmer: masterDimmer.value - property alias masterRed: masterRed.value - property alias masterGreen: masterGreen.value - property alias masterBlue: masterBlue.value - property alias masterWhite: masterWhite.value - property bool needsRegler: true Button { @@ -46,7 +40,7 @@ Item { } DmxSlider { - id: masterDimmer + onValueChanged: window.masterDimmer = value } Label { @@ -54,7 +48,7 @@ Item { } DmxSlider { - id: masterRed + onValueChanged: window.masterRed = value } Label { @@ -62,7 +56,7 @@ Item { } DmxSlider { - id: masterGreen + onValueChanged: window.masterGreen = value } Label { @@ -70,7 +64,7 @@ Item { } DmxSlider { - id: masterBlue + onValueChanged: window.masterBlue = value } Label { @@ -78,7 +72,7 @@ Item { } DmxSlider { - id: masterWhite + onValueChanged: window.masterWhite = value } } diff --git a/LightControlWindow.qml b/LightControlWindow.qml index 4a8a0f3..cdc5442 100644 --- a/LightControlWindow.qml +++ b/LightControlWindow.qml @@ -15,6 +15,12 @@ ApplicationWindow { Material.theme: Material.Dark Material.accent: Material.Purple + property int masterDimmer + property int masterRed + property int masterGreen + property int masterBlue + property int masterWhite + DeviceTypesModel { id: deviceTypesModel controller: __controller diff --git a/LightSliderPane.qml b/LightSliderPane.qml index d771e87..b63e4f7 100644 --- a/LightSliderPane.qml +++ b/LightSliderPane.qml @@ -51,23 +51,23 @@ Pane { onValueChanged: __controller.setChannel(registerAddress, value) Binding on value { - value: homePage.masterDimmer + value: masterDimmer when: model.registerType === DeviceTypeRegisterType.Dimmer } Binding on value { - value: homePage.masterRed + value: masterRed when: model.registerType === DeviceTypeRegisterType.Red } Binding on value { - value: homePage.masterGreen + value: masterGreen when: model.registerType === DeviceTypeRegisterType.Green } Binding on value { - value: homePage.masterBlue + value: masterBlue when: model.registerType === DeviceTypeRegisterType.Blue } Binding on value { - value: homePage.masterWhite + value: masterWhite when: model.registerType === DeviceTypeRegisterType.White } }