lp:~mzibricky/openlp/openlyrics

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 1758

Tim Bentley: Approve on 2011-09-23

Raoul Snyman: Approve on 2011-09-23

Andreas Preikschat: Pending requested 2011-09-23

Diff: 902 lines (+404/-116)

5 files modified

openlp/core/lib/formattingtags.py (+115/-22)
openlp/core/ui/formattingtagform.py (+17/-43)
openlp/core/utils/__init__.py (+5/-0)
openlp/plugins/songs/lib/mediaitem.py (+3/-0)
openlp/plugins/songs/lib/xml.py (+264/-51)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #745636: OpenLyrics xml including OpenLP specifics	High	Fix Released
Bug #852424: Formatting tags for multiple lines	Undecided	Invalid

Link a bug report

Related blueprints

1317. By matysek on 2011-09-23

[merge] merge with truk r1756

1316. By matysek on 2011-09-23

Fix regressions with formattingtagsform

1315. By matysek on 2011-09-23

Fix issues with ignoring comments and chords

1314. By matysek on 2011-09-22

Fix - do not save temporary key by formatting tags into openlp configuration

1313. By matysek on 2011-09-22

Fix regressions with users tags in preview and import/export in openlyrics

1312. By matysek on 2011-09-20

[merge] Merge with trunk r1754

1311. By matysek on 2011-09-20

Add openlyrics export with formatting tags support.

1310. By matysek on 2011-09-20

Dropped <line> element for openlyrics parsing and allow to import formatting tags over multiple lines and tags with only starting tag

1309. By matysek on 2011-09-19

Fix issue with more new lines when having more <lines> element in openlyrics document.

1308. By matysek on 2011-09-18

Add comments to some new functions