lp://qastaging/~raoul-snyman/openlp/cleanups

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/openlp at revision 2213

Tim Bentley: Approve on 2013-03-18

Andreas Preikschat: Pending requested 2013-03-18

Diff: 2331 lines (+790/-562)

31 files modified

openlp/core/ui/firsttimeform.py (+2/-2)
openlp/core/ui/wizard.py (+25/-7)
openlp/plugins/bibles/forms/bibleimportform.py (+3/-3)
openlp/plugins/bibles/forms/bibleupgradeform.py (+7/-7)
openlp/plugins/bibles/forms/booknameform.py (+3/-2)
openlp/plugins/songs/forms/authorsdialog.py (+1/-1)
openlp/plugins/songs/forms/editsongform.py (+8/-8)
openlp/plugins/songs/forms/editversedialog.py (+51/-50)
openlp/plugins/songs/forms/editverseform.py (+55/-55)
openlp/plugins/songs/forms/mediafilesdialog.py (+35/-25)
openlp/plugins/songs/forms/mediafilesform.py (+3/-3)
openlp/plugins/songs/forms/songbookdialog.py (+38/-28)
openlp/plugins/songs/forms/songbookform.py (+8/-5)
openlp/plugins/songs/forms/songexportform.py (+4/-9)
openlp/plugins/songs/forms/songimportform.py (+21/-21)
openlp/plugins/songs/forms/songmaintenancedialog.py (+122/-112)
openlp/plugins/songs/forms/songmaintenanceform.py (+193/-179)
openlp/plugins/songs/forms/topicsdialog.py (+31/-21)
openlp/plugins/songs/forms/topicsform.py (+21/-4)
openlp/plugins/songs/lib/__init__.py (+2/-0)
tests/interfaces/__init__.py (+2/-2)
tests/interfaces/openlp_core_lib/test_pluginmanager.py (+2/-2)
tests/interfaces/openlp_core_ui/test_filerenamedialog.py (+1/-1)
tests/interfaces/openlp_core_ui/test_servicemanager.py (+1/-1)
tests/interfaces/openlp_core_ui/test_servicenotedialog.py (+1/-1)
tests/interfaces/openlp_core_ui/test_settings_form.py (+3/-1)
tests/interfaces/openlp_core_ui/test_starttimedialog.py (+1/-1)
tests/interfaces/openlp_plugins_songs_forms/test_authorsform.py (+10/-7)
tests/interfaces/openlp_plugins_songs_forms/test_editsongform.py (+8/-1)
tests/interfaces/openlp_plugins_songs_forms/test_editverseform.py (+63/-3)
tests/interfaces/openlp_plugins_songs_forms/test_topicsform.py (+65/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2204. By Raoul Snyman on 2013-04-21

PyLint cleanups

2203. By Raoul Snyman on 2013-04-21

HEAD

2202. By Raoul Snyman on 2013-03-18

Fixed up an issue with some tests that arose in the merge from HEAD

2201. By Raoul Snyman on 2013-03-18

HEAD

2200. By Raoul Snyman on 2013-03-18

HEAD

2199. By Raoul Snyman on 2013-03-14

Merge from upstream

2198. By Raoul Snyman on 2013-03-13

HEAD

2197. By Raoul Snyman on 2013-03-13

Some more cleanups and an empty test.

2196. By Raoul Snyman on 2013-03-11

HEAD

2195. By Raoul Snyman on 2013-03-11

Cleanup EditVerseForm and friends, and expand the test.