X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=qml%2Fmain.qml;h=748ff834fe6ef6fbef6bcb3616549fb9e098cf2c;hb=d9f0af7e2ceb416fd44a0ca14d20df8604754dd1;hp=ca62780d09aea23adc6b7759e62527b6ddd509c2;hpb=df6ce0bba7db8531f365a66d45e8b6d74d5fffd1;p=harmattan%2Fcameraplus diff --git a/qml/main.qml b/qml/main.qml index ca62780..748ff83 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -20,257 +20,245 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -@IMPORT_QT_QUICK@ -import com.nokia.meego 1.1 -import com.nokia.extras 1.1 +import QtQuick 2.0 import QtCamera 1.0 import CameraPlus 1.0 import QtMobility.location 1.2 -//import QtCamera 1.0 -// TODO: flash not ready (battery low or flash not ready message) - -Window { - id: root - property alias camera: cam - VisualItemModel { - id: mainModel +// TODO: flash not ready (battery low or flash not ready message) - SettingsView { - width: mainView.width - height: mainView.height - } +CameraWindow { + id: root - CameraView { - id: cam - width: mainView.width - height: mainView.height - } + VisualItemModel { + id: mainModel - PostCaptureView { - width: mainView.width - height: mainView.height - } + SettingsView { + camera: viewfinder.camera + width: mainView.width + height: mainView.height } - ListView { - id: mainView - LayoutMirroring.enabled: false - anchors.fill: parent - orientation: ListView.Horizontal - model: mainModel - snapMode: ListView.SnapOneItem - highlightRangeMode: ListView.StrictlyEnforceRange - boundsBehavior: Flickable.StopAtBounds - currentIndex: 1 - interactive: !currentItem.pressed + CameraView { + id: viewfinder + width: mainView.width + height: mainView.height } - Component.onCompleted: { - screen.setAllowedOrientations(Screen.Landscape) - theme.inverted = true - platformSettings.init() - // TODO: hardcoding device id - root.resetCamera(0, settings.mode) + PostCaptureView { + camera: viewfinder.camera + width: mainView.width + height: mainView.height } - - PlatformSettings { - id: platformSettings + } + + ListView { + id: mainView + LayoutMirroring.enabled: false + anchors.fill: parent + orientation: ListView.Horizontal + model: mainModel + snapMode: ListView.SnapOneItem + highlightRangeMode: ListView.StrictlyEnforceRange + boundsBehavior: Flickable.StopAtBounds + currentIndex: 1 + interactive: !currentItem.pressed + } + + Component.onCompleted: { + platformSettings.init() + // TODO: hardcoding device id + root.resetCamera(0, settings.mode) + } + + PlatformSettings { + id: platformSettings + } + + Settings { + id: settings + } + + PipelineManager { + id: pipelineManager + camera: viewfinder.camera + currentItem: mainView.currentItem + } + + function resetCamera(deviceId, mode) { + if (!viewfinder.camera.reset(deviceId, mode)) { + showError(qsTr("Failed to set camera device and mode. Please restart the application.")) } - - Settings { - id: settings - } - - PipelineManager { - id: pipelineManager - camera: cam - currentItem: mainView.currentItem - } - - function resetCamera(deviceId, mode) { - if (!cam.reset(deviceId, mode)) { - showError(qsTr("Failed to set camera device and mode. Please restart the application.")) + } + + function showError(msg) { + error.text = msg + error.show() + } + + property alias dimmer: camDimmer + + 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: viewfinder.camera + 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: viewfinder.camera.running || (mainView.currentIndex == 2 && Qt.application.active) + } + + Compass { + id: compass + active: viewfinder.camera.running + } + + ReverseGeocode { + id: geocode + active: viewfinder.camera.running && settings.useGps && settings.useGeotags + } + + DeviceInfo { + id: deviceInfo + } + + FSMonitor { + id: fileSystem + } + + CameraInfoBanner { + id: error + } + + FileNaming { + id: fileNaming + imageSuffix: viewfinder.camera.imageSuffix + videoSuffix: viewfinder.camera.videoSuffix + } + + MountProtector { + id: mountProtector + path: fileNaming.path + } + + TrackerStore { + id: trackerStore + active: viewfinder.camera.running + manufacturer: deviceInfo.manufacturer + model: deviceInfo.model + } + + function checkDiskSpace() { + return fileSystem.hasFreeSpace(fileNaming.path) + } + + ImageSettings { + id: imageSettings + camera: viewfinder.camera + + function setImageResolution() { + if (!imageSettings.setResolution(settings.imageAspectRatio, settings.imageResolution)) { + showError(qsTr("Failed to set required resolution")) } } - function showError(msg) { - error.text = msg - error.show() - } - - property alias dimmer: camDimmer - - PageStack { - id: pageStack - anchors.fill: parent - } - - MouseArea { - anchors.fill: parent - enabled: pageStack.busy - } - - 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 || (mainView.currentIndex == 2 && Qt.application.active) - } - - Compass { - id: compass - active: cam.running - } - - ReverseGeocode { - id: geocode - active: cam.running && settings.useGps && settings.useGeotags - } - - DeviceInfo { - id: deviceInfo - } - - FSMonitor { - id: fileSystem - } - - InfoBanner { - id: error - } - - FileNaming { - id: fileNaming - imageSuffix: cam.imageSuffix - videoSuffix: cam.videoSuffix - } - - MountProtector { - id: mountProtector - path: fileNaming.path - } - - TrackerStore { - id: trackerStore - active: cam.running - manufacturer: deviceInfo.manufacturer - model: deviceInfo.model - } - - function checkDiskSpace() { - return fileSystem.hasFreeSpace(fileNaming.path) - } - - 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() - } + 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")) - } - } + VideoSettings { + id: videoSettings + camera: viewfinder.camera - onReadyChanged: { - if (ready) { - videoSettings.setVideoResolution() - } + function setVideoResolution() { + if (!videoSettings.setResolution(settings.videoAspectRatio, settings.videoResolution)) { + showError(qsTr("Failed to set required resolution")) } } - Connections { - target: settings - - onImageAspectRatioChanged: { - imageSettings.setImageResolution() - } - - onImageResolutionChanged: { - imageSettings.setImageResolution() - } - - onVideoResolutionChanged: { + onReadyChanged: { + if (ready) { videoSettings.setVideoResolution() } } + } - ModeController { - id: cameraMode - cam: cam - dimmer: root.dimmer - } + Connections { + target: settings - Rectangle { - property bool dimmed: false - id: camDimmer - z: 1 - anchors.fill: parent - opacity: dimmed ? 1.0 : 0.0 - color: "black" - Behavior on opacity { - PropertyAnimation { duration: 150 } - } + onImageAspectRatioChanged: { + imageSettings.setImageResolution() } - DeviceKeys { - id: keys - active: Qt.application.active && pipelineManager.scaleAcquired - repeat: !settings.zoomAsShutter + onImageResolutionChanged: { + imageSettings.setImageResolution() } - Standby { - policyLost: pipelineManager.state == "policyLost" - show: !Qt.application.active || pipelineManager.showStandBy || - (mainView.currentIndex == 1 && !camera.running) + onVideoResolutionChanged: { + videoSettings.setVideoResolution() + } + } + + ModeController { + id: cameraMode + cam: viewfinder.camera + dimmer: root.dimmer + } + + Rectangle { + property bool dimmed: false + id: camDimmer + z: 1 + anchors.fill: parent + opacity: dimmed ? 1.0 : 0.0 + color: "black" + Behavior on opacity { + PropertyAnimation { duration: 150 } } + } + + DeviceKeys { + id: keys + active: Qt.application.active && pipelineManager.scaleAcquired + repeat: !settings.zoomAsShutter + } + + Standby { + policyLost: pipelineManager.state == "policyLost" + show: !Qt.application.active || pipelineManager.showStandBy || + (mainView.currentIndex == 1 && !viewfinder.camera.running) + } }