← Back to branch summary

~andreas-pokorny/ubuntu-keyboard/shellRotation-2

« back to all changes in this revision

Viewing changes to plugins/nl/qml/Keyboard_nl_url.qml

  • Committer: Daniel d'Andrada
  • Date: 2014-12-04 15:55:32 UTC
  • mfrom: (233.2.23 ubuntu-keyboard)
  • Revision ID: daniel.dandrada@canonical.com-20141204155532-jrtpvxehmob2jsgu
Merge trunk

[ Michael Sheldon ]
* Fix old autopilot tests and implement some new ones.
* Allow Pinyin to be used in URL and email fields and fix text
  selection issues. (LP: #1393492, #1335007)
* Add ".com" as extended key on URL and email layouts for all language
  that don't have it as their primary URL key (LP: #1369510)
[ Ubuntu daily release ]
* New rebuild forced

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/nl/qml/Keyboard_nl_url.qml
84
84
            SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
85
85
            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
86
86
            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
87
 
            UrlKey         { id: urlKey; label: ".nl"; extended: [".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; height: parent.height; }
 
87
            UrlKey         { id: urlKey; label: ".nl"; extended: [".com", ".be", ".an", ".sx", ".sr", ".aw", ".cw"]; anchors.right: dotKey.left; height: parent.height; }
88
88
            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
89
89
            ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
90
90
        }