lp:~uriboni/webbrowser-app/topsite-previews

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:webbrowser-app at revision 1228

Olivier Tilloy: Approve on 2015-10-13

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-10-12

Diff: 1917 lines (+957/-198)

25 files modified

src/app/webbrowser/Browser.qml (+37/-29)
src/app/webbrowser/BrowserTab.qml (+23/-19)
src/app/webbrowser/CMakeLists.txt (+1/-1)
src/app/webbrowser/HistoryModel.qml (+0/-24)
src/app/webbrowser/HistoryView.qml (+12/-4)
src/app/webbrowser/HistoryViewWide.qml (+19/-10)
src/app/webbrowser/NewTabView.qml (+55/-18)
src/app/webbrowser/NewTabViewWide.qml (+15/-28)
src/app/webbrowser/PreviewManager.qml (+91/-0)
src/app/webbrowser/SettingsPage.qml (+2/-3)
src/app/webbrowser/UrlPreviewDelegate.qml (+123/-0)
src/app/webbrowser/UrlPreviewGrid.qml (+90/-0)
src/app/webbrowser/file-operations.cpp (+7/-0)
src/app/webbrowser/file-operations.h (+3/-0)
src/app/webbrowser/qmldir (+1/-0)
src/app/webbrowser/webbrowser-app.cpp (+8/-1)
tests/autopilot/webbrowser_app/emulators/browser.py (+41/-8)
tests/autopilot/webbrowser_app/tests/__init__.py (+12/-6)
tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+5/-6)
tests/autopilot/webbrowser_app/tests/test_site_previews.py (+168/-0)
tests/unittests/qml/tst_BrowserTab.qml (+64/-1)
tests/unittests/qml/tst_HistoryViewWide.qml (+12/-6)
tests/unittests/qml/tst_NewTabViewWide.qml (+27/-32)
tests/unittests/qml/tst_PreviewManager.qml (+117/-0)
tests/unittests/qml/tst_QmlTests.cpp (+24/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1204. By Ugo Riboni on 2015-10-13

Fix failing AP test

1203. By Ugo Riboni on 2015-10-12

Make the GridView in narrow mode non interactive so that scrolling is fully managed by the Flickable container

1202. By Ugo Riboni on 2015-10-12

Align the preview to the top-left corner of the container as that's where most sites will have recognizable content when capture is taken with a small screen size

1201. By Ugo Riboni on 2015-10-08

Merge changes from trunk

1200. By Ugo Riboni on 2015-10-08

Add reference to ActionSelectionPopover's CPO bug preventing us to use click_action_button

1199. By Ugo Riboni on 2015-10-08

Refactor the margins code for the UrlPreviewGrid so that the usage is clearer and more intuitive

1198. By Ugo Riboni on 2015-10-08

Fix the highlight being clipped at the left edge in narrow mode

1197. By Ugo Riboni on 2015-10-08

Simplify the code for safely cleaning up previews at startup. Merge and clarify 1ms-timer-hack comments.

1196. By Ugo Riboni on 2015-10-08

Fix AP tests for non-wide form factors

1195. By Ugo Riboni on 2015-10-08

Fix failing AP test by ensuring that we perform the previews cleanup when both the HistoryModel has fully loaded and all the tabs that needed to be restored at startup have restored.