Merge lp://qastaging/~uriboni/webbrowser-app/newtabview-listviews into lp://qastaging/webbrowser-app
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~uriboni/webbrowser-app/newtabview-listviews |
Merge into: | lp://qastaging/webbrowser-app |
Prerequisite: | lp://qastaging/~artmello/webbrowser-app/webbrowser-app-bookmarks_view |
Diff against target: |
2461 lines (+1569/-407) 25 files modified
src/app/webbrowser/BookmarksFoldersView.qml (+151/-140) src/app/webbrowser/BookmarksFoldersViewWide.qml (+1/-2) src/app/webbrowser/BookmarksHeader.qml (+89/-0) src/app/webbrowser/BookmarksSection.qml (+74/-0) src/app/webbrowser/CMakeLists.txt (+2/-0) src/app/webbrowser/NewTabView.qml (+50/-120) src/app/webbrowser/UrlsList.qml (+40/-22) src/app/webbrowser/bookmarks-folderlist-model.cpp (+5/-0) src/app/webbrowser/bookmarks-folderlist-model.h (+1/-0) src/app/webbrowser/bookmarks-model.cpp (+12/-0) src/app/webbrowser/bookmarks-model.h (+5/-1) src/app/webbrowser/list-aggregator-model.cpp (+240/-0) src/app/webbrowser/list-aggregator-model.h (+82/-0) src/app/webbrowser/roles-adapter-model.cpp (+111/-0) src/app/webbrowser/roles-adapter-model.h (+50/-0) src/app/webbrowser/webbrowser-app.cpp (+4/-0) tests/autopilot/webbrowser_app/emulators/browser.py (+48/-17) tests/autopilot/webbrowser_app/tests/test_bookmark_options.py (+15/-15) tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+97/-89) tests/unittests/CMakeLists.txt (+2/-0) tests/unittests/bookmarks-model/tst_BookmarksModelTests.cpp (+6/-1) tests/unittests/list-aggregator-model/CMakeLists.txt (+13/-0) tests/unittests/list-aggregator-model/tst_ListAggregatorModelTests.cpp (+361/-0) tests/unittests/roles-adapter-model/CMakeLists.txt (+13/-0) tests/unittests/roles-adapter-model/tst_RolesAdapterModelTests.cpp (+97/-0) |
To merge this branch: | bzr merge lp://qastaging/~uriboni/webbrowser-app/newtabview-listviews |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Needs Fixing | |
PS Jenkins bot | continuous-integration | Needs Fixing | |
Olivier Tilloy | Needs Fixing | ||
Review via email:
|
Commit message
Refactor BookmarksFolder
Description of the change
Refactor BookmarksFolder
Unmerged revisions
- 1262. By Ugo Riboni
-
Merge changes from trunk
- 1261. By Ugo Riboni
-
Fix the utility method removing the first real bookmark in the list by taking into account the peculiarity of working with a LimitProxyModel
- 1260. By Ugo Riboni
-
Prevent the home bookmark from being deleted
- 1259. By Ugo Riboni
-
Fix one more stray reference to a non-singleton BookmarksModel
- 1258. By Ugo Riboni
-
Fix some AP tests after changes in UrlsList
- 1257. By Ugo Riboni
-
Make sure that data change signals from the aggregated models are propagated correctly
- 1256. By Ugo Riboni
-
Remove another startup bottleneck by turning the UrlsList into a ListView fed by a LimitProxyModel with the home page bookmarks aggregated at the start. This keeps NewTabView lean at startup.
- 1255. By Ugo Riboni
-
Merge changes from trunk
- 1254. By Ugo Riboni
-
Merge changes from trunk
- 1253. By Ugo Riboni
-
Merge changes from trunk
FAILED: Continuous integration, rev:1249 jenkins. qa.ubuntu. com/job/ webbrowser- app-ci/ 2377/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 4717 jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- amd64-ci/ 1131 jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- armhf-ci/ 1131 jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- armhf-ci/ 1131/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- i386-ci/ 1131 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 3810 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 4714 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 4714/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 24382
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/webbrowser- app-ci/ 2377/rebuild
http://