ubuntu-keyboard

Merge lp:~turan-mahmudov-l/ubuntu-keyboard/trunk into lp:ubuntu-keyboard

  1. trunk
  2. Merge into trunk
Proposed by Turan Mahmudov
Status: Merged
Merged at revision: 248
Proposed branch: lp:~turan-mahmudov-l/ubuntu-keyboard/trunk
Merge into: lp:ubuntu-keyboard
Diff against target: 738 lines (+542/-17)
16 files modified
debian/control (+8/-0)
debian/ubuntu-keyboard-azerbaijani.install (+1/-0)
plugins/az/az.pro (+9/-0)
plugins/az/qml/Keyboard_az.qml (+98/-0)
plugins/az/qml/Keyboard_az_email.qml (+99/-0)
plugins/az/qml/Keyboard_az_url.qml (+98/-0)
plugins/az/qml/Keyboard_az_url_search.qml (+100/-0)
plugins/az/qml/qml.pro (+20/-0)
plugins/az/src/azerbaijaniplugin.h (+27/-0)
plugins/az/src/azerbaijaniplugin.json (+7/-0)
plugins/az/src/src.pro (+47/-0)
plugins/plugins.pro (+1/-0)
po/ubuntu-keyboard.pot (+21/-17)
qml/KeyboardContainer.qml (+3/-0)
qml/keys/LanguageMenu.qml (+1/-0)
src/lib/logic/wordengine.cpp (+2/-0)
To merge this branch: bzr merge lp:~turan-mahmudov-l/ubuntu-keyboard/trunk
Reviewer Review Type Date Requested Status
Michael Sheldon (community) Approve
PS Jenkins bot continuous-integration Approve
Łukasz Zemczak packaging Pending
Review via email: mp+236139@code.launchpad.net

Commit message

Add an Azerbaijani keyboard layout

Description of the change

Azerbaijani keyboard

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?

* Yes (minus the tests that depend on functionality that hasn't landed)

If you changed the UI, was the change specified/approved by design?

* No change

If you changed UI labels, did you update the pot file?

* Yes

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

* Yes

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

FAILED: Continuous integration, rev:229
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~turan-mahmudov-l/ubuntu-keyboard/trunk/+merge/236139/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/482/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/107/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/107/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :

What is the final result?

On Thu, Oct 16, 2014 at 4:59 PM, Michael Sheldon <
<email address hidden>> wrote:

> The proposal to merge lp:~turan-mahmudov-l/ubuntu-keyboard/trunk into
> lp:ubuntu-keyboard has been updated.
>
> Commit Message changed to:
>
> Add an Azerbaijani keyboard layout
>
> For more details, see:
>
> https://code.launchpad.net/~turan-mahmudov-l/ubuntu-keyboard/trunk/+merge/236139
> --
>
> 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

Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :

Is anything wrong?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/485/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/111/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/110/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/110/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Hi Turan,

 Sorry for the delay on re-reviewing this, we've been frantically sprinting all week :). It looks like there are a couple of small problems with the packaging. You'll need to add an entry in the debian/control file to tell it about your new plugin, something like:

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

This should be added after the entry for the ubuntu-keyboard-arabic package (we list the language plugins alphabetically).

You'll also need to include an install file for the new Debian package (this tells the package build process which files to include), this can simply be a file in the debian/ directory called ubuntu-keyboard-azerbaijani.install with the line:

usr/share/maliit/plugins/com/ubuntu/lib/az/

(Note that there isn't a slash at the beginning of the line).

If this causes any issues just let me know and I'll happily walk you through the process :)

Thanks!
 Mike.

review: Needs Fixing
lp:~turan-mahmudov-l/ubuntu-keyboard/trunk updated
230. By Turan Mahmudov

bugs fixed

Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :

Hi Michael, I updated and pushed to
https://launchpad.net/ubuntu-azerbaijani-keyboard
I can't merge this to ubuntu-keyboard

On Fri, Oct 24, 2014 at 7:51 PM, Michael Sheldon <
<email address hidden>> wrote:

> Review: Needs Fixing
>
> Hi Turan,
>
> Sorry for the delay on re-reviewing this, we've been frantically
> sprinting all week :). It looks like there are a couple of small problems
> with the packaging. You'll need to add an entry in the debian/control file
> to tell it about your new plugin, something like:
>
> 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
>
> This should be added after the entry for the ubuntu-keyboard-arabic
> package (we list the language plugins alphabetically).
>
> You'll also need to include an install file for the new Debian package
> (this tells the package build process which files to include), this can
> simply be a file in the debian/ directory called
> ubuntu-keyboard-azerbaijani.install with the line:
>
> usr/share/maliit/plugins/com/ubuntu/lib/az/
>
> (Note that there isn't a slash at the beginning of the line).
>
> If this causes any issues just let me know and I'll happily walk you
> through the process :)
>
> Thanks!
> Mike.
>
> --
>
> 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

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Hi Turan,

 I'm afraid we can't merge a separate project like that, you need to push your changes to this branch (or create a new branch as you did previously).

Thanks,
 Mike.

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

You can push to this branch by running "bzr push lp:~turan-mahmudov-l/ubuntu-keyboard/trunk"

Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :

Hi Michael. I pushed to "~turan-mahmudov-l/ubuntu-
keyboard/trunk"

On Tue, Oct 28, 2014 at 2:55 PM, Michael Sheldon <
<email address hidden>> wrote:

> You can push to this branch by running "bzr push
> lp:~turan-mahmudov-l/ubuntu-keyboard/trunk"
> --
>
> 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

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Thanks! I'll try to review that later today.

Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :

thanks :)

