lp:~macslow/unity8/launcher-icon-wobble

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity8 at revision 1887

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2015-07-21

Michael Zanetti (community): Approve on 2015-07-21

Albert Astals Cid (community): Abstain (tags clean & merges fine) on 2015-07-21

Diff: 1177 lines (+539/-43)

27 files modified

debian/control (+3/-3)
plugins/Greeter/Unity/Launcher/CMakeLists.txt (+1/-1)
plugins/Greeter/Unity/Launcher/launcheritem.cpp (+14/-0)
plugins/Greeter/Unity/Launcher/launcheritem.h (+4/-0)
plugins/Greeter/Unity/Launcher/launchermodelas.cpp (+7/-0)
plugins/Greeter/Unity/Launcher/launchermodelas.h (+1/-0)
plugins/Unity/Launcher/CMakeLists.txt (+1/-1)
plugins/Unity/Launcher/dbusinterface.cpp (+38/-20)
plugins/Unity/Launcher/dbusinterface.h (+1/-0)
plugins/Unity/Launcher/launcheritem.cpp (+23/-0)
plugins/Unity/Launcher/launcheritem.h (+3/-0)
plugins/Unity/Launcher/launchermodel.cpp (+32/-2)
plugins/Unity/Launcher/launchermodel.h (+3/-1)
qml/Launcher/LauncherDelegate.qml (+87/-1)
qml/Launcher/LauncherPanel.qml (+75/-4)
tests/mocks/Unity/Launcher/CMakeLists.txt (+1/-1)
tests/mocks/Unity/Launcher/MockLauncherItem.cpp (+19/-0)
tests/mocks/Unity/Launcher/MockLauncherItem.h (+3/-0)
tests/mocks/Unity/Launcher/MockLauncherModel.cpp (+40/-0)
tests/mocks/Unity/Launcher/MockLauncherModel.h (+3/-0)
tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt (+1/-1)
tests/plugins/Unity/Launcher/CMakeLists.txt (+1/-1)
tests/plugins/Unity/Launcher/launchermodeltest.cpp (+23/-7)
tests/qmltests/Launcher/tst_Launcher.qml (+144/-0)
tests/scripts/README (+5/-0)
tests/scripts/alert-launcher-icon.sh (+3/-0)
tests/scripts/list-launcher-icons.sh (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1841. By Mirco Müller on 2015-07-25

Merged mzanetti's branch fixing issues for launcher-icons of apps not pinned or running.

1840. By Mirco Müller on 2015-07-21

Fixed failures of xvfbtestLauncher run.

1839. By Mirco Müller on 2015-07-21

Merged with trunk and fixed conflicts.

1838. By Mirco Müller on 2015-07-17

Merged with trunk.

1837. By Mirco Müller on 2015-07-16

Added unit-test for new DBus-API Alert() of launcher-model.

1836. By Mirco Müller on 2015-07-16

Fixed launcher-model unit-test.

1835. By Mirco Müller on 2015-07-16

Added some handy shell-scripts for easier runtime-debugging of DBus-APIs on the device.

1834. By Mirco Müller on 2015-07-16

Changed DBus-interface for launcher-item from alert-flag to alert-method upon request in MP-comment.

1833. By Mirco Müller on 2015-07-16

Fixed suggestions from MP-comments.

1832. By Mirco Müller on 2015-07-16

Reverted deletion of progress-bar assets in r1780.