Merge lp:~schwann/ubuntu-keyboard/keyboard-shift-url-email into lp:ubuntu-keyboard

[Günter Schwann]

Keep url and @ key unchanged in shiftet state

Keep url and @ key unchanged in shiftet state

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'qml/keys/UrlKey.qml'
--- qml/keys/UrlKey.qml	2013-09-27 09:18:53 +0000
+++ qml/keys/UrlKey.qml	2013-10-16 17:06:29 +0000
@@ -21,7 +21,8 @@
     width: panel.keyWidth + units.gu( UI.emailLayoutUrlKeyPadding )
 
     label: ".com";
-    shifted: "/";
+    shifted: ".com";
     extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"];
+    extendedShifted: extended
     fontSize: units.gu(UI.smallFontSize);
 }
 
=== modified file 'qml/languages/Keyboard_en_email.qml'
--- qml/languages/Keyboard_en_email.qml	2013-10-09 09:12:38 +0000
+++ qml/languages/Keyboard_en_email.qml	2013-10-16 17:06:29 +0000
@@ -81,7 +81,7 @@
             height: panel.keyHeight;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
-            CharKey        { id: atKey;    label: "@"; shifted: "/";     anchors.left: symShiftKey.right; }
+            CharKey        { id: atKey;    label: "@"; shifted: "@";     anchors.left: symShiftKey.right; }
             SpaceKey       { id: spaceKey;                               anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
             UrlKey         { id: urlKey;                                 anchors.right: dotKey.left; }
             CharKey        { id: dotKey;      label: "."; shifted: ".";  anchors.right: enterKey.left; }