Merge lp://qastaging/~alecu/ubuntuone-control-panel/ui-scissors into lp://qastaging/ubuntuone-control-panel
Proposed by
Alejandro J. Cura
| Status: | Merged |
|---|---|
| Approved by: | Alejandro J. Cura |
| Approved revision: | 153 |
| Merged at revision: | 147 |
| Proposed branch: | lp://qastaging/~alecu/ubuntuone-control-panel/ui-scissors |
| Merge into: | lp://qastaging/ubuntuone-control-panel |
| Diff against target: |
1543 lines (+1256/-167) 12 files modified
data/qt/controlpanel.ui (+169/-163) data/qt/devices.ui (+164/-0) data/qt/folders.ui (+168/-0) data/qt/mainwindow.ui (+9/-4) data/qt/preferences.ui (+165/-0) data/qt/profile.ui (+180/-0) data/qt/services.ui (+236/-0) ubuntuone/controlpanel/qt/devices.py (+33/-0) ubuntuone/controlpanel/qt/folders.py (+33/-0) ubuntuone/controlpanel/qt/preferences.py (+33/-0) ubuntuone/controlpanel/qt/profile.py (+33/-0) ubuntuone/controlpanel/qt/services.py (+33/-0) |
| To merge this branch: | bzr merge lp://qastaging/~alecu/ubuntuone-control-panel/ui-scissors |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Eric Casteleijn (community) | Approve | ||
| Natalia Bidart (community) | Approve | ||
|
Review via email:
|
|||
Commit message
One .ui file per control panel tab, following the Windows Dashboard 2.5 wireframes
Description of the change
One .ui file per control panel tab, following the Windows Dashboard 2.5 wireframes
To post a comment you must log in.
Revision history for this message
| Eric Casteleijn (thisfred) wrote | # |
Revision history for this message
| Natalia Bidart (nataliabidart) wrote | # |
Revision history for this message
| Natalia Bidart (nataliabidart) | # |
review:
Approve
Revision history for this message
| Eric Casteleijn (thisfred) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good, tests pass.