merged

On Thu, Oct 30, 2014 at 6:40 PM, Michael Sheldon <
<email address hidden>> wrote:

> It looks like your entry in KeyboardContainer.qml is looking for
> Keyboard_az.qml in lib/cs/ instead of lib/az/ so isn't finding it. I've
> commented in the diff to show exactly where.
>
> Diff comments:
>
> > === modified file 'debian/control'
> > --- debian/control    2014-08-13 22:17:53 +0000
> > +++ debian/control    2014-10-30 13:54:56 +0000
> > @@ -92,6 +92,14 @@
> >  Description: Ubuntu on-screen keyboard data files - Arabic
> >   Data files for the Ubuntu virtual keyboard - Arabic
> >
> > +Package: ubuntu-keyboard-azerbaijani
> > +Architecture: any
> > +Depends: ubuntu-keyboard (= ${binary:Version}),
> > +         ${misc:Depends},
> > +         ${shlibs:Depends},
> > +Description: Ubuntu on-screen keyboard data files - Azerbaijani
> > + Data files for the Ubuntu virtual keyboard - Azerbaijani
> > +
> >  Package: ubuntu-keyboard-chinese-pinyin
> >  Architecture: any
> >  Depends: ubuntu-keyboard (= ${binary:Version}),
> >
> > === added file 'debian/ubuntu-keyboard-azerbaijani.install'
> > --- debian/ubuntu-keyboard-azerbaijani.install        1970-01-01
> 00:00:00 +0000
> > +++ debian/ubuntu-keyboard-azerbaijani.install        2014-10-30
> 13:54:56 +0000
> > @@ -0,0 +1,1 @@
> > +usr/share/maliit/plugins/com/ubuntu/lib/az/
> >
> > === added directory 'plugins/az'
> > === added file 'plugins/az/az.pro'
> > --- plugins/az/az.pro 1970-01-01 00:00:00 +0000
> > +++ plugins/az/az.pro 2014-10-30 13:54:56 +0000
> > @@ -0,0 +1,9 @@
> > +CONFIG += ordered
> > +TEMPLATE = subdirs
> > +SUBDIRS = \
> > +    src \
> > +    qml
> > +
> > +QMAKE_EXTRA_TARGETS += check
> > +check.target = check
> > +check.CONFIG = recursive
> >
> > === added directory 'plugins/az/qml'
> > === added file 'plugins/az/qml/Keyboard_az.qml'
> > --- plugins/az/qml/Keyboard_az.qml    1970-01-01 00:00:00 +0000
> > +++ plugins/az/qml/Keyboard_az.qml    2014-10-30 13:54:56 +0000
> > @@ -0,0 +1,98 @@
> > +/*
> > + * Copyright 2013 Canonical Ltd.
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU Lesser General Public License as
> published by
> > + * the Free Software Foundation; version 3.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU Lesser General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU Lesser General Public
> License
> > + * along with this program.  If not, see <http://www.gnu.org/licenses/
> >.
> > + */
> > +
> > +import QtQuick 2.0
> > +import "../../keys"
> > +import "../../keys/key_constants.js" as UI
> > +
> > +KeyPad {
> > +    anchors.fill: parent
> > +
> > +    content: c1
> > +    symbols: "languages/Keyboard_symbols.qml"
> > +
> > +    Column {
> > +        id: c1
> > +        anchors.fill: parent
> > +        spacing: 0
> > +
> > +        Row {
> > +            anchors.horizontalCenter: parent.horizontalCenter;
> > +            spacing: 0
> > +
> > +            CharKey { label: "q"; shifted: "Q"; extended: ["1"];
> extendedShifted: ["1"] }
> > +            CharKey { label: "ü"; shifted: "Ü"; extended: ["2", "w"];
> extendedShifted: ["2", "W"] }
> > +            CharKey { label: "e"; shifted: "E"; extended: ["3", "è",
> "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] }
> > +            CharKey { label: "r"; shifted: "R"; extended: ["4"];
> extendedShifted: ["4"] }
> > +            CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"];
> extendedShifted: ["5", "Þ"] }
> > +            CharKey { label: "y"; shifted: "Y"; extended: ["6", "ý",
> "¥"]; extendedShifted: ["6", "Ý", "¥"] }
> > +            CharKey { label: "u"; shifted: "U"; extended: ["7",
> "û","ù","ú"]; extendedShifted: ["7", "Û","Ù","Ú"] }
> > +            CharKey { label: "i"; shifted: "İ"; extended: ["8",
> "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
> > +            CharKey { label: "o"; shifted: "O"; extended: ["9",
> "ô","ò","ó"]; extendedShifted: ["9", "Ô","Ò","Ó"] }
> > +            CharKey { label: "p"; shifted: "P"; extended: ["0"];
> extendedShifted: ["0"] }
> > +            CharKey { label: "ö"; shifted: "Ö"; }
> > +            CharKey { label: "ğ"; shifted: "Ğ"; }
> > +        }
> > +
> > +        Row {
> > +            anchors.horizontalCenter: parent.horizontalCenter;
> > +            spacing: 0
> > +
> > +            CharKey { label: "a"; shifted: "A"; extended:
> ["ä","à","â","ª","á","å", "æ"]; extendedShifted:
> ["Ä","À","Â","ª","Á","Å","Æ"] }
> > +            CharKey { label: "s"; shifted: "S"; extended: ["ß","$"];
> extendedShifted: ["$"] }
> > +            CharKey { label: "d"; shifted: "D"; extended: ["ð"];
> extendedShifted: ["Ð"] }
> > +            CharKey { label: "f"; shifted: "F"; }
> > +            CharKey { label: "g"; shifted: "G"; }
> > +            CharKey { label: "h"; shifted: "H"; }
> > +            CharKey { label: "j"; shifted: "J"; }
> > +            CharKey { label: "k"; shifted: "K"; }
> > +            CharKey { label: "l"; shifted: "L"; }
> > +            CharKey { label: "ı"; shifted: "I"; }
> > +            CharKey { label: "ə"; shifted: "Ə"; }
> > +        }
> > +
> > +        Row {
> > +            anchors.horizontalCenter: parent.horizontalCenter;
> > +            spacing: 0
> > +
> > +            ShiftKey {}
> > +            CharKey { label: "z"; shifted: "Z"; }
> > +            CharKey { label: "x"; shifted: "X"; }
> > +            CharKey { label: "c"; shifted: "C"; }
> > +            CharKey { label: "v"; shifted: "V"; }
> > +            CharKey { label: "b"; shifted: "B"; }
> > +            CharKey { label: "n"; shifted: "N"; extended: ["ñ"];
> extendedShifted: ["Ñ"] }
> > +            CharKey { label: "m"; shifted: "M"; }
> > +            CharKey { label: "ç"; shifted: "Ç"; }
> > +            CharKey { label: "ş"; shifted: "Ş"; }
> > +            BackspaceKey {}
> > +        }
> > +
> > +        Item {
> > +            anchors.left: parent.left
> > +            anchors.right: parent.right
> > +
> > +            height: panel.keyHeight + units.gu(UI.bottom_margin*2);
> > +
> > +            SymbolShiftKey { id: symShiftKey;
>   anchors.left: parent.left; height: parent.height; }
> > +            LanguageKey    { id: languageMenuButton;
>  anchors.left: symShiftKey.right; height: parent.height; }
> > +            CharKey        { id: commaKey;    label: ","; shifted: "/";
> extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height:
> parent.height; }
> > +            SpaceKey       { id: spaceKey;
>  anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier:
> true; height: parent.height; }
> > +            CharKey        { id: dotKey;      label: "."; shifted: ".";
> extended: ["?", "!"];  extendedShifted: ["?", "!"]; anchors.right:
> enterKey.left; height: parent.height; }
> > +            ReturnKey      { id: enterKey;
>  anchors.right: parent.right; height: parent.height; }
> > +        }
> > +    } // column
> > +}
> >
> > === added file 'plugins/az/qml/Keyboard_az_email.qml'
> > --- plugins/az/qml/Keyboard_az_email.qml      1970-01-01 00:00:00 +0000
> > +++ plugins/az/qml/Keyboard_az_email.qml      2014-10-30 13:54:56 +0000
> > @@ -0,0 +1,99 @@
> > +/*
> > + * Copyright 2013 Canonical Ltd.
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU Lesser General Public License as
> published by
> > + * the Free Software Foundation; version 3.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU Lesser General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU Lesser General Public
> License
> > + * along with this program.  If not, see <http://www.gnu.org/licenses/
> >.
> > + */
> > +
> > +import QtQuick 2.0
> > +import "../../keys"
> > +import "../../keys/key_constants.js" as UI
> > +
> > +KeyPad {
> > +    anchors.fill: parent
> > +
> > +    content: c1
> > +    symbols: "languages/Keyboard_symbols.qml"
> > +
> > +    Column {
> > +        id: c1
> > +        anchors.fill: parent
> > +        spacing: 0
> > +
> > +        Row {
> > +            anchors.horizontalCenter: parent.horizontalCenter;
> > +            spacing: 0
> > +
> > +            CharKey { label: "q"; shifted: "Q"; extended: ["1"];
> extendedShifted: ["1"] }
> > +            CharKey { label: "ü"; shifted: "Ü"; extended: ["2", "w"];
> extendedShifted: ["2", "W"] }
> > +            CharKey { label: "e"; shifted: "E"; extended: ["3", "è",
> "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] }
> > +            CharKey { label: "r"; shifted: "R"; extended: ["4"];
> extendedShifted: ["4"] }
> > +            CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"];
> extendedShifted: ["5", "Þ"] }
> > +            CharKey { label: "y"; shifted: "Y"; extended: ["6", "ý",
> "¥"]; extendedShifted: ["6", "Ý", "¥"] }
> > +            CharKey { label: "u"; shifted: "U"; extended: ["7",
> "û","ù","ú"]; extendedShifted: ["7", "Û","Ù","Ú"] }
> > +            CharKey { label: "i"; shifted: "İ"; extended: ["8",
> "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
> > +            CharKey { label: "o"; shifted: "O"; extended: ["9",
> "ô","ò","ó"]; extendedShifted: ["9", "Ô","Ò","Ó"] }
> > +            CharKey { label: "p"; shifted: "P"; extended: ["0"];
> extendedShifted: ["0"] }
> > +            CharKey { label: "ö"; shifted: "Ö"; }
> > +            CharKey { label: "ğ"; shifted: "Ğ"; }
> > +        }
> > +
> > +        Row {
> > +            anchors.horizontalCenter: parent.horizontalCenter;
> > +            spacing: 0
> > +
> > +            CharKey { label: "a"; shifted: "A"; extended:
> ["ä","à","â","á","ã","å"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å"] }
> > +            CharKey { label: "s"; shifted: "S"; extended: ["ß","$"];
> extendedShifted: ["$"] }
> > +            CharKey { label: "d"; shifted: "D"; extended: ["ð"];
> extendedShifted: ["Ð"] }
> > +            CharKey { label: "f"; shifted: "F"; }
> > +            CharKey { label: "g"; shifted: "G"; }
> > +            CharKey { label: "h"; shifted: "H"; }
> > +            CharKey { label: "j"; shifted: "J"; }
> > +            CharKey { label: "k"; shifted: "K"; }
> > +            CharKey { label: "l"; shifted: "L"; }
> > +            CharKey { label: "ı"; shifted: "I"; }
> > +            CharKey { label: "ə"; shifted: "Ə"; }
> > +        }
> > +
> > +        Row {
> > +            anchors.horizontalCenter: parent.horizontalCenter;
> > +            spacing: 0
> > +
> > +            ShiftKey {}
> > +            CharKey { label: "z"; shifted: "Z"; }
> > +            CharKey { label: "x"; shifted: "X"; }
> > +            CharKey { label: "c"; shifted: "C"; }
> > +            CharKey { label: "v"; shifted: "V"; }
> > +            CharKey { label: "b"; shifted: "B"; }
> > +            CharKey { label: "n"; shifted: "N"; extended: ["ñ"];
> extendedShifted: ["Ñ"] }
> > +            CharKey { label: "m"; shifted: "M"; }
> > +            CharKey { label: "ç"; shifted: "Ç"; }
> > +            CharKey { label: "ş"; shifted: "Ş"; }
> > +            BackspaceKey {}
> > +        }
> > +
> > +        Item {
> > +            anchors.left: parent.left
> > +            anchors.right: parent.right
> > +
> > +            height: panel.keyHeight + units.gu(UI.bottom_margin*2);
> > +
> > +            SymbolShiftKey { id: symShiftKey;
>   anchors.left: parent.left; height: parent.height; }
> > +            LanguageKey    { id: languageMenuButton;
>  anchors.left: symShiftKey.right; height: parent.height; }
> > +            CharKey        { id: atKey;    label: "@"; shifted: "@";
>  anchors.left: languageMenuButton.right; height: parent.height; }
> > +            SpaceKey       { id: spaceKey;
>  anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true;
> height: parent.height; }
> > +            UrlKey         { id: urlKey; label: ".com"; extended:
> [".az", ".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"];
> anchors.right: dotKey.left; height: parent.height; }
> > +            CharKey        { id: dotKey;      label: "."; shifted: ".";
> extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right:
> enterKey.left; height: parent.height; }
> > +            ReturnKey      { id: enterKey;
>  anchors.right: parent.right; height: parent.height; }
> > +        }
> > +    } // column
> > +}
> >
> > === added file 'plugins/az/qml/Keyboard_az_url.qml'
> > --- plugins/az/qml/Keyboard_az_url.qml        1970-01-01 00:00:00 +0000
> > +++ plugins/az/qml/Keyboard_az_url.qml        2014-10-30 13:54:56 +0000
> > @@ -0,0 +1,98 @@
> > +/*
> > + * Copyright 2013 Canonical Ltd.
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU Lesser General Public License as
> published by
> > + * the Free Software Foundation; version 3.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU Lesser General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU Lesser General Public
> License
> > + * along with this program.  If not, see <http://www.gnu.org/licenses/
> >.
> > + */
> > +
> > +import QtQuick 2.0
> > +import "../../keys"
> > +import "../../keys/key_constants.js" as UI
> > +
> > +KeyPad {
> > +    anchors.fill: parent
> > +
> > +    content: c1
> > +    symbols: "languages/Keyboard_symbols.qml"
> > +
> > +    Column {
> > +        id: c1
> > +        anchors.fill: parent
> > +        spacing: 0
> > +
> > +        Row {
> > +            anchors.horizontalCenter: parent.horizontalCenter;
> > +            spacing: 0
> > +
> > +            CharKey { label: "q"; shifted: "Q"; extended: ["1"];
> extendedShifted: ["1"] }
> > +            CharKey { label: "ü"; shifted: "Ü"; extended: ["2", "w"];
> extendedShifted: ["2", "W"] }
> > +            CharKey { label: "e"; shifted: "E"; extended: ["3", "è",
> "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] }
> > +            CharKey { label: "r"; shifted: "R"; extended: ["4"];
> extendedShifted: ["4"] }
> > +            CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"];
> extendedShifted: ["5", "Þ"] }
> > +            CharKey { label: "y"; shifted: "Y"; extended: ["6", "ý",
> "¥"]; extendedShifted: ["6", "Ý", "¥"] }
> > +            CharKey { label: "u"; shifted: "U"; extended: ["7",
> "û","ù","ú"]; extendedShifted: ["7", "Û","Ù","Ú"] }
> > +            CharKey { label: "i"; shifted: "İ"; extended: ["8",
> "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
> > +            CharKey { label: "o"; shifted: "O"; extended: ["9",
> "ô","ò","ó"]; extendedShifted: ["9", "Ô","Ò","Ó"] }
> > +            CharKey { label: "p"; shifted: "P"; extended: ["0"];
> extendedShifted: ["0"] }
> > +            CharKey { label: "ö"; shifted: "Ö"; }
> > +            CharKey { label: "ğ"; shifted: "Ğ"; }
> > +        }
> > +
> > +        Row {
> > +            anchors.horizontalCenter: parent.horizontalCenter;
> > +            spacing: 0
> > +
> > +            CharKey { label: "a"; shifted: "A"; extended:
> ["ä","à","â","á","ã","å"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å"] }
> > +            CharKey { label: "s"; shifted: "S"; extended: ["ß","$"];
> extendedShifted: ["$"] }
> > +            CharKey { label: "d"; shifted: "D"; extended: ["ð"];
> extendedShifted: ["Ð"] }
> > +            CharKey { label: "f"; shifted: "F"; }
> > +            CharKey { label: "g"; shifted: "G"; }
> > +            CharKey { label: "h"; shifted: "H"; }
> > +            CharKey { label: "j"; shifted: "J"; }
> > +            CharKey { label: "k"; shifted: "K"; }
> > +            CharKey { label: "l"; shifted: "L"; }
> > +            CharKey { label: "ı"; shifted: "I"; }
> > +            CharKey { label: "ə"; shifted: "Ə"; }
> > +        }
> > +
> > +        Row {
> > +            anchors.horizontalCenter: parent.horizontalCenter;
> > +            spacing: 0
> > +
> > +            ShiftKey {}
> > +            CharKey { label: "z"; shifted: "Z"; }
> > +            CharKey { label: "x"; shifted: "X"; }
> > +            CharKey { label: "c"; shifted: "C"; }
> > +            CharKey { label: "v"; shifted: "V"; }
> > +            CharKey { label: "b"; shifted: "B"; }
> > +            CharKey { label: "n"; shifted: "N"; extended: ["ñ"];
> extendedShifted: ["Ñ"] }
> > +            CharKey { label: "m"; shifted: "M"; }
> > +            CharKey { label: "ç"; shifted: "Ç"; }
> > +            CharKey { label: "ş"; shifted: "Ş"; }
> > +            BackspaceKey {}
> > +        }
> > +
> > +        Item {
> > +            anchors.left: parent.left
> > +            anchors.right: parent.right
> > +
> > +            height: panel.keyHeight + units.gu(UI.bottom_margin*2);
> > +
> > +            SymbolShiftKey { id: symShiftKey;
>   anchors.left: parent.left; height: parent.height; }
> > +            LanguageKey    { id: languageMenuButton;
>  anchors.left: symShiftKey.right; height: parent.height; }
> > +            CharKey        { id: slashKey; label: "/"; shifted: "/";
>  anchors.left: languageMenuButton.right; height: parent.height; }
> > +            UrlKey         { id: urlKey; label: ".com"; extended:
> [".az", ".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"];
> anchors.right: dotKey.left; height: parent.height; }
> > +            CharKey        { id: dotKey;      label: "."; shifted: ".";
> extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right:
> enterKey.left; height: parent.height; }
> > +            ReturnKey      { id: enterKey;
>  anchors.right: parent.right; height: parent.height; }
> > +        }
> > +    } // column
> > +}
> >
> > === added file 'plugins/az/qml/Keyboard_az_url_search.qml'
> > --- plugins/az/qml/Keyboard_az_url_search.qml 1970-01-01 00:00:00 +0000
> > +++ plugins/az/qml/Keyboard_az_url_search.qml 2014-10-30 13:54:56 +0000
> > @@ -0,0 +1,100 @@
> > +/*
> > + * Copyright 2013 Canonical Ltd.
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU Lesser General Public License as
> published by
> > + * the Free Software Foundation; version 3.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU Lesser General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU Lesser General Public
> License
> > + * along with this program.  If not, see <http://www.gnu.org/licenses/
> >.
> > + */
> > +
> > +import QtQuick 2.0
> > +import "../../keys"
> > +import "../../keys/key_constants.js" as UI
> > +
> > +KeyPad {
> > +    anchors.fill: parent
> > +
> > +    content: c1
> > +    symbols: "languages/Keyboard_symbols.qml"
> > +
> > +    Column {
> > +        id: c1
> > +        anchors.fill: parent
> > +
> > +        spacing: 0
> > +
> > +        Row {
> > +            anchors.horizontalCenter: parent.horizontalCenter;
> > +            spacing: 0
> > +
> > +            CharKey { label: "q"; shifted: "Q"; extended: ["1"];
> extendedShifted: ["1"] }
> > +            CharKey { label: "ü"; shifted: "Ü"; extended: ["2", "w"];
> extendedShifted: ["2", "W"] }
> > +            CharKey { label: "e"; shifted: "E"; extended: ["3", "è",
> "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] }
> > +            CharKey { label: "r"; shifted: "R"; extended: ["4"];
> extendedShifted: ["4"] }
> > +            CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"];
> extendedShifted: ["5", "Þ"] }
> > +            CharKey { label: "y"; shifted: "Y"; extended: ["6", "ý",
> "¥"]; extendedShifted: ["6", "Ý", "¥"] }
> > +            CharKey { label: "u"; shifted: "U"; extended: ["7",
> "û","ù","ú"]; extendedShifted: ["7", "Û","Ù","Ú"] }
> > +            CharKey { label: "i"; shifted: "İ"; extended: ["8",
> "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
> > +            CharKey { label: "o"; shifted: "O"; extended: ["9",
> "ô","ò","ó"]; extendedShifted: ["9", "Ô","Ò","Ó"] }
> > +            CharKey { label: "p"; shifted: "P"; extended: ["0"];
> extendedShifted: ["0"] }
> > +            CharKey { label: "ö"; shifted: "Ö"; }
> > +            CharKey { label: "ğ"; shifted: "Ğ"; }
> > +        }
> > +
> > +        Row {
> > +            anchors.horizontalCenter: parent.horizontalCenter;
> > +            spacing: 0
> > +
> > +            CharKey { label: "a"; shifted: "A"; extended:
> ["ä","à","â","á","ã","å"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å"] }
> > +            CharKey { label: "s"; shifted: "S"; extended: ["ß","$"];
> extendedShifted: ["$"] }
> > +            CharKey { label: "d"; shifted: "D"; extended: ["ð"];
> extendedShifted: ["Ð"] }
> > +            CharKey { label: "f"; shifted: "F"; }
> > +            CharKey { label: "g"; shifted: "G"; }
> > +            CharKey { label: "h"; shifted: "H"; }
> > +            CharKey { label: "j"; shifted: "J"; }
> > +            CharKey { label: "k"; shifted: "K"; }
> > +            CharKey { label: "l"; shifted: "L"; }
> > +            CharKey { label: "ı"; shifted: "I"; }
> > +            CharKey { label: "ə"; shifted: "Ə"; }
> > +        }
> > +
> > +        Row {
> > +            anchors.horizontalCenter: parent.horizontalCenter;
> > +            spacing: 0
> > +
> > +            ShiftKey {}
> > +            CharKey { label: "z"; shifted: "Z"; }
> > +            CharKey { label: "x"; shifted: "X"; }
> > +            CharKey { label: "c"; shifted: "C"; }
> > +            CharKey { label: "v"; shifted: "V"; }
> > +            CharKey { label: "b"; shifted: "B"; }
> > +            CharKey { label: "n"; shifted: "N"; extended: ["ñ"];
> extendedShifted: ["Ñ"] }
> > +            CharKey { label: "m"; shifted: "M"; }
> > +            CharKey { label: "ç"; shifted: "Ç"; }
> > +            CharKey { label: "ş"; shifted: "Ş"; }
> > +            BackspaceKey {}
> > +        }
> > +
> > +        Item {
> > +            anchors.left: parent.left
> > +            anchors.right: parent.right
> > +
> > +            height: panel.keyHeight + units.gu(UI.bottom_margin*2);
> > +
> > +            SymbolShiftKey { id: symShiftKey;
>   anchors.left: parent.left; height: parent.height; }
> > +            LanguageKey    { id: languageMenuButton;
>  anchors.left: symShiftKey.right; height: parent.height; }
> > +            CharKey        { id: slashKey;    label: "/"; shifted:
> "/";  anchors.left: languageMenuButton.right; height: parent.height; }
> > +            SpaceKey       { id: spaceKey;
>  anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier:
> true; height: parent.height; }
> > +            UrlKey         { id: urlKey; label: ".com"; extended:
> [".az", ".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"];
> anchors.right: dotKey.left; height: parent.height; }
> > +            CharKey        { id: dotKey;      label: "."; shifted: ".";
> extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right:
> enterKey.left; height: parent.height; }
> > +            ReturnKey      { id: enterKey;
>  anchors.right: parent.right; height: parent.height; }
> > +        }
> > +    } // column
> > +}
> >
> > === added file 'plugins/az/qml/qml.pro'
> > --- plugins/az/qml/qml.pro    1970-01-01 00:00:00 +0000
> > +++ plugins/az/qml/qml.pro    2014-10-30 13:54:56 +0000
> > @@ -0,0 +1,20 @@
> > +TOP_BUILDDIR = $$OUT_PWD/../../..
> > +TOP_SRCDIR = $$PWD/../../..
> > +
> > +include($${TOP_SRCDIR}/config.pri)
> > +
> > +TARGET = dummy
> > +TEMPLATE = lib
> > +
> > +lang_az.path = "$$UBUNTU_KEYBOARD_LIB_DIR/az/"
> > +lang_az.files = *.qml *.js
> > +
> > +INSTALLS += lang_az
> > +
> > +# for QtCreator
> > +OTHER_FILES += \
> > +    Keyboard_az.qml \
> > +    Keyboard_az_email.qml \
> > +    Keyboard_az_url.qml \
> > +    Keyboard_az_url_search.qml
> > +
> >
> > === added directory 'plugins/az/src'
> > === added file 'plugins/az/src/azerbaijaniplugin.h'
> > --- plugins/az/src/azerbaijaniplugin.h        1970-01-01 00:00:00 +0000
> > +++ plugins/az/src/azerbaijaniplugin.h        2014-10-30 13:54:56 +0000
> > @@ -0,0 +1,27 @@
> > +#ifndef AZERBAIJANIPLUGIN_H
> > +#define AZERBAIJANIPLUGIN_H
> > +
> > +#include <QObject>
> > +#include "languageplugininterface.h"
> > +#include "westernlanguagesplugin.h"
> > +
> > +//#include <presage.h>
> > +
> > +class AzerbaijaniPlugin : public WesternLanguagesPlugin
> > +{
> > +    Q_OBJECT
> > +    Q_INTERFACES(LanguagePluginInterface)
> > +    Q_PLUGIN_METADATA(IID
> "org.qt-project.Qt.Examples.AzerbaijaniPlugin" FILE
> "azerbaijaniplugin.json")
> > +
> > +public:
> > +    explicit AzerbaijaniPlugin(QObject* parent = 0)
> > +        : WesternLanguagesPlugin(parent)
> > +    {
> > +    }
> > +
> > +    virtual ~AzerbaijaniPlugin()
> > +    {
> > +    }
> > +};
> > +
> > +#endif // AZERBAIJANIPLUGIN_H
> >
> > === added file 'plugins/az/src/azerbaijaniplugin.json'
> > --- plugins/az/src/azerbaijaniplugin.json     1970-01-01 00:00:00 +0000
> > +++ plugins/az/src/azerbaijaniplugin.json     2014-10-30 13:54:56 +0000
> > @@ -0,0 +1,7 @@
> > +{
> > +    "IID": "org.qt-project.Qt.Examples.AzerbaijaniPlugin",
> > +    "MetaData": {
> > +    },
> > +    "className": "AzerbaijaniPlugin",
> > +    "debug": true
> > +}
> >
> > === added file 'plugins/az/src/database_az.db'
> > Binary files plugins/az/src/database_az.db    1970-01-01 00:00:00 +0000
> and plugins/az/src/database_az.db     2014-10-30 13:54:56 +0000 differ
> > === added file 'plugins/az/src/src.pro'
> > --- plugins/az/src/src.pro    1970-01-01 00:00:00 +0000
> > +++ plugins/az/src/src.pro    2014-10-30 13:54:56 +0000
> > @@ -0,0 +1,47 @@
> > +TOP_BUILDDIR = $$OUT_PWD/../../..
> > +TOP_SRCDIR = $$PWD/../../..
> > +
> > +include($${TOP_SRCDIR}/config.pri)
> > +
> > +TEMPLATE        = lib
> > +CONFIG         += plugin
> > +QT             += widgets
> > +INCLUDEPATH    += \
> > +    $${TOP_SRCDIR}/src/ \
> > +    $${TOP_SRCDIR}/src/lib/ \
> > +    $${TOP_SRCDIR}/src/lib/logic/
> > +    $${TOP_SRCDIR}/plugins/westernsupport
> > +
> > +HEADERS         = \
> > +    azerbaijaniplugin.h
> > +
> > +TARGET          = $$qtLibraryTarget(azerbaijaniplugin)
> > +
> > +EXAMPLE_FILES = azerbaijaniplugin.json
> > +
> > +# generate database for presage:
> > +PLUGIN_INSTALL_PATH = $${UBUNTU_KEYBOARD_LIB_DIR}/az/
> > +
> > +lang_db_az.commands += \
> > +  rm -f $$PWD/database_az.db && \
> > +  text2ngram -n 1 -l -f sqlite -o $$PWD/database_az.db
> $$PWD/the_picture_of_dorian_gray.txt && \
> > +  text2ngram -n 2 -l -f sqlite -o $$PWD/database_az.db
> $$PWD/the_picture_of_dorian_gray.txt && \
> > +  text2ngram -n 3 -l -f sqlite -o $$PWD/database_az.db
> $$PWD/the_picture_of_dorian_gray.txt
> > +lang_db_az.files += $$PWD/database_az.db
> > +
> > +lang_db_az_install.files += $$PWD/database_az.db
> > +lang_db_az_install.path = $$PLUGIN_INSTALL_PATH
> > +
> > +QMAKE_EXTRA_TARGETS += lang_db_az lang_db_az_install
> > +
> > +target.path = $$PLUGIN_INSTALL_PATH
> > +INSTALLS += target lang_db_az_install
> > +
> > +OTHER_FILES += \
> > +    the_picture_of_dorian_gray.txt \
> > +    azerbaijaniplugin.json
> > +
> > +LIBS += $${TOP_BUILDDIR}/plugins/plugins/libwesternsupport.a -lpresage
> -lhunspell
> > +
> > +INCLUDEPATH += $$PWD/../../westernsupport
> > +DEPENDPATH += $$PWD/../../westernsupport
> >
> > === added file 'plugins/az/src/the_picture_of_dorian_gray.txt'
> > === added directory 'plugins/az/tests'
> > === modified file 'plugins/plugins.pro'
> > --- plugins/plugins.pro       2014-07-28 18:19:04 +0000
> > +++ plugins/plugins.pro       2014-10-30 13:54:56 +0000
> > @@ -3,6 +3,7 @@
> >  SUBDIRS = \
> >      westernsupport \
> >      ar \
> > +    az \
> >      cs \
> >      da \
> >      de \
> >
> > === modified file 'po/ubuntu-keyboard.pot'
> > --- po/ubuntu-keyboard.pot    2014-08-28 16:27:04 +0000
> > +++ po/ubuntu-keyboard.pot    2014-10-30 13:54:56 +0000
> > @@ -26,73 +26,77 @@
> >  msgstr ""
> >
> >  #: ../qml/keys/LanguageMenu.qml:71
> > +msgid "Azerbaijani"
> > +msgstr ""
> > +
> > +#: ../qml/keys/LanguageMenu.qml:72
> >  msgid "Czech"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:72
> > +#: ../qml/keys/LanguageMenu.qml:73
> >  msgid "Danish"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:73
> > +#: ../qml/keys/LanguageMenu.qml:74
> >  msgid "German"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:74
> > +#: ../qml/keys/LanguageMenu.qml:75
> >  msgid "English"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:75
> > +#: ../qml/keys/LanguageMenu.qml:76
> >  msgid "Spanish"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:76
> > +#: ../qml/keys/LanguageMenu.qml:77
> >  msgid "Finnish"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:77
> > +#: ../qml/keys/LanguageMenu.qml:78
> >  msgid "French"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:78
> > +#: ../qml/keys/LanguageMenu.qml:79
> >  msgid "Hebrew"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:79
> > +#: ../qml/keys/LanguageMenu.qml:80
> >  msgid "Hungarian"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:80
> > +#: ../qml/keys/LanguageMenu.qml:81
> >  msgid "Italian"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:81
> > +#: ../qml/keys/LanguageMenu.qml:82
> >  msgid "Dutch"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:82
> > +#: ../qml/keys/LanguageMenu.qml:83
> >  msgid "Polish"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:83
> > +#: ../qml/keys/LanguageMenu.qml:84
> >  msgid "Portuguese"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:84
> > +#: ../qml/keys/LanguageMenu.qml:85
> >  msgid "Russian"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:85
> > +#: ../qml/keys/LanguageMenu.qml:86
> >  msgid "Serbian"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:86
> > +#: ../qml/keys/LanguageMenu.qml:87
> >  msgid "Swedish"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:87
> > +#: ../qml/keys/LanguageMenu.qml:88
> >  msgid "Chinese - Pinyin"
> >  msgstr ""
> >
> > -#: ../qml/keys/LanguageMenu.qml:90
> > +#: ../qml/keys/LanguageMenu.qml:91
> >  msgid "Language: "
> >  msgstr ""
> >
> > === modified file 'qml/KeyboardContainer.qml'
> > --- qml/KeyboardContainer.qml 2014-09-09 11:26:52 +0000
> > +++ qml/KeyboardContainer.qml 2014-10-30 13:54:56 +0000
> > @@ -119,6 +119,7 @@
> >          {
> >              var supportedLocales = [
> >                  "ar",
> > +                "az",
> >                  "cs",
> >                  "da",
> >                  "de",
> > @@ -152,6 +153,8 @@
> >
> >              if (language === "ar")
> >                  return "lib/ar/Keyboard_ar.qml";
> > +            if (language === "az")
> > +                return "lib/cs/Keyboard_az.qml";
>
> This should be lib/az/Keyboard_az.qml
>
> >              if (language === "cs")
> >                  return "lib/cs/Keyboard_cs.qml";
> >              if (language === "da")
> >
> > === modified file 'qml/keys/LanguageMenu.qml'
> > --- qml/keys/LanguageMenu.qml 2014-09-15 09:39:19 +0000
> > +++ qml/keys/LanguageMenu.qml 2014-10-30 13:54:56 +0000
> > @@ -72,6 +72,7 @@
> >      function languageIdToName(languageId)
> >      {
> >          if (languageId == "ar")         return i18n.tr("Arabic");
> > +        if (languageId == "az")         return i18n.tr("Azerbaijani");
> >          if (languageId == "cs")         return i18n.tr("Czech");
> >          if (languageId == "da")         return i18n.tr("Danish");
> >          if (languageId == "de")         return i18n.tr("German");
> >
> > === modified file 'src/lib/logic/wordengine.cpp'
> > --- src/lib/logic/wordengine.cpp      2014-08-07 17:04:01 +0000
> > +++ src/lib/logic/wordengine.cpp      2014-10-30 13:54:56 +0000
> > @@ -357,6 +357,8 @@
> >
> >      if (languageId == "ar")
> >          d->loadPlugin("libarabicplugin.so", "ar");
> > +    else if (languageId == "az")
> > +        d->loadPlugin("libazerbaijaniplugin.so", "az");
> >      else if (languageId == "cs")
> >          d->loadPlugin("libczechplugin.so", "cs");
> >      else if (languageId == "da")
> >
>
>
> --
>
> https://code.launchpad.net/~turan-mahmudov-l/ubuntu-keyboard/trunk/+merge/236139
> You are the owner of lp:~turan-mahmudov-l/ubuntu-keyboard/trunk.
>



-- 
Hörmətlə,
Turan Mahmudov
E-mail: <email address hidden>
www.turanmahmudov.net