From 5d5e3c6888a92ba1dd2f441cf2d02afa08c7b7d2 Mon Sep 17 00:00:00 2001 From: Anika Raemer Date: Sat, 13 Mar 2021 17:06:39 +0100 Subject: [PATCH] add close button --- LenaPi/MusicPlayer.qml | 11 +++++++ LenaPi/Navigation.qml | 15 +++++++++- LenaPi/RoundButton.qml | 57 ++++++++++++++++++------------------- LenaPi/lenapi.qrc | 1 + LenaPi/main.qml | 2 ++ LenaPi/resources/close.png | Bin 0 -> 5589 bytes 6 files changed, 56 insertions(+), 30 deletions(-) create mode 100644 LenaPi/resources/close.png diff --git a/LenaPi/MusicPlayer.qml b/LenaPi/MusicPlayer.qml index 88f776e..30dfc1c 100644 --- a/LenaPi/MusicPlayer.qml +++ b/LenaPi/MusicPlayer.qml @@ -16,6 +16,17 @@ Item{ } } + RoundButton{ + id: closeApp + anchors.right: parent.right + anchors.top: parent.top + anchors.margins: container.margins + imageSource: "qrc:/icon_close" + onClicked: { + Qt.quit(); + } + } + Rectangle{ id: coverBorder anchors.horizontalCenter: parent.horizontalCenter diff --git a/LenaPi/Navigation.qml b/LenaPi/Navigation.qml index 122348d..2f6b0f3 100644 --- a/LenaPi/Navigation.qml +++ b/LenaPi/Navigation.qml @@ -4,18 +4,31 @@ import QtQuick 2.0 * @brief Navigation view containing list view displaying artists or genres and albums */ Item { + id: container + property int margins: 20 RoundButton{ id: back anchors.top: parent.top anchors.left: parent.left - anchors.margins: 20 + anchors.margins: container.margins visible: navigationList.pIsBackVisible onClicked: navigationList.navigateBack(); } // RoundButton: navigate back + RoundButton{ + id: closeApp + anchors.right: parent.right + anchors.top: parent.top + anchors.margins: container.margins + imageSource: "qrc:/icon_close" + onClicked: { + Qt.quit(); + } + } // RoundButton: closeApp + Rectangle{ anchors.left: parent.left anchors.right: parent.right diff --git a/LenaPi/RoundButton.qml b/LenaPi/RoundButton.qml index d6a4a62..1838e68 100644 --- a/LenaPi/RoundButton.qml +++ b/LenaPi/RoundButton.qml @@ -1,41 +1,40 @@ import QtQuick 2.0 +import QtQuick.Controls 2.4 -Rectangle { +/** + * @brief Round button containing an image + */ +Button { id: container property alias imageSource: image.source - signal clicked(); - border.width: 2 - border.color: "grey" + background: Rectangle{ - color: "white" + border.width: 2 + border.color: "grey" - width: 65 - height: width - radius: width/2 + color: "white" - Image{ - id: image - anchors.centerIn: parent - width: 30 - height: width - source: "qrc:/icon_back" - } - Rectangle{ - id: overlay - z: 1 - visible: !container.enabled - anchors.centerIn: parent - width: 30 - height: width - color: "#99ffffff" - } + implicitWidth: 65 + implicitHeight: width + radius: width/2 - MouseArea{ - id: controlObject - anchors.fill: parent - onClicked:{ - container.clicked(); + Image{ + id: image + anchors.centerIn: parent + width: 30 + height: width + source: "qrc:/icon_back" } + Rectangle{ + id: overlay + z: 1 + visible: !container.enabled + anchors.centerIn: parent + width: 30 + height: width + color: "#99ffffff" + } + } } diff --git a/LenaPi/lenapi.qrc b/LenaPi/lenapi.qrc index 421d47d..bba9b5d 100644 --- a/LenaPi/lenapi.qrc +++ b/LenaPi/lenapi.qrc @@ -8,5 +8,6 @@ resources/next.jpg resources/previous.jpg resources/stop.jpg + resources/close.png diff --git a/LenaPi/main.qml b/LenaPi/main.qml index 3bd0b10..7d26c1b 100644 --- a/LenaPi/main.qml +++ b/LenaPi/main.qml @@ -8,6 +8,8 @@ Window { height: 480 title: "LenaPi 1.2" + Component.onCompleted: showMaximized(); + Image{ id: background diff --git a/LenaPi/resources/close.png b/LenaPi/resources/close.png new file mode 100644 index 0000000000000000000000000000000000000000..082ecc9a792ab3754afa57a28804a0f306f3bf4a GIT binary patch literal 5589 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 literal 0 HcmV?d00001