OpenLP

Merge lp://qastaging/~phill-ridout/openlp/fixes-mkII into lp://qastaging/openlp

fixes-mkII
Merge into trunk

Proposed by Phill on 2017-11-10

Status:

Merged

Approved by:

Raoul Snyman on 2017-11-11

Approved revision:

2794

Merged at revision:

2784

Proposed branch:

lp://qastaging/~phill-ridout/openlp/fixes-mkII

Merge into:

lp://qastaging/openlp

Diff against target:

1063 lines (+167/-143)

47 files modified

openlp/core/common/__init__.py (+21/-3)
openlp/core/common/applocation.py (+1/-1)
openlp/core/common/httputils.py (+4/-4)
openlp/core/common/i18n.py (+1/-1)
openlp/core/common/mixins.py (+14/-0)
openlp/core/common/path.py (+1/-1)
openlp/core/common/settings.py (+4/-1)
openlp/core/lib/__init__.py (+1/-1)
openlp/core/lib/mediamanageritem.py (+4/-2)
openlp/core/ui/exceptionform.py (+1/-1)
openlp/core/ui/formattingtagcontroller.py (+1/-1)
openlp/core/ui/mainwindow.py (+2/-2)
openlp/core/ui/servicemanager.py (+28/-28)
openlp/core/ui/thememanager.py (+3/-3)
openlp/core/version.py (+2/-2)
openlp/core/widgets/edits.py (+13/-3)
openlp/core/widgets/views.py (+1/-1)
openlp/plugins/bibles/forms/booknameform.py (+1/-2)
openlp/plugins/bibles/lib/__init__.py (+3/-3)
openlp/plugins/bibles/lib/db.py (+1/-2)
openlp/plugins/images/lib/mediaitem.py (+2/-1)
openlp/plugins/presentations/lib/pptviewcontroller.py (+1/-1)
openlp/plugins/songs/forms/editsongform.py (+3/-3)
openlp/plugins/songs/lib/__init__.py (+2/-3)
openlp/plugins/songs/lib/importers/easyslides.py (+2/-1)
openlp/plugins/songs/lib/importers/mediashout.py (+1/-1)
openlp/plugins/songs/lib/importers/openoffice.py (+2/-2)
openlp/plugins/songs/lib/importers/opensong.py (+2/-1)
openlp/plugins/songs/lib/importers/songimport.py (+2/-21)
openlp/plugins/songs/lib/importers/songsoffellowship.py (+0/-1)
openlp/plugins/songs/lib/importers/zionworx.py (+5/-15)
openlp/plugins/songs/lib/openlyricsxml.py (+1/-1)
openlp/plugins/songusage/forms/songusagedetailform.py (+8/-2)
openlp/plugins/songusage/songusageplugin.py (+6/-9)
tests/functional/openlp_core/common/test_actions.py (+1/-0)
tests/functional/openlp_core/common/test_httputils.py (+1/-1)
tests/functional/openlp_core/common/test_i18n.py (+1/-1)
tests/functional/openlp_core/common/test_path.py (+4/-4)
tests/functional/openlp_core/lib/test_lib.py (+1/-1)
tests/functional/openlp_core/ui/test_first_time.py (+1/-1)
tests/functional/openlp_core/widgets/test_views.py (+0/-1)
tests/functional/openlp_plugins/presentations/test_presentationcontroller.py (+1/-1)
tests/interfaces/openlp_core/ui/test_projectormanager.py (+1/-1)
tests/interfaces/openlp_core/ui/test_projectorsourceform.py (+1/-1)
tests/interfaces/openlp_core/ui/test_thememanager.py (+1/-1)
tests/utils/__init__.py (+1/-1)
tests/utils/test_pylint.py (+9/-5)

To merge this branch:

bzr merge lp://qastaging/~phill-ridout/openlp/fixes-mkII

Related bugs:

Bug #1400415: Multiple exceptions merged into OSError	Low	Fix Committed
Bug #1532193: Typos in songusageplugin.py	Low	Fix Committed
Bug #1582014: Zion Worx import fails with translate() error	Low	Fix Committed
Bug #1660473: OSZL is ignored on save (inconsistent gui)	Medium	Fix Committed
Bug #1660478: Opening recent file does not prompt to save changes	Medium	Fix Committed
Bug #1660486: Dragging item in service manager without changes triggeres "unsaved"	Low	Fix Committed
Bug #1661416: Initial "extract song usage data" produces a traceback	Medium	Fix Committed
Bug #1672229: Media Library duplicates on boot and when a new item is added	Medium	Fix Committed
Bug #1698021: Copying and Pasting from Word inserts invalid characters	Medium	Fix Committed
Bug #1715125: Missing .osz file extension on save service	Medium	Fix Committed
Bug #1727517: Unicode control chars causes song importer to crash	Low	Fix Committed