lp:~trb143/openlp/media_state
Created by
Tim Bentley
and last modified
- Get this branch:
- bzr branch lp:~trb143/openlp/media_state
Only
Tim Bentley
can upload to this branch. If you are
Tim Bentley
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Raoul Snyman: Approve
-
Diff: 3097 lines (+560/-1663)22 files modified.bzrignore (+1/-0)
openlp/core/common/settings.py (+10/-4)
openlp/core/lib/theme.py (+5/-0)
openlp/core/ui/media/__init__.py (+1/-0)
openlp/core/ui/media/mediacontroller.py (+71/-169)
openlp/core/ui/media/mediaplayer.py (+5/-3)
openlp/core/ui/media/mediatab.py (+148/-0)
openlp/core/ui/media/playertab.py (+0/-269)
openlp/core/ui/media/systemplayer.py (+0/-332)
openlp/core/ui/media/vlcplayer.py (+115/-114)
openlp/core/ui/screenstab.py (+1/-1)
openlp/core/ui/settingsform.py (+8/-5)
openlp/core/ui/slidecontroller.py (+97/-8)
openlp/core/ui/themeform.py (+2/-0)
openlp/core/ui/themewizard.py (+3/-1)
openlp/core/widgets/views.py (+4/-1)
openlp/plugins/media/lib/mediaitem.py (+4/-1)
openlp/plugins/media/lib/mediatab.py (+0/-73)
openlp/plugins/media/mediaplugin.py (+0/-13)
tests/functional/openlp_core/common/test_common.py (+2/-2)
tests/functional/openlp_core/ui/media/test_systemplayer.py (+0/-567)
tests/functional/openlp_core/ui/media/test_vlcplayer.py (+83/-100)
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openlp