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

[Thomas Moenicke]

using only one loader for character and symbol layouts

using only one loader for character and symbol layouts

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-keyboard-ci/127/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-keyboard-ci/129/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'qml/KeyboardContainer.qml'
--- qml/KeyboardContainer.qml	2013-10-01 13:28:13 +0000
+++ qml/KeyboardContainer.qml	2013-10-02 16:07:30 +0000
@@ -26,7 +26,7 @@
 
     property Item activeKeypad: characterKeypadLoader.item
     property string characterKeypadSource: ""
-    property string symbolKeypadSource: ""
+    property string symbolKeypadSource: activeKeypad ? activeKeypad.symbols : ""
 
     state: "CHARACTERS"
 
@@ -46,30 +46,19 @@
             characterKeypadSource = "languages/Keyboard_zh_cn_pinyin.qml";
     }
 
+    onCharacterKeypadSourceChanged: {
+        panel.state = "CHARACTERS"
+    }
+
+    Component.onCompleted: symbolKeypadSource = activeKeypad.symbols;
+
     Loader {
         id: characterKeypadLoader
         objectName: "characterKeyPadLoader"
         anchors.fill: parent
         asynchronous: false
-        enabled: panel.state === "CHARACTERS" ? true : false
-        opacity: panel.state === "CHARACTERS" ? 1 : 0
-        source: characterKeypadSource
-        onLoaded: {
-            symbolKeypadSource = activeKeypad.symbols
-            panel.state = "CHARACTERS"
-        }
-    }
-
-    Loader {
-        id: symbolKeypadLoader
-        objectName: "symbolKeyPadLoader"
-        anchors.fill: parent
-        enabled: panel.state === "SYMBOLS" ? true : false
-        opacity: panel.state == "SYMBOLS" ? 1 : 0
-        source: symbolKeypadSource
-        asynchronous: false
-    }
-
+        source: panel.state === "CHARACTERS" ? characterKeypadSource : symbolKeypadSource
+    }
 
     states: [
         State {