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

[Cris Dywan]

Update selection and cursor to blue

[PS Jenkins bot (ps-jenkins)]

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)

[Cris Dywan (kalikiana)]

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)]

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

1131. By Cris Dywan on 2014-07-10

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

[PS Jenkins bot (ps-jenkins)]

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)

[Cris Dywan (kalikiana)]

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)]

[Zsombor Egri (zsombi)]

> 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 :)

[Cris Dywan (kalikiana)]

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

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

1132. By Cris Dywan on 2014-07-11

Update tst_textinput_touch

[Zsombor Egri (zsombi)]

You are missing the TextField changes!

Some small comments inline

review: Needs Fixing

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

1133. By Cris Dywan on 2014-07-11

Also update the selection color in the TextField

1134. By Cris Dywan on 2014-07-11

Merge lp:~tpeeters/ubuntu-ui-toolkit/NewColors

1135. By Cris Dywan on 2014-07-11

Use UbuntuColors lightGrey, blue, darkGray in Palette

1136. By Cris Dywan on 2014-07-11

Set selected.foreground alpha in the Palette

1137. By Cris Dywan on 2014-07-11

Introduce "selection" palette value for selected text

[PS Jenkins bot (ps-jenkins)]

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)

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

1138. By Cris Dywan on 2014-07-14

Update components.api

1139. By Cris Dywan on 2014-07-14

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

1140. By Cris Dywan on 2014-07-18

Slightly thicker caret

Unmerged revisions

=== modified file 'components.api'
--- components.api	2014-07-10 11:50:13 +0000
+++ components.api	2014-07-11 13:24:19 +0000
@@ -46,6 +46,12 @@
     readonly property color coolGrey
     property Gradient orangeGradient
     property Gradient greyGradient
+    readonly property color lightGrey
+    readonly property color darkGrey
+    readonly property color red
+    readonly property color green
+    readonly property color blue
+    readonly property color purple
 ComboButton 1.1
 Button
     property bool expanded

