Switch toolbar animation to opacity

[harmattan/cameraplus] / qml / VideoPlayerPage.qml

diff --git a/qml/VideoPlayerPage.qml b/qml/VideoPlayerPage.qml
index 535510e..2e310bf 100644 (file)
--- a/qml/VideoPlayerPage.qml
+++ b/qml/VideoPlayerPage.qml
@@ -58,12 +58,12 @@ Item {
     VideoPlayer {
         id: video
         anchors.fill: parent
-        cameraConfig: cam.cameraConfig
+        cameraConfig: camera.cameraConfig
 
         onError: showError(qsTr("Error playing video. Please try again or restart the application"))
 
         function toggle() {
-            if (!video.paused) {
+            if (state != VideoPlayer.StatePaused) {
                 video.pause()
             } else {
                 page.play()
@@ -94,20 +94,22 @@ Item {
         hideBack: true
         expanded: true
         anchors.bottom: parent.bottom
-        anchors.bottomMargin: show ? 20 : -1 * (height + 20)
+        anchors.bottomMargin: 20
         anchors.left: parent.left
         anchors.leftMargin: 20
-        opacity: 0.5
+        opacity: show ? 0.8 : 0.0
+        visible: opacity > 0
 
-        Behavior on anchors.bottomMargin {
+        Behavior on opacity {
             PropertyAnimation { duration: 200; }
         }
 
-        items: [
+        tools: CameraToolBarTools {
             CameraToolIcon {
-                iconId: "icon-m-toolbar-mediacontrol-stop-white"
+                iconSource: cameraTheme.videoStopIconId
                 onClicked: video.stop()
-            },
+            }
+
             CameraSlider {
                 id: slider
                 height: toolBar.height
@@ -128,16 +130,16 @@ Item {
 
                     hideTimer.restart()
                 }
-            },
+            }
+
             CameraToolIcon {
                 id: control
-                iconId: !video.paused ? "icon-m-toolbar-mediacontrol-pause-white"
-                    : "icon-m-toolbar-mediacontrol-play-white"
+                iconSource: video.state != VideoPlayer.StatePaused ? cameraTheme.videoPauseIconId : cameraTheme.videoPlayIconId
                 onClicked: {
                     video.toggle()
                     hideTimer.restart()
                 }
             }
-        ]
+        }
     }
 }