Merge branch 'master' of github.com:papyros/papyros-shell

iBelieve · iBelieve · commit 85badcb780cb · 2015-03-04T19:35:08.000-06:00
diff --git a/qml/launcher/AppDrawer.qml b/qml/launcher/AppDrawer.qml
@@ -65,6 +65,7 @@ Indicator {
                 id: input
 
                 placeholderText: "Search"
+                
             	anchors {
             	    left: parent.left
             	    right: parent.right
diff --git a/qml/launcher/UseGrid.qml b/qml/launcher/UseGrid.qml
@@ -20,37 +20,37 @@ import QtQuick 2.0
 import Material 0.1
 
 GridView {
-	z: 5
-	clip: true
-	boundsBehavior: Flickable.StopAtBounds
-	model: desktopScrobbler.desktopFiles
-	delegate: Item {
-	   	width: units.dp(90)
-	   	height: units.dp(90)
+    z: 5
+    clip: true
+    boundsBehavior: Flickable.StopAtBounds
+    model: desktopScrobbler.desktopFiles
+    delegate: Item {
+        width: units.dp(90)
+        height: units.dp(90)
 
-		Image {
-			anchors {
-				horizontalCenter: parent.horizontalCenter
-				top: parent.top
-				topMargin: units.dp(1)
-			}
-			height: units.dp(40)
-			width: units.dp(40)
-			source: edit.icon
-		}
-		Ink {
-			anchors.fill: parent
-			onClicked: edit.launch()
-		}
-		Label {
-			text: edit.localizedName || edit.name
-			anchors.bottom: parent.bottom
-			anchors.bottomMargin: units.dp(0.5)
-			width: parent.width
-			wrapMode: Text.WordWrap
-			horizontalAlignment: Text.AlignHCenter
-		}
-	}
-        cellWidth: units.dp(90)
-	cellHeight: units.dp(90)
+        Image {
+	    anchors {
+                horizontalCenter: parent.horizontalCenter
+                top: parent.top
+                topMargin: units.dp(1)
+            }
+            height: units.dp(40)
+            width: units.dp(40)
+            source: edit.icon
+        }
+        Ink {
+            anchors.fill: parent
+            onClicked: edit.launch()
+        }
+        Label {
+            text: edit.localizedName || edit.name
+            anchors.bottom: parent.bottom
+            anchors.bottomMargin: units.dp(0.5)
+            width: parent.width
+            wrapMode: Text.WordWrap
+            horizontalAlignment: Text.AlignHCenter
+        }
+    }
+    cellWidth: units.dp(90)
+    cellHeight: units.dp(90)
 }
diff --git a/qml/launcher/UseList.qml b/qml/launcher/UseList.qml
@@ -25,7 +25,7 @@ ListView {
     boundsBehavior: Flickable.StopAtBounds
     model: desktopScrobbler.desktopFiles
     delegate: ListItem.Subtitled {
-        onTriggered: edit.launch()
+        onClicked: edit.launch()
         text: edit.localizedName || edit.name
         subText: edit.localizedComment || edit.comment
     }
diff --git a/qml/panel/NotificationCenter.qml b/qml/panel/NotificationCenter.qml
@@ -1,8 +1,26 @@
+/*
+ * Papyros Shell - The desktop shell for Papyros following Material Design
+ * Copyright (C) 2015 Michael Spencer
+ *               2015 Bogdan Cuza
+ *               2015 Ricardo Vieira
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 import QtQuick 2.0
 import Material 0.1
 import Material.Extras 0.1
-import Material.ListItems 0.1 as ListItem
-import Material.Desktop 0.1
 
 View {
     fullHeight: true
@@ -28,71 +46,97 @@ View {
 
     property var widgets: ["Music"]
 
-    Column {
+    View {
+        id: view
+        height: label.height + units.dp(16)
         width: parent.width
+        backgroundColor: "#fafafa"
+        z: 10
 
-        spacing: units.dp(16)
-
-        View {
-            id: view
-            height: label.height + units.dp(16)
-            width: parent.width
-
-            Label {
-                id: label
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    bottom: parent.bottom
-                    leftMargin: units.dp(16)
-                    rightMargin: units.dp(16)
-                }
-
-                text:  Qt.formatDateTime(now, "dddd',<br>'MMMM d'<sup>%1</sup>'"
-                        .arg(Utils.nth(now.getDate())))
-
-                style: "title"
-                font.pixelSize: units.dp(30)
-                textFormat: Text.RichText
+        Label {
+            id: label
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+                leftMargin: units.dp(16)
+                rightMargin: units.dp(16)
             }
-        }
 
-        Repeater {
-            model: widgets
-            delegate: Loader {
-                source: Qt.resolvedUrl("../widgets/%1.qml".arg(modelData))
+            text:  Qt.formatDateTime(now, "dddd',<br>'MMMM d'<sup>%1</sup>'"
+                    .arg(Utils.nth(now.getDate())))
 
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: units.dp(16)
-                }
-            }
+            style: "title"
+            font.pixelSize: units.dp(30)
+            textFormat: Text.RichText
         }
     }
 
-    Item {
+    Flickable {
         anchors {
+            top: view.bottom
             left: parent.left
             right: parent.right
-            bottom: parent.bottom
-            margins: units.dp(16)
+            bottom: silentMode.bottom
+            topMargin: units.dp(16)
         }
+        z: 5
+        contentHeight: widgetCol.height
+        interactive: contentHeight > height
+        boundsBehavior: Flickable.StopAtBounds
 
-        height: units.dp(30)
+        Column {
+            id: widgetCol
 
-        Label {
-            anchors.verticalCenter: parent.verticalCenter
+            width: parent.width
 
-            text: "Silent mode"
+            Repeater {
+                model: widgets
+                delegate: Loader {
+                    source: Qt.resolvedUrl("../widgets/%1.qml".arg(modelData))
+
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        margins: units.dp(16)
+                    }
+                }
+            }
         }
+    }
+
+    Rectangle {
+        id: silentMode
+
+        anchors.bottom: parent.bottom
+        height: units.dp(46)
+        width: parent.width
+        color: "#fafafa"
+        z: 10
+
+        Rectangle {
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+                margins: units.dp(16)
+            }
+
+            height: units.dp(30)
 
-        Switch {
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.right: parent.right
+            Label {
+                anchors.verticalCenter: parent.verticalCenter
 
-            checked: config.silentMode
-            onCheckedChanged: config.silentMode = checked
+                text: "Silent mode"
+            }
+
+            Switch {
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.right: parent.right
+
+                checked: config.silentMode
+                onCheckedChanged: config.silentMode = checked
+            }
         }
     }
 }
diff --git a/qml/widgets/Music.qml b/qml/widgets/Music.qml
@@ -1,21 +1,33 @@
+/*
+ * Papyros Shell - The desktop shell for Papyros following Material Design
+ * Copyright (C) 2015 Michael Spencer
+ *               2015 Bogdan Cuza
+ *               2015 Ricardo Vieira
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 import QtQuick 2.0
 import Material 0.1
-import Material.ListItems 0.1 as ListItem
 import Material.Desktop 0.1
-import Material.Extras 0.1
 
 Column {
     spacing: units.dp(16)
 
     Repeater {
         model: musicPlayer.playerList
 
-        /*
-    if the playback state is Stopped
-    a player can't play, pause, next or previous
-    so you should replace it with an open button
-    and use the raise function,
-    */
         delegate: Card {
             width: parent.width
 
@@ -96,26 +108,41 @@ Column {
                     }
                 }
 
+                //TODO: Add a slider
+
                 Row {
                     anchors.horizontalCenter: parent.horizontalCenter
 
                     spacing: units.dp(10)
+                    opacity: playbackStatus == "Stopped" ? 0 : 1
+                    height: playbackStatus == "Stopped" ? 0 : playPauseBtn.height
 
                     IconButton {
                         name: "av/skip_previous"
-                        onTriggered: previous()
+                        onClicked: previous()
+                        enabled: canGoPrevious
                     }
 
                     IconButton {
-                        name: "av/pause"
-                        onTriggered: playPause()
+                        id: playPauseBtn
+
+                        name: playbackStatus == "Paused" ? "av/play_arrow" : "av/pause"
+                        onClicked: playPause()
                     }
 
                     IconButton {
                         name: "av/skip_next"
-                        onTriggered: next()
+                        onClicked: next()
+                        enabled: canGoNext
                     }
                 }
+
+                Button {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    opacity: playbackStatus == "Stopped" ? 1 : 0
+                    text: "Open"
+                    onClicked: raise()
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ ListView {`
`25`	`25`	`boundsBehavior: Flickable.StopAtBounds`
`26`	`26`	`model: desktopScrobbler.desktopFiles`
`27`	`27`	`delegate: ListItem.Subtitled {`
`28`		`- onTriggered: edit.launch()`
	`28`	`+ onClicked: edit.launch()`
`29`	`29`	`text: edit.localizedName \|\| edit.name`
`30`	`30`	`subText: edit.localizedComment \|\| edit.comment`
`31`	`31`	`}`