~michael-sheldon/ubuntu-keyboard/fix-magnifier-shifted

« back to all changes in this revision

Viewing changes to plugins/sv/qml/Keyboard_sv_url_search.qml

  • Committer: Michael Sheldon
  • Date: 2014-08-22 15:20:27 UTC
  • mfrom: (202.2.5 ubuntu-keyboard)
  • Revision ID: michael.sheldon@canonical.com-20140822152027-hk7s0ghn4eefa4hh
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
import QtQuick 2.0
18
18
import "../../keys"
 
19
import "../../keys/key_constants.js" as UI
19
20
 
20
21
KeyPad {
21
22
    anchors.fill: parent
42
43
            CharKey { label: "i"; shifted: "I"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
43
44
            CharKey { label: "o"; shifted: "O"; extended: ["9", "ø","ö","ô","ò","ó","õ"]; extendedShifted: ["9", "Ø","Ö","Ô","Ò","Ó","Õ"] }
44
45
            CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"] }
 
46
            CharKey { label: "å"; shifted: "Å"; }
45
47
        }
46
48
 
47
49
        Row {
57
59
            CharKey { label: "j"; shifted: "J"; }
58
60
            CharKey { label: "k"; shifted: "K"; }
59
61
            CharKey { label: "l"; shifted: "L"; }
60
 
            CharKey { label: "å"; shifted: "Å"; }
 
62
            CharKey { label: "ä"; shifted: "Ä"; extended: ["æ"]; extendedShifted: ["Æ"] }
 
63
            CharKey { label: "ö"; shifted: "Ö";  extended: ["ø"]; extendedShifted: ["Ø"] }
61
64
        }
62
65
 
63
66
        Row {
64
67
            anchors.horizontalCenter: parent.horizontalCenter;
65
68
            spacing: 0
66
69
 
67
 
            ShiftKey { padding: 0 }
 
70
            ShiftKey { padding: 0; width: panel.keyWidth * 2 }
68
71
            CharKey { label: "z"; shifted: "Z"; }
69
72
            CharKey { label: "x"; shifted: "X"; }
70
73
            CharKey { label: "c"; shifted: "C"; extended: ["ç"]; extendedShifted: ["Ç"] }
73
76
            CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
74
77
            CharKey { label: "m"; shifted: "M"; }
75
78
            CharKey { label: "ä"; shifted: "Ä"; extended: ["æ"]; extendedShifted: ["Æ"] }
76
 
            BackspaceKey { padding: 0 }
 
79
            BackspaceKey { padding: 0; width: panel.keyWidth * 2 }
77
80
        }
78
81
 
79
82
        Item {
80
83
            anchors.left: parent.left
81
84
            anchors.right: parent.right
82
85
 
83
 
            height: panel.keyHeight;
 
86
            height: panel.keyHeight + units.gu(UI.bottom_margin*2);
84
87
 
85
 
            SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
86
 
            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
87
 
            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; }
88
 
            SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true }
89
 
            UrlKey         { id: urlKey; label: ".se"; extended: [".fi", ".ax"]; anchors.right: dotKey.left; }
90
 
            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: umlaut.left; }
91
 
            CharKey        { id: umlaut;      label: "ö"; shifted: "Ö";  extended: ["ø"]; extendedShifted: ["Ø"]; anchors.right: enterKey.left; }
92
 
            ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
88
            SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
 
89
            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
 
90
            CharKey        { id: slashKey; label: "/"; shifted: "/";     anchors.left: languageMenuButton.right; height: parent.height; }
 
91
            SpaceKey       { id: spaceKey;                               anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
 
92
            UrlKey         { id: urlKey; label: ".se"; extended: [".fi", ".ax"]; anchors.right: dotKey.left; height: parent.height; }
 
93
            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
 
94
            ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
93
95
        }
94
96
    } // column
95
97
}