On Tue, Oct 28, 2014 at 3:19 PM, Michael Sheldon <
<email address hidden>> wrote:

> Thanks! I'll try to review that later today.
> --
>
> 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

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Hi, just a couple more changes needed:

To let the rest of the keyboard system know about your plugin there are a couple of files you'll need to make some small changes to. You'll need to add an entry for Azerbaijani in the languageIdToName function in qml/keys/LanguageMenu.qml and in the freeTextLanguageKeyboard and languageIsSupported functions in qml/KeyboardContainer.qml and WordEngine::onLanguageChanged in src/lib/logic/wordengine.cpp (these should really be redesigned to avoid the need for that, but that's currently fairly low on the priority list I'm afraid).

Also, I see that you've added the Arabic dictionary (hunspell-ar) as a dependency, was that intentional (if so we'll need to make some further changes to make it usable by the plugin) or just accidentally copied from the Arabic plugin entry?

Finally, it'd be handy if you could update your branch from trunk to make sure everything merges smoothly when we land this. To do that simply run 'bzr merge lp:ubuntu-trunk', if there are any merge conflicts let me know and I'll help you correct them, otherwise just run 'bzr commit -m "Merge from trunk"' and 'bzr push'.

Thanks!
 Mike.

review: Needs Fixing
lp:~turan-mahmudov-l/ubuntu-keyboard/trunk updated
231. By Turan Mahmudov

bugs fixed

Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :

Hi.

I made changes. But I didn't understand this: "Also, I see that you've
added the Arabic dictionary (hunspell-ar) as a dependency, was that
intentional (if so we'll need to make some further changes to make it
usable by the plugin) or just accidentally copied from the Arabic plugin
entry?" - what I should do?

"bzr merge lp:ubuntu-trunk" says "bzr: ERROR: Not a branch: "bzr+ssh://
bazaar.launchpad.net/+branch/ubuntu-trunk/".

I pushed files to "~turan-mahmudov-l/ubuntu-azerbaijani-keyboard/trunk/".

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

