Merge lp:~renatofilho/ubuntu-keyboard/fix-1231445 into lp:ubuntu-keyboard

[Renato Araujo Oliveira Filho]

Added support to override the action key.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/359/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/188
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/188/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/187

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

review: Approve (continuous-integration)

[lp:~renatofilho/ubuntu-keyboard/fix-1231445]

160. By Renato Araujo Oliveira Filho on 2014-04-17

Fixed icon change during the runtime.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/360/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/189
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/189/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/188

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

review: Approve (continuous-integration)

[lp:~renatofilho/ubuntu-keyboard/fix-1231445]

161. By Renato Araujo Oliveira Filho on 2014-04-29

Created qml plugin.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/366/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/195/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/195/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/194/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/ubuntu-keyboard/fix-1231445]

162. By Renato Araujo Oliveira Filho on 2014-04-29

Adding missing file.

163. By Renato Araujo Oliveira Filho on 2014-04-29

Added documentation.

164. By Renato Araujo Oliveira Filho on 2014-04-29

Fixed new package dependency.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/367/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/196/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/196/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/195/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/ubuntu-keyboard/fix-1231445]

165. By Renato Araujo Oliveira Filho on 2014-04-29

Added missing install file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/368/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/197/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/197/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/196/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/369/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/198
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/198/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/197

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

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good overall, only small issue I can see is a slight typo: "UbubntuKeyboardInputMethodExtensionPlugin" should be "UbuntuKeyboardInputMethodExtensionPlugin" in both src/imports/Ubuntu/Keyboard/plugin.h and src/imports/Ubuntu/Keyboard/plugin.cpp.

[lp:~renatofilho/ubuntu-keyboard/fix-1231445]

166. By Renato Araujo Oliveira Filho on 2014-04-30

Fixed typo.

167. By Renato Araujo Oliveira Filho on 2014-04-30

Rename package qtdeclarative5-ubuntu-keyboard-extensions to qtdeclarative5-ubuntu-keyboard-extensions0.1

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/370/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/199
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/199/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/198

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/371/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/200
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/200/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/199

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

review: Approve (continuous-integration)

[lp:~renatofilho/ubuntu-keyboard/fix-1231445]

168. By Renato Araujo Oliveira Filho on 2014-04-30

Used namespace Ubuntu.Keyboard for qml plugin.

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? 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 on device or emulator? YES

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

If you changed the packaging (debian), did you subscribe a core-dev to this MP? YES

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:168
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/372/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/201
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/201/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/200

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

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

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

[Michael Sheldon (michael-sheldon)]

review: Approve

[lp:~renatofilho/ubuntu-keyboard/fix-1231445]

169. By Renato Araujo Oliveira Filho on 2014-04-30

Fixed filename typo.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:169
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/373/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/202
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/202
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/202/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/201

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

review: Approve (continuous-integration)

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2014-01-22 20:31:47 +0000
+++ debian/control	2014-04-30 15:35:05 +0000
@@ -228,3 +228,10 @@
          ${shlibs:Depends},
 Description: Ubuntu on-screen keyboard data files - Swedish
  Data files for the Ubuntu virtual keyboard - Swedish
+
+Package: qtdeclarative5-ubuntu-keyboard-extensions0.1
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu on-screen keyboard data files - QML plugin
+ QMl extension for the Ubuntu virtual keyboard

