Merge lp:~bpierre/ubuntu-ui-toolkit/newbutton into lp:ubuntu-ui-toolkit/staging

[Pierre Bertet]

TextButton component, Button style and API update

- The new Button style has been implemented and is using the new Palette.
- The component is now a CPP plugin to support enum properties.
- [API] add `type`: allow to specify the type of button (normal, positive, negative, outline)
- [API] change `iconInsertion`: accept `Button.After` and `Button.Before`
- [API] deprecate `color`: moved in the button styles
- [API] deprecate `gradient`: moved in the button styles
- [API] deprecate `strokeColor`: moved in the button styles

TextButton component, Button style and API update

- The new Button style has been implemented and is using the new Palette.
- The component is now a CPP plugin to support enum properties.
- [API] add `type`: allow to specify the type of button (normal, positive, negative, outline)
- [API] change `iconInsertion`: accept `Button.After` and `Button.Before`
- [API] deprecate `color`: moved in the button styles
- [API] deprecate `gradient`: moved in the button styles
- [API] deprecate `strokeColor`: moved in the button styles

[Zsombor Egri (zsombi)]

Button implementation is missing. I've added few comments below, please condor those, they are crucial.

I was thinking whether this common style for all the buttons makes sense... Shouldn't we have separate style files for each button type rather than have one where we disable some visuals because they are not in use? Think about performance.

review: Needs Fixing

[Pierre Bertet (bpierre)]

Thanks for your comments, I made the required changes.

About splitting the button: the new structure (Frame instead of UbuntuShape) is simpler and there is no unused component.

But a special behavior has been required for the text button: there should be a way to make it “strong” (bold text), and the “emphasis” property is never going to be used for them. The API is not going to be the same anymore, so I will split it in separate components.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1866
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/372/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1159/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/372/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1866
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/148/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1161/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/148/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1866
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/126/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1171/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/126/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1866
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/382/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1173/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/382/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1866
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/68/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/372/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/382/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/148/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/126/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1174/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1159
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1173
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1161
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1171

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/68/rebuild

review: Needs Fixing (continuous-integration)

[Pierre Bertet (bpierre)]

I added the TextButton component, and removed it from Button. They are now two separate components and all the components in ButtonStyle.qml are shared by the Button.Normal and Button.Outline types.

[Zsombor Egri (zsombi)]

Shouldn't you have ButtonStyle and TextButtonStyle in Ubuntu.Components.Styles?

See few comments below.

review: Needs Fixing

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1870
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/436/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1481/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/436/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1870
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/213/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1482/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/213/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1870
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/190/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1483/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/190/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1870
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/446/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1484/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/446/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1870
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/114/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/436/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/446
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/446/artifact/artifacts/*zip*/artifacts.zip
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/213/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/190/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1485/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1481
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1484
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1482
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1483

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/114/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1879
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/558/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1998/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/558/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1879
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/546/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2009/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/546/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1879
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/326/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2012/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/326/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1879
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/300/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2018/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/300/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1879
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/190/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/546/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/558/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/326/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/300/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2019/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2009
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1998
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2012
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2018

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/190/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1879
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/575/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2143/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/575/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1879
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/355/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2144/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/355/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1879
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/330/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2147/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/330/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1879
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/587/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2155/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/587/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1879
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/210/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/575/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/587
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/587/artifact/artifacts/*zip*/artifacts.zip
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/355/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/330/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2156/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2143
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2155
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2144
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2147

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/210/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1882
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/584/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2194/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/584/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1882
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/364/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2195/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/364/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1882
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/339/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2196/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/339/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1882
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/596/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2197/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/596/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1882
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/218/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/584/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/596/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/364/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/339/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2198/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2194
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2197
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2195
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2196

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/218/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1883
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/585/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2199/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/585/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1883
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/365/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2200/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/365/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1883
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/340/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2201/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/340/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1883
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/597/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2202/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/597/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1883
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/219/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/585/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/597/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/365/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/340/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2203/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2199
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2202
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2200
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2201

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/219/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1887
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/430/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2455/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/430/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1887
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/649/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2456/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/649/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1887
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/404/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2457/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/404/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1887
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/620/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2458/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/620/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1887
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/264/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/620/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/649/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/430/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/404/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2459/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2458
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2456
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2455
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2457

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/264/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1888
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/431/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2463/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/431/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1888
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/650/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2464/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/650/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1888
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/405/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2465/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/405/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1888
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/621/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2468/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/621/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1888
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/265/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/621/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/650/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/431/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/405/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2469/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2468
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2464
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2463
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2465

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/265/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bpierre/ubuntu-ui-toolkit/newbutton]

1889. By Pierre Bertet on 2016-04-08

Revert development related changes on the Shadow Test app

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1888
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/651/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2470/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/651/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1888
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/432/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2471/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/432/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1888
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/406/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2472/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/406/rebuild

review: Needs Fixing (continuous-integration)

[Pierre Bertet (bpierre)]

@Zsombor Ready to be reviewed.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1888
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/622/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2473/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/622/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1888
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/266/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/622/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/651/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/432/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/406/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2474/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2473
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2470
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2471
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2472

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/266/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1889
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/652/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2475/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/652/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1889
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/433/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2476/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/433/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1889
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/407/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2477/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/407/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1889
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/623/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2478/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/623/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1889
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/267/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/623/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/652/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/433/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/407/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2479/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2478
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2475
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2476
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2477

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/267/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1889. By Pierre Bertet on 2016-04-08

Revert development related changes on the Shadow Test app

1888. By Pierre Bertet on 2016-04-08

Move FocusShape to ShapeFrame

1887. By Pierre Bertet on 2016-04-08

[sync] merge staging

1886. By Pierre Bertet on 2016-04-01

[sync] merge staging

1885. By Pierre Bertet on 2016-03-31

Minor documentation fix

1884. By Pierre Bertet on 2016-03-31

Remove backgroundPositiveText and backgroundNegativeText from the Palette values

1883. By Pierre Bertet on 2016-03-31

[sync] merge staging

1882. By Pierre Bertet on 2016-03-31

Button: remove emphasis, move Positive and Negative to types

The outline mode of the button do not include the positive and negative
emphases anymore. Therefore, the positive and negative emphases have been moved
to the type property, since they (outline vs. positive / negative) are now
mutually exclusive.

A button can now have the following types:

- Button.Normal (default)
- Button.Outline
- Button.Positive
- Button.Negative

1881. By Pierre Bertet on 2016-03-23

[sync] merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-dynamic-shapes-for-new-design

1880. By Pierre Bertet on 2016-03-23

[sync] merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-dynamic-shapes-for-new-design

