import CameraPlus 1.0
// TODO: flash not ready (battery low or flash not ready message)
-// TODO: front camera night mode
+// TODO: Sounds
+// TODO: N950 conf
CameraPage {
id: root
+ property bool deviceChangeInProgress: false
+ property bool inCaptureMode: mainView.currentIndex == 1
+ property Item dimmer: camDimmer
+
CameraTheme {
id: cameraTheme
}
VisualItemModel {
id: mainModel
- SettingsView {
- camera: viewfinder.camera
+ Loader {
+ id: settingsLoader
width: mainView.width
height: mainView.height
+
+ property bool pressed: false
+ property bool inhibitDim: false
+ property int policyMode: settings.mode == Camera.VideoMode ? CameraResources.Video : CameraResources.Image
+ opacity: item ? 1.0 : 0
+
+ Behavior on opacity {
+ NumberAnimation {duration: 200}
+ }
}
CameraView {
height: mainView.height
}
- PostCaptureView {
- camera: viewfinder.camera
+ Loader {
+ id: postCaptureLoader
+ property bool pressed: item ? item.pressed : false
+ property bool inhibitDim: item ? item.inhibitDim : false
+ property int policyMode: item ? item.policyMode : settings.mode == Camera.VideoMode ? CameraResources.Video : CameraResources.Image
+
width: mainView.width
height: mainView.height
+ opacity: item ? 1.0 : 0
+
+ Behavior on opacity {
+ NumberAnimation {duration: 200}
+ }
}
}
boundsBehavior: Flickable.StopAtBounds
currentIndex: 1
interactive: !currentItem.pressed
+ onContentXChanged: {
+ if (contentX == 0) {
+ settingsLoader.source = Qt.resolvedUrl("SettingsView.qml")
+ } else if (contentX == width) {
+ settingsLoader.source = ""
+ postCaptureLoader.source = ""
+ } else if (contentX == width * 2) {
+ postCaptureLoader.source = Qt.resolvedUrl("PostCaptureView.qml")
+ }
+ }
}
Component.onCompleted: {
Settings {
id: settings
+ onDeviceAboutToChange: {
+ root.deviceChangeInProgress = true
+ }
+
onDeviceChanged: {
viewfinder.cameraDeviceChanged()
pipelineManager.error = false
if (root.resetCamera(settings.device, settings.mode)) {
+ root.deviceChangeInProgress = false
pipelineManager.startCamera()
}
}
+
+ onImageAspectRatioChanged: {
+ if (!root.deviceChangeInProgress) {
+ imageSettings.setImageResolution()
+ }
+ }
+
+ onImageResolutionChanged: {
+ if (!root.deviceChangeInProgress) {
+ imageSettings.setImageResolution()
+ }
+ }
+
+ onVideoResolutionChanged: {
+ if (!root.deviceChangeInProgress) {
+ videoSettings.setVideoResolution()
+ }
+ }
+
+ onVideoAspectRatioChanged: {
+ if (!root.deviceChangeInProgress) {
+ videoSettings.setVideoResolution()
+ }
+ }
}
PipelineManager {
return false
}
+ if (mode == Camera.ImageMode) {
+ imageSettings.setImageResolution()
+ }
+ else if (mode == Camera.VideoMode) {
+ videoSettings.setVideoResolution()
+ }
+
return true
}
error.show()
}
- property alias dimmer: camDimmer
+ PlatformQuirks {
+ id: platformQuirks
+ }
+
+ DisplayState {
+ id: displayState
+ inhibitDim: mainView.currentItem != null ? mainView.currentItem.inhibitDim : false
+ }
+
CameraPositionSource {
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
+ active: (viewfinder.camera.running || platformQuirks.forceOn) && settings.useGps && displayState.isOn
onPositionChanged: geocode.search(position.coordinate.longitude, position.coordinate.latitude)
}
ReverseGeocode {
id: geocode
- active: viewfinder.camera.running && settings.useGps && settings.useGeotags
+ active: (viewfinder.camera.running || platformQuirks.forceOn) && settings.useGps && settings.useGeotags && displayState.isOn
}
DeviceInfo {
imagePath: platformSettings.imagePath
videoPath: platformSettings.videoPath
temporaryVideoPath: platformSettings.temporaryVideoPath
+ settings: settings
}
MountProtector {
showError(qsTr("Failed to set required resolution"))
}
}
-
- onReadyChanged: {
- if (ready) {
- imageSettings.setImageResolution()
- }
- }
}
VideoSettings {
showError(qsTr("Failed to set required resolution"))
}
}
-
- onReadyChanged: {
- if (ready) {
- videoSettings.setVideoResolution()
- }
- }
- }
-
- Connections {
- target: settings
-
- onImageAspectRatioChanged: {
- imageSettings.setImageResolution()
- }
-
- onImageResolutionChanged: {
- imageSettings.setImageResolution()
- }
-
- onVideoResolutionChanged: {
- videoSettings.setVideoResolution()
- }
}
ModeController {
DeviceKeys {
id: keys
- active: Qt.application.active && pipelineManager.scaleAcquired
+ active: Qt.application.active && pipelineManager.scaleAcquired && root.inCaptureMode && !mainView.moving
repeat: !settings.zoomAsShutter
}
+ Timer {
+ id: proximityTimer
+ running: proximitySensor.close
+ repeat: false
+ interval: 500
+ onTriggered: {
+ if (proximitySensor.close) {
+ proximitySensor.sensorClosed = true
+ }
+ }
+ }
+
+ CameraProximitySensor {
+ id: proximitySensor
+ property bool sensorClosed: false
+
+ active: Qt.application.active && viewfinder.camera.running && settings.proximityAsShutter && root.inCaptureMode && !mainView.moving
+ onCloseChanged: {
+ if (!close) {
+ sensorClosed = false
+ }
+ }
+ }
+
Standby {
policyLost: pipelineManager.state == "policyLost"
show: !Qt.application.active || pipelineManager.showStandBy ||
- (mainView.currentIndex == 1 && !viewfinder.camera.running)
+ (inCaptureMode && !viewfinder.camera.running)
}
}