Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/textDocument into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Expose textDocument of TextField

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1448
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1546/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1757
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/276
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/276/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/273
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1755
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1755/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18808

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

review: Needs Fixing (continuous-integration)

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/textDocument]

1449. By Cris Dywan on 2015-03-17

Move textDocument from TextField to TextArea

1450. By Cris Dywan on 2015-03-17

Also expose paintedWidth and paintedHeight on TextArea

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1450
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1559/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1806/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/286/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/289/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/286/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1804/console

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

paintedWidth/paintedHight does have the values of the TextEdit's paintedWidth/paintedHight, but the TextArea adds some margins around. I wonder if that shouldn't be taken into account on the outer api. If you decide to change the margins around the TextEdit an app using paintedWidth/paintedHight would need to be adjusted as it stands now.

Apart from that, the textDocument property seems to work fine in reminder-app's RTF editor and using that doesn't seem to break anything in the TextArea for me either.

review: Needs Information

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/textDocument]

1451. By Cris Dywan on 2015-03-24

Include frameSpacing in paintedWidth/ Height

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1451
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1593/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1942
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/320
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/323
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/323/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/320
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1711
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1940
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1940/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19097

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

+1 from a reminders-app point of view. I'll yet you SDK guys judge on whether this requires tests or not.

review: Approve

[Tim Peeters (tpeeters)]

Should the new API be in Ubuntu.Components 1.3 only?

review: Needs Information

[Tim Peeters (tpeeters)]

review: Needs Fixing

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/textDocument]

1452. By Cris Dywan on 2015-05-21

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1452
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1783/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2911/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/511/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/513/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/510/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2909/console

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

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

please update components.api

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/textDocument]

1453. By Cris Dywan on 2015-05-22

Update components.api

[Tim Peeters (tpeeters)]

thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-05-20 11:32:11 +0000
+++ components.api	2015-05-22 11:18:53 +0000
@@ -1051,6 +1051,8 @@
     function var remove(var start, var end)
     function var undo()
     property int mouseSelectionMode
+    readonly property double paintedHeight
+    readonly property double paintedWidth
     property bool persistentSelection
     property string placeholderText
     property var popover
@@ -1063,6 +1065,7 @@
     readonly property int selectionEnd
     readonly property int selectionStart
     property string text
+    readonly property QQuickTextDocument textDocument
     property int textFormat
     property int verticalAlignment
     property int wrapMode

=== modified file 'modules/Ubuntu/Components/1.3/TextArea.qml'
--- modules/Ubuntu/Components/1.3/TextArea.qml	2015-04-29 08:55:31 +0000
+++ modules/Ubuntu/Components/1.3/TextArea.qml	2015-05-22 11:18:53 +0000
@@ -315,6 +315,25 @@
     property alias inputMethodComposing: editor.inputMethodComposing
 
     /*!
+      Exposes the QQuickTextDocument which can be used to implement advanced
+      formatting and syntax highlighting (QSyntaxHighlighter) with C++.
+      \qmlproperty var textDocument
+    */
+    property alias textDocument: editor.textDocument
+
+    /*!
+      Exposes the paintedWidth of the underlying text component. It's required
+      if the application uses its own Flickable for scrolling.
+    */
+    readonly property real paintedWidth: editor.paintedWidth + internal.frameSpacing
+
+    /*!
+      Exposes the paintedHeight of the underlying text component. It's required
+      if the application uses its own Flickable for scrolling.
+    */
+    readonly property real paintedHeight: editor.paintedHeight + internal.frameSpacing
+
+    /*!
     Provides hints to the input method about the expected content of the text
     edit and how it should operate.