Merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.90 into lp://qastaging/ubuntuone-control-panel/stable-3-0
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 253 |
| Merged at revision: | 252 |
| Proposed branch: | lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.90 |
| Merge into: | lp://qastaging/ubuntuone-control-panel/stable-3-0 |
| Diff against target: |
11249 lines (+1476/-8283) 75 files modified
bin/ubuntuone-control-panel-gtk (+0/-54) bin/ubuntuone-control-panel-qt (+8/-37) com.ubuntuone.controlpanel.gui.service.in (+0/-3) data/gtk/dashboard.ui (+0/-198) data/gtk/device.ui (+0/-279) data/gtk/devices.ui (+0/-44) data/gtk/install.ui (+0/-57) data/gtk/management.ui (+0/-334) data/gtk/overview.ui (+0/-308) data/gtk/services.ui (+0/-317) data/gtk/volumes.ui (+0/-98) data/qt/account.ui (+11/-5) data/qt/controlpanel.ui (+14/-11) data/qt/device.ui (+2/-2) data/qt/device_remote.ui (+1/-1) data/qt/devices.ui (+7/-4) data/qt/folders.ui (+16/-13) data/qt/images.qrc (+16/-11) data/qt/loadingoverlay.ui (+1/-4) data/qt/mainwindow.ui (+2/-2) data/qt/preferences.ui (+22/-19) data/qt/side_widget.ui (+214/-0) data/qt/signin.ui (+115/-155) data/qt/ubuntuone.qss (+48/-33) docs/ubuntuone-control-panel-gtk.1 (+0/-15) docs/ubuntuone-control-panel-qt.1 (+27/-0) po/POTFILES.in (+0/-8) run-tests (+3/-8) run-tests.bat (+1/-1) setup.py (+3/-40) ubuntuone/controlpanel/backend.py (+17/-4) ubuntuone/controlpanel/dbustests/test_gui_service.py (+0/-104) ubuntuone/controlpanel/gui/__init__.py (+57/-10) ubuntuone/controlpanel/gui/gtk/__init__.py (+0/-28) ubuntuone/controlpanel/gui/gtk/gui.py (+0/-1667) ubuntuone/controlpanel/gui/gtk/package_manager.py (+0/-62) ubuntuone/controlpanel/gui/gtk/tests/__init__.py (+0/-232) ubuntuone/controlpanel/gui/gtk/tests/test_gui.py (+0/-2179) ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py (+0/-780) ubuntuone/controlpanel/gui/gtk/tests/test_package_manager.py (+0/-181) ubuntuone/controlpanel/gui/gtk/tests/test_widgets.py (+0/-205) ubuntuone/controlpanel/gui/gtk/widgets.py (+0/-362) ubuntuone/controlpanel/gui/qt/__init__.py (+2/-1) ubuntuone/controlpanel/gui/qt/account.py (+9/-1) ubuntuone/controlpanel/gui/qt/controlpanel.py (+41/-7) ubuntuone/controlpanel/gui/qt/device.py (+11/-1) ubuntuone/controlpanel/gui/qt/devices.py (+9/-1) ubuntuone/controlpanel/gui/qt/filesyncstatus.py (+3/-13) ubuntuone/controlpanel/gui/qt/folders.py (+18/-5) ubuntuone/controlpanel/gui/qt/gui.py (+5/-1) ubuntuone/controlpanel/gui/qt/loadingoverlay.py (+7/-0) ubuntuone/controlpanel/gui/qt/main/__init__.py (+36/-4) ubuntuone/controlpanel/gui/qt/main/tests/__init__.py (+17/-0) ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+105/-0) ubuntuone/controlpanel/gui/qt/main/windows.py (+0/-3) ubuntuone/controlpanel/gui/qt/preferences.py (+33/-1) ubuntuone/controlpanel/gui/qt/side_widget.py (+81/-0) ubuntuone/controlpanel/gui/qt/signin.py (+8/-59) ubuntuone/controlpanel/gui/qt/systray.py (+8/-4) ubuntuone/controlpanel/gui/qt/tests/__init__.py (+24/-71) ubuntuone/controlpanel/gui/qt/tests/test_account.py (+0/-5) ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py (+0/-2) ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+19/-20) ubuntuone/controlpanel/gui/qt/tests/test_devices.py (+0/-5) ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py (+13/-26) ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+16/-3) ubuntuone/controlpanel/gui/qt/tests/test_gui.py (+11/-1) ubuntuone/controlpanel/gui/qt/tests/test_preferences.py (+2/-16) ubuntuone/controlpanel/gui/qt/tests/test_side_widget.py (+90/-0) ubuntuone/controlpanel/gui/qt/tests/test_signin.py (+39/-147) ubuntuone/controlpanel/gui/qt/tests/test_wizard.py (+158/-0) ubuntuone/controlpanel/gui/qt/ui/__init__.py (+1/-3) ubuntuone/controlpanel/gui/qt/wizard.py (+110/-0) ubuntuone/controlpanel/gui/tests/__init__.py (+14/-7) ubuntuone/controlpanel/tests/test_web_client.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.90 |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Updating from trunk up to revno 276:
[ Natalia B. Bidart <email address hidden> ]
- Increasing timeout for webclient tests.
- Changed the initial signin page so both login and register options
are shown, and when clicked, the user is presented with either the Qt
login dialog, or the Qt registration dialog (LP: #933576).
- 'Apply these settings' button should be at the topmost right corner
in the Settings tab (LP: #944120).
- Handle properly default/non-default buttons (part of LP: #933576).
- Avoid AlreadyInstalle
- No more strings coming up from the Designer ui files (LP: #938626).
- Make gettext return unicode so we can format strings
with unicode variables (LP: #937809).
[ Roberto Alsina <email address hidden> ]
- Added a barebones manpage for ubuntuone-
(LP: #933021).
- Reset the signal handler so that ctrl+c works (LP: #944012).
- Preserved the scrollbar position when clearing/filling the folder
list (LP: #942355).
- Added keyboard shortcuts for quitting the control panel
(LP: #900753).
- Cleanup the ubuntuone-
the main module (LP: #938102).
- Parse Qt options correctly (LP: #910834).
- Migrated to argparse.
[ Rodney Dawes <email address hidden> ]
- Remove the GTK+ 2.x control panel
(LP: #934270).
- Pass ubuntuone-installer as app name to QApplication to avoid
duplication (LP: #939691).
+1