From: Mohammed Sameer <msameer@foolab.org>
Date: Fri, 2 Aug 2013 21:33:35 +0000 (+0300)
Subject: Enable camera device switcher when camera is idle.
X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=commitdiff_plain;h=09bd090c0a5bb6498040562f28a10b9bbb35aece

Enable camera device switcher when camera is idle.
---

diff --git a/qml/CameraSettings.qml b/qml/CameraSettings.qml
index b447322..e68b3ce 100644
--- a/qml/CameraSettings.qml
+++ b/qml/CameraSettings.qml
@@ -21,8 +21,11 @@
  */
 
 import QtQuick 2.0
+import QtCamera 1.0
 
 Column {
+    property Camera camera: null
+
     id: col
     spacing: 10
     width: parent.width
@@ -40,6 +43,8 @@ Column {
 
     CameraButtonRow {
         anchors.horizontalCenter: parent.horizontalCenter
+        // TODO: test this
+        enabled: camera.running && camera.idle
 
         CameraButton {
             text: qsTr("Back (Primary)");
diff --git a/qml/ImageSettings.qml b/qml/ImageSettings.qml
index dfb039e..0cc8ff2 100644
--- a/qml/ImageSettings.qml
+++ b/qml/ImageSettings.qml
@@ -56,6 +56,7 @@ Flickable {
         }
 
         CameraSettings {
+            camera: flick.camera
             anchors.horizontalCenter: parent.horizontalCenter
         }
     }
diff --git a/qml/VideoSettings.qml b/qml/VideoSettings.qml
index 99a0c62..b05dea9 100644
--- a/qml/VideoSettings.qml
+++ b/qml/VideoSettings.qml
@@ -47,6 +47,7 @@ Flickable {
         }
 
         CameraSettings {
+            camera: flick.camera
             anchors.horizontalCenter: parent.horizontalCenter
         }
     }