Ubuntu UI Toolkit

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

  1. loremIpsumDolorSitAmet
  2. Merge into staging
Proposed by Cris Dywan
Status: Merged
Approved by: Cris Dywan
Approved revision: 1257
Merged at revision: 1267
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/loremIpsumDolorSitAmet
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 250 lines (+17/-157)
5 files modified
modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml (+2/-2)
modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml (+10/-4)
modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml (+0/-73)
modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml (+0/-73)
tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py (+5/-5)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/loremIpsumDolorSitAmet
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+235160@code.launchpad.net

Commit message

Selection handler should be centered and not blinking

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

FAILED: Continuous integration, rev:1256
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1044/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4994
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/876
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/876
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/876/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/876
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4747
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6246
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13461

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

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

Nice move, I was having a branch with this as well, but good that you made it to the staging!

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

> Nice move, I was having a branch with this as well, but good that you made it
> to the staging!

Uhm, I have not seen the AP tests failing, could you check those?

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

PASSED: Continuous integration, rev:1257
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1046/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/878
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/878
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/878/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/878
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4789
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6291
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6291/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13526

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

review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Looks good, again :)

review: Approve
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/525/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5059/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/469
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/469
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/469/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/469
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4807/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6311
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6311/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13548

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/526/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5078/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/470
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/470
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/470/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/470
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4826/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6330
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13580

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/527/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5081/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/471
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/471/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/471
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4829/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6333
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6333/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13587

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/528/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5094/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/472
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/472
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/472/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/472
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4842/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6346
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6346/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13600

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/529/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5099/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/473
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/473
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/473/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/473
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4846/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6351
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6351/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13605

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/530/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5103/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/474
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/474
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/474/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/474
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4851/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6355
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6355/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13612

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/531/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5108/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/475
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/475/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/475
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4856/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6360
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6360/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13621

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/532/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5122/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/476
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/476
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/476/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/476
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4867/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6374
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6374/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13639

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/533/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/477
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/477
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/477/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/477
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4912
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6416
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6416/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13730

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml'
2--- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml 2014-08-08 07:28:49 +0000
3+++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml 2014-09-22 07:21:07 +0000
4@@ -44,8 +44,8 @@
5 from TextCursorStyle.
6 */
7 property string mainCursorStyle: "TextCursorStyle.qml"
8- property string selectionStartCursorStyle: "TextSelectionStartCursorStyle.qml"
9- property string selectionEndCursorStyle: "TextSelectionEndCursorStyle.qml"
10+ property string selectionStartCursorStyle: "TextCursorStyle.qml"
11+ property string selectionEndCursorStyle: "TextCursorStyle.qml"
12
13 // style body
14 anchors.fill: parent
15
16=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml'
17--- modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml 2014-09-04 09:16:49 +0000
18+++ modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml 2014-09-22 07:21:07 +0000
19@@ -62,7 +62,9 @@
20 interval: cursorStyle.cursorVisibleTimeout
21 running: (cursorStyle.cursorVisibleTimeout > 0) &&
22 (cursorStyle.cursorHiddenTimeout > 0) &&
23- styledItem.visible
24+ styledItem.visible &&
25+ !styledItem.contextMenuVisible &&
26+ styledItem.positionProperty === "cursorPosition"
27 repeat: true
28 property bool timerShowCursor: true
29 onTriggered: {
30@@ -78,11 +80,15 @@
31 Image {
32 id: caretItem
33 source: "artwork/caret_noshadow.png"
34- objectName: "text_cursor_style_caret"
35+ objectName: "text_cursor_style_caret_" + styledItem.positionProperty
36 anchors {
37- top: parent.bottom
38+ top: styledItem.positionProperty === "selectionStart" ? undefined : parent.bottom
39+ bottom: styledItem.positionProperty === "selectionStart" ? parent.top : undefined
40 horizontalCenter: parent.horizontalCenter
41- horizontalCenterOffset: (LayoutMirroring.enabled ? -1 : 1) * (implicitWidth / 2 - cursorWidth)
42+ horizontalCenterOffset: styledItem.positionProperty === "cursorPosition"
43+ ? 0
44+ : (LayoutMirroring.enabled ? -1 : 1) * (implicitWidth / 2 - cursorWidth)
45 }
46+ rotation: styledItem.positionProperty === "selectionStart" ? 180 : 0
47 }
48 }
49
50=== removed file 'modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml'
51--- modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml 2014-09-04 09:16:49 +0000
52+++ modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml 1970-01-01 00:00:00 +0000
53@@ -1,73 +0,0 @@
54-/*
55- * Copyright 2014 Canonical Ltd.
56- *
57- * This program is free software; you can redistribute it and/or modify
58- * it under the terms of the GNU Lesser General Public License as published by
59- * the Free Software Foundation; version 3.
60- *
61- * This program is distributed in the hope that it will be useful,
62- * but WITHOUT ANY WARRANTY; without even the implied warranty of
63- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
64- * GNU Lesser General Public License for more details.
65- *
66- * You should have received a copy of the GNU Lesser General Public License
67- * along with this program. If not, see <http://www.gnu.org/licenses/>.
68- */
69-
70-import QtQuick 2.2
71-import Ubuntu.Components 1.1
72-
73-// FIXME : move the API into Ubuntu.Components.Style
74-Item {
75- id: cursorStyle
76- /*!
77- Property specifying the visible timeout of the cursor. It is not mandatory
78- for styles to define values for this property if the cursor blinking is not
79- desired. A value of 0 turns off the cursor blinking.
80- */
81- property int cursorVisibleTimeout: 0
82- /*!
83- Property specifying the hidden timeout of the cursor. It is not mandatory
84- for styles to define values for this property if the cursor blinking is not
85- desired. A value of 0 turns off the cursor blinking.
86- */
87- property int cursorHiddenTimeout: 0
88-
89- /*!
90- Component defining the default cursor visuals.
91- */
92- property Component cursorDelegate: delegate
93-
94- /*!
95- The item pointing to the cursor handler. Styles should set to null if the
96- cursor does not have handler at all.
97- */
98- property Item caret: caretItem
99-
100- /*!
101- The width of the cursor.
102- */
103- property int cursorWidth: units.dp(1)
104-
105- // style body
106- Component {
107- id: delegate
108- Rectangle {
109- width: cursorWidth
110- // FIXME: Add a new color to the palette
111- color: UbuntuColors.blue
112- }
113- }
114-
115- // caretItem
116- Image {
117- id: caretItem
118- source: "artwork/caret_noshadow.png"
119- objectName: "text_cursor_style_caret_end"
120- anchors {
121- top: parent.bottom
122- horizontalCenter: parent.horizontalCenter
123- horizontalCenterOffset: (LayoutMirroring.enabled ? -1 : 1) * (implicitWidth / 2 - cursorWidth)
124- }
125- }
126-}
127
128=== removed file 'modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml'
129--- modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml 2014-08-12 08:09:04 +0000
130+++ modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml 1970-01-01 00:00:00 +0000
131@@ -1,73 +0,0 @@
132-/*
133- * Copyright 2014 Canonical Ltd.
134- *
135- * This program is free software; you can redistribute it and/or modify
136- * it under the terms of the GNU Lesser General Public License as published by
137- * the Free Software Foundation; version 3.
138- *
139- * This program is distributed in the hope that it will be useful,
140- * but WITHOUT ANY WARRANTY; without even the implied warranty of
141- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
142- * GNU Lesser General Public License for more details.
143- *
144- * You should have received a copy of the GNU Lesser General Public License
145- * along with this program. If not, see <http://www.gnu.org/licenses/>.
146- */
147-
148-import QtQuick 2.2
149-import Ubuntu.Components 1.1
150-
151-// FIXME : move the API into Ubuntu.Components.Style
152-Item {
153- id: cursorStyle
154- /*!
155- Property specifying the visible timeout of the cursor. It is not mandatory
156- for styles to define values for this property if the cursor blinking is not
157- desired. A value of 0 turns off the cursor blinking.
158- */
159- property int cursorVisibleTimeout: 0
160- /*!
161- Property specifying the hidden timeout of the cursor. It is not mandatory
162- for styles to define values for this property if the cursor blinking is not
163- desired. A value of 0 turns off the cursor blinking.
164- */
165- property int cursorHiddenTimeout: 0
166-
167- /*!
168- Component defining the default cursor visuals.
169- */
170- property Component cursorDelegate: delegate
171-
172- /*!
173- The item pointing to the cursor handler. Styles should set to null if the
174- cursor does not have handler at all.
175- */
176- property Item caret: caretItem
177-
178- /*!
179- The width of the cursor.
180- */
181- property int cursorWidth: units.dp(1)
182-
183- // style body
184- Component {
185- id: delegate
186- Rectangle {
187- width: cursorWidth
188- // FIXME: Add a new color to the palette
189- color: UbuntuColors.blue
190- }
191- }
192-
193- // caretItem
194- Image {
195- id: caretItem
196- source: "artwork/caret_noshadow.png"
197- anchors {
198- bottom: parent.top
199- horizontalCenter: parent.horizontalCenter
200- horizontalCenterOffset: (LayoutMirroring.enabled ? 1 : -1) * (implicitWidth / 2 - cursorWidth)
201- }
202- rotation: 180
203- }
204-}
205
206=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py'
207--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py 2014-09-17 15:11:08 +0000
208+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py 2014-09-22 07:21:07 +0000
209@@ -59,7 +59,7 @@
210 def test_caret_visible_on_focus(self):
211 try:
212 cursor = self.main_view.select_single(
213- objectName='text_cursor_style_caret')
214+ objectName='text_cursor_style_caret_cursorPosition')
215 # cursor.visible is always True if the select succeeds
216 self.assertFalse(cursor.visible)
217 except dbus.StateNotFoundError:
218@@ -69,14 +69,14 @@
219 self.pointing_device.click_object(self.textfield)
220 self.assertTrue(self.textfield.focus)
221 cursor = self.main_view.select_single(
222- objectName='text_cursor_style_caret')
223+ objectName='text_cursor_style_caret_cursorPosition')
224 self.assertTrue(cursor.visible)
225
226 def test_caret_hide_while_typing(self):
227 self.pointing_device.click_object(self.textfield)
228 self.assertTrue(self.textfield.focus)
229 cursor = self.main_view.select_single(
230- objectName='text_cursor_style_caret')
231+ objectName='text_cursor_style_caret_cursorPosition')
232 self.assertTrue(cursor.visible)
233
234 self.textfield.keyboard.type('Lorem ipsum')
235@@ -86,7 +86,7 @@
236 self.test_caret_hide_while_typing()
237 self.pointing_device.click_object(self.textfield)
238 cursor = self.main_view.select_single(
239- objectName='text_cursor_style_caret')
240+ objectName='text_cursor_style_caret_cursorPosition')
241 self.assertTrue(cursor.visible)
242
243 def test_caret_visible_after_selecting(self):
244@@ -94,5 +94,5 @@
245 # Select a character
246 self.keyboard.press_and_release('Shift+Left')
247 cursor = self.main_view.select_single(
248- objectName='text_cursor_style_caret_end')
249+ objectName='text_cursor_style_caret_selectionEnd')
250 self.assertTrue(cursor.visible)

Subscribers

People subscribed via source and target branches