Merge lp://qastaging/~osomon/webbrowser-app/oxide-context-menu into lp://qastaging/webbrowser-app

Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1142
Merged at revision: 1152
Proposed branch: lp://qastaging/~osomon/webbrowser-app/oxide-context-menu
Merge into: lp://qastaging/webbrowser-app
Diff against target: 2579 lines (+1390/-690)
34 files modified
debian/control (+2/-12)
debian/qtdeclarative5-ubuntu-web-plugin-assets.install (+0/-1)
debian/rules (+0/-4)
doc/WebView.qdoc (+44/-5)
src/Ubuntu/Web/CMakeLists.txt (+0/-3)
src/Ubuntu/Web/Selection.qml (+0/-161)
src/Ubuntu/Web/SelectionHandle.qml (+0/-47)
src/Ubuntu/Web/UbuntuWebView02.qml (+60/-156)
src/Ubuntu/Web/selection02.js (+2/-131)
src/app/CMakeLists.txt (+1/-0)
src/app/FileExtensionMapper.js (+11/-7)
src/app/FilePickerDialog.qml (+2/-2)
src/app/WebViewImpl.qml (+20/-9)
src/app/actions/Cut.qml (+23/-0)
src/app/actions/Erase.qml (+23/-0)
src/app/actions/Paste.qml (+23/-0)
src/app/actions/Redo.qml (+23/-0)
src/app/actions/SaveLink.qml (+23/-0)
src/app/actions/SelectAll.qml (+23/-0)
src/app/actions/Undo.qml (+23/-0)
src/app/browserapplication.cpp (+9/-0)
src/app/mime-database.cpp (+33/-0)
src/app/mime-database.h (+39/-0)
src/app/webbrowser/Browser.qml (+103/-26)
src/app/webbrowser/ContextMenuMobile.qml (+168/-0)
src/app/webbrowser/ContextMenuWide.qml (+158/-0)
src/app/webbrowser/assets/stock_link.svg (+164/-0)
src/app/webcontainer/WebViewImplOxide.qml (+42/-5)
tests/autopilot/webbrowser_app/emulators/browser.py (+33/-16)
tests/autopilot/webbrowser_app/tests/http_server.py (+28/-0)
tests/autopilot/webbrowser_app/tests/test_contextmenu.py (+177/-0)
tests/autopilot/webbrowser_app/tests/test_selection.py (+0/-92)
tests/unittests/qml/tst_FileExtensionMapper.qml (+39/-0)
tests/unittests/qml/tst_UbuntuWebView02.qml (+94/-13)
To merge this branch: bzr merge lp://qastaging/~osomon/webbrowser-app/oxide-context-menu
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Ugo Riboni (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+268786@code.qastaging.launchpad.net

Commit message

Use the contextMenu API new in oxide 1.8.
Update the visuals for the context menu in narrow and wide form factors.
Add text editing commands to the context menu.
Add unit and autopilot tests for the context menu features.
This bumps the runtime dependency of webapp-container and qtdeclarative5-ubuntu-web-plugin on liboxideqt-qmlplugin to 1.8.
This also removes the qtdeclarative5-ubuntu-web-plugin-assets binary package, which contained only one PNG asset which is not used anywhere any longer.

Description of the change

Use the contextMenu API new in oxide 1.8.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ugo Riboni (uriboni) wrote :

Works mostly as expected on desktop. Have not tested on device yet or ran tests myself.

I included various comments inline based on review of the code.

I am not sure if revision 1133 belongs in this MR, even though I understand why it was easy to include it. Up to you if you want to consider splitting it off, but it would certainly seem cleaner from a repository cleanliness point of view.

review: Needs Fixing
Revision history for this message
Olivier Tilloy (osomon) wrote :

Thanks for your thorough review. I replied all your comments inline (and updated the code where relevant). The only pending task is to update the code to use QMimeDatabase per your recommendation, which I’m working on now.

I removed the selection mechanism as part of this MR because in fact this new context menu implementation broke it even further (it had already been quite broken since its initial implementation, but this made things slightly worse, and I spent way too much time trying to fix it). In that regard it made sense to remove it now.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ugo Riboni (uriboni) wrote :

LGTM now and it all seems to work as expected. Tests are all ok too.

review: Approve
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Packaging changes are fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: