lp:~googol-deactivatedaccount/openlp/bug-816186

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 1702

Tim Bentley: Approve on 2011-08-05

Raoul Snyman: Approve on 2011-08-05

Diff: 115 lines (+27/-13)

2 files modified

openlp/plugins/songs/forms/songimportform.py (+2/-1)
openlp/plugins/songs/lib/olp1import.py (+25/-12)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #816186: 1.2 version songs loose themes when imported into 1.9.6

Low

Fix Released

Link a bug report

Related blueprints

1702. By Andreas Preikschat on 2011-08-05

fixed bug #816186; fixed comments; fixed list comprehension

1701. By Tim Bentley on 2011-08-05

Add DnD to Openlp form outside

1700. By Stevan Pettit on 2011-08-05

Modified firsttimeform to include existing themes in the set default theme list, if the wizard is being re-run.

1699. By Andreas Preikschat on 2011-08-02

- changed "Customize Shortcuts" to "Configure Shortcuts"
- fixed bug #816382 (Formatting Tags or Display Tags?)

1698. By Stevan Pettit on 2011-07-30

Added the ability to re-run the First Time Wizard (bug #801325)

1697. By Matthias Hub on 2011-07-30

- fixed view adjustments for os x 10.6 build scripts
- added compatibility with the file extension on os x #782581
- added "open with" file handling for os x #782581

1696. By Andreas Preikschat on 2011-07-28

- docstring clean ups

1695. By Stevan Pettit on 2011-07-25

Reset the loop buttons when a new item is sent live (bug #808420)

1694. By Andreas Preikschat on 2011-07-24

- improved rendering speed by checking if the text fits as a whole (to save time figuring out that it fits as a whole)
- use binary chop to find the number of lines which will fit on a slide (if it does not fit as a whole)
- do not use instance variables as arguments
- renamed image_manager to imageManager and theme_manager to themeManager as the classes are derived of Qt

Some changes to html (html5):
- added doctype
- removed obsolete language attribute

1693. By Tim Bentley on 2011-07-24

Allow the up and down selection to step over collapsed service items