Ubuntu UI Toolkit

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

  1. blueCursor
  2. Merge into staging
Proposed by Cris Dywan
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1140
Merged at revision: 1147
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/blueCursor
Merge into: lp:ubuntu-ui-toolkit/staging
Prerequisite: lp:~tpeeters/ubuntu-ui-toolkit/NewColors
Diff against target: 214 lines (+30/-22)
10 files modified
components.api (+1/-0)
modules/Ubuntu/Components/TextArea.qml (+1/-1)
modules/Ubuntu/Components/TextField.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/Palette.qml (+10/-8)
modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml (+2/-2)
modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml (+3/-2)
modules/Ubuntu/Components/Themes/PaletteValues.qml (+4/-0)
modules/Ubuntu/Components/Themes/SuruDark/Palette.qml (+4/-2)
tests/unit_x11/tst_components/tst_textinput_touch.qml (+3/-5)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/blueCursor
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Zsombor Egri Approve
Review via email: mp+226457@code.launchpad.net

This proposal supersedes a proposal from 2014-07-11.

Commit message

Update selection and cursor to blue

Description of the change

Update selection and cursor to blue

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

FAILED: Continuous integration, rev:1130
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/537/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1465
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1261/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/369/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/369
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/369/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/369/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1752
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2432
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2432/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9158
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1409/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote : Posted in a previous version of this proposal

FAIL! : components::TextInputTouchTests::test_long_tap_on_selected_text(TextField) 'wait for signal pressAndHold' returned FALSE. ()
   Loc: [/tmp/buildd/ubuntu-ui-toolkit-0.1.47+14.10.20140618bzr1131pkg0utopic1409+autopilot0/tests/unit_x11/tst_components/tst_textinput_touch.qml(197)]

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1131
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/576/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1793/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1512/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/408/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/408
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/408/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2054/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2870
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2870/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9605
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1699/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote : Posted in a previous version of this proposal

FAIL! : components::TextInputTouchTests::test_long_tap_on_selected_text(TextField) 'wait for signal pressAndHold' returned FALSE. ()
   Loc: [/tmp/buildd/ubuntu-ui-toolkit-0.1.49+14.10.20140709bzr1131pkg0utopic1699+autopilot0/tests/unit_x11/tst_components/tst_textinput_touch.qml(197)]

Revision history for this message
Zsombor Egri (zsombi) wrote : Posted in a previous version of this proposal

> FAIL! :
> components::TextInputTouchTests::test_long_tap_on_selected_text(TextField)
> 'wait for signal pressAndHold' returned FALSE. ()
> Loc: [/tmp/buildd/ubuntu-ui-toolkit-0.1.49+14.10.20140709bzr1131pkg0utopic1
> 699+autopilot0/tests/unit_x11/tst_components/tst_textinput_touch.qml(197)]

There was a bug in the test, see it fixed in https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/textinput-caret-and-selection/+merge/223236. Actually this whole MR was already under review, I asked you to review it :)

Revision history for this message
Cris Dywan (kalikiana) wrote : Posted in a previous version of this proposal

It's conflicting with https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/NewColors/+merge/225230 that's why I didn't push it.

Revision history for this message
Zsombor Egri (zsombi) wrote : Posted in a previous version of this proposal

You are missing the TextField changes!

Some small comments inline

review: Needs Fixing
Revision history for this message
Zsombor Egri (zsombi) wrote :

Looks brilliant now :) Thank you!!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:1132
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/584/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1860
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1557
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/416
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/416
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/416/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/416
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2956
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2956/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1304
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1747
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1747/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/584/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1135
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/585/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1564
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/417
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/417/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2965
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2965/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9700
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1310
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1754
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1754/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/585/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/248/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1927/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1605/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/192/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/192/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/192/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3035/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1807/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1137
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/587/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1934/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1610/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/419/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/419/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/419/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3045/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1813/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1138
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/588/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1937
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/420
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/420
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/420/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/420
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3049
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3049/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9782
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1818
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1818/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/588/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/251/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1955
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1634
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/195
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/195
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3068
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3068/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9805
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1369
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1837
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1837/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

NoSuchProcess: no process found with pid 3788
See bug 1329141

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/253/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1996
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1671
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/197
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/197/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/197
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3114
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1401
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1880
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1880/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/260/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2078
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/204
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/204/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/204
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2310
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3212
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3212/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9940
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1950
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1950/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/blueCursor updated
1140. By Cris Dywan

Slightly thicker caret

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

