Merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/computer-to-cloud-page into lp://qastaging/ubuntuone-control-panel
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Roberto Alsina | ||||||||
| Approved revision: | 296 | ||||||||
| Merged at revision: | 290 | ||||||||
| Proposed branch: | lp://qastaging/~nataliabidart/ubuntuone-control-panel/computer-to-cloud-page | ||||||||
| Merge into: | lp://qastaging/ubuntuone-control-panel | ||||||||
| Prerequisite: | lp://qastaging/~nataliabidart/ubuntuone-control-panel/cloud-to-computer-page | ||||||||
| Diff against target: |
1319 lines (+848/-56) 16 files modified
data/qt/controlpanel.ui (+7/-2) data/qt/local_folders.ui (+179/-0) ubuntuone/controlpanel/gui/__init__.py (+10/-0) ubuntuone/controlpanel/gui/qt/addfolder.py (+9/-5) ubuntuone/controlpanel/gui/qt/controlpanel.py (+4/-2) ubuntuone/controlpanel/gui/qt/folders.py (+298/-1) ubuntuone/controlpanel/gui/qt/gotoweb.py (+17/-1) ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py (+16/-7) ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+1/-1) ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+206/-0) ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py (+24/-5) ubuntuone/controlpanel/gui/qt/tests/test_wizard.py (+33/-15) ubuntuone/controlpanel/gui/qt/wizard.py (+33/-7) ubuntuone/controlpanel/tests/__init__.py (+9/-0) ubuntuone/controlpanel/tests/test_login_client.py (+1/-5) ubuntuone/controlpanel/tests/test_sd_client.py (+1/-5) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/computer-to-cloud-page | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
| Eric Casteleijn (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
To test IRL, please have nightlies installed and up to date. Then, from this branch, please run:
./setup.py clean build; U1_DEBUG=True PYTHONPATH=. bin/ubuntuone-
Assuming you already have U1 credentials, go to the devices tab and remove the current device. You will be presented with the initial screen, where you can play with:
From the dependency branch, you will get:
- closing from the button in the right bottom corner, you should get a confirmation dialog
- after login/register you should be presented with a screen to choose cloud folders to sync from your cloud to your desktop
- optionally, you can play with settings clicking on the button at the end of the folder listing
From this branch, you will get an additional page at the end to choose local folders to sync to your cloud. The list will offer some 'suggested' folders, and you can also add a custom folder using the 'add folder' button. Please note that changes will get applied *only* when the finish button is clicked.
Known bugs from this branch:
It all works as expected!
Code looks good, but it does use new style and old style formatting: The problem is that while new style formatting has an awesome syntax, it is reportedly much slower than the old style, *and* it may tie us to a newer Python than we want without good reason.
Old style formatting is not scheduled to ever disappear from the language so I feel we should stick with that, at least until the performance problems are solved, and everyone is on a python that supports it, but maybe just forever.