Merge into staging : strokeColor : Code : Ubuntu UI Toolkit

Reviewer	Review Type	Date Requested	Status
Tim Peeters			Approve on 2014-07-29
PS Jenkins bot	continuous-integration		Approve on 2014-07-28
Zsombor Egri		2014-06-20	Approve on 2014-06-26
Review via email: mp+223944@code.launchpad.net

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-06-23:

#

FAIL! : components::TextAreaAPI::test_clear_selection_by_click_beside_selection() 'There is no text selected' returned FALSE. ()
Loc: [/tmp/buildd/ubuntu-ui-toolkit-0.1.47+14.10.20140618bzr1115pkg0utopic1109+autopilot0/tests/unit_x11/tst_components/tst_textarea.qml(718)]

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-06-23:

#

FAIL! : components::TextAreaAPI::test_clear_selection_by_click_beside_selection() 'There is no text selected' returned FALSE. ()
Loc: [/tmp/buildd/ubuntu-ui-toolkit-0.1.47+14.10.20140618bzr1116pkg0utopic1114+autopilot0/tests/unit_x11/tst_components/tst_textarea.qml(718)]

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-06-23:

#

> FAIL! :
> components::TextAreaAPI::test_clear_selection_by_click_beside_selection()
> 'There is no text selected' returned FALSE. ()
> Loc: [/tmp/buildd/ubuntu-ui-toolkit-0.1.47+14.10.20140618bzr1116pkg0utopic1
> 114+autopilot0/tests/unit_x11/tst_components/tst_textarea.qml(718)]

This is weird... does not fail with staging...

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-06-23:

#

The strokeColor should only be applied to Button, and for version 1.1. ComboButton should also take the Button11 as base type.

review: Needs Fixing

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-06-23:

#

There's one more thing with this: this only configures the stroke colour. Meaning that whoever wants to set a button to be stroke button, must set a colour other than the default value. Do we expect apps to use the

Button {
strokeColor: UbuntuColors.warmGray
}

setup whenever they want to have a default stroke button? Shouldn't we have a property which sets the defaults?
Button {
stroke: true
}
This would set the strokeColor to the default one (preferably from Theme.palette than UbuntuColors), but the debs can then configure the strokeColor to whatever they'd like. What do you think?

review: Needs Information

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-06-23:

#

We don't really have a "default" as I understand it, the colors I've seen in designs are grey and green, I would assume developers to have a look at the guidelines and make a decision on what's appropriate. That's why there's no "semantic" API but just the color and style.

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-06-24:

#

> We don't really have a "default" as I understand it, the colors I've seen in
> designs are grey and green, I would assume developers to have a look at the
> guidelines and make a decision on what's appropriate. That's why there's no
> "semantic" API but just the color and style.

Completely makes sense!

Implementation looks nice, merge with staging and then we can approve.

Revision history for this message

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

#

FAILED: Continuous integration, rev:1118
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/463/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1190/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1056/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2063/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1199/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-06-26:

#

All clear now. Thanks for the update!

review: Approve

Revision history for this message

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

#

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

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/533/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:1123
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/568/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1742/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1466/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/400/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/400/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/400/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2797/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1648/console

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

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/572/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

Looks like tests are failing because for autopilot the buttons are no longer of type Button, so stuff like this fails:

        hide_actions_button = self.main_view.select_single(
            'Button',
            objectName='hide_actions_button')

I guess they are now Button11 (for 1.1, but when fixing the tests we should also verify that they still work when using 1.0).

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

QUbuntu: Could not create application instance
ProcessSearchError: Process exited with exit code: -6

Revision history for this message

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

#

