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 | ||||||||||||||||||||||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
Ugo Riboni (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email:
|
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-
This also removes the qtdeclarative5-
Description of the change
Use the contextMenu API new in oxide 1.8.
To post a comment you must log in.
FAILED: Continuous integration, rev:1128 jenkins. qa.ubuntu. com/job/ webbrowser- app-ci/ 2130/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 3828 jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- amd64-ci/ 884 jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- armhf-ci/ 884 jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- armhf-ci/ 884/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ webbrowser- app-vivid- i386-ci/ 884 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 3145 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 3825 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 3825/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 22758
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/ 2130/rebuild
http://