← Back to branch summary

~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-language-menu-2

« back to all changes in this revision

Viewing changes to qml/KeyboardContainer.qml

  • Committer: Thomas Moenicke
  • Date: 2013-10-23 11:49:31 UTC
  • Revision ID: thomas.moenicke@canonical.com-20131023114931-b6q49sjvzgv2ltig
fixed abstraction: C++ side does not know about QML, which instead sets a binding into a C++ property
fixed loading default en_us keyboard 

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/KeyboardContainer.qml
55
55
            if (localeIsSupported(locale))
56
56
                characterKeypadSource = "languages/"+locale+"/Keyboard_"+locale+"_url_search.qml";
57
57
        if (layoutId === "en_us")
58
 
            characterKeypadSource = "languages/en_us/Keyboard_en.qml";
 
58
            characterKeypadSource = "languages/en/Keyboard_en.qml";
59
59
        if (layoutId === "es")
60
60
            characterKeypadSource = "languages/es/Keyboard_es.qml";
61
61
        if (layoutId === "pt")