X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2FImagePage.qml;h=53c012b0d4f8ae7d04a4c33ff52fce7eed785b39;hp=5fa8783a3e7d35adcd0bc9c023f8f45f93014ae6;hb=acb6037c2c54ce53e7cda692b23a416c192cd02c;hpb=896d397cb4c88deb70a34d0e757d635c3dcd4c91

diff --git a/qml/ImagePage.qml b/qml/ImagePage.qml
index 5fa8783..53c012b 100644
--- a/qml/ImagePage.qml
+++ b/qml/ImagePage.qml
@@ -44,13 +44,13 @@ CameraPage {
                         return;
                 }
 
-                if (!checkDiskSpace()) {
-                        showError(qsTr("Not enough space to capture images."));
+                if (!fileSystem.available) {
+                        showError(qsTr("Camera cannot capture images in mass storage mode."));
                         return;
                 }
 
-                if (!fileSystem.available) {
-                        showError(qsTr("Camera cannot capture images in mass storage mode."));
+                if (!checkDiskSpace()) {
+                        showError(qsTr("Not enough space to capture images."));
                         return;
                 }
 
@@ -80,7 +80,7 @@ CameraPage {
                 height: 75
                 opacity: 0.5
                 onClicked: captureImage();
-                visible: imageMode.canCapture && !cameraMode.animationRunning && !previewAnimationRunning && cam.running
+                visible: imageMode.canCapture && !cameraMode.busy && dimmer.opacity == 0.0 && !previewAnimationRunning && cam.running
 
                 onExited: {
                         if (mouseX <= 0 || mouseY <= 0 || mouseX > width || mouseY > height) {
@@ -169,6 +169,13 @@ CameraPage {
                                         alwaysRunToEnd: true
                                 }
                         }
+
+                        Indicator {
+                                id: faceDetectionIndicator
+                                visible: settings.faceDetectionEnabled
+                                source: "image://theme/icon-m-camera-face-detection-screen"
+                        }
+
                 }
         }
 
@@ -215,10 +222,17 @@ CameraPage {
                 ImageColorFilterButton {
                         onClicked: toolBar.push(items);
                 },
+                ImageIsoButton {
+                        onClicked: toolBar.push(items);
+                },
                 ToolIcon {
                         iconSource: "image://theme/icon-m-toolbar-view-menu-white"
-                        onClicked: openFile("ImageSettingsPage.qml");
+                        onClicked: imageSettingsDialog.open();
                 }
                 ]
         }
+
+        ImageSettingsDialog {
+                id: imageSettingsDialog
+        }
 }