From 892d033931f07b80f0ecd0aa8773061350704050 Mon Sep 17 00:00:00 2001 From: Anika Raemer Date: Fri, 7 Dec 2018 11:23:59 +0100 Subject: [PATCH] added component for player control pannel --- LenaPi/MusicPlayer.qml | 47 ++++++++++------------------------ LenaPi/PlayerControlPannel.qml | 31 ++++++++++++++++++++++ LenaPi/qml.qrc | 1 + 3 files changed, 45 insertions(+), 34 deletions(-) create mode 100644 LenaPi/PlayerControlPannel.qml diff --git a/LenaPi/MusicPlayer.qml b/LenaPi/MusicPlayer.qml index ce50ed0..88f776e 100644 --- a/LenaPi/MusicPlayer.qml +++ b/LenaPi/MusicPlayer.qml @@ -6,6 +6,16 @@ Item{ property int margins: 20 + RoundButton{ + id: backNavigation + anchors.left: parent.left + anchors.top: parent.top + anchors.margins: container.margins + onClicked: { + musicModel.navigateBack(); + } + } + Rectangle{ id: coverBorder anchors.horizontalCenter: parent.horizontalCenter @@ -28,44 +38,13 @@ Item{ } } - RoundButton{ - id: backNavigation - anchors.left: parent.left - anchors.top: parent.top - anchors.margins: container.margins - onClicked: { - musicModel.navigateBack(); - } - } - - Rectangle { + PlayerControlPannel { id: controlPannel - anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom - color: "#99ffffff" - height: 140 - MediaProgress{ - id: progress - anchors.top: parent.top - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: container.margins - - model: musicModel - } - - PlayerButtons{ - id: buttons - anchors.left: parent.left - anchors.right: parent.right - anchors.top: progress.bottom - anchors.bottom: parent.bottom - - model: musicModel - spacing: 20 - } + model: musicModel + margins: container.margins } } diff --git a/LenaPi/PlayerControlPannel.qml b/LenaPi/PlayerControlPannel.qml new file mode 100644 index 0000000..d96d8a5 --- /dev/null +++ b/LenaPi/PlayerControlPannel.qml @@ -0,0 +1,31 @@ +import QtQuick 2.0 + +Rectangle { + id: container + property var model + property int margins + + color: "#99ffffff" + height: 140 + + MediaProgress{ + id: progress + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: container.margins + + model: container.model + } + + PlayerButtons{ + id: buttons + anchors.left: parent.left + anchors.right: parent.right + anchors.top: progress.bottom + anchors.bottom: parent.bottom + + model: container.model + spacing: 20 + } +} diff --git a/LenaPi/qml.qrc b/LenaPi/qml.qrc index 54dbb4b..2a2ac88 100644 --- a/LenaPi/qml.qrc +++ b/LenaPi/qml.qrc @@ -9,5 +9,6 @@ MusicPlayer.qml MediaProgress.qml PlayerButtons.qml + PlayerControlPannel.qml