Merge lp://staging/~artmello/ubuntu-system-settings/category-list-view into lp://staging/ubuntu-system-settings
Status: | Approved |
---|---|
Approved by: | Jonas G. Drange |
Approved revision: | 1772 |
Proposed branch: | lp://staging/~artmello/ubuntu-system-settings/category-list-view |
Merge into: | lp://staging/ubuntu-system-settings |
Diff against target: |
748 lines (+141/-313) 14 files modified
src/CMakeLists.txt (+0/-2) src/item-model.cpp (+21/-9) src/item-model.h (+2/-0) src/plugin-manager.cpp (+29/-51) src/plugin-manager.h (+2/-3) src/qml/CategorySection.qml (+0/-91) src/qml/MainWindow.qml (+57/-35) src/qml/UncategorizedItemsView.qml (+0/-72) src/ui.qrc (+0/-2) tests/mocks/SystemSettings/MockPluginManager.cpp (+9/-11) tests/mocks/SystemSettings/MockPluginManager.h (+3/-4) tests/mocks/SystemSettings/qmldir (+0/-2) tests/plugins/main/tst_MainWindow.qml (+2/-2) tests/tst_plugins.cpp (+16/-29) |
To merge this branch: | bzr merge lp://staging/~artmello/ubuntu-system-settings/category-list-view |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jonas G. Drange (community) | Approve | ||
system-apps-ci-bot | continuous-integration | Approve | |
Review via email: mp+321133@code.staging.launchpad.net |
Commit message
Change Categories list view to use ListView qml Component
- Change PluginManager to keep only one instance of ItemModel instead of one for each category;
- Change ItemModel to order entries taking category in account;
- Change MainWindow to use ListView instead of Columns;
- Update tests
Description of the change
Change Categories list view to use ListView qml Component
- Change PluginManager to keep only one instance of ItemModel instead of one for each category;
- Change ItemModel to order entries taking category in account;
- Change MainWindow to use ListView instead of Columns;
- Update tests
Unmerged revisions
- 1773. By Arthur Mello
-
Merge with trunk
- 1772. By Arthur Mello
-
Fix testMainWindow
- 1771. By Arthur Mello
-
Fix Plugins' sorting test
- 1770. By Arthur Mello
-
Disable sorting plugins test
- 1769. By Arthur Mello
-
Change Categories list view to use ListView qml Component
- Change PluginManager to keep only one instance of ItemModel instead of one for each category;
- Change ItemModel to order entries taking category in account;
- Change MainWindow to use ListView instead of Columns;
- Update tests;
FAILED: Continuous integration, rev:1769 /jenkins. canonical. com/system- apps/job/ lp-ubuntu- system- settings- ci/22/ /jenkins. canonical. com/system- apps/job/ build/2359/ console /jenkins. canonical. com/system- apps/job/ build-0- fetch/2359 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2176/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/2176/ console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2176/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/2176/ console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2176/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/2176/ console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-ubuntu- system- settings- ci/22/rebuild
https:/