ubuntu-keyboard

Merge lp:~sil/ubuntu-keyboard/numbers-on-top-row into lp:ubuntu-keyboard

  1. numbers-on-top-row
  2. Merge into trunk
Proposed by Stuart Langridge
Status: Rejected
Rejected by: Bill Filler
Proposed branch: lp:~sil/ubuntu-keyboard/numbers-on-top-row
Merge into: lp:ubuntu-keyboard
Diff against target: 353 lines (+115/-180)
7 files modified
qml/languages/en/ASDFGHRow.qml (+34/-0)
qml/languages/en/Keyboard_en.qml (+3/-45)
qml/languages/en/Keyboard_en_email.qml (+3/-45)
qml/languages/en/Keyboard_en_url.qml (+3/-45)
qml/languages/en/Keyboard_en_url_search.qml (+3/-45)
qml/languages/en/QWERTYRow.qml (+35/-0)
qml/languages/en/ZXCVBRow.qml (+34/-0)
To merge this branch: bzr merge lp:~sil/ubuntu-keyboard/numbers-on-top-row
Reviewer Review Type Date Requested Status
Stuart Langridge (community) Disapprove
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+198253@code.launchpad.net

Commit message

Add numbers to the extended characters on the UK keyboard top row. Refactor UK keyboard QML so that the shared data (each of the main "letter rows") is only done once, making it easier to make changes across all the UK keyboards.

Description of the change

Refactor UK keyboard QML so that the shared data (each of the main "letter rows") is only done once, making it easier to make changes across all the UK keyboards.

Add numbers to the extended characters on the top row.

Note: I have not made a change to the other language keyboards. I probably should do, but I'd like to see if this refactoring idea is a good one before I change 17 other keyboards :) Happy to have this rejected on that basis, or reviewed as being a good idea if all keyboards have it applied.

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

FAILED: Continuous integration, rev:120
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~sil/ubuntu-keyboard/numbers-on-top-row/+merge/198253/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/266/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/95/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/94

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Thomas Moenicke (thomas-moenicke) wrote :

Thanks for your MR! Did not get any feedback yet from design, anyways:

- for the numbers in the first row, I am basically fine with that but we would need that for all languages to be consistent
- refactoring: basically the right step of abstraction from the engineering point of view, however we wanted to keep a good overview of the entire layout at once, therefor I prefer to keep it as it is. The amount of maintenance for the current setup should be low, as it is very simple to do in QML.

Revision history for this message
Stuart Langridge (sil) wrote :

OK; I shall drop this branch, and do a new one. :)

Revision history for this message
Stuart Langridge (sil) :
review: Disapprove
Revision history for this message
Stuart Langridge (sil) wrote :

Disapproved and should be dropped in favour of https://code.launchpad.net/~sil/ubuntu-keyboard/top-row-numbers/+merge/198701 -- I don't want to delete this merge proposal because that will delete the comments, which are useful.

Unmerged revisions

120. By Stuart Langridge

