Merge into trunk : dnd-tabs-001 : Code : webbrowser-app

Status:	Superseded
Proposed branch:	lp://qastaging/~ahayzen/webbrowser-app/dnd-tabs-001
Merge into:	lp://qastaging/webbrowser-app
Diff against target:	3380 lines (+1348/-1063) 41 files modified src/Ubuntu/Web/UbuntuWebContext.qml (+5/-2) src/Ubuntu/Web/UserAgent02.qml (+3/-3) src/app/BrowserView.qml (+2/-5) src/app/BrowserWindow.qml (+0/-13) src/app/CMakeLists.txt (+0/-1) src/app/actions/OpenLinkInNewWindow.qml (+23/-0) src/app/actions/OpenLinkInPrivateWindow.qml (+23/-0) src/app/browserapplication.cpp (+10/-45) src/app/browserapplication.h (+3/-7) src/app/webbrowser-window.cpp (+0/-51) src/app/webbrowser-window.h (+0/-57) src/app/webbrowser/Browser.qml (+147/-418) src/app/webbrowser/BrowserTab.qml (+18/-1) src/app/webbrowser/CMakeLists.txt (+2/-0) src/app/webbrowser/LeavePrivateModeDialog.qml (+0/-43) src/app/webbrowser/TabsBar.qml (+68/-3) src/app/webbrowser/drag-helper.cpp (+100/-0) src/app/webbrowser/drag-helper.h (+61/-0) src/app/webbrowser/reparenter.cpp (+36/-0) src/app/webbrowser/reparenter.h (+36/-0) src/app/webbrowser/webbrowser-app.cpp (+38/-6) src/app/webbrowser/webbrowser-app.desktop.in.in (+9/-0) src/app/webbrowser/webbrowser-app.h (+4/-1) src/app/webbrowser/webbrowser-app.qml (+455/-49) src/app/webcontainer/WebApp.qml (+2/-0) src/app/webcontainer/WebViewImplOxide.qml (+5/-7) src/app/webcontainer/WebappContainerWebview.qml (+5/-1) src/app/webcontainer/webapp-container.cpp (+51/-26) src/app/webcontainer/webapp-container.h (+7/-2) src/app/webcontainer/webapp-container.qml (+12/-3) tests/autopilot/webbrowser_app/__init__.py (+4/-1) tests/autopilot/webbrowser_app/emulators/browser.py (+0/-55) tests/autopilot/webbrowser_app/tests/__init__.py (+22/-0) tests/autopilot/webbrowser_app/tests/test_contextmenu.py (+29/-0) tests/autopilot/webbrowser_app/tests/test_fullscreen.py (+0/-54) tests/autopilot/webbrowser_app/tests/test_keyboard.py (+22/-0) tests/autopilot/webbrowser_app/tests/test_multiple_windows.py (+40/-0) tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+0/-49) tests/autopilot/webbrowser_app/tests/test_private.py (+0/-115) tests/autopilot/webbrowser_app/tests/test_tabs.py (+0/-45) tests/unittests/qml/tst_BrowserWindow.qml (+106/-0)
To merge this branch:	bzr merge lp://qastaging/~ahayzen/webbrowser-app/dnd-tabs-001
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-09-28
Ubuntu Phablet Team		2016-09-28	Pending
Review via email: mp+307051@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2016-09-28.

Commit message

WIP Drag and drop support

Description of the change

WIP Drag and drop support, proposing so that we can get debs easily.

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-09-28:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/661/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~ahayzen/webbrowser-app/dnd-tabs-001 updated on 2016-11-28

