Merge lp:~sylvain-pineau/checkbox/ui_profiles into lp:checkbox
Status: | Merged |
---|---|
Approved by: | Zygmunt Krynicki |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2799 |
Proposed branch: | lp:~sylvain-pineau/checkbox/ui_profiles |
Merge into: | lp:checkbox |
Diff against target: |
366 lines (+76/-110) 12 files modified
checkbox-gui/checkbox-gui/WhiteListModelFactory.cpp (+10/-9) checkbox-gui/checkbox-gui/WhiteListModelFactory.h (+1/-1) checkbox-gui/checkbox-gui/checkbox-gui.pro (+2/-2) checkbox-gui/checkbox-gui/commandtool.cpp (+0/-15) checkbox-gui/checkbox-gui/commandtool.h (+0/-40) checkbox-gui/checkbox-gui/main.cpp (+10/-14) checkbox-gui/checkbox-gui/qml/SuiteSelectionView.qml (+0/-3) checkbox-gui/checkbox-gui/qml/WelcomeView.qml (+2/-6) checkbox-gui/checkbox-gui/settings.cpp (+26/-0) checkbox-gui/checkbox-gui/settings.h (+24/-0) checkbox-gui/gui-engine/gui-engine.cpp (+1/-17) checkbox-gui/gui-engine/gui-engine.h (+0/-3) |
To merge this branch: | bzr merge lp:~sylvain-pineau/checkbox/ui_profiles |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zygmunt Krynicki (community) | Approve | ||
Sylvain Pineau | Needs Resubmitting | ||
Brendan Donegan (community) | Needs Information | ||
Review via email: mp+211490@code.launchpad.net |
Description of the change
Add support for application settings using a QSettings object invokable from both C++ and QML.
An example of configuration file could be this one:
[welcome]
title = "blah blah"
text = "<p>Welcome to System Testing.
automated and manual tests to help you assess how well your system works
with Ubuntu.
tests in a predetermined order and automatically collect both system
information as well as test results. It will also prompt the user for input
when manual testing is required.
determined by which tests you decide to execute. The user will have the
opportunity to customize the test run based on the hardware components they
are interested in and the amount of time they have
available.
follow the onscreen instructions.
whitelist_filter = "^ihv-.*"
316 - whitelist. insert( child-> object_ path,true) ; insert( child-> object_ path, false);
317 + whitelist.
I don't understand this change, can you explain it?