Merge lp:~schwann/ubuntu-keyboard/keyboard-swipe-area into lp:ubuntu-keyboard

[Günter Schwann]

Increase the size of the swipe area

Increase the size of the swipe area

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/152/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/152

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/152/rebuild

review: Approve (continuous-integration)

[lp:~schwann/ubuntu-keyboard/keyboard-swipe-area]

75. By Günter Schwann on 2013-10-14

[ Daniel d'Andrada ]
* Various improvements to ubuntu-keyboard-info socket server Make it
  more robust. (LP: #1237870)
[ Thomas Moenicke ]
* more languages.
* new action key icons.
[ Guenter Schwann ]
* Fix for auto caps to work more than once Essentially it's only 25 +
  autoCapsActivated = false;.
[ Ubuntu daily release ]
* Automatic snapshot from revision 75

76. By Günter Schwann on 2013-10-14

Cancel key presses when a swipe starts

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/156/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/156
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/156

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/156/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2013-10-11 14:21:24 +0000
+++ qml/Keyboard.qml	2013-10-14 09:30:29 +0000
@@ -92,7 +92,8 @@
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.top: parent.top
-        height: (parent.height - canvas.keypadHeight) + wordRibbon.height + units.gu(UI.top_margin)
+        height: (parent.height - canvas.keypadHeight) + wordRibbon.height +
+                borderTop.height + units.gu(UI.top_margin) * 3
 
         drag.target: keyboardSurface
         drag.axis: Drag.YAxis;

=== modified file 'qml/keys/CharKey.qml'
--- qml/keys/CharKey.qml	2013-10-08 16:59:12 +0000
+++ qml/keys/CharKey.qml	2013-10-14 09:30:29 +0000
@@ -147,6 +147,14 @@
         }
     }
 
+    Connections {
+        target: swipeArea.drag
+        onActiveChanged: {
+            if (swipeArea.drag.active)
+                keyMouseArea.cancelPress();
+        }
+    }
+
     Magnifier {
         anchors.horizontalCenter: buttonImage.horizontalCenter
         anchors.bottom: buttonImage.top

=== modified file 'qml/keys/PressArea.qml'
--- qml/keys/PressArea.qml	2013-10-02 13:24:59 +0000
+++ qml/keys/PressArea.qml	2013-10-14 09:30:29 +0000
@@ -30,9 +30,15 @@
     /// Is true while the area is touched, and the finger did not yet lift
     property bool pressed: false
 
-    /// same as MouseArea pressAndHold()
+    /// Same as MouseArea pressAndHold()
     signal pressAndHold()
 
+    /// Cancels the current pressed state of the mouse are
+    function cancelPress() {
+        pressed = false;
+        holdTimer.stop();
+    }
+
     Timer {
         id: holdTimer
         interval: 1000