FAILED: Continuous integration, rev:1140
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/619/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1812
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/451
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/451
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/451/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/451
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3330
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10045
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1518
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2030
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2030/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/619/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components.api'
2--- components.api 2014-07-15 10:32:34 +0000
3+++ components.api 2014-07-18 07:21:02 +0000
4@@ -629,6 +629,7 @@
5 property color overlayText
6 property color field
7 property color fieldText
8+ property color selection
9 ToolbarButton 0.1 1.0
10 ActionItem
11 ToolbarItems 0.1 1.0
12
13=== modified file 'modules/Ubuntu/Components/TextArea.qml'
14--- modules/Ubuntu/Components/TextArea.qml 2014-06-28 17:26:49 +0000
15+++ modules/Ubuntu/Components/TextArea.qml 2014-07-18 07:21:02 +0000
16@@ -850,7 +850,7 @@
17 }
18 color: control.__styleInstance.color
19 selectedTextColor: Theme.palette.selected.foregroundText
20- selectionColor: Theme.palette.selected.foreground
21+ selectionColor: Theme.palette.selected.selection
22 font.pixelSize: FontUtils.sizeToPixels("medium")
23 // forward keys to the root element so it can be captured outside of it
24 // as well as to InputHandler to handle PageUp/PageDown keys
25
26=== modified file 'modules/Ubuntu/Components/TextField.qml'
27--- modules/Ubuntu/Components/TextField.qml 2014-06-29 21:46:30 +0000
28+++ modules/Ubuntu/Components/TextField.qml 2014-07-18 07:21:02 +0000
29@@ -979,7 +979,7 @@
30 }
31 color: control.__styleInstance.color
32 selectedTextColor: Theme.palette.selected.foregroundText
33- selectionColor: Theme.palette.selected.foreground
34+ selectionColor: Theme.palette.selected.selection
35 font.pixelSize: FontUtils.sizeToPixels("medium")
36 passwordCharacter: "\u2022"
37 // forward keys to the root element so it can be captured outside of it
38
39=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/Palette.qml'
40--- modules/Ubuntu/Components/Themes/Ambiance/Palette.qml 2013-07-05 12:21:32 +0000
41+++ modules/Ubuntu/Components/Themes/Ambiance/Palette.qml 2014-07-18 07:21:02 +0000
42@@ -15,6 +15,7 @@
43 */
44
45 import QtQuick 2.0
46+import Ubuntu.Components 1.1
47 import Ubuntu.Components.Themes 0.1
48
49 Palette {
50@@ -22,13 +23,13 @@
51 background: "#EDEDED"
52 backgroundText: "#81888888"
53 base: "#1A000000"
54- baseText: "#888888"
55- foreground: "#888888"
56+ baseText: UbuntuColors.lightGrey
57+ foreground: UbuntuColors.lightGrey
58 foregroundText: "#F3F3E7"
59 overlay: "#FDFDFD"
60- overlayText: "#888888"
61+ overlayText: UbuntuColors.lightGrey
62 field: "#1A000000"
63- fieldText: "#888888"
64+ fieldText: UbuntuColors.darkGrey
65 }
66 selected: PaletteValues {
67 /* FIXME: 'background' does not come from design
68@@ -36,10 +37,11 @@
69 that will go away with the new design.
70 */
71 background: "#B2E6E6E6"
72- backgroundText: "#888888"
73- foreground: "#DD4814"
74- foregroundText: "#F3F3E7"
75+ backgroundText: UbuntuColors.darkGrey
76+ selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
77+ foreground: UbuntuColors.blue
78+ foregroundText: UbuntuColors.darkGrey
79 field: "#FFFFFF"
80- fieldText: "#888888"
81+ fieldText: UbuntuColors.darkGrey
82 }
83 }
84
85=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml'
86--- modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml 2014-05-09 05:25:12 +0000
87+++ modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml 2014-07-18 07:21:02 +0000
88@@ -47,7 +47,7 @@
89 Component {
90 id: delegate
91 Rectangle {
92- width: units.dp(1)
93+ width: units.dp(2)
94 color: Theme.palette.selected.foreground
95 visible: blinkTimer.timerShowCursor
96 Timer {
97@@ -70,7 +70,7 @@
98 // caretItem
99 Image {
100 id: caretItem
101- source: "artwork/teardrop-left.png"
102+ source: "artwork/caret_noshadow.png"
103 anchors {
104 top: parent.bottom
105 horizontalCenter: parent.horizontalCenter
106
107=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml'
108--- modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml 2014-05-09 05:25:12 +0000
109+++ modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml 2014-07-18 07:21:02 +0000
110@@ -55,7 +55,7 @@
111 // caretItem
112 Image {
113 id: caretItem
114- source: "artwork/teardrop-left.png"
115+ source: "artwork/caret_noshadow.png"
116 anchors {
117 top: parent.bottom
118 horizontalCenter: parent.horizontalCenter
119
120=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml'
121--- modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml 2014-05-13 08:00:18 +0000
122+++ modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml 2014-07-18 07:21:02 +0000
123@@ -55,12 +55,13 @@
124 // caretItem
125 Image {
126 id: caretItem
127- source: "artwork/teardrop-right.png"
128+ source: "artwork/caret_noshadow.png"
129 anchors {
130- top: parent.bottom
131+ bottom: parent.top
132 horizontalCenter: parent.horizontalCenter
133 topMargin: -units.gu(0.5)
134 horizontalCenterOffset: LayoutMirroring.enabled ? -(units.gu(0.7) - caretItem.width) : -units.gu(0.7)
135 }
136+ rotation: 180
137 }
138 }
139
140=== added file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/caret_noshadow@27.png'
141Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/caret_noshadow@27.png 1970-01-01 00:00:00 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/caret_noshadow@27.png 2014-07-18 07:21:02 +0000 differ
142=== removed file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/teardrop-left@20.png'
143Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/teardrop-left@20.png 2014-04-25 08:18:46 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/teardrop-left@20.png 1970-01-01 00:00:00 +0000 differ
144=== removed file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/teardrop-right@20.png'
145Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/teardrop-right@20.png 2014-04-25 08:18:46 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/teardrop-right@20.png 1970-01-01 00:00:00 +0000 differ
146=== modified file 'modules/Ubuntu/Components/Themes/PaletteValues.qml'
147--- modules/Ubuntu/Components/Themes/PaletteValues.qml 2013-07-05 16:04:07 +0000
148+++ modules/Ubuntu/Components/Themes/PaletteValues.qml 2014-07-18 07:21:02 +0000
149@@ -69,4 +69,8 @@
150 Typically used for labels and images.
151 */
152 property color fieldText
153+ /*!
154+ Color applied to selected text in editable components.
155+ */
156+ property color selection
157 }
158
159=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/Palette.qml'
160--- modules/Ubuntu/Components/Themes/SuruDark/Palette.qml 2013-07-05 14:34:00 +0000
161+++ modules/Ubuntu/Components/Themes/SuruDark/Palette.qml 2014-07-18 07:21:02 +0000
162@@ -15,6 +15,7 @@
163 */
164
165 import QtQuick 2.0
166+import Ubuntu.Components 1.1
167 import Ubuntu.Components.Themes 0.1
168
169 Palette {
170@@ -33,8 +34,9 @@
171 selected: PaletteValues {
172 background: "#88D6D6D6" // FIXME: not from design
173 backgroundText: "#F3F3E7"
174- foreground: "#DD4814"
175- foregroundText: "#F3F3E7"
176+ selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
177+ foreground: UbuntuColors.blue
178+ foregroundText: UbuntuColors.darkGrey
179 field: "#FFFFFF"
180 fieldText: "#888888"
181 }
182
183=== modified file 'tests/unit_x11/tst_components/tst_textinput_touch.qml'
184--- tests/unit_x11/tst_components/tst_textinput_touch.qml 2014-06-24 08:42:47 +0000
185+++ tests/unit_x11/tst_components/tst_textinput_touch.qml 2014-07-18 07:21:02 +0000
186@@ -192,15 +192,15 @@
187 verify(selectedText !== "", "No text selected!");
188
189 popupSpy.target = findChild(data.input, "input_handler");
190- TestExtras.touchLongPress(0, data.input, guPoint(1, 1));
191+ TestExtras.touchLongPress(0, data.input, guPoint(2, 2));
192 waitForRendering(data.input, 500);
193 popupSpy.wait();
194 compare(data.input.selectedText, selectedText, "Text selection should be the same!");
195
196 // cleanup
197- TestExtras.touchRelease(0, data.input, guPoint(1, 1));
198+ TestExtras.touchRelease(0, data.input, guPoint(2, 2));
199 // dismiss popover
200- TestExtras.touchClick(0, testMain, 0, 0);
201+ TestExtras.touchClick(0, testMain, guPoint(0, 0));
202 }
203
204 function test_drag_cursor_handler_data() {
205@@ -275,9 +275,7 @@
206 flickerSpy.target = outerFlicker;
207 autoSizeTextArea.focus = data.focused;
208 var editor = findChild(autoSizeTextArea, "text_input");
209- wait(5000)
210 TestExtras.touchDrag(0, editor, guPoint(0, 0), guPoint(0, 40));
211- wait(5000)
212 flickerSpy.wait();
213 }
214 }

Subscribers

People subscribed via source and target branches