Merge pull request #39 from locusf/master

Version 0.25

rpm/lipstick-glacier-home-qt5.spec

@@ -9,7 +9,7 @@ Name:       lipstick-glacier-home-qt5
 # << macros
 
 Summary:    A nice homescreen for Glacier experience
-Version:    0.24
+Version:    0.25
 Release:    1
 Group:      System/GUI/Other
 License:    BSD

rpm/lipstick-glacier-home-qt5.yaml

 Name: lipstick-glacier-home-qt5
 Summary: A nice homescreen for Glacier experience
-Version: 0.24
+Version: 0.25
 Release: 1
 Group: System/GUI/Other
 License: BSD

src/qml/AppLauncher.qml

@@ -56,13 +56,13 @@ GridView {
         property alias uninstall: uninstall
         Rectangle {
             id: remove
-            property alias text: lbl.text
+            property alias text: removeLabel.text
             visible: onUninstall
             height: 110
             color: "red"
             width: gridview.width / 2
             Label {
-                id: lbl
+                id: removeLabel
                 anchors.centerIn: parent
                 text: "Remove"
                 font.pointSize: 8
@@ -70,14 +70,14 @@ GridView {
         }
         Rectangle {
             id: uninstall
-            property alias text: lbl2.text
+            property alias text: uninstallLabel.text
             anchors.left: remove.right
             visible: onUninstall
             color: "red"
             width: gridview.width / 2
             height: 110
             Label {
-                id: lbl2
+                id: uninstallLabel
                 anchors.centerIn: parent
                 text: "Uninstall"
                 font.pointSize: 8

src/qml/DeviceLock.qml

+import QtQuick 2.1
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Nemo 1.0
+import QtQuick.Controls.Styles.Nemo 1.0
+import QtQuick.Layouts 1.0
+
+Item {
+    id: root
+    anchors.top: clock.bottom
+    anchors.bottom: parent.bottom
+    anchors.left: parent.left
+    anchors.right: parent.right
+    ColumnLayout {
+        anchors.fill: parent
+        spacing: 40
+        TextField {
+            id: lockCodeField
+            readOnly: true
+            echoMode: TextInput.PasswordEchoOnEdit
+        }
+
+        GridLayout {
+            height: parent.height
+            width: parent.width
+            columns: 3
+            Repeater {
+                model: ["1","2","3","4","5","6","7","8","9","Ca","0","OK"]
+                delegate:
+                Button {
+                    Layout.fillWidth: true
+                    text: modelData
+                    onClicked: {
+                        if (text !== "Ca" && text !== "OK") {
+                            lockCodeField.insert(lockCodeField.cursorPosition, text)
+                        } else {
+                            if (text === "OK") {
+                                if(deviceLock.checkCode(lockCodeField.text)) {
+                                    deviceLock.setState(0)
+                                    lockCodeField.text = ""
+                                } else {
+                                    lockCodeField.text = ""
+                                }
+                            } else if (text === "Ca"){
+                                lockCodeField.text = ""
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

src/qml/Lockscreen.qml

@@ -6,12 +6,20 @@ Image {
     visible: LipstickSettings.lockscreenVisible
 
     LockscreenClock {
+        id: clock
         anchors {
             top: parent.top
             left: parent.left
             right: parent.right
         }
     }
+    DeviceLock {
+        id: deviceLockUI
+        anchors.fill: parent
+        visible: deviceLock.state === 1
+        z: 201
+    }
+
     MouseArea {
         anchors.fill: parent
     }

src/qml/NumButton.qml

@@ -28,15 +28,29 @@
 ** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 **
 ****************************************************************************************/
-
+import QtQuick 2.1
+import QtQuick.Controls 1.0
 import QtQuick.Controls.Nemo 1.0
 import QtQuick.Controls.Styles.Nemo 1.0
+import QtQuick.Layouts 1.0
 
-Button {
+Rectangle {
     id: btn
-    width: 120
-    height: 40
+    Layout.fillWidth: true
+    Layout.fillHeight: true
+    color: "transparent"
+    border.color: "white"
+    property alias text: txt.text
+    MouseArea {
+        anchors.fill: parent
         onClicked: {
             pinquery.text += btn.text
         }
+    }
+
+    Text {
+        id: txt
+        anchors.centerIn: parent
+        color: "white"
+    }
 }

src/qml/SimPanel.qml

@@ -33,6 +33,7 @@ import QtQuick 2.1
 import QtQuick.Controls.Nemo 1.0
 import QtQuick.Controls.Styles.Nemo 1.0
 import MeeGo.QOfono 0.2
+import QtQuick.Layouts 1.0
 
 Component {
     CommonPanel {
@@ -57,21 +58,25 @@ Component {
             id: simManager
         }
 
-        Column {
+        ColumnLayout {
             visible: needsPin
-            spacing: 10
-            Row {
+            anchors.fill: simpanel
+            spacing: 0
+            RowLayout {
                 spacing: 16
                 TextField {
                     id: pinquery
-                    width: 180
-                    height: 40
+                    width: 140
+                    Layout.fillWidth: true
+                    Layout.fillHeight: false
+                    Layout.preferredHeight: 20
                 }
                 Button {
                     id: pinenter
                     text: "OK"
-                    width: 120
-                    height: 40
+                    Layout.fillWidth: true
+                    Layout.fillHeight: false
+                    Layout.preferredHeight: 40
                     onClicked: {
                         simManager.enterPin(OfonoSimManager.SimPin, pinquery.text)
                         pinquery.text = ""
@@ -80,15 +85,18 @@ Component {
                 Button {
                     id: clearpin
                     text: "Clear"
-                    width: 120
-                    height: 40
+                    Layout.fillWidth: true
+                    Layout.fillHeight: false
+                    Layout.preferredHeight: 40
                     onClicked: {
                         pinquery.text = ""
                     }
                 }
             }
-            Row {
-                spacing: 16
+            GridLayout {
+                columnSpacing: 10
+                rowSpacing: 10
+                columns: 3
                 NumButton {
                     text: "1"
                 }
@@ -98,9 +106,6 @@ Component {
                 NumButton {
                     text: "3"
                 }
-            }
-            Row {
-                spacing: 16
                 NumButton {
                     text: "4"
                 }
@@ -110,9 +115,6 @@ Component {
                 NumButton {
                     text: "6"
                 }
-            }
-            Row {
-                spacing: 16
                 NumButton {
                     text: "7"
                 }
@@ -122,10 +124,8 @@ Component {
                 NumButton {
                     text: "9"
                 }
-            }
-            Row {
-                spacing: 16
                 NumButton {
+                    Layout.columnSpan: 3
                     text: "0"
                 }
             }

src/qml/compositor.qml

@@ -133,6 +133,7 @@ Compositor {
         property real lockThreshold: 0.25
         property int lockscreenX
         property int lockscreenY
+        enabled: deviceLock.state === 0
 
         onGestureStarted: {
             swipeAnimation.stop()

src/src.pro

@@ -35,7 +35,8 @@ qml.files = qml/MainScreen.qml \
     qml/BatteryPanel.qml \
     qml/CommonPanel.qml \
     qml/ShutdownScreen.qml \
-    qml/GlacierRotation.qml
+    qml/GlacierRotation.qml \
+    qml/DeviceLock.qml
 
 qmlcompositor.path = /usr/share/lipstick-glacier-home-qt5/qml/compositor
 qmlcompositor.files = qml/compositor/WindowWrapperMystic.qml \
@@ -107,6 +108,7 @@ OTHER_FILES += qml/*.qml \
     qml/BatteryPanel.qml \
     qml/CommonPanel.qml \
     qml/ShutdownScreen.qml \
-    qml/GlacierRotation.qml
+    qml/GlacierRotation.qml \
+    qml/DeviceLock.qml