=== modified file 'components.api'
--- components.api	2016-04-05 05:56:32 +0000
+++ components.api	2016-04-08 16:09:06 +0000
@@ -246,12 +246,13 @@
     property Gradient gradient
     property string iconPosition
     property color strokeColor
-Ubuntu.Components.Button 1.3: AbstractButton
+Ubuntu.Components.Button 1.3 UbuntuToolkit::Button: AbstractButton
     property color color
     property QFont font
-    property Gradient gradient
-    property string iconPosition
+    property QGradient gradient
+    property IconPosition iconPosition
     property color strokeColor
+    property Type type
 Ubuntu.Components.ListItems.Caption 1.0 0.1: Item
     property string text
 Ubuntu.Components.ListItems.Caption 1.3: Item
@@ -1398,6 +1399,8 @@
     property int textFormat
     property int verticalAlignment
     property int wrapMode
+Ubuntu.Components.TextButton 1.3 UbuntuToolkit::TextButton: AbstractButton
+    property bool strong
 Ubuntu.Components.TextField 1.0 0.1: ActionItem
     readonly property bool acceptableInput
     property bool autoScroll
@@ -1743,6 +1746,16 @@
     function var warningFormat(var line, var column, var message)
     function var waitForHeaderAnimation(var mainView)
     readonly property QuickTestUtil testUtil
+Ubuntu.Components.UbuntuToolkit.Button: Enum
+    Negative
+    Normal
+    Outline
+    Positive
+Ubuntu.Components.UbuntuToolkit.Button: Enum
+    After
+    Before
+    left
+    right
 Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton
     signal opened(QStringList uris)
 Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2016-02-12 10:55:51 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2016-04-08 16:09:06 +0000
