One cannot set mode and deviceId. Use camera::reset() instead.
[harmattan/cameraplus] / qml / main.qml
index 7258d1b..5fdc7f5 100644 (file)
@@ -1,31 +1,46 @@
 // -*- 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 com.nokia.extras 1.1
 import QtCamera 1.0
 import CameraPlus 1.0
 import QtMobility.systeminfo 1.2
+import QtMobility.location 1.2
 
-// TODO: metadata creator name, gps, geotags
-// TODO: resolutions and aspect ratios
 // TODO: postcapture
-// TODO: battery low state
-// TODO: disk space
 // TODO: flash not ready
 // TODO: focus, caf, ...
-// TODO: indicators
 // TODO: portrait/landscape
-// TODO: record video in a hidden directory and then copy the video to avoid tracker indexing it.
 // TODO: stop viewfinder in settings pages ?
-// TODO: prevent going to mass storage while recording and capturing
-// TODO: sounds
 // TODO: grid lines, face tracking, ambr
 // TODO: complete settings pages
-// TODO: stop camera properly when we get closed.
 // TODO: select primary/secondary camera.
 // TODO: disable debug builds.
 // TODO: a way to get buffers to the application
 // TODO: fcam like functionality (precise control over capture parameters).
+// TODO: changing scene mode doesn't affect the existing properties ?
+// TODO: upon startup all properties don't load correct values.
 
 PageStackWindow {
         id: root
@@ -36,11 +51,16 @@ PageStackWindow {
 
         Component.onCompleted: {
                 theme.inverted = true;
-                if (settings.mode == 0) {
-                        openFile("ImagePage.qml");
+                if (settings.mode == Camera.VideoMode) {
+                        // TODO: We will use replacePage for now.
+                        // If we use openPage() then we end up with 2 video pages
+                        // stacked on top of each other.
+                        // The first one is created when the camera mode gets
+                        // changed to video upon startup and this becomes the 2nd one.
+                        replacePage("VideoPage.qml");
                 }
                 else {
-                        openFile("VideoPage.qml");
+                        replacePage("ImagePage.qml");
                 }
         }
 
@@ -49,16 +69,64 @@ PageStackWindow {
                 error.show();
         }
 
+        function resetCamera(deviceId, mode) {
+                if (!cam.reset(deviceId, mode)) {
+                        showError(qsTr("Failed to set camera device and mode. Please restart the application."));
+                }
+        }
+
+        PositionSource {
+                // NOTE: The source will not reset the position when we lose the signal.
+                // This shouldn't be a big problem as we are course enough.
+                // If we ever need street level updates then this will be an issue.
+                id: positionSource
+                active: settings.useGps
+                // TODO: we cannot bind to cam.running because camera will stop
+                // when the connection dialog pops up and we end up with an infinite loop
+                // active: cam.running && settings.useGps
+                onPositionChanged: geocode.search(position.coordinate.longitude, position.coordinate.latitude);
+        }
+
+        MetaData {
+                id: metaData
+                camera: cam
+                manufacturer: deviceInfo.manufacturer
+                model: deviceInfo.model
+                country: geocode.country
+                city: geocode.city
+                suburb: geocode.suburb
+                longitude: positionSource.position.coordinate.longitude
+                longitudeValid: positionSource.position.longitudeValid && settings.useGps
+                latitude: positionSource.position.coordinate.latitude
+                latitudeValid: positionSource.position.latitudeValid && settings.useGps
+                elevation: positionSource.position.coordinate.altitude
+                elevationValid: positionSource.position.altitudeValid && settings.useGps
+                orientation: orientation.orientation
+                artist: settings.creatorName
+                captureDirection: compass.direction
+                captureDirectionValid: compass.directionValid
+                horizontalError: positionSource.position.horizontalAccuracy
+                horizontalErrorValid: positionSource.position.horizontalAccuracyValid && settings.useGps
+                dateTimeEnabled: true
+        }
+
+        Orientation {
+                id: orientation
+                active: cam.running
+        }
+
+        Compass {
+                id: compass
+                active: cam.running
+        }
+
+        ReverseGeocode {
+                id: geocode
+                active: cam.running && settings.useGps && settings.useGeotags
+        }
+
         CameraResources {
                 id: resourcePolicy
-                onAcquiredChanged: {
-                        if (resourcePolicy.acquired) {
-                                // TODO:
-                        }
-                        else {
-                                // TODO: We need a way to force a stop.
-                        }
-                }
         }
 
         DeviceInfo {
@@ -83,32 +151,71 @@ PageStackWindow {
                 videoSuffix: cam.videoSuffix
         }
 
-        // Stolen from https://qt.gitorious.org/qt-components/qt-components/blobs/master/examples/meego/QmlComponentGallery/qml/ListPage.qml
+        MountProtector {
+                id: mountProtector
+                path: fileNaming.path
+        }
+
         function replacePage(file) {
-                var component = Qt.createComponent(file)
+                pageStack.replace(Qt.resolvedUrl(file), {cam: cam}, true);
+        }
+
+        function openFile(file) {
+                pageStack.push(Qt.resolvedUrl(file), {cam: cam});
+        }
+
+        platformStyle: PageStackWindowStyle {
+                // TODO: Hack
+                background: " "
+        }
 
-                if (component.status == Component.Ready) {
-                        pageStack.replace(component, {cam: cam}, true);
+        ImageSettings {
+                id: imageSettings
+                camera: cam
+                function setImageResolution() {
+                        if (!imageSettings.setResolution(settings.imageAspectRatio, settings.imageResolution)) {
+                                showError(qsTr("Failed to set required resolution"));
+                        }
                 }
-                else {
-                        console.log("Error loading component:", component.errorString());
+
+                onReadyChanged: {
+                        if (ready) {
+                                imageSettings.setImageResolution();
+                        }
                 }
         }
 
-        function openFile(file) {
-                var component = Qt.createComponent(file)
+        VideoSettings {
+                id: videoSettings
+                camera: cam
 
-                if (component.status == Component.Ready) {
-                        pageStack.push(component, {cam: cam});
+                function setVideoResolution() {
+                        if (!videoSettings.setResolution(settings.videoAspectRatio, settings.videoResolution)) {
+                                showError(qsTr("Failed to set required resolution"));
+                        }
                 }
-                else {
-                        console.log("Error loading component:", component.errorString());
+
+                onReadyChanged: {
+                        if (ready) {
+                                videoSettings.setVideoResolution();
+                        }
                 }
         }
 
-        platformStyle: PageStackWindowStyle {
-                // TODO: Hack
-                background: " "
+        Connections {
+                target: settings
+
+                onImageAspectRatioChanged: {
+                        imageSettings.setImageResolution();
+                }
+
+                onImageResolutionChanged: {
+                        imageSettings.setImageResolution();
+                }
+
+                onVideoResolutionChanged: {
+                        videoSettings.setVideoResolution();
+                }
         }
 
         Camera {
@@ -127,10 +234,19 @@ PageStackWindow {
                         console.log("Camera error (" + code + "): " + message + " " + debug);
                         showError(qsTr("Camera error. Please restart the application."));
                         cam.stop();
+                        resourcePolicy.acquire(CameraResources.None);
+                        mountProtector.unlock();
+                }
+
+                onRunningChanged: {
+                        if (!cam.running) {
+                                mountProtector.unlock();
+                        }
                 }
 
                 // TODO: hardcoding device id
-                Component.onCompleted: { cam.deviceId = 0; mode = settings.mode; }
+                Component.onCompleted: { root.resetCamera(0, settings.mode); }
+                Component.onDestruction: cam.stop();
 
                 // TODO: Hack
                 z: -1
@@ -142,12 +258,18 @@ PageStackWindow {
                         opacity: 0
                         color: "black"
                 }
+
+                notifications: Sounds {
+                        id: sounds
+                        mute: !settings.soundEnabled
+                }
         }
 
         Scene {
                 id: sceneController
                 camera: cam
                 value: ready ? camera.mode == Camera.VideoMode ? settings.videoSceneMode : settings.imageSceneMode : 0
+                onValueChanged: console.log("New scene value " + value);
         }
 
         ColorTone {
@@ -168,6 +290,12 @@ PageStackWindow {
                 dimmer: root.dimmer
         }
 
+        Iso {
+                id: iso
+                camera: cam
+                value: ready ? settings.imageIso : 0
+        }
+
         Connections {
                 target: cam
                 onModeChanged: {