Merge lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-fix-symbolstate into lp:ubuntu-keyboard

[Thomas Moenicke]

fixes #1236501 wrong layout when symbols

fixes #1236501 wrong layout when symbols

[Günter Schwann (schwann)]

17 + onLoaded: activeKeypadState = "NORMAL"

This looks "fishy".
So even when loading the symbols, the state is the set to normal?
And the binding for the state gets lost.

Sure this is correct?

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-fix-symbolstate]

64. By Thomas Moenicke on 2013-10-08

activeKeypadState is set all over the place and shouldnt be a binding

[Günter Schwann (schwann)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'qml/KeyboardContainer.qml'
--- qml/KeyboardContainer.qml	2013-10-02 17:58:00 +0000
+++ qml/KeyboardContainer.qml	2013-10-08 14:05:44 +0000
@@ -26,7 +26,7 @@
     property int keyHeight: 0
 
     property Item activeKeypad: characterKeypadLoader.item
-    property string activeKeypadState: characterKeypadLoader.item ? item.state : ""
+    property string activeKeypadState: "NORMAL"
     property string characterKeypadSource: ""
     property string symbolKeypadSource: activeKeypad ? activeKeypad.symbols : ""
 
@@ -61,6 +61,7 @@
         anchors.fill: parent
         asynchronous: false
         source: panel.state === "CHARACTERS" ? characterKeypadSource : symbolKeypadSource
+        onLoaded: activeKeypadState = "NORMAL"
     }
     ExtendedKeysSelector {
         id: extendedKeysSelector
@@ -75,17 +76,9 @@
     states: [
         State {
             name: "CHARACTERS"
-            PropertyChanges {
-                target: panel
-                activeKeypad: characterKeypadLoader.item
-            }
         },
         State {
             name: "SYMBOLS"
-            PropertyChanges {
-                target: panel
-                activeKeypad: symbolKeypadLoader.item
-            }
         }
     ]