Merge into staging : NewColors : Code : Ubuntu UI Toolkit

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-07-14
Cris Dywan		2014-07-01	Approve on 2014-07-09
Review via email: mp+225230@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-01:

#

FAILED: Continuous integration, rev:1133
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/527/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1236/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/359/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/359/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/359/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2394/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1382/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-07-02:

#

Please update components.api

Interestingly this adds versioning of UbuntuColors in a simpler-looking way than https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/textinput-caret-and-selection/+merge/223236 - so probably best to get this one in first and I'll update the other one accordingly

review: Needs Fixing

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-07-02:

#

Thanks!

review: Approve

Revision history for this message

Cris Dywan (kalikiana) on 2014-07-02:

#

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-02:

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-02:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-07-02:

#

unrelated AP failure in launching app. happroving again.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-02:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-02:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-03:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-07:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-07:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-07-07:

#

Autolanding fails:
Test Result (2 failures / ±0)
ubuntuuitoolkit.tests.gallery.test_gallery.GalleryAppTestCase.test_progress_and_activity
ubuntuuitoolkit.tests.gallery.test_gallery.OpenPagesTestCase.test_open_page(progressBars)

I don't get those failures locally when running only those tests

tim@trusty:~/dev/ubuntu-ui-toolkit/m/NewColors/tests/autopilot$ autopilot3 run ubuntuuitoolkit.tests.gallery.test_gallery.OpenPagesTestCase
Loading tests from: /home/tim/dev/ubuntu-ui-toolkit/m/NewColors/tests/autopilot

Tests running...
<class 'Xlib.protocol.request.QueryExtension'>

Ran 17 tests in 88.885s
OK

tim@trusty:~/dev/ubuntu-ui-toolkit/m/NewColors/tests/autopilot$ autopilot3 run ubuntuuitoolkit.tests.gallery.test_gallery.GalleryAppTestCase.test_progress_and_activity
Loading tests from: /home/tim/dev/ubuntu-ui-toolkit/m/NewColors/tests/autopilot

Tests running...
<class 'Xlib.protocol.request.QueryExtension'>

Ran 1 test in 8.399s
OK

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-07-08:

#

File "/usr/lib/python3/dist-packages/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py", line 119, in _swipe_non_visible_child_into_view
"Couldn't swipe in the flickable.")
ubuntuuitoolkit._custom_proxy_objects._common.ToolkitException: Couldn't swipe in the flickable.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-09:

#

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

review: Approve (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) on 2014-07-09:

#

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-09:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-12:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-12:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-13:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-07-13:

#

This is amazing: the last 3 Jenkins logs show different AP test failures each. Unbelievable!

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2014-07-14:

#

review: Approve (continuous-integration)

Ubuntu UI Toolkit

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

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'components.api'
 --- components.api	2014-07-10 11:50:13 +0000
 +++ components.api	2014-07-11 09:12:44 +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 09:12:44 +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 09:12:44 +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 09:12:44 +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 09:12:44 +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 09:12:44 +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/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 09:12:44 +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();