review: Needs Fixing (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/strokeColor updated on 2014-07-17

1128. By Cris Dywan on 2014-07-17

Move versioned Button classes to subfolders

This avoids Autopilot unintentionally changing class names
And restore specifying of Button classes in Autopilot

1129. By Cris Dywan on 2014-07-17

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

1130. By Cris Dywan on 2014-07-17

Get un/versioned files in the same order in components.api

Revision history for this message

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

#

FAILED: Continuous integration, rev:1128
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/609/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2112/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1768/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/441/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/441/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/441/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3259/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1981/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

qdoc doesn't like it:

tim@C720:~/dev/ubuntu-ui-toolkit/r/strokeColor$ make docs
SRC=. ./documentation/docs.sh /home/tim/dev/ubuntu-ui-toolkit/r/strokeColor/documentation;
/home/tim/dev/ubuntu-ui-toolkit/r/strokeColor/modules/Ubuntu/Components/Action.qml:20: warning: Can't link to 'Button'
/home/tim/dev/ubuntu-ui-toolkit/r/strokeColor/modules/Ubuntu/Components/Colors/UbuntuColors.qml:81: warning: Can't link to 'Button::gradient'
/home/tim/dev/ubuntu-ui-toolkit/r/strokeColor/modules/Ubuntu/Components/Colors/UbuntuColors.qml:72: warning: Can't link to 'Button::gradient'
/home/tim/dev/ubuntu-ui-toolkit/r/strokeColor/modules/Ubuntu/Components/Popups/Dialog.qml:98: warning: Can't link to 'Button'
/home/tim/dev/ubuntu-ui-toolkit/r/strokeColor/modules/Ubuntu/Components/Popups/Popover.qml:112: warning: Can't link to 'Button'
make: *** [docs] Error 1

Revision history for this message

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

#

review: Needs Fixing

Revision history for this message

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

#

FAILED: Continuous integration, rev:1130
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/610/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2116/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1771/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/442/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/442/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/442/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3266/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1984/console

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

review: Needs Fixing (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/strokeColor updated on 2014-07-22

1131. By Cris Dywan on 2014-07-22: Move around Button11.qdoc in an attempt to please qdoc

Revision history for this message

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

#

FAILED: Continuous integration, rev:1131
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/641/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2300/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1899/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/473/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/473/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/473/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3506/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2129/console

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

review: Needs Fixing (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/strokeColor updated on 2014-07-23

1132. By Cris Dywan on 2014-07-23: Move all Button docs into Button.qdoc and mark the real ones as internal
1133. By Cris Dywan on 2014-07-23: Use correct Button parent class

Revision history for this message

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

#

My last changes make it *build* alas the docs don't include any properties and there's non-working "Button" links. This is as good as it will get, I can't find a way to make it work.

Revision history for this message

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

#

FAILED: Continuous integration, rev:1133
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/652/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2394/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1954/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/484/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/484/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/484/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3618/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2199/console

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

review: Needs Fixing (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/strokeColor updated on 2014-07-24

1134. By Cris Dywan on 2014-07-24: Make pep8 happy

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

Note to self: push_to_phone.sh doesn't push 1.1/Button.qml

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/strokeColor updated on 2014-07-25

1135. By Cris Dywan on 2014-07-25: Also push the versioned 10 and 11 folders to the phone

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

10/ and 11/ also need to be added to debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install

review: Needs Fixing

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/strokeColor updated on 2014-07-28

1136. By Cris Dywan on 2014-07-28: Add folders 10 and 11 to qtdeclarative5-ubuntu-ui-toolkit-plugin.install

Revision history for this message

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

#

FAILED: Continuous integration, rev:1136
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/665/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2569/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2053/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/497/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/497/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/497/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3812/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2306/console

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

review: Needs Fixing (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/strokeColor updated on 2014-07-28

1137. By Cris Dywan on 2014-07-28: Add .pro files for 10 and 11 folders

Revision history for this message

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

#

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

review: Approve (continuous-integration)

Revision history for this message

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

#

It appears like I finally found a solution for the problems with qdoc and AP: duplicate the Button API in 10/Button and 11/Button instead of making 11/Button inherit from 10/Button. See https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/strokeColorFix

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/strokeColor updated on 2014-07-29

1138. By Cris Dywan on 2014-07-29: Merge lp:~tpeeters/ubuntu-ui-toolkit/strokeColorFix
1139. By Cris Dywan on 2014-07-29: Drop docs from 10/Button.qml which are redundant now

Revision history for this message

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

#

hurray :) let's hope this is it!

review: Approve

Ubuntu UI Toolkit

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

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'components.api'
 --- components.api	2014-07-21 13:57:13 +0000
 +++ components.api	2014-07-29 14:43:30 +0000
@@ -33,6 +33,13 @@
      property Gradient gradient
      property font font
      property string iconPosition
++Button 1.1
++AbstractButton
++    property color strokeColor
++    property color color
++    property Gradient gradient
++    property font font
++    property string iconPosition
  CheckBox 0.1 1.0
  AbstractButton
      property bool checked
 === modified file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install'
 --- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2014-04-29 12:50:32 +0000
 +++ debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2014-07-29 14:43:30 +0000
@@ -6,6 +6,8 @@
  usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes
  usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so
  usr/lib/*/qt5/qml/Ubuntu/Components/*.qml
++usr/lib/*/qt5/qml/Ubuntu/Components/10/*.qml
++usr/lib/*/qt5/qml/Ubuntu/Components/11/*.qml
  usr/lib/*/qt5/qml/Ubuntu/Components/*.js
  usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
  usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
 === modified file 'documentation/docs.sh'
 --- documentation/docs.sh	2014-03-27 08:59:19 +0000
 +++ documentation/docs.sh	2014-07-29 14:43:30 +0000
@@ -24,7 +24,7 @@
  # Offline docs for QtCreator
  qdoc $DOC_PATH/ubuntu-ui-toolkit-qtcreator.qdocconf 2> $DOC_PATH/qdoc.log
  # FIXME: With Qt 5.2 this warning shows up, forcibly omit it from errors
--cat $DOC_PATH/qdoc.log | grep -v "qdoc: warning: No documentation for 'global'" > $DOC_PATH/qdoc.err
++grep -v "error: HTML file already exists; overwriting" $DOC_PATH/qdoc.log | grep -v "qdoc: warning: No documentation for 'global'" > $DOC_PATH/qdoc.err
  cat $DOC_PATH/qdoc.err
  test ! -s $DOC_PATH/qdoc.err || exit 1
  echo docs: Offline done.
@@ -35,7 +35,7 @@
  # Online docs. Run qdoc twice: the second run with indexes for cross-referencing
  # other APIs but discard errors because qdoc inherits all doc bugs otherwise
  qdoc $DOC_PATH/ubuntu-ui-toolkit-online.qdocconf 2> $DOC_PATH/qdoc.log
--cat $DOC_PATH/qdoc.log | grep -v "qdoc: warning: No documentation for 'global'" > $DOC_PATH/qdoc.err
++grep -v "error: HTML file already exists; overwriting" $DOC_PATH/qdoc.log | grep -v "qdoc: warning: No documentation for 'global'" > $DOC_PATH/qdoc.err
  cat $DOC_PATH/qdoc.err
  test ! -s $DOC_PATH/qdoc.err || exit 1
  echo docs: Online done.
 === modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
 --- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-04-23 09:39:11 +0000
 +++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-07-29 14:43:30 +0000
@@ -34,6 +34,16 @@
+         }
          TemplateRow {
++            title: i18n.tr("Stroke")
++
++            Button {
++                objectName: "button_stroke"
++                text: i18n.tr("Call")
++                strokeColor: UbuntuColors.warmGrey
++            }
++        }
++
++        TemplateRow {
              title: i18n.tr("Color")
              Button {
 === added directory 'modules/Ubuntu/Components/10'
 === added file 'modules/Ubuntu/Components/10/10.pro'
 --- modules/Ubuntu/Components/10/10.pro	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Components/10/10.pro	2014-07-29 14:43:30 +0000
@@ -0,0 +1,9 @@
++TEMPLATE = subdirs
++
++uri = Ubuntu.Components.10
++installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
++
++qml_files.path = $$installPath
++qml_files.files = *.qml
++
++INSTALLS += qml_files
 === renamed file 'modules/Ubuntu/Components/Button.qml' => 'modules/Ubuntu/Components/10/Button.qml'
 --- modules/Ubuntu/Components/Button.qml	2014-04-23 08:50:20 +0000
 +++ modules/Ubuntu/Components/10/Button.qml	2014-07-29 14:43:30 +0000
@@ -15,105 +15,21 @@
   */
  import QtQuick 2.0
++import Ubuntu.Components 1.0
  /*!
--    \qmltype Button
--    \inqmlmodule Ubuntu.Components 1.1
--    \ingroup ubuntu
--    \brief Standard Ubuntu button.
--
--    \l {http://design.ubuntu.com/apps/building-blocks/buttons}{See also the Design Guidelines on Buttons}.
--
--    Examples:
--    \qml
--        Column {
--            Button {
--                text: "Send"
--                onClicked: print("clicked text-only Button")
--            }
--            Button {
--                iconName: "compose"
--                gradient: UbuntuColors.greyGradient
--                onClicked: print("clicked icon-only Button")
--            }
--            Button {
--                iconName: "compose"
--                text: "Icon on left"
--                iconPosition: "left"
--                onClicked: print("clicked text and icon Button")
--            }
--        }
--    \endqml
--    An \l Action can be used to specify \b clicked, iconSource and text. Example:
--    \qml
--        Item {
--            Action {
--                id: action1
--                text: "Click me"
--                onTriggered: print("action!")
--                iconName: "compose"
--            }
--            Button {
--                anchors.centerIn: parent
--                action: action1
--                color: UbuntuColors.warmGrey
--            }
--       }
--    \endqml
++   \internal
++   Documentation in 11/Button.qml
  */
  AbstractButton {
      id: button
--    /*!
--       The background color of the button.
--
--       \sa gradient
--    */
      property color color: __styleInstance.defaultColor
--    /*!
--       The gradient used to fill the background of the button.
--
--       Standard Ubuntu gradients are defined in \l UbuntuColors.
--
--       If both a gradient and a color are specified, the gradient will be used.
--
--       \sa color
--    */
      property Gradient gradient: __styleInstance.defaultGradient
--    /*!
--      The font used for the button's text.
--    */
      property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
--    /*!
--       The source URL of the icon to display inside the button.
--       Leave this value blank for a text-only button.
--       If \l action is set, the default iconSource is that of the action.
--       \qmlproperty url iconSource
--    */
--
--    /*!
--       The text to display in the button. If an icon was defined,
--       the text will be shown next to the icon, otherwise it will
--       be centered. Leave blank for an icon-only button.
--       If \l action is set, the default text is that of the action.
--       \qmlproperty string text
--    */
--
--    /*!
--       The position of the icon relative to the text. Options
--       are "left" and "right". The default value is "left".
--
--       If only text or only an icon is defined, this
--       property is ignored and the text or icon is
--       centered horizontally and vertically in the button.
--
--       Currently this is a string value. We are waiting for
--       support for enums:
--       https://bugreports.qt-project.org/browse/QTBUG-14861
--    */
      property string iconPosition: "left"
      style: Theme.createStyleComponent("ButtonStyle.qml", button)
 === added directory 'modules/Ubuntu/Components/11'
 === added file 'modules/Ubuntu/Components/11/11.pro'
 --- modules/Ubuntu/Components/11/11.pro	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Components/11/11.pro	2014-07-29 14:43:30 +0000
@@ -0,0 +1,9 @@
++TEMPLATE = subdirs
++
++uri = Ubuntu.Components.11
++installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
++
++qml_files.path = $$installPath
++qml_files.files = *.qml
++
++INSTALLS += qml_files
 === added file 'modules/Ubuntu/Components/11/Button.qml'
 --- modules/Ubuntu/Components/11/Button.qml	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Components/11/Button.qml	2014-07-29 14:43:30 +0000
@@ -0,0 +1,125 @@
++/*
++ * 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
++
++/*!
++    \qmltype Button
++    \inqmlmodule Ubuntu.Components 1.1
++    \ingroup ubuntu
++    \brief Standard Ubuntu button.
++
++    \l {http://design.ubuntu.com/apps/building-blocks/buttons}{See also the Design Guidelines on Buttons}.
++
++    Examples:
++    \qml
++        Column {
++            Button {
++                text: "Send"
++                onClicked: print("clicked text-only Button")
++            }
++            Button {
++                iconName: "compose"
++                gradient: UbuntuColors.greyGradient
++                onClicked: print("clicked icon-only Button")
++            }
++            Button {
++                iconName: "compose"
++                text: "Icon on left"
++                iconPosition: "left"
++                onClicked: print("clicked text and icon Button")
++            }
++        }
++    \endqml
++    An \l Action can be used to specify \b clicked, iconSource and text. Example:
++    \qml
++        Item {
++            Action {
++                id: action1
++                text: "Click me"
++                onTriggered: print("action!")
++                iconName: "compose"
++            }
++            Button {
++                anchors.centerIn: parent
++                action: action1
++                color: UbuntuColors.warmGrey
++            }
++       }
++    \endqml*/
++AbstractButton {
++    id: button
++    /*!
++      \since Ubuntu.Components 1.1
++      If set to a color, the button has a stroke border instead of a filled shape.
++    */
++    property color strokeColor: Qt.rgba(0.0, 0.0, 0.0, 0.0)
++
++    /*!
++         \qmlproperty url Button::iconSource
++       The source URL of the icon to display inside the button.
++       Leave this value blank for a text-only button.
++       If \l action is set, the default iconSource is that of the action.
++    */
++
++    /*!
++       The text to display in the button. If an icon was defined,
++       the text will be shown next to the icon, otherwise it will
++       be centered. Leave blank for an icon-only button.
++       If \l action is set, the default text is that of the action.
++       \qmlproperty string Button::text
++    */
++
++    /*!
++       The background color of the button.
++
++       \sa gradient
++    */
++    property color color: __styleInstance.defaultColor
++
++    /*!
++       The gradient used to fill the background of the button.
++
++       Standard Ubuntu gradients are defined in \l UbuntuColors.
++
++       If both a gradient and a color are specified, the gradient will be used.
++
++       \sa color
++    */
++    property Gradient gradient: __styleInstance.defaultGradient
++
++    /*!
++      The font used for the button's text.
++    */
++    property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
++
++    /*!
++       The position of the icon relative to the text. Options
++       are "left" and "right". The default value is "left".
++
++       If only text or only an icon is defined, this
++       property is ignored and the text or icon is
++       centered horizontally and vertically in the button.
++
++       Currently this is a string value. We are waiting for
++       support for enums:
++       https://bugreports.qt-project.org/browse/QTBUG-14861
++    */
++    property string iconPosition: "left"
++
++    style: Theme.createStyleComponent("ButtonStyle.qml", button)
++}
 === modified file 'modules/Ubuntu/Components/Components.pro'
 --- modules/Ubuntu/Components/Components.pro	2013-07-01 05:54:33 +0000
 +++ modules/Ubuntu/Components/Components.pro	2014-07-29 14:43:30 +0000
@@ -1,5 +1,5 @@
  TEMPLATE = subdirs
--SUBDIRS += plugin Themes Colors
++SUBDIRS += plugin Themes Colors 10 11
  include(deployment.pri)
 === modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml'
 --- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-04-23 08:50:20 +0000
 +++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-07-29 14:43:30 +0000
@@ -22,13 +22,14 @@
  Item {
      id: buttonStyle
--    property Button button: styledItem
++    property var button: styledItem
      property real minimumWidth: units.gu(10)
      property real horizontalPadding: units.gu(1)
      property color defaultColor: UbuntuColors.orange
      property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
      property Gradient defaultGradient
      property real buttonFaceOffset: 0
++    property bool stroke: button.hasOwnProperty("strokeColor") && button.strokeColor != Qt.rgba(0.0, 0.0, 0.0, 0.0)
      /*!
        The property overrides the button's default background with an item. This
        item can be used by derived styles to reuse the ButtonStyle and override
@@ -82,22 +83,54 @@
      property bool isGradient: button.gradient && (button.color == defaultColor ||
                                button.gradient != defaultGradient)
++    Image {
++        id: strokeBorder
++        anchors.fill: parent
++        anchors.margins: -units.gu(0.5)
++        source: "artwork/stroke_button.png"
++        visible: false
++    }
++
++    ShaderEffect {
++        id: colorizedImage
++
++        anchors.fill: parent
++        visible: stroke && strokeBorder.status == Image.Ready
++
++        property Item source: visible ? strokeBorder : null
++        property color keyColorOut: stroke ? strokeColor : Qt.rgba(0.0, 0.0, 0.0, 0.0)
++        property color keyColorIn: Qt.rgba(1.0, 1.0, 1.0, 1.0)
++        property real threshold: 1.0
++
++        fragmentShader: "
++            varying highp vec2 qt_TexCoord0;
++            uniform sampler2D source;
++            uniform highp vec4 keyColorOut;
++            uniform highp vec4 keyColorIn;
++            uniform lowp float threshold;
++            uniform lowp float qt_Opacity;
++            void main() {
++                lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);
++                gl_FragColor = mix(vec4(keyColorOut.rgb, 1.0) * sourceColor.a, sourceColor, step(threshold, distance(sourceColor.rgb / sourceColor.a, keyColorIn.rgb))) * qt_Opacity;
++            }"
++    }
++
      UbuntuShape {
          id: background
          anchors.fill: parent
          borderSource: "radius_idle.sci"
--        visible: (color.a != 0.0) || backgroundSource
++        visible: stroke ? false : ((color.a != 0.0) || backgroundSource)
          image: backgroundSource
--        color: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.topColor) : __colorHack(button.color))
--        gradientColor: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.bottomColor) : __colorHack(button.color))
++        color: stroke ? "" : (backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.topColor) : __colorHack(button.color)))
++        gradientColor: stroke ? "" : (backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.bottomColor) : __colorHack(button.color)))
+     }
      UbuntuShape {
          id: backgroundPressed
          anchors.fill: parent
--        color: background.color
--        gradientColor: background.gradientColor
++        color: stroke ? strokeColor : background.color
++        gradientColor: stroke ? strokeColor : background.gradientColor
          borderSource: "radius_pressed.sci"
          opacity: button.pressed ? 1.0 : 0.0
          Behavior on opacity {
@@ -106,7 +139,7 @@
                  easing.type: Easing.Linear
+             }
+         }
--        visible: background.visible
++        visible: stroke || background.visible
+     }
      ButtonForeground {
@@ -120,7 +153,7 @@
          /* Pick either a clear or dark text color depending on the luminance of the
             background color to maintain good contrast (works in most cases)
          */
--        textColor: ColorUtils.luminance(button.color) <= 0.85 ? "#F3F3E7" : "#888888"
++        textColor: ColorUtils.luminance(button.color) <= 0.85 && !(stroke && !pressed) ? "#F3F3E7" : "#888888"
          iconSource: button.iconSource
          iconPosition: button.iconPosition
          iconSize: units.gu(3)
 === added file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/stroke_button@27.png'
 Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/stroke_button@27.png	1970-01-01 00:00:00 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/stroke_button@27.png	2014-07-29 14:43:30 +0000 differ
 === modified file 'modules/Ubuntu/Components/qmldir'
 --- modules/Ubuntu/Components/qmldir	2014-07-16 11:58:43 +0000
 +++ modules/Ubuntu/Components/qmldir	2014-07-29 14:43:30 +0000
@@ -6,7 +6,7 @@
  ToolbarItems 0.1 ToolbarItems.qml
  ToolbarButton 0.1 ToolbarButton.qml
  MainView 0.1 MainView.qml
--Button 0.1 Button.qml
++Button 0.1 10/Button.qml
  Panel 0.1 Panel.qml
  internal DraggingArea DraggingArea.qml
  Tab 0.1 Tab.qml
@@ -57,7 +57,7 @@
  ToolbarItems 1.0 ToolbarItems.qml
  ToolbarButton 1.0 ToolbarButton.qml
  MainView 1.0 MainView.qml
--Button 1.0 Button.qml
++Button 1.0 10/Button.qml
  Panel 1.0 Panel.qml
  Tab 1.0 Tab.qml
  TabBar 1.0 TabBar.qml
@@ -93,6 +93,7 @@
  #version 1.1
  ComboButton 1.1 ComboButton.qml
++Button 1.1 11/Button.qml
  ProgressBar 1.1 ProgressBar11.qml
  CrossFadeImage 1.1 CrossFadeImage11.qml
  PullToRefresh 1.1 PullToRefresh.qml
 === modified file 'push_to_phone.sh'
 --- push_to_phone.sh	2014-07-22 10:47:35 +0000
 +++ push_to_phone.sh	2014-07-29 14:43:30 +0000
@@ -33,7 +33,7 @@
  echo modules/Ubuntu/Components/qmldir '->' /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
  adb push Ubuntu/Components/qmldir /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
  cd ..
--for i in ListItems Pickers Popups Colors Styles Themes artwork; do
++for i in 10 11 ListItems Pickers Popups Colors Styles Themes artwork; do
      adb push modules/Ubuntu/Components/$i/ /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/$i || exit 1
  done
  # Autopilot tests should always match the Toolkit
 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py	2014-04-25 16:49:45 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py	2014-07-29 14:43:30 +0000
@@ -134,7 +134,8 @@
      def _go_to_page1(self):
          button = self.main_view.select_single(
--            'Button', objectName='go_to_page1')
++            'Button',
++            objectName='go_to_page1')
          self.pointing_device.click_object(button)
      def test_go_back(self):
 === modified file 'tests/qmlapicheck.py'
 --- tests/qmlapicheck.py	2014-07-18 15:58:50 +0000
 +++ tests/qmlapicheck.py	2014-07-29 14:43:30 +0000
@@ -74,7 +74,14 @@
          inputfiles.append(fileinput.filename())
          fileinput.nextfile()
--inputfiles.sort()
++
++# Sort filenames to maintain a consistent order
++# Get un/versioned files in the same order
++def skipversion(filename):
++    for v in ['10', '11']:
++        filename = filename.replace(v + '/', '')
++    return filename
++inputfiles.sort(key=skipversion)
  hook = fileinput.hook_encoded('utf-8')
  for line in fileinput.input(inputfiles, openhook=hook):