lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ubuntu-shape-icon

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 1594

PS Jenkins bot: Approve (continuous-integration) on 2015-08-06

Tim Peeters: Approve on 2015-08-06

Diff: 460 lines (+331/-6)

10 files modified

components.api (+1/-0)
examples/ubuntu-ui-toolkit-gallery/ShellIcon.qml (+49/-0)
examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml (+5/-0)
src/Ubuntu/Components/plugin/plugin.cpp (+2/-0)
src/Ubuntu/Components/plugin/plugin.pri (+2/-0)
src/Ubuntu/Components/plugin/ucshellicon.cpp (+60/-0)
src/Ubuntu/Components/plugin/ucshellicon.h (+41/-0)
src/Ubuntu/Components/plugin/ucubuntushape.cpp (+4/-5)
src/Ubuntu/Components/plugin/ucubuntushape.h (+2/-1)
tests/resources/ubuntushape/ShellIconTest.qml (+165/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1478130: [UbuntuShape] Add a dedicated shape for shell icons

High

Fix Released

Link a bug report

Related blueprints

1592. By Loïc Molinari on 2015-08-06

Fixed components.api.

1591. By Loïc Molinari on 2015-08-06

Added a shell icon example in the gallery.

1590. By Loïc Molinari on 2015-08-06

Renamed UbuntuShapeIcon to ShellIcon.

1589. By Loïc Molinari on 2015-08-06

Merged lp:ubuntu-ui-toolkit/staging.

1588. By Loïc Molinari on 2015-08-04

Fixed typo in th documentation.

1587. By Loïc Molinari on 2015-07-27

Changed relative radius value and increased higher allowed bound.

1586. By Loïc Molinari on 2015-07-27

Updated doc.

1585. By Loïc Molinari on 2015-07-27

Switched to PreserveAspectCrop fill mode as expected.

1584. By Loïc Molinari on 2015-07-27

Used _q_ prefix for private slots as required by guidelines.

1583. By Loïc Molinari on 2015-07-24

Added icon for the test.