lp:~trb143/openlp/bug-1097898

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp:openlp

OpenLP Core: Pending requested 2013-01-22

Diff: 1824 lines (+553/-179)

33 files modified

openlp/core/__init__.py (+2/-1)
openlp/core/lib/__init__.py (+1/-0)
openlp/core/lib/imagemanager.py (+3/-1)
openlp/core/lib/mediamanageritem.py (+73/-2)
openlp/core/lib/plugin.py (+15/-11)
openlp/core/lib/pluginmanager.py (+2/-9)
openlp/core/lib/registry.py (+77/-0)
openlp/core/lib/renderer.py (+25/-7)
openlp/core/lib/serviceitem.py (+22/-3)
openlp/core/ui/maindisplay.py (+35/-15)
openlp/core/ui/mainwindow.py (+5/-5)
openlp/core/ui/media/mediacontroller.py (+14/-3)
openlp/core/ui/servicemanager.py (+58/-21)
openlp/core/ui/settingsform.py (+15/-5)
openlp/core/ui/slidecontroller.py (+47/-18)
openlp/core/ui/thememanager.py (+40/-10)
openlp/plugins/alerts/alertsplugin.py (+1/-1)
openlp/plugins/alerts/forms/alertform.py (+1/-1)
openlp/plugins/bibles/bibleplugin.py (+2/-2)
openlp/plugins/bibles/lib/mediaitem.py (+1/-1)
openlp/plugins/custom/lib/mediaitem.py (+1/-1)
openlp/plugins/images/lib/mediaitem.py (+7/-7)
openlp/plugins/media/lib/mediaitem.py (+13/-13)
openlp/plugins/media/mediaplugin.py (+17/-7)
openlp/plugins/presentations/lib/mediaitem.py (+6/-6)
openlp/plugins/presentations/presentationplugin.py (+1/-1)
openlp/plugins/songs/forms/editsongform.py (+12/-4)
openlp/plugins/songs/forms/songimportform.py (+1/-1)
openlp/plugins/songs/lib/mediaitem.py (+4/-5)
openlp/plugins/songs/songsplugin.py (+3/-4)
openlp/plugins/songusage/songusageplugin.py (+4/-4)
tests/functional/openlp_core_lib/test_registry.py (+33/-0)
tests/functional/openlp_core_lib/test_serviceitem.py (+12/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1097898: Exiting liveview with Alt-F4 causes OpenLP to become unstable

High

Fix Released

Link a bug report

Related blueprints

2090. By Tim Bentley on 2013-01-23

remove unused

2089. By Tim Bentley on 2013-01-23

remove main window code in service manager

2088. By Tim Bentley on 2013-01-23

remove plugin helpers

2087. By Tim Bentley on 2013-01-23

Head

2086. By Tim Bentley on 2013-01-23

Head with fixes

2085. By Tim Bentley on 2013-01-23

More cleanups

2084. By Tim Bentley on 2013-01-23

More cleanups and removal of plugin_helpers

2083. By Tim Bentley on 2013-01-22

fix up some tests

2082. By Tim Bentley on 2013-01-22

Live and Preview Moved

2081. By Tim Bentley on 2013-01-22

Registry takes shape and takes over