lp:~tomasgroth/openlp/presentation-fixes24

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2607

Tim Bentley: Approve on 2016-01-14

Raoul Snyman: Approve on 2016-01-14

Diff: 214 lines (+51/-29)

9 files modified

openlp/core/ui/servicemanager.py (+6/-2)
openlp/core/ui/slidecontroller.py (+13/-12)
openlp/plugins/presentations/lib/messagelistener.py (+7/-6)
openlp/plugins/songs/forms/editsongform.py (+1/-1)
openlp/plugins/songs/lib/mediaitem.py (+3/-3)
tests/functional/openlp_core_lib/test_htmlbuilder.py (+1/-2)
tests/functional/openlp_core_ui/test_mainwindow.py (+0/-2)
tests/functional/openlp_plugins/presentations/test_messagelistener.py (+20/-0)
tests/resources/projector/data.py (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1532169: Expanding or Collapsing a Song in ServiceManager raises an Exception	High	Fix Released
Bug #1532938: Presenting with PowerPoint or Impress triggers traceback	High	Fix Released

Link a bug report

Related blueprints

2611. By Tomas Groth on 2016-01-13

pep8 fixes

2610. By Tomas Groth on 2016-01-13

Added test

2609. By Tomas Groth on 2016-01-12

trunk

2608. By Tomas Groth on 2016-01-12

Fix traceback when expanding and collapsing songs.

2607. By Tomas Groth on 2016-01-12

In _process_item, postpone check for _reset_blank, since the service_item can change type while being execute (Pdf->Image). For the same reason always use the serviceitem that might have been converted.

2606. By Tomas Groth on 2016-01-12

Fix crash when sending Pdf live.

2605. By Tomas Groth on 2016-01-11

Fix taking screenshots while using powerpoint or impress.

2604. By Jonathan Springer on 2016-01-11

Fix Mac OS X display flags test
Fix import in pjlink tests
Skip OpenOffice test if uno isn't available, e.g., on Mac OS X

2603. By Simon Hanna on 2016-01-11

Make some methods static where possible
Move some methods out of their classes where it makes sense

Add .coveragerc so that local html reports can be generated

fix pep8 errors

2602. By Raoul Snyman on 2016-01-10

Release 2.3.2