lp:~phill-ridout/openlp/bug1012110

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2326

Raoul Snyman: Approve on 2014-02-21

Jonathan Corwin: Pending requested 2014-02-11

Andreas Preikschat: Pending requested 2014-02-11

Phill: Pending requested 2014-02-11

Diff: 1156 lines (+455/-199)

12 files modified

.bzrignore (+1/-0)
openlp/core/__init__.py (+1/-1)
openlp/core/lib/__init__.py (+2/-2)
openlp/core/lib/mediamanageritem.py (+1/-1)
openlp/plugins/presentations/lib/mediaitem.py (+2/-2)
openlp/plugins/presentations/lib/pptviewcontroller.py (+10/-5)
openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp (+123/-123)
openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h (+9/-9)
openlp/plugins/presentations/lib/pptviewlib/pptviewlib.vcproj (+2/-2)
openlp/plugins/presentations/lib/presentationcontroller.py (+7/-1)
tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py (+143/-0)
tests/functional/openlp_plugins/presentations/test_presentationcontroller.py (+154/-53)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1012110: pptviewlib does not accept unicode filename

Medium

Fix Released

Link a bug report

Related blueprints

2316. By Phill on 2014-02-11

HEAD

2315. By Phill on 2014-02-11

HEAD

2314. By Phill on 2013-11-16

Fix doc strings

2313. By Phill on 2013-11-16

some final cleanups

2312. By Phill on 2013-11-16

HEAD

2311. By Phill on 2013-11-16

added some tests for PresentationController

2310. By Phill on 2013-11-07

Changed test path

2309. By Phill on 2013-11-07

Some refactoring

2308. By Phill on 2013-11-07

Added tests for load presentation

2307. By Phill on 2013-11-01

HEAD