Don't try to get an icon if we are not visible

[harmattan/cameraplus] / qml / ImageOverlay.qml

diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml
index fe01b37..c90f69e 100644 (file)
--- a/qml/ImageOverlay.qml
+++ b/qml/ImageOverlay.qml
@@ -23,7 +23,6 @@
 import QtQuick 2.0
 import QtCamera 1.0
 import CameraPlus 1.0
-import "data.js" as Data
 
 Item {
     id: overlay
@@ -126,26 +125,31 @@ Item {
         visible: controlsVisible
         expanded: settings.showToolBar
         onExpandedChanged: settings.showToolBar = expanded
-        items: [
+        tools: CameraToolBarTools {
             FlashButton {
-                onClicked: toolBar.push(items)
-            },
+                onClicked: toolBar.push(tools)
+            }
+
             ImageSceneButton {
-                onClicked: toolBar.push(items)
-            },
+                onClicked: toolBar.push(tools)
+            }
+
             ImageEvCompButton {
-                onClicked: toolBar.push(items)
-            },
+                onClicked: toolBar.push(tools)
+            }
+
             ImageWhiteBalanceButton {
-                onClicked: toolBar.push(items)
-            },
+                onClicked: toolBar.push(tools)
+            }
+
             ImageColorFilterButton {
-                onClicked: toolBar.push(items)
-            },
+                onClicked: toolBar.push(tools)
+            }
+
             ImageIsoButton {
-                onClicked: toolBar.push(items)
+                onClicked: toolBar.push(tools)
             }
-        ]
+        }
     }
 
     Rectangle {
@@ -167,27 +171,34 @@ Item {
             width: parent.width
             spacing: 5
 
+            Indicator {
+                id: flashIndicator
+                source: "image://theme/" + cameraTheme.flashIndicatorIcon(settings.imageFlashMode)
+            }
+
             Indicator {
                 id: resolutionIndicator
-                source: "image://theme/" + Data.imageIcon(settings.imageAspectRatio, settings.imageResolution)
+                property string imageAspectRatio: settings.device == 1 ? settings.secondaryImageAspectRatio : settings.primaryImageAspectRatio
+                property string imageResolution: settings.device == 1 ? settings.secondaryImageResolution : settings.primaryImageResolution
+                source: "image://theme/" + cameraTheme.imageIcon(imageAspectRatio, imageResolution, settings.device)
             }
 
             Indicator {
                 id: wbIndicator
-                source: visible ? "image://theme/" + Data.wbIcon(settings.imageWhiteBalance) + "-screen" : ""
+                source: visible ? "image://theme/" + cameraTheme.whiteBalanceIndicatorIcon(settings.imageWhiteBalance) : ""
                 visible: settings.imageWhiteBalance != WhiteBalance.Auto
             }
 
             Indicator {
                 id: cfIndicator
-                source: "image://theme/" + Data.cfIcon(settings.imageColorFilter) + "-screen"
+                source: visible ? "image://theme/" + cameraTheme.colorFilterIndicatorIcon(settings.imageColorFilter) : ""
                 visible: settings.imageColorFilter != ColorTone.Normal
             }
 
             Indicator {
                 id: isoIndicator
                 visible: settings.imageIso != 0
-                source: "image://theme/" + Data.isoIcon(settings.imageIso)
+                source: "image://theme/" + cameraTheme.isoIcon(settings.imageIso)
             }
 
             Indicator {