@@ -25,85 +25,150 @@
         className: "Button"
 
         TemplateFlow {
-            title: i18n.tr("Standard")
+            title: i18n.tr("Types")
 
             Button {
-                objectName: "button_text"
-                text: i18n.tr("Call")
+                objectName: "button_neutral"
+                text: i18n.tr("Normal")
+            }
+            Button {
+                objectName: "button_positive"
+                text: i18n.tr("Positive")
+                type: Button.Positive
+            }
+            Button {
+                objectName: "button_negative"
+                text: i18n.tr("Negative")
+                type: Button.Negative
+            }
+            Button {
+                objectName: "button_outline"
+                text: i18n.tr("Outline")
+                type: Button.Outline
             }
         }
 
         TemplateFlow {
-            title: i18n.tr("Stroke")
+            title: "Disabled"
 
             Button {
-                objectName: "button_stroke"
-                text: i18n.tr("Call")
-                strokeColor: UbuntuColors.warmGrey
+                objectName: "button_normal_disabled"
+                text: i18n.tr("Neutral")
+                enabled: false
+            }
+            Button {
+                objectName: "button_positive_disabled"
+                text: i18n.tr("Positive")
+                type: Button.Positive
+                enabled: false
+            }
+            Button {
+                objectName: "button_negative_disabled"
+                text: i18n.tr("Negative")
+                type: Button.Negative
+                enabled: false
+            }
+            Button {
+                objectName: "button_outline_disabled"
+                text: i18n.tr("Outline")
+                type: Button.Outline
+                enabled: false
             }
         }
 
         TemplateFlow {
             title: i18n.tr("Color")
-
             Button {
+                id: buttonColor
                 objectName: "button_color"
-                width: units.gu(20)
                 action: Action {
-                    text: i18n.tr("C&all %1").arg(shortcut)
-                    shortcut: 'Ctrl+L'
+                    text: i18n.tr("Switch (%1)").arg(shortcut)
+                    shortcut: 'Ctrl+C'
                     property bool flipped
                     onTriggered: flipped = !flipped
                 }
-                color: action.flipped ? UbuntuColors.blue : UbuntuColors.green
+                StyleHints {
+                    textColor: "white"
+                    color: (
+                        buttonColor.action.flipped? "#3EB34F" : "#19B6EE"
+                    )
+                }
             }
         }
 
         TemplateFlow {
             title: i18n.tr("Icon")
-
-            Button {
-                objectName: "button_iconsource"
-                iconSource: "call.png"
-            }
-        }
-
-        TemplateFlow {
-            title: i18n.tr("Icon+Text")
-
-            Button {
-                objectName: "button_iconsource_right_text"
-                width: units.gu(10)
-                text: i18n.tr("Call")
-                iconSource: "call.png"
-                iconPosition: "right"
-            }
-
-            Button {
-                objectName: "button_iconsource_left_text"
-                width: units.gu(10)
-                text: i18n.tr("Call")
-                iconSource: "call.png"
-            }
-        }
-
-        TemplateFlow {
-            title: i18n.tr("Disabled")
-
-            Button {
-                objectName: "button_text_disabled"
-                text: i18n.tr("Call")
-                enabled: false
-            }
-        }
-    }
-
-    TemplateSection {
+            Button {
+                objectName: "button_icon"
+                type: Button.Positive
+                iconName: "call-start"
+                StyleHints {
+                    minimumWidth: 0
+                }
+            }
+        }
+
+        TemplateFlow {
+            title: i18n.tr("Icon + Text")
+            Button {
+                objectName: "button_icon_right_text"
+                text: i18n.tr("Delete")
+                type: Button.Negative
+                iconName: "delete"
+                StyleHints {
+                    minimumWidth: 0
+                }
+            }
+            Button {
+                objectName: "button_icon_left_text"
+                text: i18n.tr("Call")
+                iconName: "call-start"
+                type: Button.Positive
+                iconPosition: Button.After
+                StyleHints {
+                    minimumWidth: 0
+                }
+            }
+        }
+    }
+
+    TemplateSection {
+        className: "TextButton"
+
+        TemplateFlow {
+            title: i18n.tr("Text")
+            TextButton {
+                objectName: "textbutton_normal"
+                text: i18n.tr("Normal")
+            }
+            TextButton {
+                objectName: "textbutton_strong"
+                text: i18n.tr("Strong")
+                strong: true
+            }
+        }
+
+        TemplateFlow {
+            TextButton {
+                objectName: "textbutton_normal_disabled"
+                text: i18n.tr("Normal")
+                enabled: false
+            }
+            TextButton {
+                objectName: "textbutton_strong_disabled"
+                text: i18n.tr("Strong")
+                strong: true
+                enabled: false
+            }
+        }
+    }
+
+    TemplateSection {
+        visible: false
         className: "ComboButton"
 
         TemplateFlow {
             title: i18n.tr("Collapsed")
-
             ComboButton {
                 text: "Press me"
                 objectName: "combobutton_collapsed"
@@ -119,7 +184,6 @@
 
         TemplateFlow {
             title: i18n.tr("Icon")
-
             ComboButton {
                 iconSource: "call.png"
                 width: parent.width < units.gu(30)? parent.width : units.gu(30)
@@ -131,10 +195,8 @@
                 }
             }
         }
-
         TemplateFlow {
             title: i18n.tr("Icon+Text")
-
             ComboButton {
                 text: "Answer"
                 iconSource: "call.png"
@@ -149,7 +211,6 @@
         }
         TemplateFlow {
             title: i18n.tr("Expanded")
-
             ComboButton {
                 text: "Press me"
                 objectName: "combobutton_expanded"

=== removed file 'src/Ubuntu/Components/1.3/Button.qml'
--- src/Ubuntu/Components/1.3/Button.qml	2015-09-28 14:36:54 +0000
+++ src/Ubuntu/Components/1.3/Button.qml	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-/*
- * Copyright 2015 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.4
-import Ubuntu.Components 1.3
-
-/*!
-    \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.defaultFont
-
-    /*!
-       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"
-
-    styleName: "ButtonStyle"
-}

=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2016-02-16 11:39:32 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2016-04-08 16:09:06 +0000
@@ -83,7 +83,6 @@
 	     1.3/AdaptivePageLayout.qml \
              1.3/AnimatedItem.qml \
              1.3/AppHeader.qml \
-             1.3/Button.qml \
              1.3/Captions.qml \
              1.3/CheckBox.qml \
              1.3/ComboButton.qml \

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml	2015-09-07 10:05:58 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml	2016-04-08 16:09:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2016 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,42 +14,47 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Florian Boucault <[e-mail]>
+ * Author: Pierre Bertet <[e-mail]>
  */
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 Item {
-    id: buttonForeground
+    id: root
 
     property alias text: label.text
     property alias textColor: label.color
     property alias iconSource: icon.source
-    property string iconPosition
     property real iconSize
     property real spacing
+    property alias font: label.font
+    property int iconPosition
     property bool hasIcon: iconSource != ""
     property bool hasText: text != ""
-    property alias font: label.font
+    property bool hasBoth: hasIcon && hasText
 
-    opacity: enabled ? 1.0 : 0.5
+    state: hasBoth && iconPosition === Button.After? "right" : "left"
+    implicitWidth: (
+        (hasText? label.width : 0) +
+        (hasBoth? spacing : 0) +
+        (hasIcon? icon.width : 0)
+    )
     implicitHeight: Math.max(icon.height, label.height)
-    state: hasIcon && hasText ? iconPosition : "center"
 
-    Image {
+    Icon {
         id: icon
+        visible: hasIcon
         anchors.verticalCenter: parent.verticalCenter
-        fillMode: Image.PreserveAspectFit
         width: iconSize
         height: iconSize
+        color: textColor
     }
 
     Label {
         id: label
-        anchors {
-            verticalCenter: parent.verticalCenter
-            verticalCenterOffset: units.dp(-1)
-        }
+        visible: hasText
+        anchors.verticalCenter: parent.verticalCenter
         elide: Text.ElideRight
     }
 
@@ -58,58 +63,30 @@
             name: "left"
             AnchorChanges {
                 target: icon
-                anchors.left: buttonForeground.left
+                anchors.left: root.left
             }
             AnchorChanges {
                 target: label
-                anchors.left: icon.right
+                anchors.left: hasIcon? icon.right : root.left
             }
             PropertyChanges {
                 target: label
-                anchors.leftMargin: spacing
-                width: buttonForeground.width - icon.width - spacing
-            }
-            PropertyChanges {
-                target: buttonForeground
-                implicitWidth: icon.implicitWidth + spacing + label.implicitWidth
+                anchors.leftMargin: hasIcon? units.gu(1) : 0
             }
         },
         State {
             name: "right"
             AnchorChanges {
                 target: icon
-                anchors.right: buttonForeground.right
-            }
-            AnchorChanges {
-                target: label
-                anchors.left: buttonForeground.left
-            }
-            PropertyChanges {
-                target: label
-                width: buttonForeground.width - icon.width - spacing
-            }
-            PropertyChanges {
-                target: buttonForeground
-                implicitWidth: label.implicitWidth + spacing + icon.implicitWidth
-            }
-        },
-        State {
-            name: "center"
-            AnchorChanges {
-                target: icon
-                anchors.horizontalCenter: buttonForeground.horizontalCenter
-            }
-            AnchorChanges {
-                target: label
-                anchors.horizontalCenter: buttonForeground.horizontalCenter
-            }
-            PropertyChanges {
-                target: label
-                width: Math.min(label.implicitWidth, buttonForeground.width)
-            }
-            PropertyChanges {
-                target: buttonForeground
-                implicitWidth: hasText ? label.implicitWidth : icon.implicitWidth
+                anchors.right: root.right
+            }
+            AnchorChanges {
+                target: label
+                anchors.right: icon.left
+            }
+            PropertyChanges {
+                target: label
+                anchors.rightMargin: units.gu(1)
             }
         }
     ]

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml	2015-12-09 14:45:54 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml	2016-04-08 16:09:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2016 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,169 +14,172 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Florian Boucault <[e-mail]>
+ * Author: Pierre Bertet <[e-mail]>
  */
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
+import Ubuntu.Components.Private 1.3
 
 Item {
     id: buttonStyle
 
     property var button: styledItem
-    property real minimumWidth: units.gu(10)
-    property real horizontalPadding: units.gu(1)
-    // FIXME: Add this color to the palette
-    property color defaultColor: "#b2b2b2"
-    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)
+    property real minimumWidth: button.iconName && button.text? 0 : units.gu(10)
+    property real horizontalPadding: units.gu(2)
+    property real iconSpacing: units.gu(1)
+
+    property QtObject palette: (
+        button.enabled? theme.palette.normal : theme.palette.disabled
+    )
+
+    property color color: {
+        // In Outline mode, the border has the same color than the text
+        if (button.type === Button.Outline) {
+            return textColor
+        }
+        if (button.type === Button.Positive) {
+            return palette.positive
+        }
+        if (button.type === Button.Negative) {
+            return palette.negative
+        }
+        return palette.foreground
+    }
+
+    property color textColor: {
+        if (button.type === Button.Positive) {
+            return palette.positiveText
+        }
+        if (button.type === Button.Negative) {
+            return palette.negativeText
+        }
+        return palette.foregroundText
+    }
+
+    property real frameThickness: units.dp(1)
+
+    property real radius: units.gu(0.6)
+
+    property color overlayColor: palette.foregroundText
+
+    property font defaultFont: Qt.font({
+        family: "Ubuntu",
+        pixelSize: FontUtils.sizeToPixels("medium"),
+    })
+
     /*!
       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
       the default coloured background with an image or any other drawing.
       The default value is null.
-      */
+    */
     property Item backgroundSource: null
 
     width: button.width
     height: button.height
-    implicitWidth: Math.max(minimumWidth, foreground.implicitWidth + 2*horizontalPadding)
+    implicitWidth: Math.max(minimumWidth, foreground.width + 2 * horizontalPadding)
     implicitHeight: units.gu(4)
 
-    LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
+    LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
 
-    /*! \internal */
-    // Color properties in a JS ternary operator don't work as expected in
-    // QML because it overwrites alpha values with 1. A workaround is to use
-    // Qt.rgba(). For more information, see
-    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197802 and
-    // https://bugreports.qt-project.org/browse/QTBUG-32238.
-    function __colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }
-
-
-    /* The proxy is necessary because Gradient.stops and GradientStop.color are
-       non-NOTIFYable properties. They cannot be written to so it is fine but
-       the proxy avoids the warnings.
-    */
-    property QtObject gradientProxy: gradientProxyObject
-    QtObject {
-        id: gradientProxyObject
-        property color topColor
-        property color bottomColor
-
-        function updateGradient() {
-            if (button.gradient) {
-                topColor = button.gradient.stops[0].color;
-                bottomColor = button.gradient.stops[1].color;
-            }
-        }
-
-        Component.onCompleted: {
-            updateGradient();
-            button.gradientChanged.connect(updateGradient);
-        }
-    }
-
-    // Use the gradient if it is defined and the color has not been set manually
-    // or the gradient has been set manually
-    property bool isGradient: button.gradient && (button.color == defaultColor ||
-                              button.gradient != defaultGradient)
-
     FocusShape {
     }
 
-    Image {
-        id: strokeBorder
-        anchors.fill: parent
-        anchors.margins: -units.gu(0.5)
-        // FIXME: this PNG is way too big (462x108) and do not scale properly
-        // ie. the corners are visually incorrect at most sizes
-        source: stroke ? Qt.resolvedUrl("../artwork/stroke_button.png") : ""
-        visible: false
-        cache: false
-        asynchronous: true
-    }
-
-    ShaderEffect {
-        id: colorizedImage
-
-        anchors.fill: parent
-        visible: stroke && strokeBorder.status == Image.Ready
-
-        property Item source: visible ? strokeBorder : null
-        property color keyColorOut: stroke ? button.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"  // Deprecated, use a dedicated shape.
-        visible: stroke ? false : ((backgroundColor.a != 0.0) || backgroundSource)
-        source: backgroundSource
-
-        backgroundColor: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.topColor) : __colorHack(button.color))
-        secondaryBackgroundColor: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.bottomColor) : __colorHack(button.color))
-        backgroundMode: isGradient ? UbuntuShape.VerticalGradient : UbuntuShape.SolidColor
-        opacity: styledItem.enabled ? 1.0 : 0.6
-    }
-
-    UbuntuShape {
-        id: backgroundPressed
-        anchors.fill: parent
-        backgroundColor: stroke ? button.strokeColor : background.backgroundColor
-        secondaryBackgroundColor: background.secondaryBackgroundColor
-        backgroundMode: stroke ? UbuntuShape.SolidColor : UbuntuShape.VerticalGradient
-        borderSource: "radius_pressed.sci"  // Deprecated, use a dedicated shape.
-        opacity: button.pressed ? 1.0 : 0.0
-        Behavior on opacity {
-            NumberAnimation {
-                duration: UbuntuAnimation.SnapDuration
-                easing.type: Easing.Linear
-            }
-        }
-        visible: stroke || background.visible
-    }
-
+    // Drop shadow
+    ShapeShadow {
+        visible: button.enabled
+        opacity: (
+            button.type === Button.Outline ||
+            styledItem.keyNavigationFocus ||
+            button.pressed? 0 : 1
+        )
+        width: parent.width
+        height: parent.height
+        radius: buttonStyle.radius
+        style: ShapeShadow.Outer
+        angle: 90
+        distance: units.gu(0.1)
+        size: units.gu(0.1)
+        color: Qt.rgba(0, 0, 0, 0.2)
+        Behavior on opacity {
+            UbuntuNumberAnimation {
+                duration: UbuntuAnimation.SnapDuration
+            }
+        }
+    }
+
+    // Background shape
+    ShapeFill {
+        anchors.fill: parent
+        visible: (
+            button.type !== Button.Outline ||
+            button.keyNavigationFocus ||
+            (button.hovered && !button.pressed)
+        )
+        color: {
+            var baseColor = buttonStyle.color
+            if (button.keyNavigationFocus && button.type === Button.Outline) {
+                return Qt.rgba(0, 0, 0, 0.15)
+            }
+            if (button.hovered && !button.pressed) {
+                return button.type === Button.Outline
+                    ? Qt.rgba(0, 0, 0, 0.05)
+                    : Qt.tint(buttonStyle.color, Qt.rgba(0, 0, 0, 0.05))
+            }
+            return buttonStyle.color
+        }
+        radius: buttonStyle.radius
+        Behavior on opacity {
+            UbuntuNumberAnimation {
+                duration: UbuntuAnimation.SnapDuration
+            }
+        }
+        Behavior on color {
+            enabled: button.type !== Button.Outline
+            ColorAnimation {
+                duration: UbuntuAnimation.SnapDuration
+            }
+        }
+    }
+
+    // Outline
+    ShapeFrame {
+        anchors.fill: parent
+        visible: button.type === Button.Outline && !button.keyNavigationFocus
+        color: buttonStyle.color
+        radius: buttonStyle.radius
+        thickness: frameThickness
+        Behavior on opacity {
+            UbuntuNumberAnimation {
+                duration: UbuntuAnimation.SnapDuration
+            }
+        }
+        Behavior on color {
+            ColorAnimation {
+                duration: UbuntuAnimation.SnapDuration
+            }
+        }
+    }
+
+    // Foreground (text and icon)
     ButtonForeground {
         id: foreground
-        width: parent.width - 2*horizontalPadding
         anchors {
             centerIn: parent
-            horizontalCenterOffset: buttonFaceOffset
         }
         text: button.text
-        /* 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 && !(stroke && !button.pressed) ? "#FFFFFF" : "#888888"
+        textColor: buttonStyle.textColor
         iconSource: button.iconSource
-        iconPosition: button.iconPosition
-        iconSize: units.gu(3)
-        font: button.font
-        spacing: horizontalPadding
+        iconPosition: (
+            button.iconPosition !== undefined
+                ? button.iconPosition
+                : Button.Before
+        )
+        iconSize: units.gu(2)
+        font: button.font || defaultFont
+        spacing: iconSpacing
         transformOrigin: Item.Top
-        scale: button.pressed ? 0.98 : 1.0
-        Behavior on scale {
-            NumberAnimation {
-                duration: UbuntuAnimation.SnapDuration
-                easing.type: Easing.Linear
-            }
-        }
     }
 }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2016-03-01 15:06:38 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2016-04-08 16:09:06 +0000
@@ -20,14 +20,22 @@
 
 Palette {
     normal: AmbianceNormal {}
+
     disabled: AmbianceNormal {
-        field: UbuntuColors.porcelain;
-        // inactive is 30% opaque normal
         Component.onCompleted: {
+            // specific disabled colors
+            var diff = {
+                field: UbuntuColors.porcelain,
+                positiveText: normal.positiveText,
+                negativeText: normal.negativeText,
+            };
             for (var p in normal) {
                 // skip objectName and all change signals
-                if (p == "objectName" || p == "field" || p.indexOf("Changed") > 0) continue;
-                disabled[p] = Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.3);
+                if (p === "objectName" || p.indexOf("Changed") > 0) continue;
+                disabled[p] = diff[p] || (
+                    // if not specific, colors are 30% opaque normal
+                    Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.3)
+                );
             }
         }
     }
@@ -35,18 +43,22 @@
     // selected differs from normal in background, base, foreground
     selected: AmbianceSelected {}
 
-    // selected differs from normal in background, base, foreground
+    // selected disabled differs from normal in background, base, foreground
     selectedDisabled: AmbianceSelected {
-        background: UbuntuColors.porcelain
-        base: UbuntuColors.porcelain
-        foreground: UbuntuColors.porcelain
-        // inactive is 30% opaque normal
         Component.onCompleted: {
+            // specific selected-disabled colors
+            var diff = {
+                background: UbuntuColors.porcelain,
+                base: UbuntuColors.porcelain,
+                foreground: UbuntuColors.porcelain,
+            };
             for (var p in selected) {
                 // skip objectName and all change signals
-                if (p == "objectName" || p.indexOf("Changed") > 0
-                        || p == "background" || p == "base" || p == "foreground" ) continue;
-                selectedDisabled[p] = Qt.rgba(selected[p].r, selected[p].g, selected[p].b, 0.3);
+                if (p === "objectName" || p.indexOf("Changed") > 0) continue;
+                selectedDisabled[p] = diff[p] || (
+                    // if not specific, colors are 30% opaque normal
+                    Qt.rgba(selected[p].r, selected[p].g, selected[p].b, 0.3)
+                );
             }
         }
     }

=== added file 'src/Ubuntu/Components/Themes/Ambiance/1.3/TextButtonStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/TextButtonStyle.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/TextButtonStyle.qml	2016-04-08 16:09:06 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2016 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/>.
+ *
+ * Author: Florian Boucault <[e-mail]>
+ * Author: Pierre Bertet <[e-mail]>
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Private 1.3
+
+Item {
+    id: root
+
+    property var button: styledItem
+    property real minWidth: units.gu(10)
+    property real hPadding: units.gu(2)
+    property QtObject palette: (
+        button.enabled? theme.palette.normal : theme.palette.disabled
+    )
+    property color bgColor: palette.foreground
+    property color textColor: palette.foregroundText
+    property real radius: units.gu(0.6)
+    property font font: Qt.font({
+        family: "Ubuntu",
+        weight: button.strong? Font.Normal : Font.Light,
+        pixelSize: FontUtils.sizeToPixels("medium"),
+    })
+
+    width: button.width
+    height: button.height
+    implicitWidth: Math.max(minWidth, foreground.width + 2 * hPadding)
+    implicitHeight: units.gu(4)
+
+    LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft
+    LayoutMirroring.childrenInherit: true
+
+    FocusShape {
+    }
+
+    // Background (on hover)
+    ShapeFill {
+        id: background
+        visible: background.color.a > 0
+        anchors.fill: parent
+        radius: root.radius
+        opacity: button.hovered? 1 : 0
+        color: root.bgColor
+        Behavior on opacity {
+            UbuntuNumberAnimation {
+                duration: UbuntuAnimation.SnapDuration
+            }
+        }
+    }
+
+    Label {
+        id: foreground
+        anchors.centerIn: parent
+        text: button.text
+        elide: Text.ElideRight
+        color: root.textColor
+        font: root.font
+    }
+}

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
--- src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2016-02-19 11:18:51 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2016-04-08 16:09:06 +0000
@@ -80,6 +80,7 @@
              1.3/BubbleShape.qml \
              1.3/ButtonForeground.qml \
              1.3/ButtonStyle.qml \
+             1.3/TextButtonStyle.qml \
              1.3/CheckBoxStyle.qml \
              1.3/ComboButtonStyle.qml \
              1.3/DatePickerStyle.qml \

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/qmldir'
--- src/Ubuntu/Components/Themes/Ambiance/qmldir	2016-02-19 11:18:51 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/qmldir	2016-04-08 16:09:06 +0000
@@ -77,6 +77,7 @@
 PageHeadStyle 1.3 ./1.3/PageHeadStyle.qml
 Palette 1.3 ./1.3/Palette.qml
 ButtonStyle 1.3 ./1.3/ButtonStyle.qml
+TextButtonStyle 1.3 ./1.3/TextButtonStyle.qml
 SliderStyle 1.3 ./1.3/SliderStyle.qml
 SwitchStyle 1.3 ./1.3/SwitchStyle.qml
 CheckBoxStyle 1.3 ./1.3/CheckBoxStyle.qml

=== added file 'src/Ubuntu/Components/plugin/button.cpp'
--- src/Ubuntu/Components/plugin/button.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/button.cpp	2016-04-08 16:09:06 +0000
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2016 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/>.
+ *
+ * Author: Pierre Bertet <[e-mail]>
+ */
+
+#include "button_p.h"
+#include "ucstyleditembase_p.h"
+#include "ucnamespace.h"
+
+namespace UbuntuToolkit {
+
+ButtonPrivate::ButtonPrivate()
+    : UCAbstractButtonPrivate()
+    , type(Button::Normal)
+    , font(QFont())
+    , iconPosition(Button::Before)
+    , color(QColor())
+    , strokeColor(QColor())
+    , gradient(QGradient())
+{
+}
+
+/*!
+\qmltype Button
+\instantiates UbuntuToolkit::Button
+\inherits UCAbstractButton
+\inqmlmodule Ubuntu.Components 1.3
+\ingroup ubuntu
+\brief Standard Ubuntu button.
+
+The Button component allows to create a button that follows the Ubuntu visual and behavioral standards.
+
+Several types are available: normal, the default, will be represented by an opaque shape with the text above it, while the outline type will display a transparent button with a border. The positive and negative types can be used to indicate the nature of the action.
+
+\l {http://design.ubuntu.com/apps/building-blocks/buttons}{See also the Design Guidelines on Buttons}.
+
+Example:
+\qml
+     Column {
+         Button {
+             text: "Send"
+             onClicked: print("clicked text-only Button")
+         }
+         Button {
+             iconName: "compose"
+             onClicked: print("clicked icon-only Button")
+         }
+     }
+\endqml
+
+An \l Action can be used to specify \b clicked, iconSource and text:
+\qml
+      Item {
+          Action {
+              id: action1
+              text: "Click me"
+              onTriggered: print("action!")
+              iconName: "compose"
+          }
+          Button {
+              anchors.centerIn: parent
+              action: action1
+          }
+     }
+\endqml
+
+\sa TextButton
+*/
+Button::Button(QQuickItem* parent)
+    : UCAbstractButton(*(new ButtonPrivate), parent)
+{
+    /*
+     * From ucbottomedgehint.cpp:
+     * we cannot use setStyleName as that will trigger style loading
+     * and the qmlEngine is not known at this phase of the of the
+     * initialization. Therefore we simply set the style name default. Style
+     * loading will happen during component completion.
+     */
+    UCStyledItemBasePrivate::get(this)->styleDocument = QStringLiteral("ButtonStyle");
+}
+
+/*!
+   \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.
+*/
+
+/*!
+   \qmlproperty string Button::text
+   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.
+*/
+
+/*!
+ \qmlsignal Button::clicked()
+ This handler is called when there is a mouse click on the button and the
+ button is not disabled. If \l {ActionItem::action}{action} is defined, the
+ action will be triggered.
+ */
+
+/*!
+ *
+ * \qmlsignal Button::pressAndHold()
+ * This handler is called when there is a long press.
+ */
+
+/*!
+   \qmlproperty Action Button::action
+   An \l Action to specify the \l clicked, \l iconSource and \l text
+   properties.
+*/
+
+/*!
+  \qmlproperty enumeration Button::type
+  The type defines the button style. The default value is \c Button.Normal.
+  \list
+  \li \b Button.Normal - The button shape is visible.
+  \li \b Button.Outline - The button shape is transparent but a border is present.
+  \li \b Button.Positive - The action is positive.
+  \li \b Button.Negative - The action is negative.
+  \endlist
+*/
+Button::Type Button::type()
+{
+    Q_D(Button);
+    return d->type;
+}
+void Button::setType(Type &type)
+{
+    Q_D(Button);
+    d->type = type;
+    Q_EMIT typeChanged();
+}
+
+/*!
+  \qmlproperty string Button::font
+  The font used for the button's text.
+*/
+QFont Button::font()
+{
+    Q_D(Button);
+    return d->font;
+}
+void Button::setFont(QFont &font)
+{
+    Q_D(Button);
+    d->font = font;
+    Q_EMIT fontChanged();
+}
+
+/*!
+  \qmlproperty enumeration Button::iconPosition
+
+  Where to position the icon in the button. The default value is \c Button.Before.
+
+  \note 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.
+
+  \list
+  \li \b Button.Before - The icon is positioned before the text.
+  \li \b Button.After - The icon is positioned after the text.
+  \endlist
+*/
+Button::IconPosition Button::iconPosition()
+{
+    Q_D(Button);
+    return d->iconPosition;
+}
+void Button::setIconPosition(IconPosition &iconPosition)
+{
+    Q_D(Button);
+    d->iconPosition = iconPosition;
+    Q_EMIT iconPositionChanged();
+}
+
+/*!
+  \qmlproperty string Button::color
+  \deprecated
+  The property is deprecated, use `emphasis` or a custom style instead.
+*/
+QColor Button::color()
+{
+    Q_D(Button);
+    return d->color;
+}
+void Button::setColor(QColor &color)
+{
+    Q_D(Button);
+
+    qDebug() << color;
+    qDebug() << d->color;
+
+    if (color == d->color) {
+        return;
+    }
+    d->color = color;
+
+    qDebug() << color;
+    qDebug() << d->color;
+
+    UC_QML_DEPRECATION_WARNING("WARNING: `color` is deprecated. Use `emphasis` or `StyleHint` instead.");
+
+    Q_EMIT colorChanged();
+}
+
+/*!
+  \qmlproperty string Button::strokeColor
+  \deprecated
+  The property is deprecated, set `type` to "outline" instead.
+*/
+QColor Button::strokeColor()
+{
+    Q_D(Button);
+    return d->strokeColor;
+}
+void Button::setStrokeColor(QColor &strokeColor)
+{
+    Q_D(Button);
+    if (strokeColor == d->strokeColor) {
+        return;
+    }
+    d->strokeColor = strokeColor;
+
+    UC_QML_DEPRECATION_WARNING("WARNING: `strokeColor` is deprecated. Set the `type` property to Button.Type.Normal, or use `StyleHint` instead.");
+
+    Q_EMIT strokeColorChanged();
+}
+
+/*!
+  \qmlproperty string Button::gradient
+  \deprecated
+  The property is deprecated, use `type` or a custom style instead.
+*/
+QGradient Button::gradient()
+{
+    Q_D(Button);
+    return d->gradient;
+}
+void Button::setGradient(QGradient &gradient)
+{
+    Q_D(Button);
+    if (gradient == d->gradient) {
+        return;
+    }
+    d->gradient = gradient;
+
+    UC_QML_DEPRECATION_WARNING("WARNING: `gradient` is deprecated. Use `type`, `type`, or `StyleHint` instead.");
+
+    Q_EMIT gradientChanged();
+}
+
+}

=== added file 'src/Ubuntu/Components/plugin/button.h'
--- src/Ubuntu/Components/plugin/button.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/button.h	2016-04-08 16:09:06 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2016 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/>.
+ *
+ * Author: Pierre Bertet <[e-mail]>
+ */
+
+#ifndef BUTTON_H
+#define BUTTON_H
+
+#include "ucabstractbutton.h"
+
+namespace UbuntuToolkit {
+
+class ButtonPrivate;
+class Button : public UCAbstractButton
+{
+    Q_OBJECT
+
+    Q_ENUMS(IconPosition)
+    Q_ENUMS(Type)
+
+    Q_PROPERTY(Type type READ type WRITE setType NOTIFY typeChanged FINAL)
+    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged FINAL)
+    Q_PROPERTY(IconPosition iconPosition READ iconPosition WRITE setIconPosition NOTIFY iconPositionChanged FINAL)
+
+    // deprecated properties
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged FINAL)
+    Q_PROPERTY(QColor strokeColor READ strokeColor WRITE setStrokeColor NOTIFY strokeColorChanged FINAL)
+    Q_PROPERTY(QGradient gradient READ gradient WRITE setGradient NOTIFY gradientChanged FINAL)
+
+public:
+    explicit Button(QQuickItem* parent=0);
+
+    enum IconPosition { Before, left = Before, After, right = After };
+    enum Type { Normal, Outline, Positive, Negative };
+
+    Type type();
+    void setType(Type &type);
+
+    QFont font();
+    void setFont(QFont &font);
+
+    IconPosition iconPosition();
+    void setIconPosition(IconPosition &iconPosition);
+
+    QColor color();
+    void setColor(QColor &color);
+
+    QColor strokeColor();
+    void setStrokeColor(QColor &strokeColor);
+
+    QGradient gradient();
+    void setGradient(QGradient &gradient);
+
+Q_SIGNALS:
+    void typeChanged();
+    void fontChanged();
+    void iconPositionChanged();
+    void colorChanged();
+    void strokeColorChanged();
+    void gradientChanged();
+
+private:
+    Q_DECLARE_PRIVATE(Button)
+    Q_DISABLE_COPY(Button)
+};
+
+}
+
+QML_DECLARE_TYPE(UbuntuToolkit::Button)
+
+#endif // BUTTON_H

