lp:~phill-ridout/openlp/fixes-III
Created by
Phill
and last modified
- Get this branch:
- bzr branch lp:~phill-ridout/openlp/fixes-III
Branch merges
Propose for merging
No branches
dependent on this one.
- Tim Bentley: Approve
- Raoul Snyman: Approve
- Tomas Groth: Needs Information
-
Diff: 765 lines (+218/-152)26 files modifiedopenlp/core/common/__init__.py (+4/-4)
openlp/core/common/i18n.py (+3/-3)
openlp/core/lib/db.py (+1/-1)
openlp/core/lib/formattingtags.py (+91/-90)
openlp/core/projectors/manager.py (+2/-2)
openlp/core/projectors/pjlink.py (+1/-1)
openlp/core/projectors/sourceselectform.py (+3/-3)
openlp/core/ui/__init__.py (+1/-1)
openlp/core/ui/formattingtagcontroller.py (+1/-1)
openlp/core/ui/icons.py (+3/-3)
openlp/core/ui/shortcutlistdialog.py (+1/-1)
openlp/core/ui/shortcutlistform.py (+1/-1)
openlp/core/widgets/views.py (+3/-3)
openlp/core/widgets/widgets.py (+2/-2)
openlp/plugins/bibles/lib/manager.py (+1/-1)
openlp/plugins/bibles/lib/mediaitem.py (+1/-1)
openlp/plugins/presentations/lib/impresscontroller.py (+5/-11)
openlp/plugins/songs/lib/__init__.py (+10/-8)
openlp/plugins/songs/lib/importers/easyworship.py (+2/-2)
openlp/plugins/songs/lib/importers/foilpresenter.py (+1/-1)
openlp/plugins/songs/lib/importers/openoffice.py (+1/-3)
openlp/plugins/songs/lib/importers/opspro.py (+2/-2)
openlp/plugins/songs/lib/importers/propresenter.py (+4/-4)
openlp/plugins/songs/lib/importers/videopsalm.py (+1/-1)
openlp/plugins/songs/lib/openlyricsxml.py (+1/-1)
tests/functional/openlp_core/lib/test_theme.py (+72/-1)
Recent revisions
- 2879. By Tomas Groth
-
Added Pyro4 to appveyor to make the latest tests run. Fixed test on windows by mocking out render. Missed a rename of _write_theme to save_theme. Loading VLC module can also result in an OSError. Set the default value of core/display_
on_monitor to False to avoid blocking the screen with the display window on first start. Set song import/export default directory to None. Add a webengine view for previewing themes. Made VLC loading more robust. A few minor fixes. - 2877. By Tomas Groth
-
Add a webengine view for previewing themes. Made VLC loading more robust. A few minor fixes.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openlp