Fixed scrolling by removing deprecated property; covers do not work any more
This commit is contained in:
nikwen.developer@gmail.com
committed by
nikwen.developer@gmail.com
nikwen.developer@gmail.com
parent
6fed2a77c7
commit
64c12b211e
@@ -764,6 +764,7 @@ if (ENABLE_UBUNTU)
|
||||
${CMAKE_SOURCE_DIR}/ubuntu/qml/cantata/ControlButtonsRow.qml
|
||||
${CMAKE_SOURCE_DIR}/ubuntu/qml/cantata/ListItemDelegate.qml
|
||||
${CMAKE_SOURCE_DIR}/ubuntu/qml/cantata/LabelVisual.qml
|
||||
${CMAKE_SOURCE_DIR}/ubuntu/qml/cantata/PlayQueueListItemDelegate.qml
|
||||
)
|
||||
|
||||
#
|
||||
|
||||
@@ -27,11 +27,12 @@
|
||||
import QtQuick 2.0
|
||||
import Ubuntu.Components 0.1
|
||||
import Ubuntu.Components.ListItems 0.1 as ListItem
|
||||
import 'qrc:/qml/cantata/'
|
||||
|
||||
Page {
|
||||
id: albumPage
|
||||
|
||||
width: parent.width
|
||||
anchors.fill: parent
|
||||
title: i18n.tr("Albums")
|
||||
|
||||
actions: [
|
||||
@@ -90,56 +91,57 @@ Page {
|
||||
model: albumsProxyModel
|
||||
clip: true
|
||||
|
||||
delegate: ListItemDelegate {
|
||||
delegate: PlayQueueListItemDelegate {
|
||||
text: model.mainText
|
||||
subText: model.subText
|
||||
icon: model.image
|
||||
// icon: model.image
|
||||
// progression: true //Removed due to the app showdown, will be implemented later
|
||||
|
||||
Image {
|
||||
width: units.gu(3)
|
||||
height: units.gu(3)
|
||||
smooth: true
|
||||
source: "../../icons/toolbar/add.svg"
|
||||
opacity: 0.9
|
||||
// Image {
|
||||
// id: addImage
|
||||
// width: units.gu(3)
|
||||
// height: units.gu(3)
|
||||
// smooth: true
|
||||
// source: "../../icons/toolbar/add.svg"
|
||||
// opacity: 0.9
|
||||
|
||||
anchors {
|
||||
right: parent.right
|
||||
rightMargin: units.gu(4)
|
||||
verticalCenter: parent.verticalCenter
|
||||
}
|
||||
// anchors {
|
||||
// right: parent.right
|
||||
// rightMargin: units.gu(4)
|
||||
// verticalCenter: parent.verticalCenter
|
||||
// }
|
||||
|
||||
MouseArea {
|
||||
onClicked: {
|
||||
backend.addAlbum(index, false)
|
||||
pageStack.push(currentlyPlayingPage)
|
||||
}
|
||||
anchors.fill: parent
|
||||
preventStealing: true
|
||||
}
|
||||
}
|
||||
Image {
|
||||
width: units.gu(3)
|
||||
height: units.gu(3)
|
||||
smooth: true
|
||||
source: "../../icons/toolbar/media-playback-start-light.svg"
|
||||
opacity: 0.9
|
||||
// MouseArea {
|
||||
// onClicked: {
|
||||
// backend.addAlbum(index, false)
|
||||
// pageStack.push(currentlyPlayingPage)
|
||||
// }
|
||||
// anchors.fill: parent
|
||||
// preventStealing: true
|
||||
// }
|
||||
// }
|
||||
// Image {
|
||||
// width: units.gu(3)
|
||||
// height: units.gu(3)
|
||||
// smooth: true
|
||||
// source: "../../icons/toolbar/media-playback-start-light.svg"
|
||||
// opacity: 0.9
|
||||
|
||||
anchors {
|
||||
right: parent.right
|
||||
rightMargin: units.gu(0)
|
||||
verticalCenter: parent.verticalCenter
|
||||
}
|
||||
// anchors {
|
||||
// right: parent.right
|
||||
// rightMargin: units.gu(0)
|
||||
// verticalCenter: parent.verticalCenter
|
||||
// }
|
||||
|
||||
MouseArea {
|
||||
onClicked: {
|
||||
backend.addAlbum(index, true)
|
||||
pageStack.push(currentlyPlayingPage)
|
||||
}
|
||||
anchors.fill: parent
|
||||
preventStealing: true
|
||||
}
|
||||
}
|
||||
// MouseArea {
|
||||
// onClicked: {
|
||||
// backend.addAlbum(index, true)
|
||||
// pageStack.push(currentlyPlayingPage)
|
||||
// }
|
||||
// anchors.fill: parent
|
||||
// preventStealing: true
|
||||
// }
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
183
ubuntu/qml/cantata/PlayQueueListItemDelegate.qml
Normal file
183
ubuntu/qml/cantata/PlayQueueListItemDelegate.qml
Normal file
@@ -0,0 +1,183 @@
|
||||
/*
|
||||
* Copyright 2012 Canonical Ltd.
|
||||
* Copyright 2014 Niklas Wenzel <nikwen.developer@gmail.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation; version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import QtQuick 2.0
|
||||
import Ubuntu.Components 0.1
|
||||
import Ubuntu.Components.ListItems 0.1
|
||||
|
||||
/*!
|
||||
\qmltype MultiValue
|
||||
\inqmlmodule Ubuntu.Components.ListItems 0.1
|
||||
\ingroup ubuntu-listitems
|
||||
\brief List item displaying a second string under the main label.
|
||||
\b{This component is under heavy development.}
|
||||
|
||||
Examples:
|
||||
\qml
|
||||
import Ubuntu.Components.ListItems 0.1 as ListItem
|
||||
Column {
|
||||
ListItem.Subtitled {
|
||||
text: "Idle"
|
||||
subText: "Secondary label"
|
||||
}
|
||||
ListItem.Subtitled {
|
||||
text: "Disabled"
|
||||
enabled: false
|
||||
subText: "Secondary label"
|
||||
}
|
||||
ListItem.Subtitled {
|
||||
text: "Selected"
|
||||
selected: true
|
||||
subText: "Secondary label"
|
||||
}
|
||||
ListItem.Subtitled {
|
||||
text: "Progression"
|
||||
subText: "Secondary label"
|
||||
progression: true
|
||||
}
|
||||
ListItem.Subtitled {
|
||||
text: "Icon"
|
||||
subText: "Secondary label"
|
||||
icon: Qt.resolvedUrl("icon.png")
|
||||
}
|
||||
ListItem.Subtitled {
|
||||
text: "Multiple lines"
|
||||
subText: "This is a single-line subText."
|
||||
}
|
||||
ListItem.Subtitled {
|
||||
text: "Multiple lines"
|
||||
subText: "It also works well with icons and progression."
|
||||
icon: Qt.resolvedUrl("icon.png")
|
||||
progression: true
|
||||
}
|
||||
}
|
||||
\endqml
|
||||
*/
|
||||
Empty {
|
||||
id: listItemDelegate
|
||||
__height: Math.max(middleVisuals.height, units.gu(6))
|
||||
|
||||
/*!
|
||||
\preliminary
|
||||
The text that is shown in the list item as a label.
|
||||
\qmlproperty string text
|
||||
*/
|
||||
property alias text: label.text
|
||||
|
||||
/*!
|
||||
\preliminary
|
||||
The list of strings that will be shown under the label text
|
||||
\qmlproperty string subText
|
||||
*/
|
||||
property alias subText: subLabel.text
|
||||
|
||||
Image {
|
||||
id: iconImage
|
||||
width: units.gu(3)
|
||||
height: units.gu(3)
|
||||
smooth: true
|
||||
source: "../../icons/toolbar/add.svg"
|
||||
opacity: 0.9
|
||||
|
||||
anchors {
|
||||
left: parent.left
|
||||
leftMargin: units.gu(1)
|
||||
verticalCenter: parent.verticalCenter
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
id: middleVisuals
|
||||
anchors {
|
||||
left: iconImage.right
|
||||
right: addImage.left
|
||||
leftMargin: units.gu(1)
|
||||
rightMargin: units.gu(1)
|
||||
verticalCenter: parent.verticalCenter
|
||||
}
|
||||
height: childrenRect.height + label.anchors.topMargin + subLabel.anchors.bottomMargin
|
||||
|
||||
LabelVisual {
|
||||
id: label
|
||||
selected: listItemDelegate.selected
|
||||
anchors {
|
||||
top: parent.top
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
}
|
||||
}
|
||||
LabelVisual {
|
||||
id: subLabel
|
||||
selected: listItemDelegate.selected
|
||||
secondary: true
|
||||
anchors {
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
top: label.bottom
|
||||
}
|
||||
fontSize: "small"
|
||||
}
|
||||
}
|
||||
|
||||
Image {
|
||||
id: addImage
|
||||
width: units.gu(3)
|
||||
height: units.gu(3)
|
||||
smooth: true
|
||||
source: "../../icons/toolbar/add.svg"
|
||||
opacity: 0.9
|
||||
|
||||
anchors {
|
||||
right: playImage.left
|
||||
rightMargin: units.gu(1)
|
||||
verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
onClicked: {
|
||||
backend.addAlbum(index, false)
|
||||
pageStack.push(currentlyPlayingPage)
|
||||
}
|
||||
anchors.fill: parent
|
||||
preventStealing: true
|
||||
}
|
||||
}
|
||||
|
||||
Image {
|
||||
id: playImage
|
||||
width: units.gu(3)
|
||||
height: units.gu(3)
|
||||
smooth: true
|
||||
source: "../../icons/toolbar/media-playback-start-light.svg"
|
||||
opacity: 0.9
|
||||
|
||||
anchors {
|
||||
right: parent.right
|
||||
rightMargin: units.gu(1)
|
||||
verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
onClicked: {
|
||||
backend.addAlbum(index, true)
|
||||
pageStack.push(currentlyPlayingPage)
|
||||
}
|
||||
anchors.fill: parent
|
||||
preventStealing: true
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,5 +25,6 @@
|
||||
<file>icons/toolbar/navigation-menu.svg</file>
|
||||
<file>icons/toolbar/clear.svg</file>
|
||||
<file>icons/toolbar/speaker.svg</file>
|
||||
<file>qml/cantata/PlayQueueListItemDelegate.qml</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
Reference in New Issue
Block a user