Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1571099 into lp:ubuntu-keyboard

Proposed by Michael Sheldon on 2017-04-12
Status: Approved
Approved by: Andrew Hayzen on 2017-04-12
Approved revision: 549
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/fix-1571099
Merge into: lp:ubuntu-keyboard
Diff against target: 87 lines (+8/-8)
4 files modified
plugins/ca/qml/Keyboard_ca.qml (+2/-2)
plugins/ca/qml/Keyboard_ca_email.qml (+2/-2)
plugins/ca/qml/Keyboard_ca_url.qml (+2/-2)
plugins/ca/qml/Keyboard_ca_url_search.qml (+2/-2)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-1571099
Reviewer Review Type Date Requested Status
Andrew Hayzen (community) 2017-04-12 Approve on 2017-04-12
Review via email: mp+322442@code.launchpad.net

Commit message

Make extended keys consistent between shifted and unshifted state on the Catalan layout

Description of the change

Make extended keys consistent between shifted and unshifted state on the Catalan layout

To post a comment you must log in.
Andrew Hayzen (ahayzen) wrote :

LGTM, resolves the original issue where shift/non-shift had different characters for the Catalan layout.

review: Approve

Unmerged revisions

549. By Michael Sheldon on 2017-04-12

Make extended keys consistent between shifted and unshifted state on the Catalan layout

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/ca/qml/Keyboard_ca.qml'
2--- plugins/ca/qml/Keyboard_ca.qml 2016-01-25 16:02:23 +0000
3+++ plugins/ca/qml/Keyboard_ca.qml 2017-04-12 11:04:43 +0000
4@@ -49,7 +49,7 @@
5 spacing: 0
6
7 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"]; leftSide: true; }
8- CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
9+ CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["ẞ","$"] }
10 CharKey { label: "d"; shifted: "D"; }
11 CharKey { label: "f"; shifted: "F"; }
12 CharKey { label: "g"; shifted: "G"; }
13@@ -85,7 +85,7 @@
14 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
15 CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "«","»", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "«","»", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
16 SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
17- CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?",'"',"(","!",")", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
18+ CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
19 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
20 }
21 } // column
22
23=== modified file 'plugins/ca/qml/Keyboard_ca_email.qml'
24--- plugins/ca/qml/Keyboard_ca_email.qml 2016-01-25 16:02:23 +0000
25+++ plugins/ca/qml/Keyboard_ca_email.qml 2017-04-12 11:04:43 +0000
26@@ -49,7 +49,7 @@
27 spacing: 0
28
29 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"]; leftSide: true; }
30- CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
31+ CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["ẞ","$"] }
32 CharKey { label: "d"; shifted: "D"; }
33 CharKey { label: "f"; shifted: "F"; }
34 CharKey { label: "g"; shifted: "G"; }
35@@ -86,7 +86,7 @@
36 CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; }
37 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
38 UrlKey { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; }
39- CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?",'"',"(","!",")", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
40+ CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
41 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
42 }
43 } // column
44
45=== modified file 'plugins/ca/qml/Keyboard_ca_url.qml'
46--- plugins/ca/qml/Keyboard_ca_url.qml 2016-01-25 16:02:23 +0000
47+++ plugins/ca/qml/Keyboard_ca_url.qml 2017-04-12 11:04:43 +0000
48@@ -49,7 +49,7 @@
49 spacing: 0
50
51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"]; leftSide: true; }
52- CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
53+ CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["ẞ","$"] }
54 CharKey { label: "d"; shifted: "D"; }
55 CharKey { label: "f"; shifted: "F"; }
56 CharKey { label: "g"; shifted: "G"; }
57@@ -85,7 +85,7 @@
58 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
59 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; }
60 UrlKey { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; }
61- CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?",'"',"(","!",")", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
62+ CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
63 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
64 }
65 } // column
66
67=== modified file 'plugins/ca/qml/Keyboard_ca_url_search.qml'
68--- plugins/ca/qml/Keyboard_ca_url_search.qml 2016-01-25 16:02:23 +0000
69+++ plugins/ca/qml/Keyboard_ca_url_search.qml 2017-04-12 11:04:43 +0000
70@@ -49,7 +49,7 @@
71 spacing: 0
72
73 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"]; leftSide: true; }
74- CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
75+ CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["ẞ","$"] }
76 CharKey { label: "d"; shifted: "D"; }
77 CharKey { label: "f"; shifted: "F"; }
78 CharKey { label: "g"; shifted: "G"; }
79@@ -86,7 +86,7 @@
80 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; }
81 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
82 UrlKey { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; }
83- CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?",'"',"(",")","!","«","»", "·", "¿", "¡"]; extendedShifted: ["?",'"',"(",")","!","«","»", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
84+ CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
85 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
86 }
87 } // column

Subscribers

People subscribed via source and target branches