Added support for strftime() format to creator name text

[harmattan/cameraplus] / qml / ImageOverlay.qml

diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml
index f191b35..ca507c9 100644 (file)
--- a/qml/ImageOverlay.qml
+++ b/qml/ImageOverlay.qml
@@ -33,6 +33,7 @@ Item {
     property bool pressed: capture.pressed || zoomSlider.pressed || modeButton.pressed
     property bool controlsVisible: imageMode.canCapture && cam.running && !animationRunning
         && dimmer.opacity == 0.0 && !cameraMode.busy
+    property bool inhibitDim: false
 
     signal previewAvailable(string uri)
 
@@ -44,6 +45,8 @@ Item {
 
         onCaptureEnded: stopAutoFocus()
 
+        enablePreview: settings.enablePreview
+
         onPreviewAvailable: overlay.previewAvailable(preview)
 
         onSaved: mountProtector.unlock(fileNaming.imagePath)
@@ -106,7 +109,7 @@ Item {
         id: captureControl
         capturePressed: capture.pressed
         zoomPressed: zoomCapture.zoomPressed
-        proximityClosed: proximitySensor.close
+        proximityClosed: proximitySensor.sensorClosed
         onStartCapture: captureImage()
         onCancelCapture: stopAutoFocus()
     }
@@ -131,7 +134,7 @@ Item {
         tools: CameraToolBarTools {
             FlashButton {
                 onClicked: toolBar.push(tools)
-                visible: !overlay.cam.quirks.hasQuirk(Quirks.NoFlash)
+                visible: overlay.cam ? !overlay.cam.quirks.hasQuirk(Quirks.NoFlash) : false
             }
 
             ImageSceneButton {