diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-19 12:47:43 +0100 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-19 12:48:12 +0100 |
| commit | 3ff350bd5376c5a255909b43a7336801e797ca76 (patch) | |
| tree | 65f1c52a50b26394cbdb2bd6186a7d4a67b0e987 | |
| parent | 0e7623417dbe9627334b550d7287a1830872564e (diff) | |
Import the patches for the demo applications into the app repos.
Bug-AGL: SPEC-5294
Change-Id: Ic54c598dfdcc702831a7637c72ee863d84b913e3
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
| -rw-r--r-- | app/HVAC.qml | 19 | ||||
| -rw-r--r-- | app/SeatHeatButton.qml | 10 |
2 files changed, 14 insertions, 15 deletions
diff --git a/app/HVAC.qml b/app/HVAC.qml index 4e27e2d..592dd1b 100644 --- a/app/HVAC.qml +++ b/app/HVAC.qml @@ -43,7 +43,6 @@ ApplicationWindow { anchors.centerIn: parent width: Window.width height: Window.height - scale: Window.scale ColumnLayout { anchors.fill: parent @@ -53,7 +52,7 @@ ApplicationWindow { Layout.fillHeight: true Layout.alignment: Qt.AlignHCenter Image { - source: './images/HMI_HVAC_Fan_Icon.svg' + source: 'qrc:/images/HMI_HVAC_Fan_Icon.svg' } Item { width: 1080 * 0.8 @@ -100,8 +99,8 @@ ApplicationWindow { Layout.fillWidth: true spacing: 20 ToggleButton { - onImage: './images/HMI_HVAC_Active.svg' - offImage: './images/HMI_HVAC_Inactive.svg' + onImage: 'qrc:/images/HMI_HVAC_Active.svg' + offImage: 'qrc:/images/HMI_HVAC_Inactive.svg' Label { anchors.centerIn: parent color: parent.checked ? '#00ADDC' : '#848286' @@ -113,8 +112,8 @@ ApplicationWindow { } } ToggleButton { - onImage: './images/HMI_HVAC_Active.svg' - offImage: './images/HMI_HVAC_Inactive.svg' + onImage: 'qrc:/images/HMI_HVAC_Active.svg' + offImage: 'qrc:/images/HMI_HVAC_Inactive.svg' Label { anchors.centerIn: parent color: parent.checked ? '#00ADDC' : '#848286' @@ -126,8 +125,8 @@ ApplicationWindow { } } ToggleButton { - onImage: './images/HMI_HVAC_Circulation_Active.svg' - offImage: './images/HMI_HVAC_Circulation_Inactive.svg' + onImage: 'qrc:/images/HMI_HVAC_Circulation_Active.svg' + offImage: 'qrc:/images/HMI_HVAC_Circulation_Inactive.svg' onCheckedChanged: { console.debug('Circulation', checked) } @@ -157,8 +156,8 @@ ApplicationWindow { Repeater { model: ['AirDown', 'AirUp', 'AirRight', 'Rear', 'Front'] ToggleButton { - onImage: './images/HMI_HVAC_%1_Active.svg'.arg(model.modelData) - offImage: './images/HMI_HVAC_%1_Inactive.svg'.arg(model.modelData) + onImage: 'qrc:/images/HMI_HVAC_%1_Active.svg'.arg(model.modelData) + offImage: 'qrc:/images/HMI_HVAC_%1_Inactive.svg'.arg(model.modelData) onCheckedChanged: { console.debug(model.modelData, checked) } diff --git a/app/SeatHeatButton.qml b/app/SeatHeatButton.qml index 3495cf6..7e2e1d4 100644 --- a/app/SeatHeatButton.qml +++ b/app/SeatHeatButton.qml @@ -33,13 +33,13 @@ Item { anchors.centerIn: parent Image { id: chair - source: './images/HMI_HVAC_%1_Chair_OFF.svg'.arg(root.side) + source: 'qrc:/images/HMI_HVAC_%1_Chair_OFF.svg'.arg(root.side) states: [ State { when: root.headLevel > 0 PropertyChanges { target: chair - source: './images/HMI_HVAC_%1_Chair_ON.svg'.arg(root.side) + source: 'qrc:/images/HMI_HVAC_%1_Chair_ON.svg'.arg(root.side) } } ] @@ -48,20 +48,20 @@ Item { id: indicator width: 178 height: 18 - source: './images/HMI_HVAC_ChairIndicator_OFF.svg' + source: 'qrc:/images/HMI_HVAC_ChairIndicator_OFF.svg' states: [ State { when: root.headLevel === 1 PropertyChanges { target: indicator - source: './images/HMI_HVAC_ChairIndicator_One.svg' + source: 'qrc:/images/HMI_HVAC_ChairIndicator_One.svg' } }, State { when: root.headLevel === 2 PropertyChanges { target: indicator - source: './images/HMI_HVAC_ChairIndicator_Two.svg' + source: 'qrc:/images/HMI_HVAC_ChairIndicator_Two.svg' } } ] |