Refactor English keyboard to have multiple rows. Add numbers as extended characters to top (QWERTY) row.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'qml/languages/en/ASDFGHRow.qml'
--- qml/languages/en/ASDFGHRow.qml 1970-01-01 00:00:00 +0000
+++ qml/languages/en/ASDFGHRow.qml 2013-12-09 13:00:17 +0000
@@ -0,0 +1,34 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import "../../keys"
19
20/* The top row (QWERTYUIOP) of the keyboard, which does not change between different keyboard types */
21Row {
22 anchors.horizontalCenter: parent.horizontalCenter;
23 spacing: 0
24
25 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"] }
26 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
27 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
28 CharKey { label: "f"; shifted: "F"; }
29 CharKey { label: "g"; shifted: "G"; }
30 CharKey { label: "h"; shifted: "H"; }
31 CharKey { label: "j"; shifted: "J"; }
32 CharKey { label: "k"; shifted: "K"; }
33 CharKey { label: "l"; shifted: "L"; }
34}
035
=== modified file 'qml/languages/en/Keyboard_en.qml'
--- qml/languages/en/Keyboard_en.qml 2013-10-25 13:16:15 +0000
+++ qml/languages/en/Keyboard_en.qml 2013-12-09 13:00:17 +0000
@@ -28,51 +28,9 @@
28 anchors.fill: parent28 anchors.fill: parent
29 spacing: 029 spacing: 0
3030
31 Row {31 QWERTYRow {}
32 anchors.horizontalCenter: parent.horizontalCenter;32 ASDFGHRow {}
33 spacing: 033 ZXCVBRow {}
34
35 CharKey { label: "q"; shifted: "Q"; }
36 CharKey { label: "w"; shifted: "W"; }
37 CharKey { label: "e"; shifted: "E"; extended: ["è", "é", "ê", "ë", "€"]; extendedShifted: ["È","É", "Ê", "Ë", "€"] }
38 CharKey { label: "r"; shifted: "R"; }
39 CharKey { label: "t"; shifted: "T"; extended: ["þ"]; extendedShifted: ["Þ"] }
40 CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥"]; extendedShifted: ["Ý", "¥"] }
41 CharKey { label: "u"; shifted: "U"; extended: ["û","ù","ú","ü"]; extendedShifted: ["Û","Ù","Ú","Ü"] }
42 CharKey { label: "i"; shifted: "I"; extended: ["î","ï","ì","í"]; extendedShifted: ["Î","Ï","Ì","Í"] }
43 CharKey { label: "o"; shifted: "O"; extended: ["ö","ô","ò","ó"]; extendedShifted: ["Ö","Ô","Ò","Ó"] }
44 CharKey { label: "p"; shifted: "P"; }
45 }
46
47 Row {
48 anchors.horizontalCenter: parent.horizontalCenter;
49 spacing: 0
50
51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"] }
52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
53 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
54 CharKey { label: "f"; shifted: "F"; }
55 CharKey { label: "g"; shifted: "G"; }
56 CharKey { label: "h"; shifted: "H"; }
57 CharKey { label: "j"; shifted: "J"; }
58 CharKey { label: "k"; shifted: "K"; }
59 CharKey { label: "l"; shifted: "L"; }
60 }
61
62 Row {
63 anchors.horizontalCenter: parent.horizontalCenter;
64 spacing: 0
65
66 ShiftKey {}
67 CharKey { label: "z"; shifted: "Z"; }
68 CharKey { label: "x"; shifted: "X"; }
69 CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] }
70 CharKey { label: "v"; shifted: "V"; }
71 CharKey { label: "b"; shifted: "B"; }
72 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
73 CharKey { label: "m"; shifted: "M"; }
74 BackspaceKey {}
75 }
7634
77 Item {35 Item {
78 anchors.left: parent.left36 anchors.left: parent.left
7937
=== modified file 'qml/languages/en/Keyboard_en_email.qml'
--- qml/languages/en/Keyboard_en_email.qml 2013-10-25 13:16:15 +0000
+++ qml/languages/en/Keyboard_en_email.qml 2013-12-09 13:00:17 +0000
@@ -28,51 +28,9 @@
28 anchors.fill: parent28 anchors.fill: parent
29 spacing: 029 spacing: 0
3030
31 Row {31 QWERTYRow {}
32 anchors.horizontalCenter: parent.horizontalCenter;32 ASDFGHRow {}
33 spacing: 033 ZXCVBRow {}
34
35 CharKey { label: "q"; shifted: "Q"; }
36 CharKey { label: "w"; shifted: "W"; }
37 CharKey { label: "e"; shifted: "E"; extended: ["è", "é", "ê", "ë", "€"]; extendedShifted: ["È","É", "Ê", "Ë", "€"] }
38 CharKey { label: "r"; shifted: "R"; }
39 CharKey { label: "t"; shifted: "T"; extended: ["þ"]; extendedShifted: ["Þ"] }
40 CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥"]; extendedShifted: ["Ý", "¥"] }
41 CharKey { label: "u"; shifted: "U"; extended: ["û","ù","ú","ü"]; extendedShifted: ["Û","Ù","Ú","Ü"] }
42 CharKey { label: "i"; shifted: "I"; extended: ["î","ï","ì","í"]; extendedShifted: ["Î","Ï","Ì","Í"] }
43 CharKey { label: "o"; shifted: "O"; extended: ["ö","ô","ò","ó"]; extendedShifted: ["Ö","Ô","Ò","Ó"] }
44 CharKey { label: "p"; shifted: "P"; }
45 }
46
47 Row {
48 anchors.horizontalCenter: parent.horizontalCenter;
49 spacing: 0
50
51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å"] }
52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
53 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
54 CharKey { label: "f"; shifted: "F"; }
55 CharKey { label: "g"; shifted: "G"; }
56 CharKey { label: "h"; shifted: "H"; }
57 CharKey { label: "j"; shifted: "J"; }
58 CharKey { label: "k"; shifted: "K"; }
59 CharKey { label: "l"; shifted: "L"; }
60 }
61
62 Row {
63 anchors.horizontalCenter: parent.horizontalCenter;
64 spacing: 0
65
66 ShiftKey {}
67 CharKey { label: "z"; shifted: "Z"; }
68 CharKey { label: "x"; shifted: "X"; }
69 CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] }
70 CharKey { label: "v"; shifted: "V"; }
71 CharKey { label: "b"; shifted: "B"; }
72 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
73 CharKey { label: "m"; shifted: "M"; }
74 BackspaceKey {}
75 }
7634
77 Item {35 Item {
78 anchors.left: parent.left36 anchors.left: parent.left
7937
=== modified file 'qml/languages/en/Keyboard_en_url.qml'
--- qml/languages/en/Keyboard_en_url.qml 2013-10-25 13:16:15 +0000
+++ qml/languages/en/Keyboard_en_url.qml 2013-12-09 13:00:17 +0000
@@ -28,51 +28,9 @@
28 anchors.fill: parent28 anchors.fill: parent
29 spacing: 029 spacing: 0
3030
31 Row {31 QWERTYRow {}
32 anchors.horizontalCenter: parent.horizontalCenter;32 ASDFGHRow {}
33 spacing: 033 ZXCVBRow {}
34
35 CharKey { label: "q"; shifted: "Q"; }
36 CharKey { label: "w"; shifted: "W"; }
37 CharKey { label: "e"; shifted: "E"; extended: ["è", "é", "ê", "ë", "€"]; extendedShifted: ["È","É", "Ê", "Ë", "€"] }
38 CharKey { label: "r"; shifted: "R"; }
39 CharKey { label: "t"; shifted: "T"; extended: ["þ"]; extendedShifted: ["Þ"] }
40 CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥"]; extendedShifted: ["Ý", "¥"] }
41 CharKey { label: "u"; shifted: "U"; extended: ["û","ù","ú","ü"]; extendedShifted: ["Û","Ù","Ú","Ü"] }
42 CharKey { label: "i"; shifted: "I"; extended: ["î","ï","ì","í"]; extendedShifted: ["Î","Ï","Ì","Í"] }
43 CharKey { label: "o"; shifted: "O"; extended: ["ö","ô","ò","ó"]; extendedShifted: ["Ö","Ô","Ò","Ó"] }
44 CharKey { label: "p"; shifted: "P"; }
45 }
46
47 Row {
48 anchors.horizontalCenter: parent.horizontalCenter;
49 spacing: 0
50
51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å"] }
52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
53 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
54 CharKey { label: "f"; shifted: "F"; }
55 CharKey { label: "g"; shifted: "G"; }
56 CharKey { label: "h"; shifted: "H"; }
57 CharKey { label: "j"; shifted: "J"; }
58 CharKey { label: "k"; shifted: "K"; }
59 CharKey { label: "l"; shifted: "L"; }
60 }
61
62 Row {
63 anchors.horizontalCenter: parent.horizontalCenter;
64 spacing: 0
65
66 ShiftKey {}
67 CharKey { label: "z"; shifted: "Z"; }
68 CharKey { label: "x"; shifted: "X"; }
69 CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] }
70 CharKey { label: "v"; shifted: "V"; }
71 CharKey { label: "b"; shifted: "B"; }
72 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
73 CharKey { label: "m"; shifted: "M"; }
74 BackspaceKey {}
75 }
7634
77 Item {35 Item {
78 anchors.left: parent.left36 anchors.left: parent.left
7937
=== modified file 'qml/languages/en/Keyboard_en_url_search.qml'
--- qml/languages/en/Keyboard_en_url_search.qml 2013-10-25 13:16:15 +0000
+++ qml/languages/en/Keyboard_en_url_search.qml 2013-12-09 13:00:17 +0000
@@ -29,51 +29,9 @@
2929
30 spacing: 030 spacing: 0
3131
32 Row {32 QWERTYRow {}
33 anchors.horizontalCenter: parent.horizontalCenter;33 ASDFGHRow {}
34 spacing: 034 ZXCVBRow {}
35
36 CharKey { label: "q"; shifted: "Q"; }
37 CharKey { label: "w"; shifted: "W"; }
38 CharKey { label: "e"; shifted: "E"; extended: ["è", "é", "ê", "ë", "€"]; extendedShifted: ["È","É", "Ê", "Ë", "€"] }
39 CharKey { label: "r"; shifted: "R"; }
40 CharKey { label: "t"; shifted: "T"; extended: ["þ"]; extendedShifted: ["Þ"] }
41 CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥"]; extendedShifted: ["Ý", "¥"] }
42 CharKey { label: "u"; shifted: "U"; extended: ["û","ù","ú","ü"]; extendedShifted: ["Û","Ù","Ú","Ü"] }
43 CharKey { label: "i"; shifted: "I"; extended: ["î","ï","ì","í"]; extendedShifted: ["Î","Ï","Ì","Í"] }
44 CharKey { label: "o"; shifted: "O"; extended: ["ö","ô","ò","ó"]; extendedShifted: ["Ö","Ô","Ò","Ó"] }
45 CharKey { label: "p"; shifted: "P"; }
46 }
47
48 Row {
49 anchors.horizontalCenter: parent.horizontalCenter;
50 spacing: 0
51
52 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å"] }
53 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
54 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
55 CharKey { label: "f"; shifted: "F"; }
56 CharKey { label: "g"; shifted: "G"; }
57 CharKey { label: "h"; shifted: "H"; }
58 CharKey { label: "j"; shifted: "J"; }
59 CharKey { label: "k"; shifted: "K"; }
60 CharKey { label: "l"; shifted: "L"; }
61 }
62
63 Row {
64 anchors.horizontalCenter: parent.horizontalCenter;
65 spacing: 0
66
67 ShiftKey {}
68 CharKey { label: "z"; shifted: "Z"; }
69 CharKey { label: "x"; shifted: "X"; }
70 CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] }
71 CharKey { label: "v"; shifted: "V"; }
72 CharKey { label: "b"; shifted: "B"; }
73 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
74 CharKey { label: "m"; shifted: "M"; }
75 BackspaceKey {}
76 }
7735
78 Item {36 Item {
79 anchors.left: parent.left37 anchors.left: parent.left
8038
=== added file 'qml/languages/en/QWERTYRow.qml'
--- qml/languages/en/QWERTYRow.qml 1970-01-01 00:00:00 +0000
+++ qml/languages/en/QWERTYRow.qml 2013-12-09 13:00:17 +0000
@@ -0,0 +1,35 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import "../../keys"
19
20/* The top row (QWERTYUIOP) of the keyboard, which does not change between different keyboard types */
21Row {
22 anchors.horizontalCenter: parent.horizontalCenter;
23 spacing: 0
24
25 CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; }
26 CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"]; }
27 CharKey { label: "e"; shifted: "E"; extended: ["è", "é", "ê", "ë", "€", "3"]; extendedShifted: ["È","É", "Ê", "Ë", "€", "3"] }
28 CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"]; }
29 CharKey { label: "t"; shifted: "T"; extended: ["þ", "5"]; extendedShifted: ["Þ", "5"] }
30 CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥", "6"]; extendedShifted: ["Ý", "¥", "6"] }
31 CharKey { label: "u"; shifted: "U"; extended: ["û","ù","ú","ü", "7"]; extendedShifted: ["Û","Ù","Ú","Ü", "7"] }
32 CharKey { label: "i"; shifted: "I"; extended: ["î","ï","ì","í", "8"]; extendedShifted: ["Î","Ï","Ì","Í", "8"] }
33 CharKey { label: "o"; shifted: "O"; extended: ["ö","ô","ò","ó", "9"]; extendedShifted: ["Ö","Ô","Ò","Ó", "9"] }
34 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; }
35}
036
=== added file 'qml/languages/en/ZXCVBRow.qml'
--- qml/languages/en/ZXCVBRow.qml 1970-01-01 00:00:00 +0000
+++ qml/languages/en/ZXCVBRow.qml 2013-12-09 13:00:17 +0000
@@ -0,0 +1,34 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import "../../keys"
19
20/* The top row (QWERTYUIOP) of the keyboard, which does not change between different keyboard types */
21Row {
22 anchors.horizontalCenter: parent.horizontalCenter;
23 spacing: 0
24
25 ShiftKey {}
26 CharKey { label: "z"; shifted: "Z"; }
27 CharKey { label: "x"; shifted: "X"; }
28 CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] }
29 CharKey { label: "v"; shifted: "V"; }
30 CharKey { label: "b"; shifted: "B"; }
31 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
32 CharKey { label: "m"; shifted: "M"; }
33 BackspaceKey {}
34}

Subscribers

People subscribed via source and target branches