From: Mohammed Sameer <msameer@foolab.org>
Date: Tue, 6 Aug 2013 23:03:59 +0000 (+0300)
Subject: Add back scene mode indicators
X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=commitdiff_plain;h=0cc3c29ff939adee6a1a4a8dc59042fcbd47118d

Add back scene mode indicators
---

diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml
index c14791e..02154f0 100644
--- a/qml/ImageOverlay.qml
+++ b/qml/ImageOverlay.qml
@@ -201,6 +201,12 @@ Item {
                 source: "image://theme/" + cameraTheme.isoIcon(settings.imageIso)
             }
 
+            Indicator {
+                id: sceneIndicator
+                visible: settings.imageSceneMode != Scene.Auto
+                source: visible ? "image://theme/" + cameraTheme.imageSceneModeIndicatorIcon(settings.imageSceneMode) : ""
+            }
+
             Indicator {
                 id: gpsIndicator
                 visible: settings.useGps
diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml
index f9d0672..1f71980 100644
--- a/qml/VideoOverlay.qml
+++ b/qml/VideoOverlay.qml
@@ -165,6 +165,12 @@ Item {
                 visible: settings.videoColorFilter != ColorTone.Normal
             }
 
+            Indicator {
+                id: sceneIndicator
+                visible: settings.videoSceneMode != Scene.Auto
+                source: visible ? "image://theme/" + cameraTheme.videoSceneModeIndicatorIcon(settings.videoSceneMode) : ""
+            }
+
             Indicator {
                 id: gpsIndicator
                 visible: settings.useGps
diff --git a/qml/harmattan/CameraTheme.qml b/qml/harmattan/CameraTheme.qml
index de630d0..3511142 100644
--- a/qml/harmattan/CameraTheme.qml
+++ b/qml/harmattan/CameraTheme.qml
@@ -240,4 +240,20 @@ QtObject {
             return colorFilterIcon(val) + "-screen"
         }
     }
-}
\ No newline at end of file
+
+    function imageSceneModeIndicatorIcon(val) {
+        if (val == Scene.Auto) {
+            return ""
+        } else {
+            return imageSceneModeIcon(val) + "-screen"
+        }
+    }
+
+    function videoSceneModeIndicatorIcon(val) {
+        if (val == Scene.Auto) {
+            return ""
+        } else {
+            return videoSceneModeIcon(val) + "-screen"
+        }
+    }
+}