Fixed image preview
[harmattan/cameraplus] / qml / VideoPage.qml
index 39adf2e..dbb3d44 100644 (file)
@@ -1,23 +1,59 @@
 // -*- 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
 
 CameraPage {
         id: page
 
         policyMode: CameraResources.Video
 
-        controlsVisible: recording.visible && cam.running && !standbyWidget.visible
-
+        controlsVisible: cam.running && !videoMode.recording && videoMode.canCapture && !cameraMode.busy && dimmer.opacity == 0.0 && !previewAnimationRunning
         orientationLock: PageOrientation.LockLandscape
 
-        DisplayState {
-                inhibitDim: videoMode.recording
+        function startRecording() {
+                if (!fileSystem.available) {
+                        showError(qsTr("Camera cannot record videos in mass storage mode."));
+                        return;
+                }
+
+                if (!checkBattery()) {
+                        showError(qsTr("Not enough battery to record video."));
+                        return;
+                }
+
+                if (!checkDiskSpace()) {
+                        showError(qsTr("Not enough space to record video."));
+                        return;
+                }
+
+                openFileNow("RecordingPage.qml");
         }
 
-        Button {
+        CaptureButton {
                 id: recording
                 anchors.right: parent.right
                 anchors.rightMargin: 20
@@ -27,94 +63,70 @@ CameraPage {
                 height: 75
                 opacity: 0.5
 
-                onClicked: {
-                        if (!fileSystem.available) {
-                                showError(qsTr("Camera cannot record videos in mass storage mode."));
-                                return;
-                        }
-
-                        // 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;
-                                }
-                        }
-                }
+                onClicked: startRecording();
 
-                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: Qt.application
-                onActiveChanged: {
-                        if (!Qt.application.active && videoMode.recording) {
-                                videoMode.stopRecording();
-                        }
-                }
+                visible: controlsVisible
         }
 
         VideoMode {
                 id: videoMode
                 camera: cam
                 onPreviewAvailable: {
-                        if (!standbyWidget.visible) {
-                                page.setPreview(preview);
-                        }
+                        page.setPreview(preview);
                 }
         }
 
-        VideoTorchButton {
-                id: torch
-                visible: controlsVisible
+        Rectangle {
                 anchors.top: parent.top
-                anchors.left: parent.left
                 anchors.topMargin: 20
+                anchors.left: parent.left
                 anchors.leftMargin: 20
+                width: 48
+                height: col.height
+                color: "black"
+                border.color: "gray"
+                radius: 20
                 opacity: 0.5
-        }
+                visible: controlsVisible
 
-        VideoSceneButton {
-                id: scene
-                visible: controlsVisible && !videoMode.recording
-                anchors.top: torch.bottom
-                anchors.left: parent.left
-                anchors.topMargin: 10
-                anchors.leftMargin: 20
-        }
+                Column {
+                        id: col
+                        width: parent.width
+                        spacing: 5
 
-        EvCompButton {
-                id: evComp
-                visible: controlsVisible
-                anchors.top: scene.bottom
-                anchors.left: parent.left
-                anchors.topMargin: 10
-                anchors.leftMargin: 20
+                        Indicator {
+                                id: resolutionIndicator
+                                source: "image://theme/" + Data.videoIcon(settings.videoResolution);
+                        }
+
+                        Indicator {
+                                id: wbIndicator
+                                source: visible ? "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 {
@@ -129,6 +141,43 @@ CameraPage {
                 opacity: 0.5
                 iconSource: "image://theme/icon-m-camera-roll"
                 onClicked: openFile("PostCapturePage.qml");
-                visible: controlsVisible && !videoMode.recording
+                visible: controlsVisible
+        }
+
+        CameraToolBar {
+                id: toolBar
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: 20
+                anchors.left: parent.left
+                anchors.leftMargin: 20
+                opacity: 0.5
+                targetWidth: parent.width - (anchors.leftMargin * 2) - (66 * 1.5)
+                visible: controlsVisible
+                expanded: settings.showToolBar
+                onExpandedChanged: settings.showToolBar = expanded;
+
+                items: [
+                VideoTorchButton {
+                        camera: cam
+                },
+                VideoSceneButton {
+                        onClicked: toolBar.push(items);
+                },
+                VideoEvCompButton {
+                        onClicked: toolBar.push(items);
+                },
+                VideoWhiteBalanceButton {
+                        onClicked: toolBar.push(items);
+                },
+                VideoColorFilterButton {
+                        onClicked: toolBar.push(items);
+                },
+                VideoMuteButton {
+                },
+                ToolIcon {
+                        iconSource: "image://theme/icon-m-toolbar-view-menu-white"
+                        onClicked: openFile("VideoSettingsPage.qml");
+                }
+                ]
         }
 }