=== added file 'src/Ubuntu/Components/plugin/button_p.h'
--- src/Ubuntu/Components/plugin/button_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/button_p.h	2016-04-08 16:09:06 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2016 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/>.
+ */
+
+#ifndef BUTTON_P
+#define BUTTON_P
+
+#include "button.h"
+#include "ucabstractbutton_p.h"
+
+namespace UbuntuToolkit {
+
+class ButtonPrivate : public UCAbstractButtonPrivate
+{
+    Q_DECLARE_PUBLIC(Button)
+public:
+    explicit ButtonPrivate();
+
+    static ButtonPrivate *get(Button *item)
+    {
+        return item->d_func();
+    }
+
+    Button::Type type;
+    QFont font;
+    Button::IconPosition iconPosition;
+    QColor color;
+    QColor strokeColor;
+    QGradient gradient;
+};
+
+}
+
+#endif // BUTTON_P

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2016-04-08 16:09:04 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2016-04-08 16:09:06 +0000
@@ -80,6 +80,8 @@
 #include "ucperformancemonitor.h"
 #include "privates/ucpagewrapper.h"
 #include "privates/appheaderbase.h"
+#include "button.h"
+#include "textbutton.h"
 #include "privates/shape/shadow.h"
 #include "privates/shape/fill.h"
 #include "privates/shape/frame.h"
