Switch toolbar animation to opacity

[harmattan/cameraplus] / qml / Standby.qml

diff --git a/qml/Standby.qml b/qml/Standby.qml
index e7c2b1b..757f1c7 100644 (file)
--- a/qml/Standby.qml
+++ b/qml/Standby.qml
@@ -3,7 +3,7 @@
 /*!
  * This file is part of CameraPlus.
  *
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ * Copyright (C) 2012-2013 Mohammed Sameer <msameer@foolab.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,45 +20,44 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.0
+import QtQuick 2.0
 
 Rectangle {
-        id: standby
+    id: standby
 
-        property bool show: true
-        property bool policyLost: false
+    property bool show: true
+    property bool policyLost: false
 
-        color: "black"
-        anchors.fill: parent
-        z: 2
-
-        visible: opacity != 0.0
-        opacity: show ? 1.0 : 0.0
+    color: "black"
+    anchors.fill: parent
+    z: 2
 
-        Behavior on opacity {
-                PropertyAnimation { duration: 250; }
-        }
+    visible: opacity != 0.0
+    opacity: show ? 1.0 : 0.0
 
-        MouseArea {
-                anchors.fill: parent
-                enabled: parent.visible
-        }
+    Behavior on opacity {
+        PropertyAnimation { duration: 250 }
+    }
 
-        Image {
-                id: icon
-                source: "image://theme/icon-l-camera-standby"
-                anchors.centerIn: parent
-        }
-
-        Label {
-                anchors.top: icon.bottom
-                anchors.right: parent.right
-                anchors.left: parent.left
-                text: qsTr("Resources lost")
-                color: "white"
-                font.pixelSize: 36
-                horizontalAlignment: Text.AlignHCenter
-                visible: parent.policyLost
-        }
+    MouseArea {
+        anchors.fill: parent
+        enabled: parent.visible
+    }
+
+    Image {
+        id: icon
+        source: cameraTheme.standbyIcon
+        anchors.centerIn: parent
+    }
+
+    CameraLabel {
+        anchors.top: icon.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+        text: qsTr("Resources lost")
+        color: "white"
+        font.pixelSize: 36
+        horizontalAlignment: Text.AlignHCenter
+        visible: parent.policyLost
+    }
 }