ubuntu-keyboard

Merge lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-fix-shiftstate into lp:ubuntu-keyboard

  1. ubuntu-keyboard-fix-shiftstate
  2. Merge into trunk
Proposed by Thomas Moenicke
Status: Merged
Approved by: Günter Schwann
Approved revision: 58
Merged at revision: 57
Proposed branch: lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-fix-shiftstate
Merge into: lp:ubuntu-keyboard
Diff against target: 47 lines (+6/-13)
2 files modified
qml/keys/CharKey.qml (+2/-13)
qml/keys/ShiftKey.qml (+4/-0)
To merge this branch: bzr merge lp:~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-fix-shiftstate
Reviewer Review Type Date Requested Status
Günter Schwann (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+188821@code.launchpad.net

Commit message

shift state/key fixes

Description of the change

shift state/key fixes

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Günter Schwann (schwann) wrote :

Looks good and works well
Needed assets are not available to fully implement bug # 1229114
Still approving

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/keys/CharKey.qml'
2--- qml/keys/CharKey.qml 2013-09-30 11:12:21 +0000
3+++ qml/keys/CharKey.qml 2013-10-02 12:06:17 +0000
4@@ -68,18 +68,7 @@
5 * extended keys change as well when shifting keyboard, typically lower-uppercase: ê vs Ê
6 */
7 property string oskState: panel.activeKeypad.state
8- property var activeExtendedModel: extended
9-
10- onOskStateChanged: {
11- if (panel.activeKeypad.state == "NORMAL") {
12- keyLabel.text = label;
13- activeExtendedModel = extended;
14- } else if (panel.activeKeypad.state == "SHIFTED") {
15- keyLabel.text = shifted;
16- activeExtendedModel = extendedShifted
17- }
18- // CAPSLOCK keeps everything as in SHIFTED, nothing to do
19- }
20+ property var activeExtendedModel: (panel.activeKeypad.state === "NORMAL") ? extended : extendedShifted
21
22 Component.onCompleted: {
23 if (annotation) {
24@@ -105,7 +94,7 @@
25
26 Text {
27 id: keyLabel
28- text: ""
29+ text: (panel.activeKeypad.state === "NORMAL") ? label : shifted;
30 anchors.centerIn: parent
31 font.family: UI.fontFamily
32 font.pixelSize: fontSize
33
34=== modified file 'qml/keys/ShiftKey.qml'
35--- qml/keys/ShiftKey.qml 2013-09-10 07:33:38 +0000
36+++ qml/keys/ShiftKey.qml 2013-10-02 12:06:17 +0000
37@@ -37,6 +37,10 @@
38 panel.activeKeypad.state = "NORMAL"
39 }
40
41+ onPressAndHold: {
42+ panel.activeKeypad.state = "CAPSLOCK"
43+ }
44+
45 onDoubleClicked: {
46 if (panel.activeKeypad.state == "SHIFTED")
47 panel.activeKeypad.state = "CAPSLOCK"

Subscribers

People subscribed via source and target branches