ubuntu-keyboard

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

  1. fix-1571099
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Approved
Approved by: Andrew Hayzen
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) Approve
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.
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

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

review: Approve
Reply

Unmerged revisions

549. By Michael Sheldon

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
=== modified file 'plugins/ca/qml/Keyboard_ca.qml'
--- plugins/ca/qml/Keyboard_ca.qml 2016-01-25 16:02:23 +0000
+++ plugins/ca/qml/Keyboard_ca.qml 2017-04-12 11:04:43 +0000
@@ -49,7 +49,7 @@
49 spacing: 049 spacing: 0
5050
51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"]; leftSide: true; }51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"]; leftSide: true; }
52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["ẞ","$"] }
53 CharKey { label: "d"; shifted: "D"; }53 CharKey { label: "d"; shifted: "D"; }
54 CharKey { label: "f"; shifted: "F"; }54 CharKey { label: "f"; shifted: "F"; }
55 CharKey { label: "g"; shifted: "G"; }55 CharKey { label: "g"; shifted: "G"; }
@@ -85,7 +85,7 @@
85 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }85 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
86 CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "«","»", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "«","»", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }86 CharKey { id: commaKey; label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "«","»", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "«","»", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
87 SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }87 SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
88 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?",'"',"(","!",")", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }88 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
89 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }89 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
90 }90 }
91 } // column91 } // column
9292
=== modified file 'plugins/ca/qml/Keyboard_ca_email.qml'
--- plugins/ca/qml/Keyboard_ca_email.qml 2016-01-25 16:02:23 +0000
+++ plugins/ca/qml/Keyboard_ca_email.qml 2017-04-12 11:04:43 +0000
@@ -49,7 +49,7 @@
49 spacing: 049 spacing: 0
5050
51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"]; leftSide: true; }51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"]; leftSide: true; }
52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["ẞ","$"] }
53 CharKey { label: "d"; shifted: "D"; }53 CharKey { label: "d"; shifted: "D"; }
54 CharKey { label: "f"; shifted: "F"; }54 CharKey { label: "f"; shifted: "F"; }
55 CharKey { label: "g"; shifted: "G"; }55 CharKey { label: "g"; shifted: "G"; }
@@ -86,7 +86,7 @@
86 CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; }86 CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; }
87 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }87 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
88 UrlKey { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; }88 UrlKey { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; }
89 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?",'"',"(","!",")", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }89 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
90 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }90 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
91 }91 }
92 } // column92 } // column
9393
=== modified file 'plugins/ca/qml/Keyboard_ca_url.qml'
--- plugins/ca/qml/Keyboard_ca_url.qml 2016-01-25 16:02:23 +0000
+++ plugins/ca/qml/Keyboard_ca_url.qml 2017-04-12 11:04:43 +0000
@@ -49,7 +49,7 @@
49 spacing: 049 spacing: 0
5050
51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"]; leftSide: true; }51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"]; leftSide: true; }
52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["ẞ","$"] }
53 CharKey { label: "d"; shifted: "D"; }53 CharKey { label: "d"; shifted: "D"; }
54 CharKey { label: "f"; shifted: "F"; }54 CharKey { label: "f"; shifted: "F"; }
55 CharKey { label: "g"; shifted: "G"; }55 CharKey { label: "g"; shifted: "G"; }
@@ -85,7 +85,7 @@
85 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }85 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
86 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; }86 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; }
87 UrlKey { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; }87 UrlKey { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; }
88 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?",'"',"(","!",")", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }88 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
89 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }89 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
90 }90 }
91 } // column91 } // column
9292
=== modified file 'plugins/ca/qml/Keyboard_ca_url_search.qml'
--- plugins/ca/qml/Keyboard_ca_url_search.qml 2016-01-25 16:02:23 +0000
+++ plugins/ca/qml/Keyboard_ca_url_search.qml 2017-04-12 11:04:43 +0000
@@ -49,7 +49,7 @@
49 spacing: 049 spacing: 0
5050
51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"]; leftSide: true; }51 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å","ª","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","ª","Æ"]; leftSide: true; }
52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }52 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["ẞ","$"] }
53 CharKey { label: "d"; shifted: "D"; }53 CharKey { label: "d"; shifted: "D"; }
54 CharKey { label: "f"; shifted: "F"; }54 CharKey { label: "f"; shifted: "F"; }
55 CharKey { label: "g"; shifted: "G"; }55 CharKey { label: "g"; shifted: "G"; }
@@ -86,7 +86,7 @@
86 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; }86 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; }
87 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }87 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
88 UrlKey { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; }88 UrlKey { id: urlKey; label: ".com"; extended: [".cat", ".ad", ".es"]; anchors.right: dotKey.left; height: parent.height; }
89 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?",'"',"(",")","!","«","»", "·", "¿", "¡"]; extendedShifted: ["?",'"',"(",")","!","«","»", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }89 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; extendedShifted: ["?", "-", "_", "+", "%", "!", "#", "/", "·", "¿", "¡"]; anchors.right: enterKey.left; height: parent.height; }
90 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }90 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
91 }91 }
92 } // column92 } // column

Subscribers

People subscribed via source and target branches