Improved UI, Refactored code, Dialog.qml now is unnecesary, added Too…

…lButton in TitleBar

plasmoid/contents/code/utils.js

@@ -16,6 +16,12 @@
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+.pragma library
+
+var iconApplication
+var plasmoid
+var i18n
+
 function setActions(sourceActive, identity){
 	var icon
 
@@ -32,18 +38,19 @@ function setActions(sourceActive, identity){
 		case 'clementine':
 			icon = 'application-x-clementine'
 	}
+	iconApplication = icon
+	print(iconApplication)
 
 	plasmoid.setAction('raise', i18n("Open %1", identity), icon)
 	plasmoid.setAction('quit', i18n("Quit"), 'window-close')
-	plasmoid.setActionSeparator('sep0')
-	plasmoid.setAction('nextSource', i18n("Next source"), 'go-next')
+	plasmoid.setAction('nextSource', i18n("Next multimedia source"), 'go-next')
 	plasmoid.setActionSeparator('sep1')
+
 }
 
 function removeActions(){
 	plasmoid.removeAction('raise')
 	plasmoid.removeAction('quit')
-	plasmoid.removeAction('sep0')
 	plasmoid.removeAction('nextSource')
 	plasmoid.removeAction('sep1')
 }

plasmoid/contents/ui/CompactApplet.qml

