diff --git a/data/qml/CoverFlip.qml b/data/qml/CoverFlip.qml index 345542ffe..6a2d359a6 100644 --- a/data/qml/CoverFlip.qml +++ b/data/qml/CoverFlip.qml @@ -91,7 +91,7 @@ PathView { PropertyChanges { target: delegateItem width: root.coverSize * 2 - z: coverDelegate._origZ + z: delegateItem._origZ } } ] diff --git a/data/qml/StationScene.qml b/data/qml/StationScene.qml index d5ff6c94c..96567e3e4 100644 --- a/data/qml/StationScene.qml +++ b/data/qml/StationScene.qml @@ -158,6 +158,8 @@ Rectangle { height: scene.height width: scene.width visible: stationListView.currentIndex == 1 + + onBackClicked: stationListView.decrementCurrentIndex() } } diff --git a/data/qml/StationView.qml b/data/qml/StationView.qml index 196bc29af..5db40e91e 100644 --- a/data/qml/StationView.qml +++ b/data/qml/StationView.qml @@ -6,67 +6,7 @@ Item { id: root property int coverSize - Item { - anchors { top: parent.top; left: parent.left; bottom: parent.bottom } - anchors.margins: 50 - width: scene.width / 2 - - Column { - anchors { left: parent.left; top: parent.top; right: parent.right } - Text { - color: "white" - font.pointSize: 12 - width: parent.width - elide: Text.ElideRight - text: "Station:" - } - Text { - color: "white" - font.pointSize: 14 - font.bold: true - width: parent.width - elide: Text.ElideRight - text: rootView.title - } - } - Column { - anchors.right: parent.right - anchors.left: parent.left - anchors.verticalCenter: parent.verticalCenter - width: scene.width / 3 - - - Text { - color: "white" - font.pointSize: 12 - width: parent.width - elide: Text.ElideRight - text: "Now Playing:" - visible: currentlyPlayedIndex !== -1 - } - Text { - color: "white" - font.pointSize: 16 - width: parent.width - elide: Text.ElideRight - text: currentlyPlayedIndex > -1 ? coverView.model.itemFromIndex( currentlyPlayedIndex ).name : "" - } - Text { - color: "white" - font.pointSize: 14 - width: parent.width - elide: Text.ElideRight - text: currentlyPlayedIndex > -1 ? coverView.model.itemFromIndex( currentlyPlayedIndex ).artistName : "" - } - Text { - color: "white" - font.pointSize: 14 - width: parent.width - elide: Text.ElideRight - text: currentlyPlayedIndex > -1 ? coverView.model.itemFromIndex( currentlyPlayedIndex ).albumName : "" - } - } - } + signal backClicked() CoverFlip { id: coverView @@ -86,5 +26,91 @@ Item { } } + + Item { + anchors { top: parent.top; left: parent.left; bottom: parent.bottom } + anchors.margins: titleText.height * 3 + width: scene.width / 2 + + Column { + anchors { left: parent.left; top: parent.top; right: parent.right } + Text { + id: titleText + color: "white" + font.pointSize: 18 + width: parent.width + elide: Text.ElideRight + text: rootView.title + } + Text { + color: "white" + font.pointSize: 14 + font.bold: true + width: parent.width + elide: Text.ElideRight + opacity: .8 + text: generator.summary + } + } + Column { + anchors.right: parent.right + anchors.left: parent.left + anchors.verticalCenter: parent.verticalCenter + width: scene.width / 3 + spacing: titleText.height * 2 + + + Rectangle { + border.width: 4 + border.color: "white" + height: titleText.height * 3 + width: height + radius: height / 2 + color: backbuttonMouseArea.containsMouse ? "#22ffffff" : "black" + Behavior on color { + ColorAnimation { duration: 200 } + } + + Text { + anchors.centerIn: parent + text: "<" + color: "white" + font.pixelSize: parent.height * .75 + font.bold: true + } + MouseArea { + id: backbuttonMouseArea + anchors.fill: parent + hoverEnabled: true + onClicked: root.backClicked() + } + } + Rectangle { + border.width: 4 + border.color: "white" + height: titleText.height * 3 + width: height + radius: height / 2 + color: addbuttonMouseArea.containsMouse ? "#22ffffff" : "black" + Behavior on color { + ColorAnimation { duration: 200 } + } + Text { + anchors.centerIn: parent + text: "+" + color: "white" + font.pixelSize: parent.height * .75 + font.bold: true + } + MouseArea { + id: addbuttonMouseArea + hoverEnabled: true + anchors.fill: parent + onClicked: root.backClicked() + } + } + } + } + } diff --git a/src/libtomahawk/playlist/dynamic/GeneratorInterface.h b/src/libtomahawk/playlist/dynamic/GeneratorInterface.h index c483984ea..4f82e3cc7 100644 --- a/src/libtomahawk/playlist/dynamic/GeneratorInterface.h +++ b/src/libtomahawk/playlist/dynamic/GeneratorInterface.h @@ -47,6 +47,7 @@ class DLLEXPORT GeneratorInterface : public QObject { Q_OBJECT Q_PROPERTY( QString type READ type ) + Q_PROPERTY( QString summary READ sentenceSummary) /// oh qjson. Q_PROPERTY( int mode READ mode WRITE setMode )