X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2Fmain.qml;h=d7c69e65fabc1b048cfb96ba9d03b0628a00b1e3;hp=0766c9fa13010b77081eb88bdcb91313bc028b17;hb=695e8f4f85218b41a7f27af281fcebe8238a33b7;hpb=2d9ddbdccd4a4b75f3564849b31221a1b017e9c1 diff --git a/qml/main.qml b/qml/main.qml index 0766c9f..d7c69e6 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -3,7 +3,7 @@ /*! * This file is part of CameraPlus. * - * Copyright (C) 2012 Mohammed Sameer + * Copyright (C) 2012-2013 Mohammed Sameer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,280 +20,12 @@ * 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 +import QtQuick 2.0 -// TODO: postcapture -// TODO: flash not ready -// TODO: focus, caf, ... -// TODO: portrait/landscape -// TODO: stop viewfinder in settings pages ? -// TODO: grid lines, face tracking, ambr -// TODO: complete settings pages -// 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. +CameraWindow { + id: rootWindow -PageStackWindow { - id: root - - property alias dimmer: camDimmer - - showStatusBar: false - - Component.onCompleted: { - theme.inverted = true; - // TODO: hardcoding device id - root.resetCamera(0, settings.mode); - } - - function showError(msg) { - error.text = msg; - 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 - } - - DeviceInfo { - id: deviceInfo - } - - FSMonitor { - id: fileSystem - } - - InfoBanner { - id: error - } - - Settings { - id: settings - } - - FileNaming { - id: fileNaming - imageSuffix: cam.imageSuffix - videoSuffix: cam.videoSuffix - } - - MountProtector { - id: mountProtector - path: fileNaming.path - } - - function replacePage(file) { - pageStack.replace(Qt.resolvedUrl(file), {cam: cam}, true); - } - - function openFile(file) { - pageStack.push(Qt.resolvedUrl(file), {cam: cam}); - } - - platformStyle: PageStackWindowStyle { - // TODO: Hack - background: " " - } - - ImageSettings { - id: imageSettings - camera: cam - function setImageResolution() { - if (!imageSettings.setResolution(settings.imageAspectRatio, settings.imageResolution)) { - showError(qsTr("Failed to set required resolution")); - } - } - - onReadyChanged: { - if (ready) { - imageSettings.setImageResolution(); - } - } - } - - VideoSettings { - id: videoSettings - camera: cam - - function setVideoResolution() { - if (!videoSettings.setResolution(settings.videoAspectRatio, settings.videoResolution)) { - showError(qsTr("Failed to set required resolution")); - } - } - - onReadyChanged: { - if (ready) { - videoSettings.setVideoResolution(); - } - } - } - - Connections { - target: settings - - onImageAspectRatioChanged: { - imageSettings.setImageResolution(); - } - - onImageResolutionChanged: { - imageSettings.setImageResolution(); - } - - onVideoResolutionChanged: { - videoSettings.setVideoResolution(); - } - } - - Camera { -/* - onDeviceIdChanged: { - // TODO: is this needed ? - if (platformWindow.active) { - cam.start(); - } - } -*/ - id: cam - anchors.fill: parent - - onError: { - 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(); - } - } - - Component.onDestruction: cam.stop(); - - // TODO: Hack - z: -1 - - Rectangle { - id: camDimmer - z: 1 - anchors.fill: parent - 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 { - id: colorToneController - camera: cam - value: ready ? camera.mode == Camera.VideoMode ? settings.videoColorFilter : settings.imageColorFilter : 0 - } - - WhiteBalance { - id: whiteBalanceController - camera: cam - value: ready ? camera.mode == Camera.VideoMode ? settings.videoWhiteBalance : settings.imageWhiteBalance : 0 - } - - ModeController { - id: cameraMode - cam: cam - dimmer: root.dimmer - } - - Iso { - id: iso - camera: cam - value: ready ? settings.imageIso : 0 - } - - Connections { - target: cam - onModeChanged: { - if (cam.mode == Camera.VideoMode) { - replacePage("VideoPage.qml"); - } - else { - replacePage("ImagePage.qml"); - } - } - } + initialPage: Component { + MainPage {} + } }