Added a flash indicator

[harmattan/cameraplus] / qml / ImageOverlay.qml

diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml
index 9875ab4..20becc2 100644 (file)
--- a/qml/ImageOverlay.qml
+++ b/qml/ImageOverlay.qml
@@ -20,8 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
-import com.nokia.meego 1.1
+import QtQuick 2.0
 import QtCamera 1.0
 import CameraPlus 1.0
 import "data.js" as Data
@@ -74,7 +73,7 @@ Item {
         anchors.right: parent.right
         anchors.rightMargin: 20
         anchors.verticalCenter: parent.verticalCenter
-        iconSource: "image://theme/icon-m-camera-shutter"
+        iconId: cameraTheme.captureButtonImageIconId
         width: 75
         height: 75
         opacity: 0.5
@@ -127,26 +126,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 {
@@ -168,9 +172,16 @@ Item {
             width: parent.width
             spacing: 5
 
+            Indicator {
+                id: flashIndicator
+                source: "image://theme/" + Data.flashIcon(settings.imageFlashMode) + "-screen"
+            }
+
             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/" + Data.imageIcon(imageAspectRatio, imageResolution)
             }
 
             Indicator {
@@ -194,7 +205,7 @@ Item {
             Indicator {
                 id: gpsIndicator
                 visible: settings.useGps
-                source: "image://theme/icon-m-camera-location"
+                source: cameraTheme.gpsIndicatorIcon
 
                 PropertyAnimation on opacity  {
                     easing.type: Easing.OutSine
@@ -210,7 +221,7 @@ Item {
             Indicator {
                 id: faceDetectionIndicator
                 visible: settings.faceDetectionEnabled
-                source: "image://theme/icon-m-camera-face-detection-screen"
+                source: cameraTheme.faceDetectionIndicatorIcon
             }
 
         }