← Back to branch summary

~thomas-moenicke/phablet-extras/maliit-plugins_fix_focus_out

« back to all changes in this revision

Viewing changes to nemo-keyboard/org/nemomobile/EnglishLandscape.qml

  • Committer: Tarmac
  • Author(s): Renato Araujo Oliveira Filho
  • Date: 2013-02-19 17:59:08 UTC
  • mfrom: (2102.1.6 fix-1122170)
  • Revision ID: tarmac-20130219175908-j203vkxzywk7a3oh
Fixed keyboard visuals and update keys icons. Fixes: https://bugs.launchpad.net/bugs/1122170.

Approved by Gustavo Pichorim Boiko, PS Jenkins bot, Jouni Helminen.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nemo-keyboard/org/nemomobile/EnglishLandscape.qml
40
40
    spacing: units.gu(UI.landscapeSpacing)
41
41
 
42
42
    property int columns: Math.max(row1.length, row2.length, row3.length)
43
 
    property int keyWidth: (columns == 11) ? units.gu(UI.landscapeWidthNarrow)
44
 
                                           : units.gu(UI.landscapeWidth)
 
43
    property int keyWidth: units.gu(UI.landscapeWidth)
45
44
    property int keyHeight: units.gu(UI.landscapeHeight)
46
 
    property int keyMargin: (columns == 11) ? units.gu(UI.landscapeMarginNarrow)
47
 
                                            : units.gu(UI.landscapeMargin)
 
45
    property int keyMargin: UI.landscapeMargin
48
46
 
49
47
    Row { //Row 1
50
48
        anchors.horizontalCenter: parent.horizontalCenter
78
76
 
79
77
    Row { //Row 3
80
78
        anchors.horizontalCenter: parent.horizontalCenter
81
 
        spacing: (columns == 11) ? 6 : 8
 
79
        spacing: keyMargin
82
80
 
83
 
        FunctionKey {
 
81
        ShiftKey {
 
82
            state: {
 
83
                if (inSymView) {
 
84
                    return "SYMBOLS"
 
85
                } else if (isShifted) {
 
86
                    if (isShiftLocked)
 
87
                        return "CAPSLOCK"; 
 
88
                    else
 
89
                        return "SHIFT";
 
90
                }
 
91
                return ""
 
92
            }
 
93
                    
84
94
            width: units.gu(UI.LANDSCAPE_KEYUPPER_WIDTH); height: keyHeight
85
95
            landscape: true
86
 
            icon: inSymView ? ""
87
 
                : (isShiftLocked) ? "icon-m-input-methods-capslock.svg"
88
 
                : (isShifted) ? "icon_shift_upsidedown.png"
89
 
                : "icon_shift.png"
90
 
 
91
96
            caption: inSymView ? (inSymView2 ? "2/2" : "1/2") : ""
92
97
            opacity: (mouseArea.containsMouse || (isShiftLocked && (!inSymView))) ? 0.6 : 1
93
98
            onClickedPass: {
131
136
 
132
137
    Row { //Row 4
133
138
        anchors.horizontalCenter: parent.horizontalCenter
134
 
        spacing: (columns == 11) ? 6 : 8
 
139
        spacing: keyMargin
135
140
        FunctionKey {
136
141
            width: units.gu(UI.LANDSCAPE_KEY123_WIDTH); height: keyHeight
137
142
            landscape: true