diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-19 13:27:37 +0100 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-19 13:27:47 +0100 |
| commit | 77ea1b245737d0cfc4d20035e6476dae6969e699 (patch) | |
| tree | 20735c00ec8926e639df71b7198ba2d7aef16f4d | |
| parent | 0e670c959deaee14923043978554453ddd91c041 (diff) | |
Import the patches for the demo applications into the app repos.
Bug-AGL: SPEC-5294
Change-Id: I00de015ca1ce86d7c8b3b58e0fe457fef7c18d00
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
| -rw-r--r-- | app/Messaging.qml | 4 | ||||
| -rw-r--r-- | app/Notification.qml | 2 | ||||
| -rw-r--r-- | app/TabImageButton.qml | 11 |
3 files changed, 9 insertions, 8 deletions
diff --git a/app/Messaging.qml b/app/Messaging.qml index 48568c2..05bd452 100644 --- a/app/Messaging.qml +++ b/app/Messaging.qml @@ -41,13 +41,13 @@ ApplicationWindow { contentHeight: 160 TabImageButton { - icon: "./images/ic_contacts_48px.svg" + iconSource: "qrc:/images/ic_contacts_48px.svg" text: "Alerts" font.pixelSize: 50 } TabImageButton { - icon: "./images/ic_contacts_48px.svg" + iconSource: "qrc:/images/ic_contacts_48px.svg" text: "Compose" font.pixelSize: 50 } diff --git a/app/Notification.qml b/app/Notification.qml index ac6b360..dd68ce3 100644 --- a/app/Notification.qml +++ b/app/Notification.qml @@ -30,7 +30,7 @@ Item { Image { id: button scale: 0.5 - source: '../images/HMI_Settings_X.svg' + source: 'qrc:/images/HMI_Settings_X.svg' MouseArea { anchors.fill: button onClicked: notificationModel.remove(index) diff --git a/app/TabImageButton.qml b/app/TabImageButton.qml index 2176595..c707574 100644 --- a/app/TabImageButton.qml +++ b/app/TabImageButton.qml @@ -41,6 +41,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls 2.2 import QtQuick.Controls.impl 2.2 import QtQuick.Templates 2.2 as T +import QtQuick.Controls.Basic 2.2 T.TabButton { id: control @@ -53,13 +54,13 @@ T.TabButton { padding: 6 - property url icon + property url iconSource contentItem: ColumnLayout { spacing: 20 Image { Layout.alignment: Qt.AlignCenter - source: control.icon + source: control.iconSource width: 96 height: 96 @@ -70,7 +71,7 @@ T.TabButton { font: control.font elide: Text.ElideRight opacity: enabled ? 1 : 0.3 - color: !control.checked ? Default.textLightColor : control.down ? Default.textDarkColor : Default.textColor + color: !control.checked ? Basic.textLightColor : control.down ? Basic.textDarkColor : Basic.textColor horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } @@ -78,7 +79,7 @@ T.TabButton { background: Rectangle { implicitHeight: 160 color: control.down - ? (control.checked ? Default.tabButtonCheckedPressedColor : Default.tabButtonPressedColor) - : (control.checked ? "transparent" : Default.tabButtonColor) + ? (control.checked ? Basic.tabButtonCheckedPressedColor : Basic.tabButtonPressedColor) + : (control.checked ? "transparent" : Basic.tabButtonColor) } } |