@@ -35,6 +35,8 @@ Flow{
 
 	property int _buttonSize: vertical ? (parent && parent.width ? parent.width : 0 ): (parent && parent.height ? parent.height : 0 )
 
+	property alias playbackBarVisible: playbackBar.visible
+
 	PlaybackBar{
 		id: playbackBar
 		buttonSize: parent._buttonSize
@@ -45,17 +47,27 @@ Flow{
 		PopupButton{
 			id: popup
 
-			size: mpris2.sourceActive ? _buttonSize * (plasmoid.configuration.FlatButtons ? 0.7 : 0.5) : _buttonSize
+			size: playbackBar.visible ?
+				_buttonSize * (plasmoid.configuration.FlatButtons ? 0.7 : 0.5) : _buttonSize
 			anchors.centerIn: parent
-			opened: popupDialog.visible
+			opened: plasmoid.expanded
 
 			onClicked: {
-				popupDialog.setVisible(!popupDialog.visible)
+				plasmoid.expanded = !plasmoid.expanded
 			}
 		}
-		Dialog{
-			id: popupDialog
-			visualParent: playbackControl
+	}
+
+
+	Timer{
+		//HACK: For PopupApplet in  Notification
+		running: playbackBar.visible
+		interval: 100
+		onTriggered: {
+			if((!vertical && playbackBar.width > playbackControl.width) ||
+				(vertical && playbackBar.height > playbackControl.height)){
+				playbackBar.visible = false
+			}
 		}
 	}
 

plasmoid/contents/ui/CoverArt.qml

@@ -28,6 +28,7 @@ Rectangle{
 	height: units.iconSizes.enormous
 	color: Utils.adjustAlpha(theme.complementaryBackgroundColor, 0.4)
 	radius: 2
+	opacity: 0.1
 
 	border{
 		width: 1
@@ -76,15 +77,16 @@ Rectangle{
 		horizontalAlignment: Image.AlignHCenter
 		verticalAlignment: Image.AlignVCenter
 
-		Component.onCompleted: statusChanged(status)
-
 		onStatusChanged:{
-			if(status == Image.Ready)
+			if(status == Image.Ready && mpris2.artUrl != "")
 				appear.start()
 			else if(status == Image.Null)
 				fade.start()
-			else if(status == Image.Error)
+			else if(status == Image.Error){
+				fade.start()
 				debug("Err on CoverArt: " + mpris2.artUrl)
+			}else
+				fade.start()
 		}
 	}
 }

plasmoid/contents/ui/Dialog.qml

@@ -19,7 +19,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.core 2.0 as PlasmaCores
 import org.kde.plasma.plasmoid 2.0
 
 PlasmaCore.Dialog{
@@ -44,6 +44,7 @@ PlasmaCore.Dialog{
 	hideOnWindowDeactivate: true
 
 	onVisibleChanged: {
+		plasmoid.expanded = true
 		debug("Dialog visible: "+visible )
 		if(visible)
 			mpris2.interval = mpris2.maximumLoad

plasmoid/contents/ui/FullApplet.qml

@@ -19,8 +19,8 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-// import org.kde.plasma.core 2.0 as PlasmaCore
-// import org.kde.plasma.extras 2.0 as PlasmaExtras
+import org.kde.plasma.extras 2.0 as PlasmaExtras
 
+// import org.kde.plasma.core 2.0 as PlasmaCore
 
 DefaultLayout{}

plasmoid/contents/ui/Mpris2.qml

@@ -26,6 +26,8 @@ PlasmaCore.DataSource{
 
 	engine: 'mpris2'
 
+	interval: plasmoid.expanded ? maximumLoad : minimumLoad
+
 	readonly property int maximumLoad: 450
 
 	readonly property int minimumLoad: 1500
@@ -45,7 +47,7 @@ PlasmaCore.DataSource{
 
 	property string identity: hasSource('Identity') ? data[source]['Identity'] : i18n("No media player")
 
-	property string playbackStatus: hasSource('PlaybackStatus') ? data[source]['PlaybackStatus'] : "Paused"
+	property string playbackStatus: hasSource('PlaybackStatus') ? data[source]['PlaybackStatus'] : ""
 
 	property string artUrl: hasMetadataMpris('artUrl') ? data[source]['Metadata']['mpris:artUrl'] : ""
 
@@ -78,6 +80,8 @@ PlasmaCore.DataSource{
 
 	Component.onCompleted: nextSource()
 
+	onIntervalChanged: debug("interval: "+interval)
+
 	onIdentityChanged:{
 		if(source.length > 0) Utils.setActions(source[0], identity)
 	}

plasmoid/contents/ui/PlaybackItem.qml

@@ -29,10 +29,10 @@ Item{
 
     property int buttonSize: units.iconSizes.small
 
-    visible: mpris2.sourceActive
-
     enabled: mpris2.sourceActive && mpris2.canControl
 
+    visible: mpris2.sourceActive
+
     signal playPause()
 
     signal previous()

plasmoid/contents/ui/PopupButton.qml

@@ -34,6 +34,16 @@ IconWidget{
 		id: svgSource
 		property var arrows: PlasmaCore.Svg{ imagePath: "widgets/arrows" }
 		property var media: PlasmaCore.Svg{ imagePath: "icons/media" }
+		function playbackIcon(){
+			var icon
+			if(mpris2.playbackStatus == "Playing")
+				icon = "media-playback-start"
+			else if(mpris2.playbackStatus == "Paused")
+				icon = "media-playback-pause"
+			else
+				icon = "media-playback-start"
+			return icon
+		}
 	}
 
 	state: "default"
@@ -49,11 +59,12 @@ IconWidget{
 
 	states: [
 	State{
-		when: !mpris2.sourceActive
+		when: !mpris2.sourceActive || !playbackBarVisible
 		PropertyChanges{
 			target: iconPopup
 			svg: svgSource.media
-			iconSource: "media-playback-start"
+			iconSource: svgSource.playbackIcon()
+			rotation: 0
 		}
 	},
 	State{

plasmoid/contents/ui/TitleBar.qml

@@ -19,13 +19,56 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
+import "plasmapackage:/code/utils.js" as Utils
 
-PlasmaExtras.Title{
-	id: titleBar
-	Layout.minimumHeight: height + units.smallSpacing
-	lineHeight: 1.2
-	text: mpris2.identity
-	enabled: mpris2.sourceActive
+RowLayout{
+	Layout.minimumHeight: implicitHeight + units.smallSpacing
+
+	PlasmaExtras.Title{
+		id: titleBar
+		Layout.fillWidth: true
+		lineHeight: 1.2
+		text: mpris2.identity
+		enabled: mpris2.sourceActive
+	}
+
+	PlasmaComponents.ToolButton{
+		id: menuButton
+		property var contextMenu
+
+		Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+		enabled: mpris2.sourceActive
+		iconSource: "configure"
+		onClicked: {
+			if(!contextMenu)
+				contextMenu = contextMenuComponent.createObject(menuButton)
+			contextMenu.open()
+		}
+	}
+
+	Component{
+		id: contextMenuComponent
+		PlasmaComponents.ContextMenu{
+			visualParent: menuButton
+			PlasmaComponents.MenuItem{
+				icon: Utils.iconApplication
+				text: "Open " + mpris2.identity
+				onClicked: action_raise()
+			}
+			PlasmaComponents.MenuItem{
+				icon: "window-close"
+				text: "Quit"
+				onClicked: action_quit()
+			}
+			PlasmaComponents.MenuItem{
+				icon: "go-next"
+				text: "Next multimedia source"
+				onClicked: action_nextSource()
+			}
+		}
+	}
 }
 

plasmoid/contents/ui/main.qml

@@ -23,6 +23,7 @@ import QtQuick.Layouts 1.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.plasmoid 2.0
+import "plasmapackage:/code/utils.js" as Utils
 
 Item {
     id: root
@@ -45,8 +46,10 @@ Item {
 		onFormFactorChanged: {
 		debug("FormFactor: " + plasmoid.formFactor)
 			if(plasmoid.formFactor == 0){
+				Plasmoid.expanded = true
 				Plasmoid.preferredRepresentation = Plasmoid.fullRepresentation
-				mpris2.interval = mpris2.maximumLoad
+			}else{
+				plasmoid.expanded = false
 			}
 		}
 	}
@@ -73,6 +76,9 @@ Item {
 	Component.onCompleted:{
 		debug("Location: " + Plasmoid.location)
 		plasmoid.formFactorChanged()
+		//NOTE: Init Utils
+		Utils.plasmoid = plasmoid
+		Utils.i18n = i18n
     }
 
 	QtObject{

plasmoid/metadata.desktop

@@ -14,14 +14,14 @@ X-Plasma-MainScript=ui/main.qml
 X-Plasma-Provides=org.kde.plasma.multimediacontrols
 X-Plasma-NotificationArea=true
 X-Plasma-DBusActivationService=org.mpris.MediaPlayer2.*
-#X-Plasma-ConfigPlugins=kcm_playbarshortcuts
+# X-Plasma-ConfigPlugins=kcm_playbarshortcuts
 
 X-KDE-PluginInfo-Author=Smith AR
 X-KDE-PluginInfo-Category=Multimedia
 X-KDE-PluginInfo-Email[email protected]
 X-KDE-PluginInfo-License=GPLv3
-X-KDE-PluginInfo-Name=audoban.playbar2
-X-KDE-PluginInfo-Version=2alpha
+X-KDE-PluginInfo-Name=audoban.applet.playbar
+X-KDE-PluginInfo-Version=1.9Alpha
 X-KDE-PluginInfo-Website=https://github.com/audoban/PlayBar2
 
 X-KDE-ServiceTypes=Plasma/Applet