=== added file 'debian/qtdeclarative5-ubuntu-keyboard-extensions0.1.install'
--- debian/qtdeclarative5-ubuntu-keyboard-extensions0.1.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-ubuntu-keyboard-extensions0.1.install	2014-04-30 15:35:05 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/qml/Ubuntu/Keyboard/*

=== modified file 'qml/keys/ActionKey.qml'
--- qml/keys/ActionKey.qml	2013-10-31 14:24:31 +0000
+++ qml/keys/ActionKey.qml	2014-04-30 15:35:05 +0000
@@ -36,8 +36,6 @@
     imgNormal: UI.imageActionKey
     imgPressed: UI.imageActionKeyPressed
 
-    property string __icon: iconNormal
-
     // can be overwritten by keys
     property color colorNormal: "transparent"
     property color colorShifted: "transparent"
@@ -45,23 +43,33 @@
 
     Icon {
         id: iconImage
-        name: __icon
+        name: actionKeyRoot.iconNormal
+        color: actionKeyRoot.colorNormal
         anchors.centerIn: parent
         visible: (label == "")
         width: units.gu(2.5)
         height: units.gu(2.5)
+
     }
 
-    onOskStateChanged: {
-        if (panel.activeKeypadState == "NORMAL") {
-            __icon = iconNormal;
-            iconImage.color = colorNormal;
-        } else if (panel.activeKeypadState == "SHIFTED") {
-            __icon = iconShifted;
-            iconImage.color = colorShifted;
-        } else if (panel.activeKeypadState == "CAPSLOCK") {
-            __icon = iconCapsLock;
-            iconImage.color = colorCapsLock;
+    // make sure the icon changes even if the property icon* change on runtime
+    state: panel.activeKeypadState
+    states: [
+        State {
+            name: "SHIFTED"
+            PropertyChanges {
+                target: iconImage
+                name: actionKeyRoot.iconShifted
+                color: actionKeyRoot.colorShifted
+            }
+        },
+        State {
+            name: "CAPSLOCK"
+            PropertyChanges {
+                target: iconImage
+                name: actionKeyRoot.iconCapsLock
+                color: actionKeyRoot.colorCapsLock
+            }
         }
-    }
+    ]
 }

=== modified file 'qml/keys/CharKey.qml'
--- qml/keys/CharKey.qml	2014-04-07 12:20:08 +0000
+++ qml/keys/CharKey.qml	2014-04-30 15:35:05 +0000
@@ -99,11 +99,16 @@
     Text {
         id: keyLabel
         text: (panel.activeKeypadState === "NORMAL") ? label : shifted;
-        anchors.centerIn: parent
         font.family: UI.fontFamily
         font.pixelSize: fontSize
         font.bold: UI.fontBold
         color: UI.fontColor
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.margins: units.gu( UI.annotationMargins )
+        horizontalAlignment: Text.AlignHCenter
+        elide: Text.ElideRight
     }
 
     /// shows an annotation

=== modified file 'qml/keys/ReturnKey.qml'
--- qml/keys/ReturnKey.qml	2013-10-09 13:51:12 +0000
+++ qml/keys/ReturnKey.qml	2014-04-30 15:35:05 +0000
@@ -17,8 +17,19 @@
 import QtQuick 2.0
 
 ActionKey {
-    iconNormal: "keyboard-return"
-    iconShifted: "keyboard-return";
-    iconCapsLock: "keyboard-return";
+    property var actionKeyOverride: maliit_input_method.actionKeyOverride
+    property string overrideIconName: actionKeyOverride && actionKeyOverride.icon ? actionKeyOverride.icon : ""
+    property string overrideLabel: actionKeyOverride && actionKeyOverride.label ? actionKeyOverride.label : ""
+
+    enabled: actionKeyOverride ? actionKeyOverride.enabled : true
+    // overrideIcon has high priority over label
+    label: overrideIconName == "" ? overrideLabel : ""
+    shifted: label
+
+    iconNormal: (overrideIconName == "") && (overrideLabel == "") ? "keyboard-return" : overrideIconName
+    iconShifted: iconNormal
+    iconCapsLock: iconNormal
+
     action: "return"
+    // TODO: input_method.actionKeyOverride.highlighted
 }

=== added directory 'src/imports'
=== added directory 'src/imports/Ubuntu'
=== added directory 'src/imports/Ubuntu/Keyboard'
=== added file 'src/imports/Ubuntu/Keyboard/Keyboard.pro'
--- src/imports/Ubuntu/Keyboard/Keyboard.pro	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Keyboard/Keyboard.pro	2014-04-30 15:35:05 +0000
@@ -0,0 +1,29 @@
+TEMPLATE = lib
+QT += qml quick
+CONFIG += qt plugin no_keywords
+TARGET = ubuntu-keyboard-qml
+
+HEADERS += \
+    plugin.h \
+    inputmethodextensions.h \
+
+SOURCES += \
+    plugin.cpp \
+    inputmethodextensions.cpp \
+
+QMLDIR_FILE = qmldir
+
+# deployment rules for the plugin
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)Ubuntu/Keyboard
+target.path = $$installPath
+
+qmldir_file.path = $$installPath
+qmldir_file.files = $$QMLDIR_FILE
+
+INSTALLS += target qmldir_file
+
+QMAKE_EXTRA_TARGETS += check
+check.target = check
+check.CONFIG = recursive
+
+

=== added file 'src/imports/Ubuntu/Keyboard/inputmethodextensions.cpp'
--- src/imports/Ubuntu/Keyboard/inputmethodextensions.cpp	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Keyboard/inputmethodextensions.cpp	2014-04-30 15:35:05 +0000
@@ -0,0 +1,121 @@
+/*
+ * This file is part of Maliit Plugins
+ *
+ * Copyright (C) 2014 Canonical Ltda
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list
+ * of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ * Neither the name of Nokia Corporation nor the names of its contributors may be
+ * used to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "inputmethodextensions.h"
+
+#include <QtCore>
+
+namespace Ubuntu {
+namespace Keyboard {
+
+/*!
+    \qmltype InputMethod
+    \inqmlmodule Ubuntu.Keyboard 0.1
+    \brief The InputMethod is a helper class used to attach properties used by Ubuntu Keyboard into input fields
+
+    Example:
+    \qml
+    Item {
+        TextField {
+            id: field
+            InputMethod.extensions:  {
+                 'enterKeyText': 'My Enter',
+                 'enterKeyEnabled': true,
+                 'enterKeyHighlighted': true,
+            }
+        }
+    }
+    \endqml
+*/
+
+InputMethodExtension::InputMethodExtension(QObject *parent)
+    : QObject(parent),
+      m_inputText(0)
+{
+    m_inputText = findInput(parent);
+}
+
+/*!
+    Allow to change the default visual of the action Key, the value is a dictonary,
+    and the valid keys for the dictionary are:
+    \list
+    \li - enterKeyText (string) - The text to be displayed in the "Enter" key of the virtual keyboard
+    \li - enterKeyEnabled (boolean) - If the "Enter" key of the virtual keyboard should be enabled or not
+    \li - enterKeyHighlighted (boolean) - If the "Enter" key of the virtual keyboard should be highlighted or not
+    \endlist
+
+    \qmlproperty var extensions
+*/
+QVariantMap InputMethodExtension::inputMethodExtensions() const
+{
+    return m_extensions;
+}
+
+void InputMethodExtension::setInputMethodExtensions(const QVariantMap &map)
+{
+    if (m_extensions != map) {
+        m_extensions = map;
+        if (m_inputText) {
+            m_inputText->setProperty("__inputMethodExtensions", m_extensions);
+        }
+        Q_EMIT inputMethodExtensionsChanged();
+    }
+}
+
+QObject *InputMethodExtension::findInput(QObject *parent)
+{
+    static QStringList inputClasses;
+    if (inputClasses.isEmpty()) {
+        inputClasses << "QQuickTextInput"
+                     << "QQuickTextEdit";
+    }
+    Q_FOREACH(QObject *c, parent->children()) {
+        if (inputClasses.contains(c->metaObject()->className())) {
+            return c;
+        }
+        QObject *cc = findInput(c);
+        if (cc) {
+            return cc;
+        }
+    }
+    return 0;
+}
+
+InputMethod::InputMethod(QObject *parent)
+    : QObject(parent)
+{
+}
+
+InputMethodExtension *InputMethod::qmlAttachedProperties(QObject *obj)
+{
+    return new InputMethodExtension(obj);
+}
+
+} // namespace Ubuntu
+} // namespace Keyboard

=== added file 'src/imports/Ubuntu/Keyboard/inputmethodextensions.h'
--- src/imports/Ubuntu/Keyboard/inputmethodextensions.h	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Keyboard/inputmethodextensions.h	2014-04-30 15:35:05 +0000
@@ -0,0 +1,74 @@
+/*
+ * This file is part of Maliit Plugins
+ *
+ * Copyright (C) 2014 Canonical Ltda
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list
+ * of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ * Neither the name of Nokia Corporation nor the names of its contributors may be
+ * used to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef UBUNTU_KEYBOARD_EXTENSION_H
+#define UBUNTU_KEYBOARD_EXTENSION_H
+
+#include <QtCore>
+#include <QtQuick>
+
+namespace Ubuntu {
+namespace Keyboard {
+
+class InputMethodExtension : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QVariantMap extensions READ inputMethodExtensions WRITE setInputMethodExtensions NOTIFY inputMethodExtensionsChanged)
+public:
+    InputMethodExtension(QObject *parent = 0);
+
+    QVariantMap inputMethodExtensions() const;
+    void setInputMethodExtensions(const QVariantMap &map);
+
+Q_SIGNALS:
+    void inputMethodExtensionsChanged();
+
+private:
+    QVariantMap m_extensions;
+    QObject *m_inputText;
+
+    QObject *findInput(QObject *parent);
+};
+
+class InputMethod : public QObject
+{
+    Q_OBJECT
+
+public:
+    InputMethod(QObject *parent = 0);
+
+    static InputMethodExtension *qmlAttachedProperties(QObject *obj);
+};
+
+} // namespace Ubuntu
+} // namespace Keyboard
+
+QML_DECLARE_TYPEINFO(Ubuntu::Keyboard::InputMethod, QML_HAS_ATTACHED_PROPERTIES)
+
+#endif

=== added file 'src/imports/Ubuntu/Keyboard/plugin.cpp'
--- src/imports/Ubuntu/Keyboard/plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Keyboard/plugin.cpp	2014-04-30 15:35:05 +0000
@@ -0,0 +1,46 @@
+/*
+ * This file is part of Maliit Plugins
+ *
+ * Copyright (C) 2014 Canonical Ltda
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list
+ * of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ * Neither the name of Nokia Corporation nor the names of its contributors may be
+ * used to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "plugin.h"
+#include "inputmethodextensions.h"
+
+#include <QQmlEngine>
+
+namespace Ubuntu {
+namespace Keyboard {
+
+void InputMethodExtensionPlugin::registerTypes(const char *uri)
+{
+    // @uri Ubuntu.Maliit
+    qmlRegisterType<InputMethodExtension>();
+    qmlRegisterType<InputMethod>(uri, 0, 1, "InputMethod");
+}
+
+} // namespace Ubuntu
+} // namespace Keyboard

=== added file 'src/imports/Ubuntu/Keyboard/plugin.h'
--- src/imports/Ubuntu/Keyboard/plugin.h	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Keyboard/plugin.h	2014-04-30 15:35:05 +0000
@@ -0,0 +1,50 @@
+/*
+ * This file is part of Maliit Plugins
+ *
+ * Copyright (C) 2014 Canonical Ltda
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list
+ * of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ * Neither the name of Nokia Corporation nor the names of its contributors may be
+ * used to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef UBUNTU_KEYBOARD_INPUTMETHOD_EXTENSION_PLUGIN_H
+#define UBUNTU_KEYBOARD_INPUTMETHOD_EXTENSION_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+namespace Ubuntu {
+namespace Keyboard {
+
+class InputMethodExtensionPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+} // namespace Ubuntu
+} // namespace Keyboard
+
+#endif //UBUNTU_KEYBOARD_INPUTMETHOD_EXTENSION_PLUGIN_H

=== added file 'src/imports/Ubuntu/Keyboard/qmldir'
--- src/imports/Ubuntu/Keyboard/qmldir	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Keyboard/qmldir	2014-04-30 15:35:05 +0000
@@ -0,0 +1,2 @@
+module Ubuntu.Keyboard
+plugin ubuntu-keyboard-qml

=== added file 'src/imports/Ubuntu/Ubuntu.pro'
--- src/imports/Ubuntu/Ubuntu.pro	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Ubuntu.pro	2014-04-30 15:35:05 +0000
@@ -0,0 +1,7 @@
+CONFIG += ordered 
+TEMPLATE = subdirs
+SUBDIRS = Keyboard
+
+QMAKE_EXTRA_TARGETS += check
+check.target = check
+check.CONFIG = recursive

=== added file 'src/imports/imports.pro'
--- src/imports/imports.pro	1970-01-01 00:00:00 +0000
+++ src/imports/imports.pro	2014-04-30 15:35:05 +0000
@@ -0,0 +1,9 @@
+CONFIG += ordered 
+TEMPLATE = subdirs
+SUBDIRS = Ubuntu
+
+
+
+QMAKE_EXTRA_TARGETS += check
+check.target = check
+check.CONFIG = recursive

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2014-04-15 12:18:47 +0000
+++ src/plugin/inputmethod.cpp	2014-04-30 15:35:05 +0000
@@ -58,6 +58,8 @@
 
 namespace {
 
+const char * const actionKeyName = "actionKey";
+
 Qt::ScreenOrientation rotationAngleToScreenOrientation(int angle)
 {
     bool portraitIsPrimary = QGuiApplication::primaryScreen()->primaryOrientation()
@@ -263,50 +265,35 @@
     d->truncateEnabledLanguageLocales(d->m_settings.enabledLanguages());
     Q_EMIT enabledLanguagesChanged(d->enabledLanguages);
 }
-// todo remove
+
 void InputMethod::setKeyOverrides(const QMap<QString, QSharedPointer<MKeyOverride> > &overrides)
 {
     Q_D(InputMethod);
 
-    for (OverridesIterator i(d->key_overrides.begin()), e(d->key_overrides.end()); i != e; ++i) {
-        const SharedOverride &override(i.value());
-
-        if (override) {
-            disconnect(override.data(), SIGNAL(keyAttributesChanged(const QString &, const MKeyOverride::KeyOverrideAttributes)),
-                       this,            SLOT(updateKey(const QString &, const MKeyOverride::KeyOverrideAttributes)));
-        }
-    }
-
-    d->key_overrides.clear();
-    QMap<QString, Key> overriden_keys;
-
-    for (OverridesIterator i(overrides.begin()), e(overrides.end()); i != e; ++i) {
-        const SharedOverride &override(i.value());
-
-        if (override) {
-            d->key_overrides.insert(i.key(), override);
-            connect(override.data(), SIGNAL(keyAttributesChanged(const QString &, const MKeyOverride::KeyOverrideAttributes)),
-                    this,            SLOT(updateKey(const QString &, const MKeyOverride::KeyOverrideAttributes)));
-            overriden_keys.insert(i.key(), overrideToKey(override));
-        }
-    }
-
-}
-// todo remove
-void InputMethod::updateKey(const QString &key_id,
-                            const MKeyOverride::KeyOverrideAttributes changed_attributes)
-{
-    Q_D(InputMethod);
-
-    Q_UNUSED(changed_attributes);
-
-    QMap<QString, SharedOverride>::iterator iter(d->key_overrides.find(key_id));
-
-    if (iter != d->key_overrides.end()) {
-        const Key &override_key(overrideToKey(iter.value()));
-        Logic::KeyOverrides overrides_update;
-
-        overrides_update.insert(key_id, override_key);
+    // we only care about actionKey override by now
+    const QMap<QString, SharedOverride >::const_iterator iter(overrides.find(actionKeyName));
+    bool actionKeyChanged = false;
+
+    if (d->actionKeyOverrider) {
+        disconnect(d->actionKeyOverrider.data(), SIGNAL(keyAttributesChanged(const QString &, const MKeyOverride::KeyOverrideAttributes)),
+                   this, SIGNAL(actionKeyOverrideChanged()));
+        d->actionKeyOverrider.clear();
+        actionKeyChanged = true;
+    }
+
+    if (iter != overrides.end()) {
+        QSharedPointer<MKeyOverride> actionKeyOverrider(*iter);
+
+        if (actionKeyOverrider) {
+            d->actionKeyOverrider = actionKeyOverrider;
+            connect(d->actionKeyOverrider.data(), SIGNAL(keyAttributesChanged(const QString &, const MKeyOverride::KeyOverrideAttributes)),
+                    this, SIGNAL(actionKeyOverrideChanged()));
+        }
+        actionKeyChanged = true;
+    }
+
+    if (actionKeyChanged) {
+        Q_EMIT actionKeyOverrideChanged();
     }
 }
 
@@ -342,7 +329,7 @@
 
     bool emitPredictionEnabled = false;
 
-    bool newPredictionEnabled = inputMethodHost()->predictionEnabled(valid) 
+    bool newPredictionEnabled = inputMethodHost()->predictionEnabled(valid)
                                 || d->editor.wordEngine()->languageFeature()->alwaysShowSuggestions();
 
     if (!valid)
@@ -451,6 +438,15 @@
     return d->m_settings.keyPressFeedback();
 }
 
+//! \brief InputMethod::actionKeyOverride returns any override information about
+//! the action key
+//! \return
+QObject *InputMethod::actionKeyOverride() const
+{
+    Q_D(const InputMethod);
+    return d->actionKeyOverrider.data();
+}
+
 //! \brief InputMethod::setActiveLanguage
 //! Sets the currently active/used language
 //! \param newLanguage id of the new language. For example "en" or "es"

=== modified file 'src/plugin/inputmethod.h'
--- src/plugin/inputmethod.h	2014-03-12 02:48:29 +0000
+++ src/plugin/inputmethod.h	2014-04-30 15:35:05 +0000
@@ -52,6 +52,7 @@
     Q_PROPERTY(QStringList enabledLanguages READ enabledLanguages NOTIFY enabledLanguagesChanged)
     Q_PROPERTY(QString activeLanguage READ activeLanguage WRITE setActiveLanguage NOTIFY activeLanguageChanged)
     Q_PROPERTY(bool useAudioFeedback READ useAudioFeedback NOTIFY useAudioFeedbackChanged)
+    Q_PROPERTY(QObject* actionKeyOverride READ actionKeyOverride NOTIFY actionKeyOverrideChanged)
 
     Q_ENUMS(TextContentType)
 
@@ -106,6 +107,8 @@
     Q_SLOT void onVisibleRectChanged();
     bool useAudioFeedback() const;
 
+    QObject* actionKeyOverride() const;
+
 Q_SIGNALS:
     void contentTypeChanged(TextContentType contentType);
     void activateAutocaps();
@@ -115,14 +118,13 @@
     void wordEngineEnabledChanged(bool wordEngineEnabled);
     void wordRibbonEnabledChanged(bool wordRibbonEnabled);
     void windowGeometryRectChanged(QRect rect);
+    void actionKeyOverrideChanged();
 
 private:
     Q_SLOT void onAutoCorrectSettingChanged();
     Q_SLOT void onEnabledLanguageSettingsChanged();
     Q_SLOT void updateAutoCaps();
 
-    Q_SLOT void updateKey(const QString &key_id,
-                          const MKeyOverride::KeyOverrideAttributes changed_attributes);
     Q_SLOT void onKeyboardClosed();
 
     Q_SLOT void onLayoutWidthChanged(int width);

=== modified file 'src/plugin/inputmethod_p.h'
--- src/plugin/inputmethod_p.h	2014-01-23 16:42:33 +0000
+++ src/plugin/inputmethod_p.h	2014-04-30 15:35:05 +0000
@@ -44,7 +44,7 @@
 public:
     InputMethod* q;
     Editor editor;
-    QMap<QString, SharedOverride> key_overrides;
+    SharedOverride actionKeyOverrider;
     Logic::EventHandler event_handler;
     MAbstractInputMethodHost* host;
     QQuickView* view;
@@ -66,7 +66,6 @@
                                 MAbstractInputMethodHost *host)
         : q(_q)
         , editor(EditorOptions(), new Model::Text, new Logic::WordEngine)
-        , key_overrides()
         , event_handler()
         , host(host)
         , view(0)

=== modified file 'src/src.pro'
--- src/src.pro	2013-07-19 12:05:07 +0000
+++ src/src.pro	2014-04-30 15:35:05 +0000
@@ -4,6 +4,7 @@
     lib \
     view \
     plugin \
+    imports \
 #    benchmark \
 
 

=== modified file 'ubuntu-keyboard.pro'
--- ubuntu-keyboard.pro	2013-12-19 16:03:15 +0000
+++ ubuntu-keyboard.pro	2014-04-30 15:35:05 +0000
@@ -30,7 +30,7 @@
     !build_pass:system(echo -e \"$$config_string\")
 }
 
-CONFIG += ordered 
+CONFIG += ordered
 TEMPLATE = subdirs
 
 DIST_NAME = $$UBUNTU_KEYBOARD_PACKAGENAME-$$UBUNTU_KEYBOARD_VERSION