X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2FVideoPlayerPage.qml;h=7f4d98139a78ff795398a9fb93343e624d13b9b4;hp=c87e50791153dcfbefbb6d7e943320dff4d2c2f3;hb=85c427cfb45ba69054e7e36a94b673600a051351;hpb=2220bbab5b160494b906972df6d8bdb327d737be

diff --git a/qml/VideoPlayerPage.qml b/qml/VideoPlayerPage.qml
index c87e507..7f4d981 100644
--- a/qml/VideoPlayerPage.qml
+++ b/qml/VideoPlayerPage.qml
@@ -20,8 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
 import CameraPlus 1.0
 import QtCamera 1.0
 import QtCameraExtras 1.0
@@ -36,6 +35,10 @@ Item {
         return video.play()
     }
 
+    function stop() {
+        return video.stop()
+    }
+
     MouseArea {
         anchors.top: parent.top
         anchors.bottom: toolBar.top
@@ -55,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()
@@ -100,20 +103,19 @@ Item {
             PropertyAnimation { duration: 200; }
         }
 
-        items: [
-            ToolIcon {
-                iconId: "icon-m-toolbar-mediacontrol-stop-white"
+        tools: CameraToolBarTools {
+            CameraToolIcon {
+                iconSource: cameraTheme.videoStopIconId
                 onClicked: video.stop()
-            },
-            Slider {
+            }
+
+            CameraSlider {
                 id: slider
                 height: toolBar.height
                 anchors.verticalCenter: parent.verticalCenter
 
-                platformStyle: SliderStyle {
-                    handleBackground: ""
-                    handleBackgroundPressed: ""
-                }
+                handleBackground: ""
+                handleBackgroundPressed: ""
 
                 minimumValue: 0
                 maximumValue: video.duration
@@ -127,16 +129,16 @@ Item {
 
                     hideTimer.restart()
                 }
-            },
-            ToolIcon {
+            }
+
+            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()
                 }
             }
-        ]
+        }
     }
 }