@@ -237,6 +239,8 @@
     qmlRegisterType<UCPageTreeNode>(uri, 1, 3, "PageTreeNode");
     qmlRegisterType<UCPopupContext>(uri, 1, 3, "PopupContext");
     qmlRegisterType<UCMainViewBase>(uri, 1, 3, "MainViewBase");
+    qmlRegisterType<UbuntuToolkit::Button>(uri, 1, 3, "Button");
+    qmlRegisterType<UbuntuToolkit::TextButton>(uri, 1, 3, "TextButton");
 }
 
 void UbuntuComponentsPlugin::initializeContextProperties(QQmlEngine *engine)

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2016-04-08 16:09:04 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2016-04-08 16:09:06 +0000
@@ -110,22 +110,20 @@
     $$PWD/ucmainviewbase.h \
     $$PWD/ucmainviewbase_p.h \
     $$PWD/ucperformancemonitor.h \
-    $$PWD/label_p.h \
     $$PWD/privates/listviewextensions.h \
     $$PWD/privates/ucpagewrapper.h \
     $$PWD/privates/ucpagewrapper_p.h \
     $$PWD/privates/ucpagewrapperincubator_p.h \
     $$PWD/privates/appheaderbase.h \
-<<<<<<< TREE
-    $$PWD/label_p.h \
-    $$PWD/ucbottomedgeregion_p.h
-=======
+    $$PWD/button.h \
+    $$PWD/textbutton.h \
     $$PWD/privates/shape/utils.h \
     $$PWD/privates/shape/texturefactory.h \
     $$PWD/privates/shape/fill.h \
     $$PWD/privates/shape/frame.h \
