[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-mediacenter] /: Moar busy indicators, playlist cleanup
From: Shantanu Tushar <shaan7in () gmail ! com>
Date: 2012-07-29 6:49:22
Message-ID: 20120729064922.88852A6094 () git ! kde ! org
[Download RAW message or body]
Git commit 664ab23e12892d316b1239719470b9fb6f50fb1d by Shantanu Tushar.
Committed on 29/07/2012 at 08:48.
Pushed by shantanu into branch 'master'.
Moar busy indicators, playlist cleanup
M +1 -0 browsingbackends/metadatabackends/metadatamusicbackend/metadatamusicbackend.cpp
M +9 -6 browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/MediaBrowser.qml
M +0 -6 browsingbackends/metadatabackends/metadatamusicbackend/metadatamusicmodel.cpp
M +25 -69 components/playlist/Playlist.qml
M +5 -14 shells/newshell/package/contents/ui/mediacenter.qml
http://commits.kde.org/plasma-mediacenter/664ab23e12892d316b1239719470b9fb6f50fb1d
diff --git a/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusicbackend.cpp \
b/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusicbackend.cpp \
index 7dcf4ab..4c5212a 100644
--- a/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusicbackend.cpp
+++ b/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusicbackend.cpp
@@ -59,6 +59,7 @@ void MetadataMusicBackend::init()
if (metadataModel()) {
m_metadataMusicModel = new MetadataMusicModel(this);
}
+ updateModelAccordingToFilters();
}
QString MetadataMusicBackend::mediaBrowserOverride() const
diff --git a/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/MediaBrowser.qml \
b/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/MediaBrowser.qml
index 51e0343..124a44b 100644
--- a/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/MediaBrowser.qml
+++ b/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/MediaBrowser.qml
@@ -61,16 +61,19 @@ Row {
ListView {
width: parent.width/3 ; height: parent.height
model: backend.musicModel
- header: PlasmaComponents.Label {
- text: "Songs"; width: parent.width; height: 96
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- font.pointSize: 14
- color: "white"
+ header: PlasmaComponents.Button {
+ text: "All Songs"; width: parent.width; height: 96
+ onClicked: backend.albumFilter = backend.artistFilter = ""
}
delegate: MusicDelegate { width: parent.width; height: 64 }
spacing: 5
highlight: MediaItemHighlight { z: 1 }
highlightFollowsCurrentItem: true
+
+ PlasmaComponents.BusyIndicator {
+ anchors.centerIn: parent
+ running: parent.count == 0
+ visible: running
+ }
}
}
diff --git a/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusicmodel.cpp \
b/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusicmodel.cpp index \
3b3ab1c..c17a185 100644
--- a/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusicmodel.cpp
+++ b/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusicmodel.cpp
@@ -31,12 +31,6 @@
MetadataMusicModel::MetadataMusicModel (QObject* parent)
: AbstractMetadataModel (parent)
{
- if (metadataModel()) {
-
- }
- else {
- kDebug() << "WARNING: Constructor called before metadataModel set :/";
- }
}
MetadataMusicModel::~MetadataMusicModel()
diff --git a/components/playlist/Playlist.qml b/components/playlist/Playlist.qml
index 7fa8f61..10c53fe 100644
--- a/components/playlist/Playlist.qml
+++ b/components/playlist/Playlist.qml
@@ -20,92 +20,48 @@
import QtQuick 1.1
import org.kde.plasma.components 0.1 as PlasmaComponents
- Rectangle {
+Rectangle {
id: playlistItem
signal playRequested(string url)
- height: parent.height
- width: parent.width / 3
+ clip: true
color: "black"
- Rectangle {
- id: rect
- color: "lightblue"
- width: parent.width
- height: clearPlaylist.height
- opacity: 0.4
- anchors.bottomMargin: 5
+ Row {
+ id: topRow
+ anchors { top: parent.top; left: parent.left; right: parent.right }
+ height: 64
- PlasmaComponents.ToolButton {
- id: clearPlaylist
- width: 40
- height: width
- anchors.top: parent.top
- iconSource: "edit-clear-list"
- onClicked: {
- playlistModel.clearPlaylist();
+ Item {
+ height: parent.height
+ width: parent.width - clearPlaylist.width
+ Text {
+ id: mediaCount
+ anchors.centerIn: parent
+ text: playlistList.count + " items"
+ font.pixelSize: 18
+ color: "white"
}
}
- Text {
- id: mediaCount
- anchors.left: clearPlaylist.right
- anchors.leftMargin: 10
- anchors.verticalCenter: parent.verticalCenter
- text: "MediaCount " + playlistList.count
- font.pixelSize: 18
- color: "white"
+ PlasmaComponents.ToolButton {
+ id: clearPlaylist
+ width: height
+ height: parent.height
+ iconSource: "edit-clear-list"
+ onClicked: playlistModel.clearPlaylist();
}
}
ListView {
id: playlistList
- anchors.top: rect.bottom
+ anchors { top: topRow.bottom; left: parent.left; right: parent.right }
anchors.bottom: parent.bottom
- anchors.topMargin: 4
+ anchors.margins: 5
model: playlistModel
- width: parent.width
- height: parent.height - clearPlaylist.height
spacing: 3
+ clip: true
- delegate:
- Item{
- id: listViewItem
- width: parent.width
- height: 30
- MouseArea {
- hoverEnabled: true
- onEntered: listViewItem.ListView.view.currentIndex = index
- anchors.fill: parent
- onClicked: {
- playlistModel.currentIndex = index
- playlistItem.playRequested(mediaUrl)
- }
- }
- Rectangle {
- anchors.fill: parent
- color: listViewItem.ListView.isCurrentItem ? "#002378" : \
"lightsteelblue"
- opacity: 0.4
- Text {
- text: display
- color: (index == playlistModel.currentIndex) ? "red" : "white"
- elide: Text.ElideRight
- font.pixelSize: 18
- anchors.verticalCenter: parent.verticalCenter
- }
- }
-
- PlasmaComponents.ToolButton {
- id: removeFromPlaylistButton
- width: 30
- height: width
- visible: listViewItem.ListView.isCurrentItem
- iconSource: "list-remove"
- anchors { right: parent.right; top: parent.top }
- onClicked: {
- playlistModel.removeFromPlaylist (index);
- }
- }
- }
+ delegate: PlaylistDelegate { width: parent.width; height: 32 }
}
}
diff --git a/shells/newshell/package/contents/ui/mediacenter.qml \
b/shells/newshell/package/contents/ui/mediacenter.qml index cf80594..2b40ca6 100644
--- a/shells/newshell/package/contents/ui/mediacenter.qml
+++ b/shells/newshell/package/contents/ui/mediacenter.qml
@@ -134,9 +134,7 @@ Rectangle {
onPlaylistButtonClicked: {
if(playlistButtonChecked) {
- mediaBrowser.state = "resize"
playlist.state = "playlistShow"
- playlist.z = 2
} else {
mediaBrowser.state = ""
playlist.state = ""
@@ -203,7 +201,7 @@ Rectangle {
MediaCenterComponents.MediaBrowser {
id: mediaBrowser
anchors {
- left: parent.left; right: parent.right; top: mediaController.bottom; \
bottom:parent.bottom + left: parent.left; right: playlist.left; top: \
mediaController.bottom; bottom:parent.bottom }
height: parent.height
visible: false
@@ -253,24 +251,17 @@ Rectangle {
}
}
- states: [
- State {
- name: "resize"
- AnchorChanges { target: mediaBrowser; anchors.right: playlist.left }
- }
- ]
-
transitions: [ Transition { AnchorAnimation { duration: 500 } } ]
}
MediaCenterComponents.Playlist {
id: playlist
anchors {
- top: mediaController.bottom
- left: parent.right
- right: undefined
+ top: mediaController.bottom; bottom: parent.bottom
+ left: parent.right; right: undefined
margins: 10
}
+ width: parent.width/4
onPlayRequested: {
z = 0
mediaPlayer.visible = true
@@ -289,7 +280,7 @@ Rectangle {
}
]
- transitions: [ Transition { AnchorAnimation { duration: 100 } } ]
+ transitions: [ Transition { AnchorAnimation { duration: 200 } } ]
}
MediaCenterComponents.AboutPMC {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic