[lock] Lock/unlock the screen from anywhere in the homescreen. Also k…

…ill application by dragging it down.
locusf · Apr 23, 2014 · 0a07786 · 0a07786
1 parent 3b6707c
commit 0a07786
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 13 deletions.
diff --git a/src/qml/MainScreen.qml b/src/qml/MainScreen.qml
@@ -37,6 +37,7 @@ import QtQuick.Window 2.1
 import org.nemomobile.time 1.0
 import org.nemomobile.configuration 1.0
 import org.freedesktop.contextkit 1.0
+import "scripts/desktop.js" as Desktop
 
 Page {
 
@@ -112,6 +113,20 @@ Page {
             font.pointSize: 8
         }
     }
+    Component.onCompleted: {
+        Desktop.instance = desktop
+    }
+    function lockscreenVisible() {
+        return LipstickSettings.lockscreenVisible === true
+    }
+    function lockScreen(enabled) {
+        if (enabled) {
+            LipstickSettings.lockScreen(true)
+        } else {
+            LipstickSettings.lockscreenVisible = false
+        }
+
+    }
 
     Pager {
         id: pager

diff --git a/src/qml/compositor.qml b/src/qml/compositor.qml
@@ -25,6 +25,7 @@ import QtQuick 2.0
 import org.nemomobile.lipstick 0.1
 
 import "compositor"
+import "scripts/desktop.js" as Desktop
 
 Compositor {
     id: root
@@ -118,7 +119,7 @@ Compositor {
         id: gestureArea
         z: 2
         anchors.fill: parent
-        enabled: root.appActive
+
 
         property real swipeThreshold: 0.15
 
@@ -129,11 +130,25 @@ Compositor {
         }
 
         onGestureFinished: {
-            if (gestureArea.progress >= swipeThreshold) {
-                swipeAnimation.valueTo = inverted ? -max : max
-                swipeAnimation.start()
-            } else {
-                cancelAnimation.start()
+            if (root.appActive) {
+                if (gestureArea.progress >= swipeThreshold) {
+                    swipeAnimation.valueTo = inverted ? -max : max
+                    swipeAnimation.start()
+                } else {
+                    cancelAnimation.start()
+                }
+                if (gestureArea.gesture == "down") {
+                    Lipstick.compositor.closeClientForWindowId(topmostWindow.window.windowId)
+                }
+            } else if (root.homeActive){
+                if (gestureArea.progress >= swipeThreshold) {
+                    // Locks or unlocks depending if the screen is locked.
+                    if (!Desktop.instance.lockscreenVisible()) {
+                        Desktop.instance.lockScreen(true)
+                    } else {
+                        Desktop.instance.lockScreen(false)
+                    }
+                }
             }
         }
 
@@ -151,12 +166,6 @@ Compositor {
                     x: gestureArea.horizontal ? gestureArea.value : 0
                     y: gestureArea.horizontal ? 0 : gestureArea.value
                 }
-
-                PropertyChanges {
-                    target: homeLayer
-                    opacity: 0.6 + 0.4 * gestureArea.progress
-                    scale: 0.8 + 0.2 * gestureArea.progress
-                }
             }
         ]
 

diff --git a/src/qml/scripts/desktop.js b/src/qml/scripts/desktop.js
@@ -0,0 +1,3 @@
+.pragma library
+
+var instance
diff --git a/src/resources-qml.qrc b/src/resources-qml.qrc
@@ -34,5 +34,6 @@
         <file>qml/theme/icon-m-framework-close-thumbnail.png</file>
         <file>qml/NotificationPreview.qml</file>
         <file>qml/images/notification-circle.png</file>
+        <file>qml/scripts/desktop.js</file>
     </qresource>
 </RCC>
diff --git a/src/src.pro b/src/src.pro
@@ -41,6 +41,7 @@ OTHER_FILES += qml/*.qml \
     qml/compositor/WindowWrapperBase.qml \
     qml/compositor/WindowWrapperAlpha.qml \
     qml/compositor/ScreenGestureArea.qml \
-    qml/NotificationPreview.qml
+    qml/NotificationPreview.qml \
+    qml/scripts/desktop.js