lp:~ralsina/ubuntuone-windows-installer/diego-installer-ui

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-windows-installer at revision 21

Roberto Alsina (community): Approve on 2011-07-22

Diff: 1956 lines (+1028/-595)

12 files modified

data/qt/choose_sign_in.ui (+12/-6)
data/qt/images.qrc (+17/-0)
data/qt/license.ui (+8/-8)
data/qt/setup_account.ui (+51/-34)
data/qt/side_widget.ui (+238/-64)
data/qt/ubuntuone.qss (+96/-0)
ubuntuone_installer/gui/qt/gui.py (+23/-6)
ubuntuone_installer/gui/qt/local_folders.py (+171/-171)
ubuntuone_installer/gui/qt/setup_account.py (+158/-156)
ubuntuone_installer/gui/qt/side_widget.py (+73/-49)
ubuntuone_installer/gui/qt/tests/test_gui.py (+26/-1)
ubuntuone_installer/gui/qt/tests/test_side_widget.py (+155/-100)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

31. By Roberto Alsina on 2011-07-22

--fixes=lp:807003

30. By Roberto Alsina on 2011-07-22

Resolved conflicts

29. By Diego Sarmentero on 2011-07-19

tests fixed.

28. By Diego Sarmentero on 2011-07-15

adjust minimum width column for grid layout in setup account.

27. By Diego Sarmentero on 2011-07-15

adjust width to avoid interlar resizing.

26. By Diego Sarmentero on 2011-07-15

updating button styles.
removing markup from strings.
using constant for application name.

25. By Diego Sarmentero on 2011-07-14

deleting repeated line of 2 insertions of the qrc as a resource

24. By Diego Sarmentero on 2011-07-14

fixing commentary.
removing if result == 0 from "done" method, just leaving the path of the else.

23. By Diego Sarmentero on 2011-07-14

Fixing style.
Tests complete.

22. By Diego Sarmentero on 2011-07-14

test fixed.