lp:~nataliabidart/ubuntuone-control-panel/preferences

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-control-panel at revision 163

John Lenton (community): Approve on 2011-06-17

Diff: 1391 lines (+839/-131)

13 files modified

data/qt/preferences.ui (+89/-63)
ubuntuone/controlpanel/backend.py (+109/-15)
ubuntuone/controlpanel/gui/qt/folders.py (+3/-2)
ubuntuone/controlpanel/gui/qt/main/linux.py (+8/-0)
ubuntuone/controlpanel/gui/qt/preferences.py (+107/-1)
ubuntuone/controlpanel/gui/qt/tests/__init__.py (+14/-7)
ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py (+1/-1)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+2/-2)
ubuntuone/controlpanel/gui/qt/tests/test_preferences.py (+165/-0)
ubuntuone/controlpanel/integrationtests/test_sd_client/test_linux.py (+84/-25)
ubuntuone/controlpanel/sd_client/linux.py (+45/-0)
ubuntuone/controlpanel/tests/__init__.py (+3/-0)
ubuntuone/controlpanel/tests/test_backend.py (+209/-15)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #797294: Implement preferences tab in the QT version

High

Fix Released

Link a bug report

Related blueprints

169. By Natalia Bidart on 2011-06-17

Merged trunk in.

168. By Natalia Bidart on 2011-06-16

Merged trunk in.

167. By Natalia Bidart on 2011-06-16

Removed garbage.

166. By Natalia Bidart on 2011-06-16

Preferences done!

165. By Natalia Bidart on 2011-06-15

Started adding logic for settings to Preferences tab.

164. By Natalia Bidart on 2011-06-15

Merged trunk in.

163. By Natalia Bidart on 2011-06-14

Test pass now.

162. By Natalia Bidart on 2011-06-14

New QT ui prefs test file.

161. By Natalia Bidart on 2011-06-14

Backend is now ready to handle file sync settings ops.

160. By Natalia Bidart on 2011-06-14

Attaching bug #797294.