lp://staging/~laney/ubuntu-system-settings/reset-api

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu-system-settings at revision 863

PS Jenkins bot: Approve (continuous-integration) on 2014-07-31

Sebastien Bacher (community): Needs Fixing on 2014-07-29

Alberto Mardegan: Needs Fixing on 2014-03-03

Diff: 541 lines (+268/-30)

17 files modified

debian/control (+2/-0)
lib/SystemSettings/plugin-interface.h (+9/-0)
plugins/battery/plugin/battery-plugin.h (+3/-3)
plugins/brightness/plugin/brightness-plugin.h (+3/-3)
plugins/reset/ResetAllSettings.qml (+4/-2)
plugins/system-update/plugin/update-plugin.h (+4/-3)
src/plugin-manager.cpp (+12/-0)
src/plugin-manager.h (+1/-0)
src/plugin.cpp (+63/-5)
src/plugin.h (+2/-0)
tests/CMakeLists.txt (+4/-0)
tests/data/phone.settings (+9/-0)
tests/test-plugin.cpp (+18/-10)
tests/test-plugin.h (+3/-3)
tests/test-plugin2.cpp (+44/-0)
tests/test-plugin2.h (+41/-0)
tests/tst_plugins.cpp (+46/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

504. By Iain Lane on 2014-07-31

Merge trunk

503. By Iain Lane on 2014-03-03

If you have a plugin then it must be interface 2, otherwise you don't get to reset.

502. By Iain Lane on 2014-03-03

Don't need that loop, it's just a missing qtquick QML build-dep

501. By Iain Lane on 2014-03-03

No need to include QEventLoop in the test any more

500. By Iain Lane on 2014-03-03

Wait for the pageComponent to be ready in the reset method itself instead of the test

499. By Iain Lane on 2014-03-03

Don't leak component, don't include unused 'reset' property in tests

498. By Iain Lane on 2014-02-28

Try to wait for the page component to be ready to avoid test failures, maybe

497. By Iain Lane on 2014-02-28

Add some tests for the new reset api

496. By Iain Lane on 2014-02-27

Initialise the pointers to 0; add a "2" interface to not break ABI

495. By Iain Lane on 2014-02-27

(broken) Add a 'reset' API

Plugins can reset their settings in two ways

  - by providing a function 'bool reset()' in their 'plugin' which returns true
  - providing a javascript function 'reset' in their page component at the top level