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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.0 at revision 2131

Tim Bentley: Approve on 2013-02-05

Raoul Snyman: Approve on 2013-02-04

Diff: 60 lines (+14/-3)

4 files modified

openlp/plugins/songs/lib/__init__.py (+2/-0)
openlp/plugins/songs/lib/ewimport.py (+4/-1)
openlp/plugins/songs/lib/songproimport.py (+4/-1)
openlp/plugins/songs/lib/sundayplusimport.py (+4/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1098075: Cancelling character table dialogue in importer causes OpenLP to crash

Low

Fix Released

Link a bug report

Related blueprints

2134. By Phill on 2013-02-04

Reduced some code

2133. By Phill on 2013-02-03

changed variables to result

2132. By Phill on 2013-02-03

Reworked to return None rather than using exceptions as per Raoul's request

2131. By Phill on 2013-02-03

Fixes bug1095699 by rasing an error when the user cancels the codepage selection dialog.

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)

2127. By Tim Bentley on 2013-01-05

Release 2.0.1

2126. By Samuel Mehrbrodt on 2013-01-05

When importing a presentation containing a non-ASCII character, an exception is no longer thrown preventing the file from being loaded.

2125. By Jonathan Corwin on 2013-01-02

Attempt to successfully import the settings we can now export.

* QSettings exports the 'general' group as '%General' but appears in some circumstances (Linux?) to struggle to import this again. Try and compensate.

* If you run 2.1, even if just the once, it'll create a [players] settings group. If you later go back to 2.0 it'll load this group (even if it doesn't use it) and so it'll be exported. However the import considers the group invalid so fails. I've therefore changed the import to be more forgiving and just ignore unknown groups. A basic sanity test is done earlier instead.