Merge lp:~renatofilho/ubuntu-ui-toolkit/fix-1231445 into lp:ubuntu-ui-toolkit/staging

[Renato Araujo Oliveira Filho]

Added support for maliit extensions, allowing the app to change the visuals of the action key.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1011
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/50/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/320/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4936/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4521/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5090/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/50/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Something's wrong with staging. This branch doesn't update components.api but the diff doesn't reflect the changes. I also confirmed that staging generates a diff on an unmodified checkout.

I'd say hold on for a bit, this needs to be sorted out first.

[Cris Dywan (kalikiana)]

False alarm, staging is fine… it helps to build the branch fully.

So: please ensure the branch is built and then you should get this:

--- components.api 2014-04-17 19:57:52.805931000 +0200
+++ components.api.new 2014-04-17 19:58:40.294200785 +0200
@@ -447,6 +447,7 @@ modules/Ubuntu/Components/TextArea.qml
     property enumeration horizontalAlignment
     property bool inputMethodComposing
     property enumeration inputMethodHints
+ property var inputMethodExtensions
     property int length
     property int lineCount
     property enumeration mouseSelectionMode
@@ -511,6 +512,7 @@ modules/Ubuntu/Components/TextField.qml
     property string inputMask
     property bool inputMethodComposing
     property enumeration inputMethodHints
+ property var inputMethodExtensions
     property int length
     property int maximumLength
     property enumeration mouseSelectionMode

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1012
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/52/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/324/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4940/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4528/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5097/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/52/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1013
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4529
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4529/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5098
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5098/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/53/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

We are preparing the version fix for the toolkit, therefore this change should be exported to 1.1 once the versioning will land into the toolkit.

review: Needs Fixing

[Zsombor Egri (zsombi)]

41 + Provides extended properties to the input method allowing to change de default visual of the action Key

s/de/the

It is not clear what values can be listed into this property. Either describe what can be there or link to some documentation that defines what values can be there.

review: Needs Fixing

[Renato Araujo Oliveira Filho (renatofilho)]

> 41 + Provides extended properties to the input method allowing to
> change de default visual of the action Key
>
> s/de/the
>
> It is not clear what values can be listed into this property. Either describe
> what can be there or link to some documentation that defines what values can
> be there.

Documentation updated on rev. 1014

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1014
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/94/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/426/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5050/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4672/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5239/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/94/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1015
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/95/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/427/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5051/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4673/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5240/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/95/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1016
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/96/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5052
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/96
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/385
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4674
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4674/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5241
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5241/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/96/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1018
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/118/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/472/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5096/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-amd64-ci/118/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-armhf-ci/118/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-trusty-i386-ci/118/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4732/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5291/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/118/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

"Copyright 2012 Canonical Ltd." <- fix your copyright headers

[Zsombor Egri (zsombi)]

This has been resolved in a much nicer way using attached objects defined in ubuntu-keyboard plugin. Therefore this MP is no longer valid. Rejected.

Unmerged revisions

1018. By Renato Araujo Oliveira Filho on 2014-04-28

Merged mainline.

1017. By Renato Araujo Oliveira Filho on 2014-04-28

Moved changes to version 1.1.

1016. By Renato Araujo Oliveira Filho on 2014-04-24

Merged mainline.

1015. By Renato Araujo Oliveira Filho on 2014-04-24

Fixed typo.

1014. By Renato Araujo Oliveira Filho on 2014-04-24

Updated documentation for inputMethodExtensions

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

Updated components.api.

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

Fixed documentation.

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

Added support for maliit extensions, allowing the app to change the visuals of the action key.

=== modified file 'CHANGES'
--- CHANGES	2014-04-24 20:35:41 +0000
+++ CHANGES	2014-04-28 15:46:20 +0000
@@ -98,6 +98,8 @@
 * CHANGED in CrossFadeImage: readonly property size sourceSize TO property size sourceSize
 * DEPRECATED in Header: property Item contents
 * DEPRECATED IN Tabs: property TabBar tabBar
