ubuntu-keyboard

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

  1. keyboard-shift-url-email
  2. Merge into trunk
Proposed by Günter Schwann
Status: Merged
Approved by: Bill Filler
Approved revision: 79
Merged at revision: 80
Proposed branch: lp:~schwann/ubuntu-keyboard/keyboard-shift-url-email
Merge into: lp:ubuntu-keyboard
Diff against target: 26 lines (+3/-2)
2 files modified
qml/keys/UrlKey.qml (+2/-1)
qml/languages/Keyboard_en_email.qml (+1/-1)
To merge this branch: bzr merge lp:~schwann/ubuntu-keyboard/keyboard-shift-url-email
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+191466@code.launchpad.net

Commit message

Keep url and @ key unchanged in shiftet state

Description of the change

Keep url and @ key unchanged in shiftet state

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/keys/UrlKey.qml'
2--- qml/keys/UrlKey.qml 2013-09-27 09:18:53 +0000
3+++ qml/keys/UrlKey.qml 2013-10-16 17:06:29 +0000
4@@ -21,7 +21,8 @@
5 width: panel.keyWidth + units.gu( UI.emailLayoutUrlKeyPadding )
6
7 label: ".com";
8- shifted: "/";
9+ shifted: ".com";
10 extended: [".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"];
11+ extendedShifted: extended
12 fontSize: units.gu(UI.smallFontSize);
13 }
14
15=== modified file 'qml/languages/Keyboard_en_email.qml'
16--- qml/languages/Keyboard_en_email.qml 2013-10-09 09:12:38 +0000
17+++ qml/languages/Keyboard_en_email.qml 2013-10-16 17:06:29 +0000
18@@ -81,7 +81,7 @@
19 height: panel.keyHeight;
20
21 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; }
22- CharKey { id: atKey; label: "@"; shifted: "/"; anchors.left: symShiftKey.right; }
23+ CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: symShiftKey.right; }
24 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true }
25 UrlKey { id: urlKey; anchors.right: dotKey.left; }
26 CharKey { id: dotKey; label: "."; shifted: "."; anchors.right: enterKey.left; }

Subscribers

People subscribed via source and target branches