Move all icon ids used in .qml files into CameraTheme and create a harmattan theme

[harmattan/cameraplus] / qml / ImageOverlay.qml

diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml
index 842768d..fe01b37 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 QtQuick 1.1
-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
@@ -194,7 +193,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 +209,7 @@ Item {
             Indicator {
                 id: faceDetectionIndicator
                 visible: settings.faceDetectionEnabled
-                source: "image://theme/icon-m-camera-face-detection-screen"
+                source: cameraTheme.faceDetectionIndicatorIcon
             }
 
         }