Ubuntu
webbrowser-app package

Use SortFilterModel for custom models

Bug #1480947 reported by Olivier Tilloy
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Canonical System Image
Fix Released
Medium
Bill Filler
Canonical System Image ww02-2016 "ota9"
webbrowser-app (Ubuntu)
Fix Released
Medium
Olivier Tilloy

Bug Description

While browsing the UITK documentation, I stumbled upon https://developer.ubuntu.com/api/apps/qml/sdk-15.04/Ubuntu.Components.SortFilterModel/, which is essentially QSortFilterProxyModel exposed to QML.

webbrowser-app has a number of custom models written in C++ that inherit QSortFilterProxyModel. Some of them could most likely be replaced by a pure QML component with this model from the UITK.

From a very quick glance, the following models are candidates:
 - HistoryDomainModel
 - BookmarksFolderModel
 - HistoryDomainListChronologicalModel

This would have the advantage of removing a significant amount of custom C++ code, speeding up build time and unit tests run time.

Tags: refactoring

Related branches

lp:~osomon/webbrowser-app/use-qml-SortFilterModel
PS Jenkins bot: Approve (continuous-integration)
Ugo Riboni (community): Approve
Diff: 2429 lines (+242/-1360)
42 files modified
src/app/webbrowser/CMakeLists.txt (+0/-4)
src/app/webbrowser/HistoryView.qml (+6/-6)
src/app/webbrowser/HistoryViewWide.qml (+12/-7)
src/app/webbrowser/NewTabView.qml (+1/-5)
src/app/webbrowser/NewTabViewWide.qml (+1/-6)
src/app/webbrowser/PreviewManager.qml (+1/-3)
src/app/webbrowser/TopSitesModel.qml (+31/-0)
src/app/webbrowser/history-domain-model.cpp (+4/-5)
src/app/webbrowser/history-domain-model.h (+5/-5)
src/app/webbrowser/history-domainlist-chronological-model.cpp (+0/-55)
src/app/webbrowser/history-domainlist-chronological-model.h (+0/-46)
src/app/webbrowser/history-domainlist-model.cpp (+4/-5)
src/app/webbrowser/history-domainlist-model.h (+6/-6)
src/app/webbrowser/history-lastvisitdate-model.cpp (+0/-141)
src/app/webbrowser/history-lastvisitdate-model.h (+0/-63)
src/app/webbrowser/history-lastvisitdatelist-model.cpp (+45/-7)
src/app/webbrowser/history-lastvisitdatelist-model.h (+1/-0)
src/app/webbrowser/history-model.cpp (+9/-1)
src/app/webbrowser/history-model.h (+2/-1)
src/app/webbrowser/history-timeframe-model.cpp (+0/-98)
src/app/webbrowser/history-timeframe-model.h (+0/-63)
src/app/webbrowser/limit-proxy-model.h (+1/-1)
src/app/webbrowser/top-sites-model.cpp (+0/-60)
src/app/webbrowser/top-sites-model.h (+0/-49)
src/app/webbrowser/webbrowser-app.cpp (+0/-8)
tests/unittests/CMakeLists.txt (+0/-4)
tests/unittests/history-domain-model/tst_HistoryDomainModelTests.cpp (+8/-14)
tests/unittests/history-domainlist-chronological-model/CMakeLists.txt (+0/-13)
tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp (+0/-110)
tests/unittests/history-domainlist-model/tst_HistoryDomainListModelTests.cpp (+11/-25)
tests/unittests/history-lastvisitdate-model/CMakeLists.txt (+0/-11)
tests/unittests/history-lastvisitdate-model/tst_HistoryLastVisitDateModelTests.cpp (+0/-138)
tests/unittests/history-lastvisitdatelist-model/tst_HistoryLastVisitDateListModelTests.cpp (+14/-35)
tests/unittests/history-model/tst_HistoryModelTests.cpp (+1/-1)
tests/unittests/history-timeframe-model/CMakeLists.txt (+0/-13)
tests/unittests/history-timeframe-model/tst_HistoryTimeframeModelTests.cpp (+0/-160)
tests/unittests/limit-proxy-model/tst_LimitProxyModelTests.cpp (+79/-60)
tests/unittests/qml/CMakeLists.txt (+0/-3)
tests/unittests/qml/tst_HistoryViewWide.qml (+0/-1)
tests/unittests/qml/tst_QmlTests.cpp (+0/-6)
tests/unittests/top-sites-model/CMakeLists.txt (+0/-13)
tests/unittests/top-sites-model/tst_TopSitesModelTests.cpp (+0/-108)
Olivier Tilloy (osomon)
Changed in webbrowser-app (Ubuntu):
status: New → Triaged
importance: Undecided → Medium
tags: added: refactoring
Revision history for this message
Olivier Tilloy (osomon) wrote :

Blocked on bug #1485674.

Olivier Tilloy (osomon)
Changed in webbrowser-app (Ubuntu):
assignee: nobody → Olivier Tilloy (osomon)
status: Triaged → In Progress
Revision history for this message
Olivier Tilloy (osomon) wrote :

The substitution of HistoryLastVisitDateModel with a SortFilterModel is blocked by bug #1495641.

Jean-Baptiste Lallement (jibel)
Changed in canonical-devices-system-image:
assignee: nobody → Bill Filler (bfiller)
importance: Undecided → Medium
milestone: none → ww02-2016
status: New → In Progress
Jean-Baptiste Lallement (jibel)
Changed in canonical-devices-system-image:
status: In Progress → Fix Committed
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package webbrowser-app - 0.23+16.04.20151204-0ubuntu1

---------------
webbrowser-app (0.23+16.04.20151204-0ubuntu1) xenial; urgency=medium

  [ CI Train Bot ]
  * New rebuild forced.
  * Resync trunk.

  [ Olivier Tilloy ]
  * Fix 3 autopilot test failures on desktop in narrow mode. (LP:
    #1522344)
  * Fix multiple keyboard focus/shortcut issues. (LP: #1522776,
    #1522783, #1522757, #1522767)
  * Replace custom models (HistoryDomainListChronologicalModel,
    HistoryLastVisitDateModel and TopSitesModel) with simple, pure QML
    SortFilterModel instances. Remove entirely HistoryTimeframeModel
    which was not needed any longer. (LP: #1480947)
  * Skip a test that requires HTTPS support in the test suite, which is
    lacking for now.
  * Update translation template.

 -- Olivier Tilloy <email address hidden> Fri, 04 Dec 2015 11:06:50 +0000

Changed in webbrowser-app (Ubuntu):
status: In Progress → Fix Released
Pat McGowan (pat-mcgowan)
Changed in canonical-devices-system-image:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.