lp:~phill-ridout/openlp/bug1135392_2.0

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.0 at revision 2137

Tim Bentley: Approve on 2013-03-06

Andreas Preikschat (community): Approve on 2013-03-05

Diff: 8 lines (+1/-0)

1 file modified

openlp/plugins/songs/forms/editsongform.py (+1/-0)

api

Superseded for merging into lp:openlp

OpenLP Core: Pending requested 2013-03-04

Diff: 1331 lines (+778/-14) (has conflicts)

19 files modified

openlp/.version (+4/-0)
openlp/core/__init__.py (+15/-0)
openlp/core/lib/__init__.py (+17/-0)
openlp/core/lib/eventreceiver.py.OTHER (+293/-0)
openlp/core/lib/mediamanageritem.py (+9/-0)
openlp/core/lib/serviceitem.py (+17/-0)
openlp/core/lib/settings.py (+68/-0)
openlp/core/lib/settingsmanager.py.OTHER (+168/-0)
openlp/core/ui/aboutdialog.py (+6/-0)
openlp/core/ui/mainwindow.py (+13/-0)
openlp/core/ui/media/vendor/vlc.py (+1/-1)
openlp/core/ui/slidecontroller.py (+18/-0)
openlp/plugins/songs/forms/editsongform.py (+29/-0)
openlp/plugins/songs/lib/__init__.py (+7/-0)
openlp/plugins/songs/lib/ewimport.py (+22/-6)
openlp/plugins/songs/lib/songimport.py (+2/-1)
openlp/plugins/songs/lib/songshowplusimport.py (+13/-6)
scripts/check_dependencies.py (+6/-0)
scripts/openlp-remoteclient.py.OTHER (+70/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1135392: Catch all error trap in editsongform.py, _processLyrics

High

Fix Released

Link a bug report

Related blueprints

2137. By Phill on 2013-03-04

Fixes bug:#1135392 by reraising the exception.

2136. By Phill on 2013-02-26

Fixes bug #1114457 by counting the records

2135. By Andreas Preikschat on 2013-02-20

Fix bug #1128376 (Configure shortcuts has two items called settings)

2134. By Phill on 2013-02-18

Song Import Wizard - bugs

2133. By Andreas Preikschat on 2013-02-18

Inconvenient focus in Song Editor when adding authors) by reimplementing the keyPressEvent

2132. By Andreas Preikschat on 2013-02-18

Display verses on live tool bar' ignored

2131. By Phill on 2013-02-05

Fix bug #1098075: Cancelling character table dialog in song importer causes OpenLP to crash

2130. By Andreas Preikschat on 2013-01-23

- fixed Bug 1086987 (Log system does not log all exceptions)

2129. By Arjan Schrijver on 2013-01-18

When a saved service file is loaded, images always get a black background instead of the configured background. This patch fixes that, although I'm not sure if it fits within the coding standards.

2128. By Arjan Schrijver on 2013-01-15

check_dependencies.py fails on version numbers with letters (bug #1095699)