Merge lp://staging/~nataliabidart/ubuntuone-control-panel/all-ui-from-code into lp://staging/ubuntuone-control-panel
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 268 |
| Merged at revision: | 264 |
| Proposed branch: | lp://staging/~nataliabidart/ubuntuone-control-panel/all-ui-from-code |
| Merge into: | lp://staging/ubuntuone-control-panel |
| Prerequisite: | lp://staging/~nataliabidart/ubuntuone-control-panel/unicode-gettext |
| Diff against target: |
989 lines (+243/-88) 22 files modified
data/qt/account.ui (+5/-5) data/qt/controlpanel.ui (+7/-7) data/qt/device.ui (+2/-2) data/qt/device_remote.ui (+1/-1) data/qt/devices.ui (+4/-4) data/qt/folders.ui (+13/-13) data/qt/loadingoverlay.ui (+1/-4) data/qt/mainwindow.ui (+1/-1) data/qt/preferences.ui (+13/-13) data/qt/signin.ui (+7/-10) ubuntuone/controlpanel/gui/__init__.py (+53/-7) ubuntuone/controlpanel/gui/qt/account.py (+9/-1) ubuntuone/controlpanel/gui/qt/controlpanel.py (+25/-2) ubuntuone/controlpanel/gui/qt/device.py (+11/-1) ubuntuone/controlpanel/gui/qt/devices.py (+9/-1) ubuntuone/controlpanel/gui/qt/folders.py (+13/-5) ubuntuone/controlpanel/gui/qt/loadingoverlay.py (+7/-0) ubuntuone/controlpanel/gui/qt/preferences.py (+33/-1) ubuntuone/controlpanel/gui/qt/signin.py (+17/-3) ubuntuone/controlpanel/gui/qt/systray.py (+7/-2) ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+4/-2) ubuntuone/controlpanel/gui/qt/ui/__init__.py (+1/-3) |
| To merge this branch: | bzr merge lp://staging/~nataliabidart/ubuntuone-control-panel/all-ui-from-code |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
| Manuel de la Peña (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- No more strings coming up from the Designer ui files (LP: #938626).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Tedious work that had to be done +10000000