Moved standby to its own component

diff --git a/qml/CameraPage.qml b/qml/CameraPage.qml
index 98503cf..4c871ae 100644 (file)
--- a/qml/CameraPage.qml
+++ b/qml/CameraPage.qml
@@ -65,37 +65,6 @@ Page {
                 }
         }
 
-        Rectangle {
-                // TODO: fade out transition
-                // TODO: there is a toolbar visible on the first startup
-                id: standby
-                color: "black"
-                anchors.fill: parent
-                visible: standbyVisible && page.status == PageStatus.Active && pipelineManager.showStandBy
-                z: 2
-                MouseArea {
-                        anchors.fill: parent
-                        enabled: parent.visible
-                }
-
-                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: pipelineManager.state == "policyLost"
-                }
-        }
-
         function setPreview(image) {
                 preview.setPreview(image);
         }

diff --git a/qml/Standby.qml b/qml/Standby.qml
new file mode 100644 (file)
index 0000000..e7c2b1b
--- /dev/null
+++ b/qml/Standby.qml
@@ -0,0 +1,64 @@
+// -*- qml -*-
+
+/*!
+ * This file is part of CameraPlus.
+ *
+ * Copyright (C) 2012 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+import QtQuick 1.1
+import com.nokia.meego 1.0
+
+Rectangle {
+        id: standby
+
+        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
+
+        Behavior on opacity {
+                PropertyAnimation { duration: 250; }
+        }
+
+        MouseArea {
+                anchors.fill: parent
+                enabled: parent.visible
+        }
+
+        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
+        }
+}

diff --git a/qml/main.qml b/qml/main.qml
index 936b7f1..abae02a 100644 (file)
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -397,4 +397,9 @@ PageStackWindow {
                         }
                 }
         }
+
+        Standby {
+                policyLost: pipelineManager.state == "policyLost"
+                show: pageStack.currentPage.standbyVisible && pageStack.currentPage.status == PageStatus.Active && pipelineManager.showStandBy
+        }
 }