> Review: Needs Fixing
>
> Hi, just a couple more changes needed:
>
> To let the rest of the keyboard system know about your plugin there are a
> couple of files you'll need to make some small changes to. You'll need to
> add an entry for Azerbaijani in the languageIdToName function in
> qml/keys/LanguageMenu.qml and in the freeTextLanguageKeyboard and
> languageIsSupported functions in qml/KeyboardContainer.qml and
> WordEngine::onLanguageChanged in src/lib/logic/wordengine.cpp (these should
> really be redesigned to avoid the need for that, but that's currently
> fairly low on the priority list I'm afraid).
>
> Also, I see that you've added the Arabic dictionary (hunspell-ar) as a
> dependency, was that intentional (if so we'll need to make some further
> changes to make it usable by the plugin) or just accidentally copied from
> the Arabic plugin entry?
>
> Finally, it'd be handy if you could update your branch from trunk to make
> sure everything merges smoothly when we land this. To do that simply run
> 'bzr merge lp:ubuntu-trunk', if there are any merge conflicts let me know
> and I'll help you correct them, otherwise just run 'bzr commit -m "Merge
> from trunk"' and 'bzr push'.
>
> Thanks!
> Mike.
> --
>
> 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

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Sorry, my fault, that should have been "bzr merge lp:ubuntu-keyboard".

For the Arabic dictionary simply remove the hunspell-ar line from the dependencies in debian/control. I've marked the relevant line with an in-line comment on the diff.

You'll need to push changes to "lp:~turan-mahmudov-l/ubuntu-keyboard/trunk/" (this branch), otherwise we won't be able to merge them with ubuntu-keyboard (ubuntu-azerbaijani-keyboard is considered to be a separate project by launchpad).

lp:~turan-mahmudov-l/ubuntu-keyboard/trunk updated
232. By Turan Mahmudov

fixed

Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :
Download full text (30.7 KiB)

I pushed and merged.

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

> Sorry, my fault, that should have been "bzr merge lp:ubuntu-keyboard".
>
> For the Arabic dictionary simply remove the hunspell-ar line from the
> dependencies in debian/control. I've marked the relevant line with an
> in-line comment on the diff.
>
> You'll need to push changes to
> "lp:~turan-mahmudov-l/ubuntu-keyboard/trunk/" (this branch), otherwise we
> won't be able to merge them with ubuntu-keyboard
> (ubuntu-azerbaijani-keyboard is considered to be a separate project by
> launchpad).
>
> Diff comments:
>
> > === modified file 'debian/control'
> > --- debian/control 2014-08-13 22:17:53 +0000
> > +++ debian/control 2014-10-28 11:00:47 +0000
> > @@ -92,6 +92,15 @@
> > 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}),
> > + hunspell-ar,
>
> ^ This line
>
> > + ${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-28
> 11:00:47 +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-28 11:00:47 +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-28 11:00:47 +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
> > ...

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Tiny thing but your latest changes have some tabs in the indentation instead of spaces. We try to keep a consistent indentation style throughout the codebase, so if you could change those to spaces it'd be a big help. I've marked the relevant lines in the diff.

Thanks!

lp:~turan-mahmudov-l/ubuntu-keyboard/trunk updated
233. By Turan Mahmudov

tabs to spaces

Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :
Download full text (32.4 KiB)

I fixed, pushed and merged.

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

> Tiny thing but your latest changes have some tabs in the indentation
> instead of spaces. We try to keep a consistent indentation style throughout
> the codebase, so if you could change those to spaces it'd be a big help.
> I've marked the relevant lines in the diff.
>
> Thanks!
>
> Diff comments:
>
> > === modified file 'debian/control'
> > --- debian/control 2014-08-13 22:17:53 +0000
> > +++ debian/control 2014-10-30 12:23:43 +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
> 12:23:43 +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 12:23:43 +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 12:23:43 +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 {
> > ...

Revision history for this message
Michael Sheldon (michael-sheldon) 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.

lp:~turan-mahmudov-l/ubuntu-keyboard/trunk updated
234. By Turan Mahmudov

bugs fixed

Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :
Download full text (32.2 KiB)

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
> > +
> > + ...

Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :

Hi, Michael. Thanks a lot ;)

On Fri, Oct 31, 2014 at 5:42 PM, Michael Sheldon <
<email address hidden>> wrote:

> The proposal to merge lp:~turan-mahmudov-l/ubuntu-keyboard/trunk into
> lp:ubuntu-keyboard has been updated.
>
> Description changed to:
>
> Azerbaijani keyboard
>
> Are there any related MPs required for this MP to build/function as
> expected? Please list.
>
> * No
>
> Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no
> changes)
>
> * Yes
>
> Did you perform an exploratory manual test run of your code change and any
> related functionality on device or emulator?
>
> * Yes
>
> Did you successfully run all tests found in your component's Test Plan (
> https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device
> or emulator?
>
> * Yes (minus the tests that depend on functionality that hasn't landed)
>
> If you changed the UI, was the change specified/approved by design?
>
> * No change
>
> If you changed UI labels, did you update the pot file?
>
> * Yes
>
> If you changed the packaging (debian), did you add a core-dev as a
> reviewer to this MP?
>
> * Yes
>
> For more details, see:
>
> https://code.launchpad.net/~turan-mahmudov-l/ubuntu-keyboard/trunk/+merge/236139
> --
>
> 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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:234
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/496/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/121
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/121

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

review: Approve (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes (completed on submitter's behalf)

review: Approve
Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :

Hi. In which ubuntu touch version azerbaijani keyboard layout will be
integrated?
On Oct 31, 2014 6:29 PM, "Michael Sheldon" <email address hidden>
wrote:

> Review: Approve
>
> Did you perform an exploratory manual test run of the code change and any
> related functionality on device or emulator?
>
> * Yes
>
> Did CI run pass? If not, please explain why.
>
> * Yes
>
> Have you checked that submitter has accurately filled out the submitter
> checklist and has taken no shortcut?
>
> * Yes (completed on submitter's behalf)
> --
>
> https://code.launchpad.net/~turan-mahmudov-l/ubuntu-keyboard/trunk/+merge/236139
> You are the owner of lp:~turan-mahmudov-l/ubuntu-keyboard/trunk.
>

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Hi Turan,

 It should be going in to Vivid fairly soon; we've just been sorting out some last minute bug fixes for the RTM branch, once that's all sorted we'll be turning our attention to landing lots of new stuff in Vivid.

Cheers,
Mike.

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Hi Turan!

 Sorry, there's one last final step before we can merge this. We need you to sign the contributor license agreement: http://www.ubuntu.com/legal/contributors

 This allows you to retain copyright ownership of your contributions but grants us a license to make use of them within the project.

Thanks!
Mike.

Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :

Hi. I signed, and noted launchpad that "ubuntu-azerbaijani-keyboard". Is it
right?

On Tue, Nov 11, 2014 at 7:45 PM, Michael Sheldon <
<email address hidden>> wrote:

> Hi Turan!
>
> Sorry, there's one last final step before we can merge this. We need you
> to sign the contributor license agreement:
> http://www.ubuntu.com/legal/contributors
>
> This allows you to retain copyright ownership of your contributions but
> grants us a license to make use of them within the project.
>
> Thanks!
> Mike.
> --
>
> 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

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Thanks, however the launchpad ID needs to be the ID of your account, i.e. turan-mahmudov-l not of the project (and in this case the project is actually ubuntu-keyboard). That should probably be made a little clearer on the form, sorry about that.

Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :

Okay, I signed again.

On Wed, Nov 12, 2014 at 12:44 AM, Michael Sheldon <
<email address hidden>> wrote:

> Thanks, however the launchpad ID needs to be the ID of your account, i.e.
> turan-mahmudov-l not of the project (and in this case the project is
> actually ubuntu-keyboard). That should probably be made a little clearer on
> the form, sorry about that.
> --
>
> 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

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Great, thanks very much. As soon as that's been processed on our side we can see about getting this landed in vivid :)

Revision history for this message
Turan Mahmudov (turan-mahmudov-l) wrote :

Thanks a lot. I want to make a keyboard layout for Turkish also. may I?

On Wed, Nov 12, 2014 at 12:56 AM, Michael Sheldon <
<email address hidden>> wrote:

> Great, thanks very much. As soon as that's been processed on our side we
> can see about getting this landed in vivid :)
> --
>
> 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

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

That'd be great, the more layouts we can support the better :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2014-08-13 22:17:53 +0000
+++ debian/control 2014-10-30 15:05:36 +0000
@@ -92,6 +92,14 @@
92Description: Ubuntu on-screen keyboard data files - Arabic92Description: Ubuntu on-screen keyboard data files - Arabic
93 Data files for the Ubuntu virtual keyboard - Arabic93 Data files for the Ubuntu virtual keyboard - Arabic
9494
95Package: ubuntu-keyboard-azerbaijani
96Architecture: any
97Depends: ubuntu-keyboard (= ${binary:Version}),
98 ${misc:Depends},
99 ${shlibs:Depends},
100Description: Ubuntu on-screen keyboard data files - Azerbaijani
101 Data files for the Ubuntu virtual keyboard - Azerbaijani
102
95Package: ubuntu-keyboard-chinese-pinyin103Package: ubuntu-keyboard-chinese-pinyin
96Architecture: any104Architecture: any
97Depends: ubuntu-keyboard (= ${binary:Version}),105Depends: ubuntu-keyboard (= ${binary:Version}),
98106
=== 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 15:05:36 +0000
@@ -0,0 +1,1 @@
1usr/share/maliit/plugins/com/ubuntu/lib/az/
02
=== 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 15:05:36 +0000
@@ -0,0 +1,9 @@
1CONFIG += ordered
2TEMPLATE = subdirs
3SUBDIRS = \
4 src \
5 qml
6
7QMAKE_EXTRA_TARGETS += check
8check.target = check
9check.CONFIG = recursive
010
=== 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 15:05:36 +0000
@@ -0,0 +1,98 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import "../../keys"
19import "../../keys/key_constants.js" as UI
20
21KeyPad {
22 anchors.fill: parent
23
24 content: c1
25 symbols: "languages/Keyboard_symbols.qml"
26
27 Column {
28 id: c1
29 anchors.fill: parent
30 spacing: 0
31
32 Row {
33 anchors.horizontalCenter: parent.horizontalCenter;
34 spacing: 0
35
36 CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"] }
37 CharKey { label: "ü"; shifted: "Ü"; extended: ["2", "w"]; extendedShifted: ["2", "W"] }
38 CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] }
39 CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] }
40 CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"]; extendedShifted: ["5", "Þ"] }
41 CharKey { label: "y"; shifted: "Y"; extended: ["6", "ý", "¥"]; extendedShifted: ["6", "Ý", "¥"] }
42 CharKey { label: "u"; shifted: "U"; extended: ["7", "û","ù","ú"]; extendedShifted: ["7", "Û","Ù","Ú"] }
43 CharKey { label: "i"; shifted: "İ"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
44 CharKey { label: "o"; shifted: "O"; extended: ["9", "ô","ò","ó"]; extendedShifted: ["9", "Ô","Ò","Ó"] }
45 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"] }
46 CharKey { label: "ö"; shifted: "Ö"; }
47 CharKey { label: "ğ"; shifted: "Ğ"; }
48 }
49
50 Row {
51 anchors.horizontalCenter: parent.horizontalCenter;
52 spacing: 0
53
54 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"] }
55 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
56 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
57 CharKey { label: "f"; shifted: "F"; }
58 CharKey { label: "g"; shifted: "G"; }
59 CharKey { label: "h"; shifted: "H"; }
60 CharKey { label: "j"; shifted: "J"; }
61 CharKey { label: "k"; shifted: "K"; }
62 CharKey { label: "l"; shifted: "L"; }
63 CharKey { label: "ı"; shifted: "I"; }
64 CharKey { label: "ə"; shifted: "Ə"; }
65 }
66
67 Row {
68 anchors.horizontalCenter: parent.horizontalCenter;
69 spacing: 0
70
71 ShiftKey {}
72 CharKey { label: "z"; shifted: "Z"; }
73 CharKey { label: "x"; shifted: "X"; }
74 CharKey { label: "c"; shifted: "C"; }
75 CharKey { label: "v"; shifted: "V"; }
76 CharKey { label: "b"; shifted: "B"; }
77 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
78 CharKey { label: "m"; shifted: "M"; }
79 CharKey { label: "ç"; shifted: "Ç"; }
80 CharKey { label: "ş"; shifted: "Ş"; }
81 BackspaceKey {}
82 }
83
84 Item {
85 anchors.left: parent.left
86 anchors.right: parent.right
87
88 height: panel.keyHeight + units.gu(UI.bottom_margin*2);
89
90 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; }
91 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
92 CharKey { id: commaKey; label: ","; shifted: "/"; extended: ["'", ";", ":"]; anchors.left: languageMenuButton.right; height: parent.height; }
93 SpaceKey { id: spaceKey; anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
94 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
95 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
96 }
97 } // column
98}
099
=== 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 15:05:36 +0000
@@ -0,0 +1,99 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import "../../keys"
19import "../../keys/key_constants.js" as UI
20
21KeyPad {
22 anchors.fill: parent
23
24 content: c1
25 symbols: "languages/Keyboard_symbols.qml"
26
27 Column {
28 id: c1
29 anchors.fill: parent
30 spacing: 0
31
32 Row {
33 anchors.horizontalCenter: parent.horizontalCenter;
34 spacing: 0
35
36 CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"] }
37 CharKey { label: "ü"; shifted: "Ü"; extended: ["2", "w"]; extendedShifted: ["2", "W"] }
38 CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] }
39 CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] }
40 CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"]; extendedShifted: ["5", "Þ"] }
41 CharKey { label: "y"; shifted: "Y"; extended: ["6", "ý", "¥"]; extendedShifted: ["6", "Ý", "¥"] }
42 CharKey { label: "u"; shifted: "U"; extended: ["7", "û","ù","ú"]; extendedShifted: ["7", "Û","Ù","Ú"] }
43 CharKey { label: "i"; shifted: "İ"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
44 CharKey { label: "o"; shifted: "O"; extended: ["9", "ô","ò","ó"]; extendedShifted: ["9", "Ô","Ò","Ó"] }
45 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"] }
46 CharKey { label: "ö"; shifted: "Ö"; }
47 CharKey { label: "ğ"; shifted: "Ğ"; }
48 }
49
50 Row {
51 anchors.horizontalCenter: parent.horizontalCenter;
52 spacing: 0
53
54 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å"] }
55 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
56 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
57 CharKey { label: "f"; shifted: "F"; }
58 CharKey { label: "g"; shifted: "G"; }
59 CharKey { label: "h"; shifted: "H"; }
60 CharKey { label: "j"; shifted: "J"; }
61 CharKey { label: "k"; shifted: "K"; }
62 CharKey { label: "l"; shifted: "L"; }
63 CharKey { label: "ı"; shifted: "I"; }
64 CharKey { label: "ə"; shifted: "Ə"; }
65 }
66
67 Row {
68 anchors.horizontalCenter: parent.horizontalCenter;
69 spacing: 0
70
71 ShiftKey {}
72 CharKey { label: "z"; shifted: "Z"; }
73 CharKey { label: "x"; shifted: "X"; }
74 CharKey { label: "c"; shifted: "C"; }
75 CharKey { label: "v"; shifted: "V"; }
76 CharKey { label: "b"; shifted: "B"; }
77 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
78 CharKey { label: "m"; shifted: "M"; }
79 CharKey { label: "ç"; shifted: "Ç"; }
80 CharKey { label: "ş"; shifted: "Ş"; }
81 BackspaceKey {}
82 }
83
84 Item {
85 anchors.left: parent.left
86 anchors.right: parent.right
87
88 height: panel.keyHeight + units.gu(UI.bottom_margin*2);
89
90 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; }
91 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
92 CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; }
93 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
94 UrlKey { id: urlKey; label: ".com"; extended: [".az", ".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; }
95 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
96 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
97 }
98 } // column
99}
0100
=== 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 15:05:36 +0000
@@ -0,0 +1,98 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import "../../keys"
19import "../../keys/key_constants.js" as UI
20
21KeyPad {
22 anchors.fill: parent
23
24 content: c1
25 symbols: "languages/Keyboard_symbols.qml"
26
27 Column {
28 id: c1
29 anchors.fill: parent
30 spacing: 0
31
32 Row {
33 anchors.horizontalCenter: parent.horizontalCenter;
34 spacing: 0
35
36 CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"] }
37 CharKey { label: "ü"; shifted: "Ü"; extended: ["2", "w"]; extendedShifted: ["2", "W"] }
38 CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] }
39 CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] }
40 CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"]; extendedShifted: ["5", "Þ"] }
41 CharKey { label: "y"; shifted: "Y"; extended: ["6", "ý", "¥"]; extendedShifted: ["6", "Ý", "¥"] }
42 CharKey { label: "u"; shifted: "U"; extended: ["7", "û","ù","ú"]; extendedShifted: ["7", "Û","Ù","Ú"] }
43 CharKey { label: "i"; shifted: "İ"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
44 CharKey { label: "o"; shifted: "O"; extended: ["9", "ô","ò","ó"]; extendedShifted: ["9", "Ô","Ò","Ó"] }
45 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"] }
46 CharKey { label: "ö"; shifted: "Ö"; }
47 CharKey { label: "ğ"; shifted: "Ğ"; }
48 }
49
50 Row {
51 anchors.horizontalCenter: parent.horizontalCenter;
52 spacing: 0
53
54 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å"] }
55 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
56 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
57 CharKey { label: "f"; shifted: "F"; }
58 CharKey { label: "g"; shifted: "G"; }
59 CharKey { label: "h"; shifted: "H"; }
60 CharKey { label: "j"; shifted: "J"; }
61 CharKey { label: "k"; shifted: "K"; }
62 CharKey { label: "l"; shifted: "L"; }
63 CharKey { label: "ı"; shifted: "I"; }
64 CharKey { label: "ə"; shifted: "Ə"; }
65 }
66
67 Row {
68 anchors.horizontalCenter: parent.horizontalCenter;
69 spacing: 0
70
71 ShiftKey {}
72 CharKey { label: "z"; shifted: "Z"; }
73 CharKey { label: "x"; shifted: "X"; }
74 CharKey { label: "c"; shifted: "C"; }
75 CharKey { label: "v"; shifted: "V"; }
76 CharKey { label: "b"; shifted: "B"; }
77 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
78 CharKey { label: "m"; shifted: "M"; }
79 CharKey { label: "ç"; shifted: "Ç"; }
80 CharKey { label: "ş"; shifted: "Ş"; }
81 BackspaceKey {}
82 }
83
84 Item {
85 anchors.left: parent.left
86 anchors.right: parent.right
87
88 height: panel.keyHeight + units.gu(UI.bottom_margin*2);
89
90 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; }
91 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
92 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; }
93 UrlKey { id: urlKey; label: ".com"; extended: [".az", ".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; }
94 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
95 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
96 }
97 } // column
98}
099
=== 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 15:05:36 +0000
@@ -0,0 +1,100 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import "../../keys"
19import "../../keys/key_constants.js" as UI
20
21KeyPad {
22 anchors.fill: parent
23
24 content: c1
25 symbols: "languages/Keyboard_symbols.qml"
26
27 Column {
28 id: c1
29 anchors.fill: parent
30
31 spacing: 0
32
33 Row {
34 anchors.horizontalCenter: parent.horizontalCenter;
35 spacing: 0
36
37 CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"] }
38 CharKey { label: "ü"; shifted: "Ü"; extended: ["2", "w"]; extendedShifted: ["2", "W"] }
39 CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] }
40 CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] }
41 CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"]; extendedShifted: ["5", "Þ"] }
42 CharKey { label: "y"; shifted: "Y"; extended: ["6", "ý", "¥"]; extendedShifted: ["6", "Ý", "¥"] }
43 CharKey { label: "u"; shifted: "U"; extended: ["7", "û","ù","ú"]; extendedShifted: ["7", "Û","Ù","Ú"] }
44 CharKey { label: "i"; shifted: "İ"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
45 CharKey { label: "o"; shifted: "O"; extended: ["9", "ô","ò","ó"]; extendedShifted: ["9", "Ô","Ò","Ó"] }
46 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"] }
47 CharKey { label: "ö"; shifted: "Ö"; }
48 CharKey { label: "ğ"; shifted: "Ğ"; }
49 }
50
51 Row {
52 anchors.horizontalCenter: parent.horizontalCenter;
53 spacing: 0
54
55 CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","á","ã","å"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å"] }
56 CharKey { label: "s"; shifted: "S"; extended: ["ß","$"]; extendedShifted: ["$"] }
57 CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
58 CharKey { label: "f"; shifted: "F"; }
59 CharKey { label: "g"; shifted: "G"; }
60 CharKey { label: "h"; shifted: "H"; }
61 CharKey { label: "j"; shifted: "J"; }
62 CharKey { label: "k"; shifted: "K"; }
63 CharKey { label: "l"; shifted: "L"; }
64 CharKey { label: "ı"; shifted: "I"; }
65 CharKey { label: "ə"; shifted: "Ə"; }
66 }
67
68 Row {
69 anchors.horizontalCenter: parent.horizontalCenter;
70 spacing: 0
71
72 ShiftKey {}
73 CharKey { label: "z"; shifted: "Z"; }
74 CharKey { label: "x"; shifted: "X"; }
75 CharKey { label: "c"; shifted: "C"; }
76 CharKey { label: "v"; shifted: "V"; }
77 CharKey { label: "b"; shifted: "B"; }
78 CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
79 CharKey { label: "m"; shifted: "M"; }
80 CharKey { label: "ç"; shifted: "Ç"; }
81 CharKey { label: "ş"; shifted: "Ş"; }
82 BackspaceKey {}
83 }
84
85 Item {
86 anchors.left: parent.left
87 anchors.right: parent.right
88
89 height: panel.keyHeight + units.gu(UI.bottom_margin*2);
90
91 SymbolShiftKey { id: symShiftKey; anchors.left: parent.left; height: parent.height; }
92 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
93 CharKey { id: slashKey; label: "/"; shifted: "/"; anchors.left: languageMenuButton.right; height: parent.height; }
94 SpaceKey { id: spaceKey; anchors.left: slashKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
95 UrlKey { id: urlKey; label: ".com"; extended: [".az", ".co.uk", ".net", ".org", ".edu", ".gov", ".ac.uk"]; anchors.right: dotKey.left; height: parent.height; }
96 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "!"]; extendedShifted: ["?", "!"]; anchors.right: enterKey.left; height: parent.height; }
97 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
98 }
99 } // column
100}
0101
=== 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 15:05:36 +0000
@@ -0,0 +1,20 @@
1TOP_BUILDDIR = $$OUT_PWD/../../..
2TOP_SRCDIR = $$PWD/../../..
3
4include($${TOP_SRCDIR}/config.pri)
5
6TARGET = dummy
7TEMPLATE = lib
8
9lang_az.path = "$$UBUNTU_KEYBOARD_LIB_DIR/az/"
10lang_az.files = *.qml *.js
11
12INSTALLS += lang_az
13
14# for QtCreator
15OTHER_FILES += \
16 Keyboard_az.qml \
17 Keyboard_az_email.qml \
18 Keyboard_az_url.qml \
19 Keyboard_az_url_search.qml
20
021
=== 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 15:05:36 +0000
@@ -0,0 +1,27 @@
1#ifndef AZERBAIJANIPLUGIN_H
2#define AZERBAIJANIPLUGIN_H
3
4#include <QObject>
5#include "languageplugininterface.h"
6#include "westernlanguagesplugin.h"
7
8//#include <presage.h>
9
10class AzerbaijaniPlugin : public WesternLanguagesPlugin
11{
12 Q_OBJECT
13 Q_INTERFACES(LanguagePluginInterface)
14 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Examples.AzerbaijaniPlugin" FILE "azerbaijaniplugin.json")
15
16public:
17 explicit AzerbaijaniPlugin(QObject* parent = 0)
18 : WesternLanguagesPlugin(parent)
19 {
20 }
21
22 virtual ~AzerbaijaniPlugin()
23 {
24 }
25};
26
27#endif // AZERBAIJANIPLUGIN_H
028
=== 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 15:05:36 +0000
@@ -0,0 +1,7 @@
1{
2 "IID": "org.qt-project.Qt.Examples.AzerbaijaniPlugin",
3 "MetaData": {
4 },
5 "className": "AzerbaijaniPlugin",
6 "debug": true
7}
08
=== added file 'plugins/az/src/database_az.db'
1Binary files plugins/az/src/database_az.db 1970-01-01 00:00:00 +0000 and plugins/az/src/database_az.db 2014-10-30 15:05:36 +0000 differ9Binary files plugins/az/src/database_az.db 1970-01-01 00:00:00 +0000 and plugins/az/src/database_az.db 2014-10-30 15:05:36 +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 15:05:36 +0000
@@ -0,0 +1,47 @@
1TOP_BUILDDIR = $$OUT_PWD/../../..
2TOP_SRCDIR = $$PWD/../../..
3
4include($${TOP_SRCDIR}/config.pri)
5
6TEMPLATE = lib
7CONFIG += plugin
8QT += widgets
9INCLUDEPATH += \
10 $${TOP_SRCDIR}/src/ \
11 $${TOP_SRCDIR}/src/lib/ \
12 $${TOP_SRCDIR}/src/lib/logic/
13 $${TOP_SRCDIR}/plugins/westernsupport
14
15HEADERS = \
16 azerbaijaniplugin.h
17
18TARGET = $$qtLibraryTarget(azerbaijaniplugin)
19
20EXAMPLE_FILES = azerbaijaniplugin.json
21
22# generate database for presage:
23PLUGIN_INSTALL_PATH = $${UBUNTU_KEYBOARD_LIB_DIR}/az/
24
25lang_db_az.commands += \
26 rm -f $$PWD/database_az.db && \
27 text2ngram -n 1 -l -f sqlite -o $$PWD/database_az.db $$PWD/the_picture_of_dorian_gray.txt && \
28 text2ngram -n 2 -l -f sqlite -o $$PWD/database_az.db $$PWD/the_picture_of_dorian_gray.txt && \
29 text2ngram -n 3 -l -f sqlite -o $$PWD/database_az.db $$PWD/the_picture_of_dorian_gray.txt
30lang_db_az.files += $$PWD/database_az.db
31
32lang_db_az_install.files += $$PWD/database_az.db
33lang_db_az_install.path = $$PLUGIN_INSTALL_PATH
34
35QMAKE_EXTRA_TARGETS += lang_db_az lang_db_az_install
36
37target.path = $$PLUGIN_INSTALL_PATH
38INSTALLS += target lang_db_az_install
39
40OTHER_FILES += \
41 the_picture_of_dorian_gray.txt \
42 azerbaijaniplugin.json
43
44LIBS += $${TOP_BUILDDIR}/plugins/plugins/libwesternsupport.a -lpresage -lhunspell
45
46INCLUDEPATH += $$PWD/../../westernsupport
47DEPENDPATH += $$PWD/../../westernsupport
048
=== 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 15:05:36 +0000
@@ -3,6 +3,7 @@
3SUBDIRS = \3SUBDIRS = \
4 westernsupport \4 westernsupport \
5 ar \5 ar \
6 az \
6 cs \7 cs \
7 da \8 da \
8 de \9 de \
910
=== modified file 'po/ubuntu-keyboard.pot'
--- po/ubuntu-keyboard.pot 2014-08-28 16:27:04 +0000
+++ po/ubuntu-keyboard.pot 2014-10-30 15:05:36 +0000
@@ -26,73 +26,77 @@
26msgstr ""26msgstr ""
2727
28#: ../qml/keys/LanguageMenu.qml:7128#: ../qml/keys/LanguageMenu.qml:71
29msgid "Azerbaijani"
30msgstr ""
31
32#: ../qml/keys/LanguageMenu.qml:72
29msgid "Czech"33msgid "Czech"
30msgstr ""34msgstr ""
3135
32#: ../qml/keys/LanguageMenu.qml:7236#: ../qml/keys/LanguageMenu.qml:73
33msgid "Danish"37msgid "Danish"
34msgstr ""38msgstr ""
3539
36#: ../qml/keys/LanguageMenu.qml:7340#: ../qml/keys/LanguageMenu.qml:74
37msgid "German"41msgid "German"
38msgstr ""42msgstr ""
3943
40#: ../qml/keys/LanguageMenu.qml:7444#: ../qml/keys/LanguageMenu.qml:75
41msgid "English"45msgid "English"
42msgstr ""46msgstr ""
4347
44#: ../qml/keys/LanguageMenu.qml:7548#: ../qml/keys/LanguageMenu.qml:76
45msgid "Spanish"49msgid "Spanish"
46msgstr ""50msgstr ""
4751
48#: ../qml/keys/LanguageMenu.qml:7652#: ../qml/keys/LanguageMenu.qml:77
49msgid "Finnish"53msgid "Finnish"
50msgstr ""54msgstr ""
5155
52#: ../qml/keys/LanguageMenu.qml:7756#: ../qml/keys/LanguageMenu.qml:78
53msgid "French"57msgid "French"
54msgstr ""58msgstr ""
5559
56#: ../qml/keys/LanguageMenu.qml:7860#: ../qml/keys/LanguageMenu.qml:79
57msgid "Hebrew"61msgid "Hebrew"
58msgstr ""62msgstr ""
5963
60#: ../qml/keys/LanguageMenu.qml:7964#: ../qml/keys/LanguageMenu.qml:80
61msgid "Hungarian"65msgid "Hungarian"
62msgstr ""66msgstr ""
6367
64#: ../qml/keys/LanguageMenu.qml:8068#: ../qml/keys/LanguageMenu.qml:81
65msgid "Italian"69msgid "Italian"
66msgstr ""70msgstr ""
6771
68#: ../qml/keys/LanguageMenu.qml:8172#: ../qml/keys/LanguageMenu.qml:82
69msgid "Dutch"73msgid "Dutch"
70msgstr ""74msgstr ""
7175
72#: ../qml/keys/LanguageMenu.qml:8276#: ../qml/keys/LanguageMenu.qml:83
73msgid "Polish"77msgid "Polish"
74msgstr ""78msgstr ""
7579
76#: ../qml/keys/LanguageMenu.qml:8380#: ../qml/keys/LanguageMenu.qml:84
77msgid "Portuguese"81msgid "Portuguese"
78msgstr ""82msgstr ""
7983
80#: ../qml/keys/LanguageMenu.qml:8484#: ../qml/keys/LanguageMenu.qml:85
81msgid "Russian"85msgid "Russian"
82msgstr ""86msgstr ""
8387
84#: ../qml/keys/LanguageMenu.qml:8588#: ../qml/keys/LanguageMenu.qml:86
85msgid "Serbian"89msgid "Serbian"
86msgstr ""90msgstr ""
8791
88#: ../qml/keys/LanguageMenu.qml:8692#: ../qml/keys/LanguageMenu.qml:87
89msgid "Swedish"93msgid "Swedish"
90msgstr ""94msgstr ""
9195
92#: ../qml/keys/LanguageMenu.qml:8796#: ../qml/keys/LanguageMenu.qml:88
93msgid "Chinese - Pinyin"97msgid "Chinese - Pinyin"
94msgstr ""98msgstr ""
9599
96#: ../qml/keys/LanguageMenu.qml:90100#: ../qml/keys/LanguageMenu.qml:91
97msgid "Language: "101msgid "Language: "
98msgstr ""102msgstr ""
99103
=== modified file 'qml/KeyboardContainer.qml'
--- qml/KeyboardContainer.qml 2014-09-09 11:26:52 +0000
+++ qml/KeyboardContainer.qml 2014-10-30 15:05:36 +0000
@@ -119,6 +119,7 @@
119 {119 {
120 var supportedLocales = [120 var supportedLocales = [
121 "ar",121 "ar",
122 "az",
122 "cs",123 "cs",
123 "da",124 "da",
124 "de",125 "de",
@@ -152,6 +153,8 @@
152153
153 if (language === "ar")154 if (language === "ar")
154 return "lib/ar/Keyboard_ar.qml";155 return "lib/ar/Keyboard_ar.qml";
156 if (language === "az")
157 return "lib/az/Keyboard_az.qml";
155 if (language === "cs")158 if (language === "cs")
156 return "lib/cs/Keyboard_cs.qml";159 return "lib/cs/Keyboard_cs.qml";
157 if (language === "da")160 if (language === "da")
158161
=== modified file 'qml/keys/LanguageMenu.qml'
--- qml/keys/LanguageMenu.qml 2014-09-15 09:39:19 +0000
+++ qml/keys/LanguageMenu.qml 2014-10-30 15:05:36 +0000
@@ -72,6 +72,7 @@
72 function languageIdToName(languageId)72 function languageIdToName(languageId)
73 {73 {
74 if (languageId == "ar") return i18n.tr("Arabic");74 if (languageId == "ar") return i18n.tr("Arabic");
75 if (languageId == "az") return i18n.tr("Azerbaijani");
75 if (languageId == "cs") return i18n.tr("Czech");76 if (languageId == "cs") return i18n.tr("Czech");
76 if (languageId == "da") return i18n.tr("Danish");77 if (languageId == "da") return i18n.tr("Danish");
77 if (languageId == "de") return i18n.tr("German");78 if (languageId == "de") return i18n.tr("German");
7879
=== 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 15:05:36 +0000
@@ -357,6 +357,8 @@
357357
358 if (languageId == "ar")358 if (languageId == "ar")
359 d->loadPlugin("libarabicplugin.so", "ar");359 d->loadPlugin("libarabicplugin.so", "ar");
360 else if (languageId == "az")
361 d->loadPlugin("libazerbaijaniplugin.so", "az");
360 else if (languageId == "cs")362 else if (languageId == "cs")
361 d->loadPlugin("libczechplugin.so", "cs");363 d->loadPlugin("libczechplugin.so", "cs");
362 else if (languageId == "da")364 else if (languageId == "da")

Subscribers

People subscribed via source and target branches