=== added file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml'
--- examples/ubuntu-ui-toolkit-gallery/Colors.qml	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Colors.qml	2014-07-11 13:24:19 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 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.2
+import Ubuntu.Components 1.1
+
+Template {
+    objectName: "colorsTemplate"
+
+    TemplateSection {
+        title: "UbuntuColors"
+        className: "UbuntuColors"
+
+        // Except orange, none of the colors from UbuntuComponents 1.0
+        // are included because they may be deprecated soon.
+        TemplateRow {
+            title: i18n.tr("Orange")
+            UbuntuShape {
+                color: UbuntuColors.orange
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Light grey")
+            UbuntuShape {
+                color: UbuntuColors.lightGrey
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Dark grey")
+            UbuntuShape {
+                color: UbuntuColors.darkGrey
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Red")
+            UbuntuShape {
+                color: UbuntuColors.red
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Green")
+            UbuntuShape {
+                color: UbuntuColors.green
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Blue")
+            UbuntuShape {
+                color: UbuntuColors.blue
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Purple")
+            UbuntuShape {
+                color: UbuntuColors.purple
+            }
+        }
+    }
+}

=== modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml'
--- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2014-07-02 13:39:29 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2014-07-11 13:24:19 +0000
@@ -28,7 +28,11 @@
         label: "Styles"
         source: "Styles.qml"
     }
-
+    ListElement {
+        objectName: "colorsElement"
+        label: "Colors"
+        source: "Colors.qml"
+    }
     ListElement {
         objectName: "togglesElement"
         label: "Toggles"

=== modified file 'modules/Ubuntu/Components/Colors/FIXME'
--- modules/Ubuntu/Components/Colors/FIXME	2013-07-01 05:54:33 +0000
+++ modules/Ubuntu/Components/Colors/FIXME	2014-07-11 13:24:19 +0000
@@ -1,3 +1,7 @@
 UbuntuColors.qml is located in the Colors subdirectory because
 QuickUtils::createQmlObject() fails if the QML file is located in a
 folder that has a qmldir file with JavaScript modules.
+
+UbuntuColors 1.1 is not in a file named UbuntuColors11.qml but in
+UbuntuColors.qml so that qdoc can properly detect the component
+name without a qmldir file.

=== added file 'modules/Ubuntu/Components/Colors/UbuntuColors.qml'
--- modules/Ubuntu/Components/Colors/UbuntuColors.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Colors/UbuntuColors.qml	2014-07-11 13:24:19 +0000
@@ -0,0 +1,131 @@
+/*
+    Copyright 2014 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.2
+
+/*!
+    \qmltype UbuntuColors
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief Singleton defining the Ubuntu color palette.
+
+    Each color of the Ubuntu color palette is accesible from it.
+    For more information on how to appropriately use the colors according to
+    the context, please refer to the
+    \l{http://design.ubuntu.com/brand/colour-palette}{Ubuntu brand guidelines}.
+
+    Example of use:
+
+    \qml
+    Rectangle {
+       color: UbuntuColors.orange
+    }
+    \endqml
+*/
+QtObject {
+    // old colors from UbuntuColors 1.0:
+
+    /*!
+      Orange. Recommended for branded elements, display progress
+      and intensity, textual links on light backgrounds.
+    */
+    readonly property color orange: "#DD4814"
+    /*!
+      \deprecated
+      Ubuntu supporting color: light aubergine
+    */
+    readonly property color lightAubergine: "#77216F"
+    /*!
+      \deprecated
+      Ubuntu supporting color: mid aubergine
+    */
+    readonly property color midAubergine: "#5E2750"
+    /*!
+      \deprecated
+      Ubuntu supporting color: dark aubergine
+    */
+    readonly property color darkAubergine: "#2C001E"
+    /*!
+      \deprecated
+      Ubuntu neutral color: warm grey
+    */
+    readonly property color warmGrey: "#AEA79F"
+    /*!
+      \deprecated
+      Ubuntu neutral color: cool grey
+    */
+    readonly property color coolGrey: "#333333"
+
+    /*!
+      Ubuntu orange gradient
+
+      \sa Button::gradient
+    */
+    property Gradient orangeGradient: Gradient {
+        GradientStop { position: 0.0; color: "#DD4814" }
+        GradientStop { position: 1.0; color: "#D9722D" }
+    }
+    /*!
+      Ubuntu grey gradient
+
+      \sa Button::gradient
+    */
+    property Gradient greyGradient: Gradient {
+        GradientStop { position: 0.0; color: "#888888" }
+        GradientStop { position: 1.0; color: "#BBBBBB" }
+    }
+
+    // New colors introduced in UbuntuColors 1.1:
+
+    /*!
+      Light grey. Recommended for neutral action buttons and
+      secondary text.
+      \since Ubuntu.Components 1.1
+     */
+    readonly property color lightGrey: "#888888"
+
+    /*!
+      Dark grey. Recommended for text and action icons.
+      \since Ubuntu.Components 1.1
+     */
+    readonly property color darkGrey: "#5d5d5d"
+
+    /*!
+      Red. Recommended for negative and irreversible action
+      buttons, errors and alerts.
+      \since Ubuntu.Components 1.1
+     */
+    readonly property color red: "#fc4949"
+
+    /*!
+      Green. Recommended for positive action buttons.
+      \since Ubuntu.Components 1.1
+     */
+    readonly property color green: "#3fb24f"
+
+    /*!
+      Blue. Recommended for text selection and text cursor.
+      \since Ubuntu.Components 1.1
+     */
+    readonly property color blue: "#1ab6ef"
+
+    /*!
+      Purple. Recommended for proper nouns in
+      list items.
+      \since Ubuntu.Components 1.1
+     */
+    readonly property color purple: "#762572"
+}

=== renamed file 'modules/Ubuntu/Components/Colors/UbuntuColors.qml' => 'modules/Ubuntu/Components/Colors/UbuntuColors10.qml'
--- modules/Ubuntu/Components/Colors/UbuntuColors.qml	2013-07-02 00:15:07 +0000
+++ modules/Ubuntu/Components/Colors/UbuntuColors10.qml	2014-07-11 13:24:19 +0000
@@ -1,5 +1,5 @@
 /*
-    Copyright 2013 Canonical Ltd.
+    Copyright 2013-2014 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
@@ -14,67 +14,23 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.2
 
 /*!
-    \qmltype UbuntuColors
-    \inqmlmodule Ubuntu.Components 0.1
-    \ingroup theming
-    \brief Singleton defining the Ubuntu color palette.
-
-    Each color of the Ubuntu color palette is accesible from it.
-    For more information on how to appropriately use the colors according to
-    the context, please refer to the
-    \l{http://design.ubuntu.com/brand/colour-palette}{Ubuntu brand guidelines}.
-
-    Example of use:
-
-    \qml
-    Rectangle {
-       color: UbuntuColors.orange
-    }
-    \endqml
+    \internal
+    Documentation is in UbuntuColors.qml
 */
 QtObject {
-    /*!
-       Ubuntu core color: Ubuntu orange
-    */
     readonly property color orange: "#DD4814"
-    /*!
-       Ubuntu supporting color: light aubergine
-    */
     readonly property color lightAubergine: "#77216F"
-    /*!
-       Ubuntu supporting color: mid aubergine
-    */
     readonly property color midAubergine: "#5E2750"
-    /*!
-       Ubuntu supporting color: dark aubergine
-    */
     readonly property color darkAubergine: "#2C001E"
-    /*!
-       Ubuntu neutral color: warm grey
-    */
     readonly property color warmGrey: "#AEA79F"
-    /*!
-       Ubuntu neutral color: cool grey
-    */
     readonly property color coolGrey: "#333333"
-
-    /*!
-       Ubuntu orange gradient
-
-       \sa Button::gradient
-    */
     property Gradient orangeGradient: Gradient {
         GradientStop { position: 0.0; color: "#DD4814" }
         GradientStop { position: 1.0; color: "#D9722D" }
     }
-    /*!
-       Ubuntu grey gradient
-
-       \sa Button::gradient
-    */
     property Gradient greyGradient: Gradient {
         GradientStop { position: 0.0; color: "#888888" }
         GradientStop { position: 1.0; color: "#BBBBBB" }

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2014-06-28 17:26:49 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2014-07-11 13:24:19 +0000
@@ -850,7 +850,8 @@
             }
             color: control.__styleInstance.color
             selectedTextColor: Theme.palette.selected.foregroundText
-            selectionColor: Theme.palette.selected.foreground
+            property color selCol: Theme.palette.selected.foreground
+            selectionColor: Qt.rgba(selCol.r, selCol.g, selCol.b, 0.2)
             font.pixelSize: FontUtils.sizeToPixels("medium")
             // forward keys to the root element so it can be captured outside of it
             // as well as to InputHandler to handle PageUp/PageDown keys

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-06-29 21:46:30 +0000
+++ modules/Ubuntu/Components/TextField.qml	2014-07-11 13:24:19 +0000
@@ -979,7 +979,8 @@
             }
             color: control.__styleInstance.color
             selectedTextColor: Theme.palette.selected.foregroundText
-            selectionColor: Theme.palette.selected.foreground
+            property color selCol: Theme.palette.selected.foreground
+            selectionColor: Qt.rgba(selCol.r, selCol.g, selCol.b, 0.2)
             font.pixelSize: FontUtils.sizeToPixels("medium")
             passwordCharacter: "\u2022"
             // forward keys to the root element so it can be captured outside of it

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/Palette.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/Palette.qml	2013-07-05 12:21:32 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/Palette.qml	2014-07-11 13:24:19 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes 0.1
 
 Palette {
@@ -22,13 +23,13 @@
         background: "#EDEDED"
         backgroundText: "#81888888"
         base: "#1A000000"
-        baseText: "#888888"
-        foreground: "#888888"
+        baseText: UbuntuColors.lightGrey
+        foreground: UbuntuColors.lightGrey
         foregroundText: "#F3F3E7"
         overlay: "#FDFDFD"
-        overlayText: "#888888"
+        overlayText: UbuntuColors.lightGrey
         field: "#1A000000"
-        fieldText: "#888888"
+        fieldText: UbuntuColors.darkGrey
     }
     selected: PaletteValues {
         /* FIXME: 'background' does not come from design
@@ -36,10 +37,10 @@
            that will go away with the new design.
         */
         background: "#B2E6E6E6"
-        backgroundText: "#888888"
-        foreground: "#DD4814"
-        foregroundText: "#F3F3E7"
+        backgroundText: UbuntuColors.darkGrey
+        foreground: UbuntuColors.blue
+        foregroundText: UbuntuColors.darkGrey
         field: "#FFFFFF"
-        fieldText: "#888888"
+        fieldText: UbuntuColors.darkGrey
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2014-05-09 05:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2014-07-11 13:24:19 +0000
@@ -70,7 +70,7 @@
     // caretItem
     Image {
         id: caretItem
-        source: "artwork/teardrop-left.png"
+        source: "artwork/caret_noshadow.png"
         anchors {
             top: parent.bottom
             horizontalCenter: parent.horizontalCenter

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml	2014-05-09 05:25:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextSelectionEndCursorStyle.qml	2014-07-11 13:24:19 +0000
@@ -55,7 +55,7 @@
     // caretItem
     Image {
         id: caretItem
-        source: "artwork/teardrop-left.png"
+        source: "artwork/caret_noshadow.png"
         anchors {
             top: parent.bottom
             horizontalCenter: parent.horizontalCenter

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml	2014-05-13 08:00:18 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextSelectionStartCursorStyle.qml	2014-07-11 13:24:19 +0000
@@ -55,12 +55,13 @@
     // caretItem
     Image {
         id: caretItem
-        source: "artwork/teardrop-right.png"
+        source: "artwork/caret_noshadow.png"
         anchors {
-            top: parent.bottom
+            bottom: parent.top
             horizontalCenter: parent.horizontalCenter
             topMargin: -units.gu(0.5)
             horizontalCenterOffset: LayoutMirroring.enabled ? -(units.gu(0.7) - caretItem.width) : -units.gu(0.7)
         }
+        rotation: 180
     }
 }

=== added file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]'
Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	2014-07-11 13:24:19 +0000 differ
=== removed file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]'
Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	2014-04-25 08:18:46 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]'
Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	2014-04-25 08:18:46 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/Palette.qml'
--- modules/Ubuntu/Components/Themes/SuruDark/Palette.qml	2013-07-05 14:34:00 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/Palette.qml	2014-07-11 13:24:19 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Themes 0.1
 
 Palette {
@@ -33,8 +34,8 @@
     selected: PaletteValues {
         background: "#88D6D6D6" // FIXME: not from design
         backgroundText: "#F3F3E7"
-        foreground: "#DD4814"
-        foregroundText: "#F3F3E7"
+        foreground: UbuntuColors.blue
+        foregroundText: UbuntuColors.darkGrey
         field: "#FFFFFF"
         fieldText: "#888888"
     }

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-06-10 11:47:09 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2014-07-11 13:24:19 +0000
@@ -92,7 +92,14 @@
     return uriHandler;
 }
 
-static QObject *registerUbuntuColors(QQmlEngine *engine, QJSEngine *scriptEngine)
+static QObject *registerUbuntuColors10(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(scriptEngine)
+    return UbuntuComponentsPlugin::registerQmlSingletonType(engine,
+           "Ubuntu.Components", "Colors/UbuntuColors10.qml");
+}
+
+static QObject *registerUbuntuColors11(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(scriptEngine)
     return UbuntuComponentsPlugin::registerQmlSingletonType(engine,
@@ -154,7 +161,7 @@
 
 void UbuntuComponentsPlugin::registerTypesToVersion(const char *uri, int major, int minor)
 {
-    qmlRegisterSingletonType<QObject>(uri, major, minor, "UbuntuColors", registerUbuntuColors);
+    qmlRegisterSingletonType<QObject>(uri, major, minor, "UbuntuColors", registerUbuntuColors10);
     qmlRegisterUncreatableType<UbuntuI18n>(uri, major, minor, "i18n", "Singleton object");
     qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, major, minor, "QQuickImageBase");
     qmlRegisterUncreatableType<UCUnits>(uri, major, minor, "UCUnits", "Not instantiable");
@@ -184,6 +191,7 @@
     // register 0.1 for backward compatibility
     registerTypesToVersion(uri, 0, 1);
     registerTypesToVersion(uri, 1, 0);
+    qmlRegisterSingletonType<QObject>(uri, 1, 1, "UbuntuColors", registerUbuntuColors11);
 
     // register custom event
     ForwardedEvent::registerForwardedEvent();

=== modified file 'tests/unit_x11/tst_components/tst_textinput_touch.qml'
--- tests/unit_x11/tst_components/tst_textinput_touch.qml	2014-06-24 08:42:47 +0000
+++ tests/unit_x11/tst_components/tst_textinput_touch.qml	2014-07-11 13:24:19 +0000
@@ -192,15 +192,15 @@
             verify(selectedText !== "", "No text selected!");
 
             popupSpy.target = findChild(data.input, "input_handler");
-            TestExtras.touchLongPress(0, data.input, guPoint(1, 1));
+            TestExtras.touchLongPress(0, data.input, guPoint(2, 2));
             waitForRendering(data.input, 500);
             popupSpy.wait();
             compare(data.input.selectedText, selectedText, "Text selection should be the same!");
 
             // cleanup
-            TestExtras.touchRelease(0, data.input, guPoint(1, 1));
+            TestExtras.touchRelease(0, data.input, guPoint(2, 2));
             // dismiss popover
-            TestExtras.touchClick(0, testMain, 0, 0);
+            TestExtras.touchClick(0, testMain, guPoint(0, 0));
         }
 
         function test_drag_cursor_handler_data() {
@@ -275,9 +275,7 @@
             flickerSpy.target = outerFlicker;
             autoSizeTextArea.focus = data.focused;
             var editor = findChild(autoSizeTextArea, "text_input");
-            wait(5000)
             TestExtras.touchDrag(0, editor, guPoint(0, 0), guPoint(0, 40));
-            wait(5000)
             flickerSpy.wait();
         }
     }