No more construction of icon ids by anything outside CameraTheme

diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml
index 5b08ecb..3108675 100644 (file)
--- a/qml/ImageOverlay.qml
+++ b/qml/ImageOverlay.qml
@@ -173,7 +173,7 @@ Item {
 
             Indicator {
                 id: flashIndicator
-                source: "image://theme/" + cameraTheme.flashIcon(settings.imageFlashMode) + "-screen"
+                source: "image://theme/" + cameraTheme.flashIndicatorIcon(settings.imageFlashMode)
             }
 
             Indicator {
@@ -185,13 +185,13 @@ Item {
 
             Indicator {
                 id: wbIndicator
-                source: visible ? "image://theme/" + cameraTheme.whiteBalanceIcon(settings.imageWhiteBalance) + "-screen" : ""
+                source: visible ? "image://theme/" + cameraTheme.whiteBalanceIndicatorIcon(settings.imageWhiteBalance) : ""
                 visible: settings.imageWhiteBalance != WhiteBalance.Auto
             }
 
             Indicator {
                 id: cfIndicator
-                source: "image://theme/" + cameraTheme.colorFilterIcon(settings.imageColorFilter) + "-screen"
+                source: "image://theme/" + cameraTheme.colorFilterIndicatorIcon(settings.imageColorFilter)
                 visible: settings.imageColorFilter != ColorTone.Normal
             }
 

diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml
index 3dbc726..f9d0672 100644 (file)
--- a/qml/VideoOverlay.qml
+++ b/qml/VideoOverlay.qml
@@ -155,13 +155,13 @@ Item {
 
             Indicator {
                 id: wbIndicator
-                source: visible ? "image://theme/" + cameraTheme.whiteBalanceIcon(settings.videoWhiteBalance) + "-screen" : ""
+                source: visible ? "image://theme/" + cameraTheme.whiteBalanceIndicatorIcon(settings.videoWhiteBalance) : ""
                 visible: settings.videoWhiteBalance != WhiteBalance.Auto
             }
 
             Indicator {
                 id: cfIndicator
-                source: "image://theme/" + cameraTheme.colorFilterIcon(settings.videoColorFilter) + "-screen"
+                source: visible ? "image://theme/" + cameraTheme.colorFilterIndicatorIcon(settings.videoColorFilter) : ""
                 visible: settings.videoColorFilter != ColorTone.Normal
             }
 

diff --git a/qml/harmattan/CameraTheme.qml b/qml/harmattan/CameraTheme.qml
index 431e913..de630d0 100644 (file)
--- a/qml/harmattan/CameraTheme.qml
+++ b/qml/harmattan/CameraTheme.qml
@@ -220,4 +220,24 @@ QtObject {
                 return ""
         }
     }
+
+    function flashIndicatorIcon(val) {
+        return flashIcon(val) + "-screen"
+    }
+
+    function whiteBalanceIndicatorIcon(val) {
+        if (val == WhiteBalance.Auto) {
+            return ""
+        } else {
+            return whiteBalanceIcon(val) + "-screen"
+        }
+    }
+
+    function colorFilterIndicatorIcon(val) {
+        if (val == ColorTone.Normal) {
+            return ""
+        } else {
+            return colorFilterIcon(val) + "-screen"
+        }
+    }
 }
\ No newline at end of file