+* ADDED IN: TextArea: alias inputMethodExtensions: editor.__inputMethodExtensions 
+* ADDED IN: TextField: alias inputMethodExtensions: editor.__inputMethodExtensions
 
 Compatibility Breaks
 ********************

=== modified file 'components.api'
--- components.api	2014-04-25 20:40:20 +0000
+++ components.api	2014-04-28 15:46:20 +0000
@@ -459,6 +459,7 @@
     property enumeration horizontalAlignment
     property bool inputMethodComposing
     property enumeration inputMethodHints
+    property var inputMethodExtensions
     property int length
     property int lineCount
     property enumeration mouseSelectionMode
@@ -522,6 +523,7 @@
     property string inputMask
     property bool inputMethodComposing
     property enumeration inputMethodHints
+    property var inputMethodExtensions
     property int length
     property int maximumLength
     property enumeration mouseSelectionMode

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2014-04-28 06:48:28 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2014-04-28 15:46:20 +0000
@@ -526,6 +526,9 @@
       */
     property alias wrapMode:editor.wrapMode
 
+    /*!\internal */
+    property alias __editor: editor
+
     // signals
     /*!
       This handler is called when the user clicks on a link embedded in the text.
@@ -907,6 +910,9 @@
         // Images are not shown when text contains <img> tags
         // bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27071
         TextEdit {
+            // maliit extensions
+            property variant __inputMethodExtensions: null
+
             objectName: "textarea_input"
             readOnly: false
             id: editor

=== added file 'modules/Ubuntu/Components/TextArea11.qml'
--- modules/Ubuntu/Components/TextArea11.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/TextArea11.qml	2014-04-28 15:46:20 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2012 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
+
+TextArea {
+    id: control
+
+    /*!
+      Provides extended properties to the input method allowing 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
+
+      \qml
+      TextField {
+          text: "Text"
+
+          inputMethodExtensions: {
+            'enterKeyText': 'My Enter',
+            'enterKeyEnabled': true,
+            'enterKeyHighlighted': true,
+          }
+      }
+      \endqml
+
+      \qmlproperty var inputMethodExtensions
+    */
+    property alias inputMethodExtensions: __editor.__inputMethodExtensions
+}

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-04-28 06:48:28 +0000
+++ modules/Ubuntu/Components/TextField.qml	2014-04-28 15:46:20 +0000
@@ -605,6 +605,9 @@
       */
     property alias selectedTextColor: editor.selectedTextColor
 
+    /*!\internal */
+    property alias __editor: editor
+
     /*!
       This handler is called when the Return or Enter key is pressed. Note that if
       there is a validator or inputMask set on the text input, the handler will only
@@ -971,7 +974,6 @@
     }
 
 
-    // text input
     Flickable {
         id: flicker
         objectName: "textfield_scroller"
@@ -994,6 +996,10 @@
 
         TextInput {
             id: editor
+
+            // maliit extensions
+            property variant __inputMethodExtensions: null
+
             // FocusScope will forward focus to this component
             focus: true
             anchors.verticalCenter: parent.verticalCenter

=== added file 'modules/Ubuntu/Components/TextField11.qml'
--- modules/Ubuntu/Components/TextField11.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/TextField11.qml	2014-04-28 15:46:20 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2012 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
+
+TextField {
+    id: control
+
+    /*!
+      Provides extended properties to the input method allowing 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
+
+      \qml
+      TextField {
+          text: "Text"
+
+          inputMethodExtensions: {
+            'enterKeyText': 'My Enter',
+            'enterKeyEnabled': true,
+            'enterKeyHighlighted': true,
+          }
+      }
+      \endqml
+
+      \qmlproperty var inputMethodExtensions
+    */
+    property alias inputMethodExtensions: __editor.__inputMethodExtensions
+}

=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/qmldir	2014-04-28 15:46:20 +0000
@@ -92,3 +92,5 @@
 
 #version 1.1
 ComboButton 1.1 ComboButton.qml
+TextField 1.1 TextField11.qml
+TextArea 1.1 TextArea11.qml