-    $$PWD/privates/shape/shadow.h
->>>>>>> MERGE-SOURCE
+    $$PWD/privates/shape/shadow.h \
+    $$PWD/label_p.h \
+    $$PWD/ucbottomedgeregion_p.h
 
 SOURCES += $$PWD/plugin.cpp \
     $$PWD/uctheme.cpp \
@@ -202,6 +200,8 @@
     $$PWD/privates/ucpagewrapper.cpp \
     $$PWD/privates/ucpagewrapperincubator.cpp \
     $$PWD/privates/appheaderbase.cpp \
+    $$PWD/button.cpp \
+    $$PWD/textbutton.cpp \
     $$PWD/privates/shape/utils.cpp \
     $$PWD/privates/shape/texturefactory.cpp \
     $$PWD/privates/shape/fill.cpp \

=== added file 'src/Ubuntu/Components/plugin/textbutton.cpp'
--- src/Ubuntu/Components/plugin/textbutton.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/textbutton.cpp	2016-04-08 16:09:06 +0000
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2016 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/>.
+ *
+ * Author: Pierre Bertet <[e-mail]>
+ */
+
+#include "textbutton_p.h"
+#include "ucstyleditembase_p.h"
+#include "ucnamespace.h"
+
+namespace UbuntuToolkit {
+
+TextButtonPrivate::TextButtonPrivate()
+    : UCAbstractButtonPrivate()
+    , strong(false)
+{
+}
+
+/*!
+\qmltype TextButton
+\instantiates UbuntuToolkit::TextButton
+\inherits UCAbstractButton
+\inqmlmodule Ubuntu.Components 1.3
+\ingroup ubuntu
+\brief Ubuntu text button.
+
+The TextButton component allows to create a text-only button that follows the Ubuntu visual and behavioral standards.
+
+The button can be strong, which will be represented by a bold font.
+
+\l {http://design.ubuntu.com/apps/building-blocks/buttons}{See also the Design Guidelines on Buttons}.
+
+Example:
+
+\qml
+TextButton {
+    text: "Send"
+    onClicked: print("clicked text-only Button")
+}
+\endqml
+
+An \l Action can be used to specify \b clicked and \b text:
+
+\qml
+Item {
+    Action {
+       id: myAction
+       text: "Click me"
+       onTriggered: print("action!")
+    }
+    TextButton {
+       action: myAction
+    }
+}
+\endqml
+
+\sa Button
+*/
+
+TextButton::TextButton(QQuickItem* parent)
+    : UCAbstractButton(*(new TextButtonPrivate), parent)
+{
+    /*
+     * From ucbottomedgehint.cpp:
+     * we cannot use setStyleName as that will trigger style loading
+     * and the qmlEngine is not known at this phase of the of the
+     * initialization. Therefore we simply set the style name default. Style
+     * loading will happen during component completion.
+     */
+    UCStyledItemBasePrivate::get(this)->styleDocument = QStringLiteral("TextButtonStyle");
+}
+
+/*!
+   \qmlproperty url TextButton::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.
+*/
+
+/*!
+    \qmlproperty string TextButton::text
+    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.
+*/
+
+/*!
+    \qmlsignal TextButton::clicked()
+    This handler is called when there is a mouse click on the button and the
+    button is not disabled. If \l {ActionItem::action}{action} is defined, the
+    action will be triggered.
+*/
+
+/*!
+    \qmlsignal TextButton::pressAndHold()
+    This handler is called when there is a long press.
+*/
+
+/*!
+    \qmlproperty Action TextButton::action
+    An \l Action to specify the clicked and \l text properties.
+*/
+
+/*!
+    \qmlproperty bool TextButton::strong
+    Set to `true` to give importance to the button. The button font will appear
+    in bold.
+*/
+bool TextButton::strong()
+{
+    Q_D(TextButton);
+    return d->strong;
+}
+void TextButton::setStrong(bool &strong)
+{
+    Q_D(TextButton);
+    d->strong = strong;
+    Q_EMIT strongChanged();
+}
+
+}

