[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-mediacenter] /: Merge branch 'PMC/0.9'
From:       Shantanu Tushar <shaan7in () gmail ! com>
Date:       2012-04-16 17:47:38
Message-ID: 20120416174738.10796A60BB () git ! kde ! org
[Download RAW message or body]

Git commit 2c779fd3868ce61eeff529db49900e5dc4055137 by Shantanu Tushar.
Committed on 16/04/2012 at 19:47.
Pushed by shantanu into branch 'master'.

Merge branch 'PMC/0.9'

Conflicts:
	components/mediacontroller/MediaController.qml
	shells/newshell/package/contents/ui/mediacenter.qml

M  +16   -0    components/mediacontroller/MediaController.qml
M  +4    -28   shells/newshell/package/contents/ui/mediacenter.qml

http://commits.kde.org/plasma-mediacenter/2c779fd3868ce61eeff529db49900e5dc4055137

diff --cc components/mediacontroller/MediaController.qml
index 602e0ab,be645e7..16e3f91
--- a/components/mediacontroller/MediaController.qml
+++ b/components/mediacontroller/MediaController.qml
@@@ -27,9 -27,8 +27,12 @@@ PlasmaCore.FrameSvgItem 
      enabledBorders: "LeftBorder|RightBorder|BottomBorder"
  
      property QtObject runtimeDataObject
++
 +    property alias curMediaTime: curMediaTime.text
 +    property alias totalMediaTime: totalMediaTime.text
 +
+     signal requestToggleBrowser
+ 
      Row {
          id: mediaController
          anchors {
diff --cc shells/newshell/package/contents/ui/mediacenter.qml
index b7e11e5,91f9b17..671bff5
--- a/shells/newshell/package/contents/ui/mediacenter.qml
+++ b/shells/newshell/package/contents/ui/mediacenter.qml
@@@ -60,18 -53,9 +60,17 @@@ Rectangle 
          stopped: runtimeData.stopped
          volume: runtimeData.volume
  
-         onClicked: mediaBrowser.visible = mediaBrowser.visible ? false : true
+         onClicked: mediaController.visible = mediaController.visible ? false : true
 -        onCurrentTimeChanged: runtimeData.currentTime = currentTime
 -
 +        onCurrentTimeChanged: {
 +            runtimeData.currentTime = currentTime
 +            currentTimeSec = currentTime /1000;
 +            currentTimeHr = Math.floor(currentTimeSec / 3600);
 +            currentTimeSec %= 3600;
 +            currentTimeMin = Math.floor(currentTimeSec / 60);
 +            currentTimeSec = Math.floor(currentTimeSec % 60);
 +            mediaController.curMediaTime = currentTimeHr + ":"  + currentTimeMin + \
":" + currentTimeSec;  +        }
- 
-         onStoppedChanged: runtimeData.stopped = stopped
++        
          Keys.onPressed: {
              if(event.key == 16777344) { //Media Play key
                  if(mediaPlayer.playing) {


[prev in list] [next in list] [prev in thread] [next in thread]