Ubuntu One Control Panel

Merge lp://staging/~nataliabidart/ubuntuone-control-panel/ui-styling into lp://staging/ubuntuone-control-panel

  1. ui-styling
  2. Merge into trunk
Proposed by Natalia Bidart
Status: Merged
Approved by: Roberto Alsina
Approved revision: 187
Merged at revision: 179
Proposed branch: lp://staging/~nataliabidart/ubuntuone-control-panel/ui-styling
Merge into: lp://staging/ubuntuone-control-panel
Diff against target: 1885 lines (+1166/-302)
21 files modified
data/qt/controlpanel.ui (+463/-148)
data/qt/devices.ui (+111/-98)
data/qt/folders.ui (+3/-0)
data/qt/images.qrc (+8/-0)
data/qt/loadingoverlay.ui (+118/-0)
data/qt/mainwindow.ui (+13/-1)
data/qt/preferences.ui (+34/-9)
data/qt/ubuntuone.qss (+177/-0)
data/qt/ubuntuonebin.ui (+0/-16)
ubuntuone/controlpanel/gui/__init__.py (+3/-1)
ubuntuone/controlpanel/gui/qt/controlpanel.py (+10/-5)
ubuntuone/controlpanel/gui/qt/device.py (+9/-0)
ubuntuone/controlpanel/gui/qt/devices.py (+6/-7)
ubuntuone/controlpanel/gui/qt/loadingoverlay.py (+121/-0)
ubuntuone/controlpanel/gui/qt/main/windows.py (+14/-1)
ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+7/-4)
ubuntuone/controlpanel/gui/qt/tests/test_device.py (+10/-0)
ubuntuone/controlpanel/gui/qt/tests/test_devices.py (+4/-5)
ubuntuone/controlpanel/gui/qt/tests/test_loadingoverlay.py (+36/-0)
ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py (+6/-6)
ubuntuone/controlpanel/gui/qt/ubuntuonebin.py (+13/-1)
To merge this branch: bzr merge lp://staging/~nataliabidart/ubuntuone-control-panel/ui-styling
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Natalia Bidart (community) Approve
Review via email: mp+67746@code.staging.launchpad.net

Commit message

- Add styling to the QT UI (LP: #807003).

Description of the change

This branch is 99.99% a production from Diego Sarmentero.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve
lp://staging/~nataliabidart/ubuntuone-control-panel/ui-styling updated
186. By Natalia Bidart

Removed font property that should not be set so defaults are used.

187. By Natalia Bidart

Removing all ocurrences of "MS Shell Dlg 2".

Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches