Switch toolbar animation to opacity

[harmattan/cameraplus] / qml / CameraView.qml

diff --git a/qml/CameraView.qml b/qml/CameraView.qml
index 2fdc6ef..58821a5 100644 (file)
--- a/qml/CameraView.qml
+++ b/qml/CameraView.qml
@@ -24,8 +24,6 @@ import QtQuick 2.0
 import QtCamera 1.0
 import CameraPlus 1.0
 
-// TODO: reset reticle and roi when we stop camera or change mode
-
 Viewfinder {
     id: viewfinder
     property bool pressed: focusReticle.locked || preview.animationRunning
@@ -46,11 +44,15 @@ Viewfinder {
         visible: settings.gridEnabled
     }
 
+    PhoneProfile {
+        id: phoneProfile
+    }
+
     Camera {
         id: cam
         sounds: Sounds {
             id: sounds
-            mute: !settings.soundEnabled
+            mute: !settings.soundEnabled || phoneProfile.isSilent
             volume: volumeControl.fullVolume ? Sounds.VolumeHigh : Sounds.VolumeLow
             imageCaptureStart: platformSettings.imageCaptureStartedSound
             imageCaptureEnd: platformSettings.imageCaptureEndedSound
@@ -159,98 +161,98 @@ Viewfinder {
     Binding {
         target: cam.flash
         property: "value"
-        when: cam.mode == Camera.ImageMode
+        when: cam.mode == Camera.ImageMode && !root.deviceChangeInProgress
         value: settings.imageFlashMode
     }
 
     Binding {
         target: settings
         property: "imageFlashMode"
-        when: cam.mode == Camera.ImageMode
+        when: cam.mode == Camera.ImageMode && !root.deviceChangeInProgress
         value: cam.flash.value
     }
 
     Binding {
         target: cam.scene
         property: "value"
-        when: cam.mode == Camera.VideoMode
+        when: cam.mode == Camera.VideoMode && !root.deviceChangeInProgress
         value: settings.videoSceneMode
     }
 
     Binding {
         target: cam.scene
         property: "value"
-        when: cam.mode == Camera.ImageMode
+        when: cam.mode == Camera.ImageMode && !root.deviceChangeInProgress
         value: settings.imageSceneMode
     }
 
     Binding {
         target: cam.evComp
         property: "value"
-        when: cam.mode == Camera.ImageMode
+        when: cam.mode == Camera.ImageMode && !root.deviceChangeInProgress
         value: settings.imageEvComp
     }
 
     Binding {
         target: cam.evComp
         property: "value"
-        when: cam.mode == Camera.VideoMode
+        when: cam.mode == Camera.VideoMode && !root.deviceChangeInProgress
         value: settings.videoEvComp
     }
 
     Binding {
         target: settings
         property: "imageEvComp"
-        when: cam.mode == Camera.ImageMode
+        when: cam.mode == Camera.ImageMode && !root.deviceChangeInProgress
         value: cam.evComp.value
     }
 
     Binding {
         target: settings
         property: "videoEvComp"
-        when: cam.mode == Camera.VideoMode
+        when: cam.mode == Camera.VideoMode && !root.deviceChangeInProgress
         value: cam.evComp.value
     }
 
     Binding {
         target: cam.whiteBalance
         property: "value"
-        when: cam.mode == Camera.ImageMode
+        when: cam.mode == Camera.ImageMode && !root.deviceChangeInProgress
         value: settings.imageWhiteBalance
     }
 
     Binding {
         target: cam.whiteBalance
         property: "value"
-        when: cam.mode == Camera.VideoMode
+        when: cam.mode == Camera.VideoMode && !root.deviceChangeInProgress
         value: settings.videoWhiteBalance
     }
 
     Binding {
         target: cam.colorTone
         property: "value"
-        when: cam.mode == Camera.ImageMode
+        when: cam.mode == Camera.ImageMode && !root.deviceChangeInProgress
         value: settings.imageColorFilter
     }
 
     Binding {
         target: cam.colorTone
         property: "value"
-        when: cam.mode == Camera.VideoMode
+        when: cam.mode == Camera.VideoMode && !root.deviceChangeInProgress
         value: settings.videoColorFilter
     }
 
     Binding {
         target: cam.iso
         property: "value"
-        when: cam.mode == Camera.ImageMode
+        when: cam.mode == Camera.ImageMode && !root.deviceChangeInProgress
         value: settings.imageIso
     }
 
     Binding {
         target: settings
         property: "imageIso"
-        when: cam.mode == Camera.ImageMode
+        when: cam.mode == Camera.ImageMode && !root.deviceChangeInProgress
         value: cam.iso.value
     }
 
@@ -285,4 +287,10 @@ Viewfinder {
 
         return false
     }
+
+    function cameraDeviceChanged() {
+        if (loader.item) {
+            loader.item.cameraDeviceChanged()
+        }
+    }
 }