Initial ui reimplementation. Still in its early phase.

[harmattan/cameraplus] / qml / ModeController.qml

diff --git a/qml/ModeController.qml b/qml/ModeController.qml
index b764eec..a986dd7 100644 (file)
--- a/qml/ModeController.qml
+++ b/qml/ModeController.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
@@ -26,40 +26,32 @@ import QtCamera 1.0
 
 Item {
         id: controller
-        property int mode: settings.mode
         property Camera cam: null
         property Item dimmer: null
-        property alias animationRunning: animation.running
+        property bool busy: cam.mode != settings.mode
 
-        SequentialAnimation {
-                id: animation
-                property int mode: Camera.UnknownMode
-
-                function setMode() {
-                        root.resetCamera(cam.deviceId, mode);
-                }
-
-                NumberAnimation { target: dimmer; property: "opacity"; from: 0; to: 1; duration: 150; alwaysRunToEnd: true }
-
-                PauseAnimation { duration: 50 }
-
-                ParallelAnimation {
-                        ScriptAction { script: animation.setMode(); }
-                        PauseAnimation { duration: 200 }
+        onBusyChanged: {
+                if (busy) {
+                        controller.dimmer.dimmed = true;
                 }
-
-                PauseAnimation { duration: 50 }
-
-                NumberAnimation { target: dimmer; property: "opacity"; from: 1; to: 0; duration: 150; alwaysRunToEnd: true }
         }
 
-        onModeChanged: {
-                if (!cam || cam.mode == mode) {
-                        return;
+        Connections {
+                target: controller.cam
+                onModeChanged: {
+                        controller.dimmer.dimmed = false;
                 }
+        }
 
-                animation.mode = mode;
+        PauseAnimation {
+                id: pause
+                duration: 50
+                running: controller.dimmer.opacity == 1.0 && controller.busy
 
-                animation.start();
+                onRunningChanged: {
+                        if (!running && controller.busy) {
+                                root.resetCamera(cam.deviceId, settings.mode);
+                        }
+                }
         }
 }