1519. By Andrew Hayzen on 2016-09-29: * Fix reparenting by ensuring that QML context is not set to a window
* Changes to BrowserTab declaration so that properties can be set after creation
* Allow unit tests to run
1520. By Andrew Hayzen on 2016-09-30: * Add destruction code to repearenter so that it correctly destroys any contexts and objects left
1521. By Andrew Hayzen on 2016-09-30: * Change behaviour so if dropped in the bottom part of the browser window it generates a new window
1522. By Andrew Hayzen on 2016-09-30: * If dragging within the original window and Chrome when in multi-window drag, move tab delegate with mouse
* Move drag handle to bottom right of mouse instead of centred
* When dragging the tab delegate don't animate it
1523. By Andrew Hayzen on 2016-09-30: * Reenable animation when dragging as model moves depend on it
1524. By Andrew Hayzen on 2016-10-04: * Only allow tabs to be dragged to windows of the same incognito type
1525. By Andrew Hayzen on 2016-10-04: * Raise window when DropArea is entered
* Change styling of DropArea
* Add "Move to New Window" context item to tab delegates
1526. By Andrew Hayzen on 2016-10-10: * Add autopilot tests TestMultipleWindowsDrag to ensure that drag and drop functions correct in wide mode
1527. By Andrew Hayzen on 2016-10-10: * Merge of trunk
1528. By Andrew Hayzen on 2016-10-12: * Update autopilot tests to use new switch_to_unfocused_window which improves switching on unity7 env
1529. By Andrew Hayzen on 2016-10-13: * Add Reparenter unit tests
1530. By Andrew Hayzen on 2016-10-14: * Merge of lp:webbrowser-app/staging and resolve conflicts
1531. By Andrew Hayzen on 2016-10-14: * Fix for progress bar appearing after tab is dragged out
1532. By Andrew Hayzen on 2016-10-24: * Be more declarative in DropArea
* Change use of DropActions to make more sense
* Change unit test to use default timeout
* Allow setting of expectedAction in DragHelper
* Update uses of null to Q_NULLPTR
* Disable dragging on mir clients
1533. By Andrew Hayzen on 2016-10-24: * Limit y diff of visual tabitem when dragging
1534. By Andrew Hayzen on 2016-10-26: * Fix regression where new tabs have massive favicons
1535. By Andrew Hayzen on 2016-10-26: * Remove white shade on bottom part of browser to match design
1536. By Andrew Hayzen on 2016-10-27: * Revert change in use of DropAction as dropping outside of a DropArea is always IgnoreAction
* Change test_drag_tab_outside_new_window to move the tab below the window
* Change property tabsBarHeight to be real rather than int
1537. By Andrew Hayzen on 2016-10-27: * Revert .pot changes
1538. By Andrew Hayzen on 2016-10-27: * Revert changes to test as it was fine before :-)
1539. By Andrew Hayzen on 2016-11-08: * Remove referenes to browser, tabModel and windo in TabsBar.qml
* Remove reference to builder in Browser.qml
* Allowed passing of properties to Reparenter::createObject()
* Made Reparenter a singleton
* Moved buildContextProperties() and createTabHelper() into internal to make them private
* Change dropArea.heightThreshold to be real not int
* Removed many console.debug() calls
* Changes includes to be fully-qualified in drag-helper and reparenter
* Renamed closeMethod to callback for newWindowFromTab()
1540. By Andrew Hayzen on 2016-11-08: * Ensure that switchToTab is called after binding a new tab, otherwise the chrome's position can be broken
1541. By Andrew Hayzen on 2016-11-08: * Merge of lp:webbrowser-app/staging
1542. By Andrew Hayzen on 2016-11-08: * Update dropArea shade to match new design
* Fix for bad conflict resolution
1543. By Andrew Hayzen on 2016-11-08: * Fix for typo
1544. By Andrew Hayzen on 2016-11-10: * Add .dragging property to DragHelper so that drop area shade knows when a drag event is occuring
* Change DragHelper to a singleton
1545. By Andrew Hayzen on 2016-11-18: * Changed DragHelper to be a QObject and use member initialisation
* Changed Reparenter::createObject to use beginCreate and completeCreate
* Various fixes to reduce warnings under QML tests
1546. By Andrew Hayzen on 2016-11-18: * Use forward declaration of QQuickItem
1547. By Andrew Hayzen on 2016-11-18: * Fix for missed case of createTabHelper -> createTab
1548. By Andrew Hayzen on 2016-11-22: * Ensure webviews are not shown when newTabView is active
1549. By Andrew Hayzen on 2016-11-22: * Change keyboard shortcuts to use contentsContainer visibility instead of tabsContainer
1550. By Andrew Hayzen on 2016-11-24: * Use enabled rather than visible on the tabContainer to prevent events being stolen, otherwise chrome disappears when opening new tabs as the locationBarController.offset doesn't get set
1551. By Andrew Hayzen on 2016-11-25: * Before tab is closed, check if a new tab needs to be generated as the context will disappear
1552. By Andrew Hayzen on 2016-11-28: * Use deleteLater rather than delete item; otherwise on slower devices such as phones it crashes
* Don't delete the context if it was not removed from the reparenter context store
* Change qml test for reparenter to respect that the delete may take time to happen

webbrowser-app

Merge lp://qastaging/~ahayzen/webbrowser-app/dnd-tabs-001 into lp://qastaging/webbrowser-app

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers