← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/pt/qml/Keyboard_pt.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:
plugins/pt/qml/Keyboard_pt.qml
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
79
80
            anchors.left: parent.left
80
81
            anchors.right: parent.right
81
82
 
82
 
            height: panel.keyHeight;
 
83
            height: panel.keyHeight + units.gu(UI.bottom_margin*2);
83
84
 
84
 
            SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; }
85
 
            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; }
86
 
            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; }
87
 
            SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true }
88
 
            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; }
89
 
            ReturnKey      { id: enterKey;                               anchors.right: parent.right }
 
85
            SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
 
86
            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
 
87
            CharKey        { id: commaKey;    label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
 
88
            SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; 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
91
        }
91
92
    } // column
92
93
}