import QtQuick 2.0
import QtCamera 1.0
import CameraPlus 1.0
-import "data.js" as Data
Item {
id: overlay
ImageMode {
id: imageMode
camera: cam
- onPreviewAvailable: {
- overlay.previewAvailable(preview)
- cam.autoFocus.stopAutoFocus()
- }
- onSaved: mountProtector.unlock()
+ onCaptureEnded: cam.autoFocus.stopAutoFocus()
+
+ onPreviewAvailable: overlay.previewAvailable(preview)
+
+ onSaved: mountProtector.unlock(fileNaming.imagePath)
}
ZoomSlider {
anchors.right: parent.right
anchors.rightMargin: 20
anchors.verticalCenter: parent.verticalCenter
- iconId: cameraTheme.captureButtonImageIconId
+ iconSource: cameraTheme.captureButtonImageIconId
width: 75
height: 75
opacity: 0.5
spacing: 5
Indicator {
- id: resolutionIndicator
- property string imageAspectRatio: settings.device == 1 ? settings.secondaryImageAspectRatio : settings.primaryImageAspectRatio
- property string imageResolution: settings.device == 1 ? settings.secondaryImageResolution : settings.primaryImageResolution
- source: "image://theme/" + Data.imageIcon(imageAspectRatio, imageResolution)
+ id: flashIndicator
+ visible: !toolBar.expanded
+ source: cameraTheme.flashIcon(settings.imageFlashMode)
+ }
+
+ CameraLabel {
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.leftMargin: 5
+ anchors.rightMargin: 5
+ anchors.topMargin: 5
+ anchors.bottomMargin: 5
+ property string mp: imageSettings.currentResolutionMegapixel == "" ? "?" : imageSettings.currentResolutionMegapixel
+ text: qsTr("%1M").arg(mp)
+ font.bold: true
+ verticalAlignment: Text.AlignVCenter
+ horizontalAlignment: Text.AlignHCenter
}
Indicator {
id: wbIndicator
- source: visible ? "image://theme/" + Data.wbIcon(settings.imageWhiteBalance) + "-screen" : ""
- visible: settings.imageWhiteBalance != WhiteBalance.Auto
+ source: visible ? cameraTheme.whiteBalanceIcon(settings.imageWhiteBalance) : ""
+ visible: settings.imageWhiteBalance != WhiteBalance.Auto && !toolBar.expanded
}
Indicator {
id: cfIndicator
- source: "image://theme/" + Data.cfIcon(settings.imageColorFilter) + "-screen"
- visible: settings.imageColorFilter != ColorTone.Normal
+ source: visible ? cameraTheme.colorFilterIcon(settings.imageColorFilter) : ""
+ visible: settings.imageColorFilter != ColorTone.Normal && !toolBar.expanded
}
Indicator {
id: isoIndicator
- visible: settings.imageIso != 0
- source: "image://theme/" + Data.isoIcon(settings.imageIso)
+ visible: settings.imageIso != 0 && !toolBar.expanded
+ source: visible ? cameraTheme.isoIcon(settings.imageIso) : ""
+ }
+
+ Indicator {
+ id: sceneIndicator
+ visible: settings.imageSceneMode != Scene.Auto && !toolBar.expanded
+ source: visible ? cameraTheme.imageSceneModeIcon(settings.imageSceneMode) : ""
}
Indicator {
}
function cameraError() {
- mountProtector.unlock()
+ mountProtector.unlock(fileNaming.imagePath)
}
function policyLost() {
function captureImage() {
if (!imageMode.canCapture) {
showError(qsTr("Camera is already capturing an image."))
+ cam.autoFocus.stopAutoFocus()
} else if (!checkBattery()) {
showError(qsTr("Not enough battery to capture images."))
+ cam.autoFocus.stopAutoFocus()
} else if (!fileSystem.available) {
showError(qsTr("Camera cannot capture images in mass storage mode."))
- } else if (!checkDiskSpace()) {
+ cam.autoFocus.stopAutoFocus()
+ } else if (!fileSystem.hasFreeSpace(fileNaming.imagePath)) {
showError(qsTr("Not enough space to capture images."))
- } else if (!mountProtector.lock()) {
+ cam.autoFocus.stopAutoFocus()
+ } else if (!mountProtector.lock(fileNaming.imagePath)) {
showError(qsTr("Failed to lock images directory."))
+ cam.autoFocus.stopAutoFocus()
} else {
metaData.setMetaData()
var fileName = fileNaming.imageFileName()
if (!imageMode.capture(fileName)) {
showError(qsTr("Failed to capture image. Please restart the camera."))
- mountProtector.unlock()
+ mountProtector.unlock(fileNaming.imagePath)
+ cam.autoFocus.stopAutoFocus()
} else {
trackerStore.storeImage(fileName)
}