=== added file 'src/Ubuntu/Components/plugin/textbutton.h'
--- src/Ubuntu/Components/plugin/textbutton.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/textbutton.h	2016-04-08 16:09:06 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016 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/>.
+ *
+ * Author: Pierre Bertet <[e-mail]>
+ */
+
+#ifndef TEXTBUTTON_H
+#define TEXTBUTTON_H
+
+#include "ucabstractbutton.h"
+
+namespace UbuntuToolkit {
+
+class TextButtonPrivate;
+class TextButton : public UCAbstractButton
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool strong READ strong WRITE setStrong NOTIFY strongChanged)
+
+public:
+    explicit TextButton(QQuickItem* parent=0);
+
+    bool strong();
+    void setStrong(bool &strong);
+
+Q_SIGNALS:
+    void strongChanged();
+
+private:
+    Q_DECLARE_PRIVATE(TextButton)
+    Q_DISABLE_COPY(TextButton)
+};
+
+}
+
+QML_DECLARE_TYPE(UbuntuToolkit::TextButton)
+
+#endif  // TEXTBUTTON_H

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2016-03-01 19:36:40 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2016-04-08 16:09:06 +0000
@@ -104,7 +104,7 @@
 {
     d_func()->init();
 }
-UCAbstractButton::UCAbstractButton(UCAbstractButtonPrivate &&dd, QQuickItem *parent)
+UCAbstractButton::UCAbstractButton(UCAbstractButtonPrivate &dd, QQuickItem *parent)
     : UCActionItem(dd, parent)
 {
     d_func()->init();

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.h'
--- src/Ubuntu/Components/plugin/ucabstractbutton.h	2016-02-10 19:35:49 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.h	2016-04-08 16:09:06 +0000
@@ -60,7 +60,7 @@
     void pressAndHold();
 
 protected:
-    UCAbstractButton(UCAbstractButtonPrivate &&, QQuickItem *parent = 0);
+    UCAbstractButton(UCAbstractButtonPrivate &, QQuickItem *parent = 0);
 
     Q_DECLARE_PRIVATE(UCAbstractButton)
     Q_PRIVATE_SLOT(d_func(), void _q_mouseAreaPressed())

=== modified file 'src/Ubuntu/Components/qmldir'
--- src/Ubuntu/Components/qmldir	2016-02-16 11:39:32 +0000
+++ src/Ubuntu/Components/qmldir	2016-04-08 16:09:06 +0000
@@ -103,7 +103,6 @@
 ToolbarButton 1.3 1.3/ToolbarButton.qml
 MainView 1.3 1.3/MainView.qml
 ComboButton 1.3 1.3/ComboButton.qml
-Button 1.3 1.3/Button.qml
 Panel 1.3 1.3/Panel.qml
 Tab 1.3 1.3/Tab.qml
 TabBar 1.3 1.3/TabBar.qml

=== added file 'tests/unit/tst_performance/ButtonGrid13.qml'
--- tests/unit/tst_performance/ButtonGrid13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/ButtonGrid13.qml	2016-04-08 16:09:06 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2016 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.3
+import Ubuntu.Components 1.3
+
+Grid {
+    width: 800
+    height: 600
+    rows: 16
+    columns: 16
+    Repeater {
+        model: 16*16
+        Button {
+        }
+    }
+}

=== modified file 'tests/unit/tst_performance/tst_performance.cpp'
--- tests/unit/tst_performance/tst_performance.cpp	2015-12-07 22:16:52 +0000
+++ tests/unit/tst_performance/tst_performance.cpp	2016-04-08 16:09:06 +0000
@@ -110,7 +110,8 @@
         QTest::newRow("grid with Label 1.3") << "LabelGrid13.qml" << QUrl();
         QTest::newRow("grid with UbuntuShape") << "UbuntuShapeGrid.qml" << QUrl();
         QTest::newRow("grid with UbuntuShapePair") << "PairOfUbuntuShapeGrid.qml" << QUrl();
-        QTest::newRow("grid with Button") << "ButtonGrid.qml" << QUrl();
+        QTest::newRow("grid with Button 1.1") << "ButtonGrid.qml" << QUrl();
+        QTest::newRow("grid with Button 1.3") << "ButtonGrid13.qml" << QUrl();
         QTest::newRow("grid with Slider") << "SliderGrid.qml" << QUrl();
         QTest::newRow("list with QtQuick Item") << "ItemList.qml" << QUrl();
         QTest::newRow("list with new ListItem") << "ListItemList.qml" << QUrl();
@@ -131,7 +132,7 @@
         QTest::newRow("list of Scrollbar 1.3") << "ListOfScrollbars_1_3.qml" << QUrl();
         QTest::newRow("list of ScrollView 1.3 with both Scrollbars") << "ListOfScrollView_bothScrollbars_1_3.qml" << QUrl();
         // disable this test as it takes >20 seconds. Kept still for measurements to be done during development
-        //        QTest::newRow("list with ListItems.Base (one icon, one label and one chevron)") << "ListItemsBaseList.qml" << QUrl();
+        // QTest::newRow("list with ListItems.Base (one icon, one label and one chevron)") << "ListItemsBaseList.qml" << QUrl();
         QTest::newRow("single MainView") << "MainView.qml" << QUrl();
     }