X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=qml%2FVideoPage.qml;h=b6b93be21f356c28260ea5fe8efe3e56028b9873;hb=206a980ab4f3a31f19929df50f1ab0a2175fd6c7;hp=792e6ff0a13c2d8d1c6bf7ba961b7fe079b1608b;hpb=895fac6221a914ba37c34b41815553e11fb95e49;p=harmattan%2Fcameraplus

diff --git a/qml/VideoPage.qml b/qml/VideoPage.qml
index 792e6ff..b6b93be 100644
--- a/qml/VideoPage.qml
+++ b/qml/VideoPage.qml
@@ -1,15 +1,48 @@
 // -*- qml -*-
+
+/*!
+ * This file is part of CameraPlus.
+ *
+ * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 import QtQuick 1.1
 import com.nokia.meego 1.1
 import QtCamera 1.0
+import CameraPlus 1.0
+import "data.js" as Data
 
+// TODO: video recording indicators.
+// TODO: stop recording when battery low
+// TODO: stop recording when disk is low
 CameraPage {
         id: page
 
-        controlsVisible: recording.visible && cam.running && !standbyWidget.visible
+        policyMode: CameraResources.Video
+
+        controlsVisible: videoControlsVisible && !videoMode.recording
+        property bool videoControlsVisible: recording.visible && cam.running && !standbyWidget.visible
 
         orientationLock: PageOrientation.LockLandscape
 
+        DisplayState {
+                inhibitDim: videoMode.recording
+        }
+
         Button {
                 id: recording
                 anchors.right: parent.right
@@ -19,23 +52,54 @@ CameraPage {
                 width: 75
                 height: 75
                 opacity: 0.5
+
                 onClicked: {
-                        if (!videoMode.recording) {
-                // TODO:
-                                videoMode.startRecording("/home/developer/foo.mp4");
+                        if (!fileSystem.available) {
+                                showError(qsTr("Camera cannot record videos in mass storage mode."));
+                                return;
                         }
-                        else {
+
+                        // We only toggle the mode to video recording so
+                        // policy can acquire the needed resources
+
+                        if (policyMode == CameraResources.Video) {
+                                policyMode = CameraResources.Recording;
+                        }
+                        else if (videoMode.recording) {
+                                // We just ask to stop video.
                                 videoMode.stopRecording();
                         }
                 }
 
+                Connections {
+                        target: videoMode
+                        onRecordingChanged: {
+                                if (!videoMode.recording) {
+                                        policyMode = CameraResources.Video;
+                                }
+                        }
+                }
+
+                Connections {
+                        target: resourcePolicy
+                        onAcquiredChanged: {
+                                if (resourcePolicy.acquired && policyMode == CameraResources.Recording) {
+                                        metaData.setMetaData();
+                                        if (!videoMode.startRecording(fileNaming.videoFileName())) {
+                                                showError(qsTr("Failed to record video. Please restart the camera."));
+                                                policyMode = CameraResources.Video
+}
+                                }
+                        }
+                }
+
                 visible: (videoMode.recording || videoMode.canCapture) && !cameraMode.animationRunning && !previewAnimationRunning && !standbyWidget.visible
         }
 
         Connections {
-                target: platformWindow
+                target: Qt.application
                 onActiveChanged: {
-                        if (!platformWindow.active && videoMode.recording) {
+                        if (!Qt.application.active && videoMode.recording) {
                                 videoMode.stopRecording();
                         }
                 }
@@ -53,7 +117,7 @@ CameraPage {
 
         VideoTorchButton {
                 id: torch
-                visible: controlsVisible
+                visible: videoControlsVisible
                 anchors.top: parent.top
                 anchors.left: parent.left
                 anchors.topMargin: 20
@@ -63,7 +127,7 @@ CameraPage {
 
         VideoSceneButton {
                 id: scene
-                visible: controlsVisible && !videoMode.recording
+                visible: controlsVisible
                 anchors.top: torch.bottom
                 anchors.left: parent.left
                 anchors.topMargin: 10
@@ -72,10 +136,83 @@ CameraPage {
 
         EvCompButton {
                 id: evComp
-                visible: controlsVisible
+                visible: videoControlsVisible
                 anchors.top: scene.bottom
                 anchors.left: parent.left
                 anchors.topMargin: 10
                 anchors.leftMargin: 20
         }
+
+        MouseArea {
+                id: indicators
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: 20
+                anchors.left: parent.left
+                anchors.leftMargin: 20
+                width: 48
+                height: col.height
+                onClicked: openFile("VideoSettingsPage.qml");
+                visible: controlsVisible
+
+                BorderImage {
+                        id: image
+                        anchors.fill: parent
+                        smooth: true
+                        source: indicators.pressed ? "image://theme/meegotouch-camera-settings-indicators-background-pressed" : "image://theme/meegotouch-camera-settings-indicators-background"
+                }
+
+                Column {
+                        id: col
+                        width: parent.width
+                        spacing: 5
+
+                        Indicator {
+                                id: resolutionIndicator
+                                source: "image://theme/" + Data.videoIcon(settings.videoResolution);
+                        }
+
+                        Indicator {
+                                id: wbIndicator
+                                source: "image://theme/" + Data.wbIcon(settings.videoWhiteBalance) + "-screen"
+                                visible: settings.videoWhiteBalance != WhiteBalance.Auto
+                        }
+
+                        Indicator {
+                                id: cfIndicator
+                                source: "image://theme/" + Data.cfIcon(settings.videoColorFilter) + "-screen"
+                                visible: settings.videoColorFilter != ColorTone.Normal
+                        }
+
+                        Indicator {
+                                id: gpsIndicator
+                                visible: settings.useGps
+                                source: "image://theme/icon-m-camera-location"
+
+                                PropertyAnimation on opacity  {
+                                        easing.type: Easing.OutSine
+                                        loops: Animation.Infinite
+                                        from: 0.2
+                                        to: 1.0
+                                        duration: 1000
+                                        running: settings.useGps && !positionSource.position.longitudeValid
+                                        alwaysRunToEnd: true
+                                }
+                        }
+                }
+        }
+
+        Button {
+                id: cameraRoll
+                anchors.top: parent.top
+                anchors.right: parent.right
+                anchors.topMargin: 20
+                anchors.rightMargin: 20
+                width: 56
+                height: 56
+
+                opacity: 0.5
+                iconSource: "image://theme/icon-m-camera-roll"
+                onClicked: openFile("PostCapturePage.qml");
+                visible: controlsVisible && !videoMode.recording
+        }
 }