diff --git a/LenaPi/MusicPlayer.qml b/LenaPi/MusicPlayer.qml index e060de7..ce50ed0 100644 --- a/LenaPi/MusicPlayer.qml +++ b/LenaPi/MusicPlayer.qml @@ -57,66 +57,15 @@ Item{ model: musicModel } - Item{ + PlayerButtons{ + id: buttons anchors.left: parent.left anchors.right: parent.right anchors.top: progress.bottom anchors.bottom: parent.bottom - Row{ - id: buttons - spacing: 20 - anchors.centerIn: parent - RoundButton{ - id: previous - anchors.verticalCenter: parent.verticalCenter - - width: 60 - imageSource: "qrc:/icon_previous" - - enabled: musicModel.pHasPrevious - - onClicked:{ - musicModel.playPrevious(); - } - } - RoundButton{ - id: playPause - anchors.verticalCenter: parent.verticalCenter - width: 80 - imageSource: musicModel.pIsPlaying ? "qrc:/icon_pause" : "qrc:/icon_play" - - onClicked:{ - musicModel.playPause(); - } - } - RoundButton{ - id: stop - anchors.verticalCenter: parent.verticalCenter - - width: 60 - imageSource: "qrc:/icon_stop" - - enabled: musicModel.pIsPlaying - - onClicked:{ - musicModel.stopMusic(); - } - } - RoundButton{ - id: next - anchors.verticalCenter: parent.verticalCenter - - width: 60 - imageSource: "qrc:/icon_next" - - enabled: musicModel.pHasNext - - onClicked:{ - musicModel.playNext(); - } - } - } //Row - }// Item + model: musicModel + spacing: 20 + } } } diff --git a/LenaPi/PlayerButtons.qml b/LenaPi/PlayerButtons.qml new file mode 100644 index 0000000..7235629 --- /dev/null +++ b/LenaPi/PlayerButtons.qml @@ -0,0 +1,62 @@ +import QtQuick 2.0 + +Item { + id: container + property var model + property var spacing: 20 + Row{ + id: buttons + anchors.centerIn: parent + spacing: container.spacing + + RoundButton{ + id: previous + anchors.verticalCenter: parent.verticalCenter + + width: 60 + imageSource: "qrc:/icon_previous" + + enabled: model.pHasPrevious + + onClicked:{ + model.playPrevious(); + } + } + RoundButton{ + id: playPause + anchors.verticalCenter: parent.verticalCenter + width: 80 + imageSource: model.pIsPlaying ? "qrc:/icon_pause" : "qrc:/icon_play" + + onClicked:{ + model.playPause(); + } + } + RoundButton{ + id: stop + anchors.verticalCenter: parent.verticalCenter + + width: 60 + imageSource: "qrc:/icon_stop" + + enabled: model.pIsPlaying + + onClicked:{ + model.stopMusic(); + } + } + RoundButton{ + id: next + anchors.verticalCenter: parent.verticalCenter + + width: 60 + imageSource: "qrc:/icon_next" + + enabled: model.pHasNext + + onClicked:{ + model.playNext(); + } + } + } //Row +} diff --git a/LenaPi/qml.qrc b/LenaPi/qml.qrc index 47671ef..54dbb4b 100644 --- a/LenaPi/qml.qrc +++ b/LenaPi/qml.qrc @@ -8,5 +8,6 @@ Navigation.qml MusicPlayer.qml MediaProgress.qml + PlayerButtons.qml