OpenLP

Merge lp:~trb143/openlp/textcleanups into lp:openlp

  1. textcleanups
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: 2804
Proposed branch: lp:~trb143/openlp/textcleanups
Merge into: lp:openlp
Diff against target: 8433 lines (+725/-780)
479 files modified
copyright.txt (+1/-1)
openlp.py (+1/-1)
openlp/__init__.py (+1/-1)
openlp/core/__init__.py (+1/-1)
openlp/core/api/__init__.py (+3/-3)
openlp/core/api/deploy.py (+2/-2)
openlp/core/api/endpoint/__init__.py (+1/-1)
openlp/core/api/endpoint/controller.py (+4/-4)
openlp/core/api/endpoint/core.py (+2/-3)
openlp/core/api/endpoint/pluginhelpers.py (+1/-1)
openlp/core/api/endpoint/remote.py (+2/-3)
openlp/core/api/endpoint/service.py (+2/-3)
openlp/core/api/http/__init__.py (+3/-2)
openlp/core/api/http/endpoint.py (+1/-1)
openlp/core/api/http/errors.py (+1/-1)
openlp/core/api/http/server.py (+4/-4)
openlp/core/api/http/wsgiapp.py (+2/-3)
openlp/core/api/poll.py (+1/-1)
openlp/core/api/tab.py (+1/-1)
openlp/core/api/websockets.py (+2/-2)
openlp/core/app.py (+2/-3)
openlp/core/common/__init__.py (+2/-2)
openlp/core/common/actions.py (+1/-2)
openlp/core/common/applocation.py (+1/-1)
openlp/core/common/db.py (+1/-2)
openlp/core/common/httputils.py (+1/-1)
openlp/core/common/i18n.py (+1/-1)
openlp/core/common/json.py (+1/-1)
openlp/core/common/mixins.py (+2/-2)
openlp/core/common/path.py (+1/-1)
openlp/core/common/registry.py (+1/-1)
openlp/core/common/settings.py (+2/-2)
openlp/core/display/__init__.py (+1/-1)
openlp/core/display/renderer.py (+3/-3)
openlp/core/display/screens.py (+3/-3)
openlp/core/lib/__init__.py (+2/-2)
openlp/core/lib/db.py (+1/-1)
openlp/core/lib/exceptions.py (+1/-1)
openlp/core/lib/formattingtags.py (+2/-2)
openlp/core/lib/htmlbuilder.py (+2/-2)
openlp/core/lib/imagemanager.py (+2/-2)
openlp/core/lib/json/__init__.py (+1/-1)
openlp/core/lib/mediamanageritem.py (+2/-2)
openlp/core/lib/plugin.py (+1/-1)
openlp/core/lib/pluginmanager.py (+1/-1)
openlp/core/lib/serviceitem.py (+2/-2)
openlp/core/lib/settingstab.py (+1/-1)
openlp/core/lib/theme.py (+1/-1)
openlp/core/lib/ui.py (+1/-2)
openlp/core/projectors/__init__.py (+1/-1)
openlp/core/projectors/constants.py (+1/-1)
openlp/core/projectors/db.py (+1/-1)
openlp/core/projectors/editform.py (+2/-2)
openlp/core/projectors/manager.py (+2/-2)
openlp/core/projectors/pjlink.py (+1/-1)
openlp/core/projectors/sourceselectform.py (+2/-2)
openlp/core/projectors/tab.py (+1/-1)
openlp/core/projectors/upgrade.py (+1/-1)
openlp/core/resources.py (+1/-1)
openlp/core/threading.py (+1/-1)
openlp/core/ui/__init__.py (+1/-1)
openlp/core/ui/aboutdialog.py (+1/-1)
openlp/core/ui/aboutform.py (+2/-2)
openlp/core/ui/advancedtab.py (+1/-1)
openlp/core/ui/exceptiondialog.py (+1/-1)
openlp/core/ui/exceptionform.py (+1/-1)
openlp/core/ui/filerenamedialog.py (+1/-1)
openlp/core/ui/filerenameform.py (+1/-1)
openlp/core/ui/firsttimeform.py (+5/-5)
openlp/core/ui/firsttimelanguagedialog.py (+1/-1)
openlp/core/ui/firsttimelanguageform.py (+1/-1)
openlp/core/ui/firsttimewizard.py (+1/-1)
openlp/core/ui/formattingtagcontroller.py (+1/-1)
openlp/core/ui/formattingtagdialog.py (+1/-1)
openlp/core/ui/formattingtagform.py (+2/-2)
openlp/core/ui/generaltab.py (+1/-1)
openlp/core/ui/maindisplay.py (+1/-1)
openlp/core/ui/mainwindow.py (+5/-8)
openlp/core/ui/media/__init__.py (+1/-1)
openlp/core/ui/media/endpoint.py (+2/-2)
openlp/core/ui/media/mediacontroller.py (+6/-6)
openlp/core/ui/media/mediaplayer.py (+1/-1)
openlp/core/ui/media/playertab.py (+1/-1)
openlp/core/ui/media/systemplayer.py (+1/-2)
openlp/core/ui/media/vendor/__init__.py (+1/-1)
openlp/core/ui/media/vendor/mediainfoWrapper.py (+1/-1)
openlp/core/ui/media/vendor/vlc.py (+2/-3)
openlp/core/ui/media/vlcplayer.py (+6/-5)
openlp/core/ui/media/webkitplayer.py (+2/-2)
openlp/core/ui/plugindialog.py (+1/-1)
openlp/core/ui/pluginform.py (+1/-1)
openlp/core/ui/printservicedialog.py (+1/-1)
openlp/core/ui/printserviceform.py (+2/-2)
openlp/core/ui/serviceitemeditdialog.py (+1/-1)
openlp/core/ui/serviceitemeditform.py (+1/-1)
openlp/core/ui/servicemanager.py (+1/-1)
openlp/core/ui/servicenoteform.py (+1/-1)
openlp/core/ui/settingsdialog.py (+1/-1)
openlp/core/ui/settingsform.py (+1/-1)
openlp/core/ui/shortcutlistdialog.py (+1/-1)
openlp/core/ui/shortcutlistform.py (+1/-1)
openlp/core/ui/slidecontroller.py (+1/-2)
openlp/core/ui/splashscreen.py (+1/-1)
openlp/core/ui/starttimedialog.py (+1/-1)
openlp/core/ui/starttimeform.py (+1/-1)
openlp/core/ui/style.py (+2/-2)
openlp/core/ui/themeform.py (+1/-1)
openlp/core/ui/themelayoutdialog.py (+1/-1)
openlp/core/ui/themelayoutform.py (+1/-1)
openlp/core/ui/thememanager.py (+1/-1)
openlp/core/ui/themestab.py (+1/-1)
openlp/core/ui/themewizard.py (+1/-1)
openlp/core/version.py (+1/-1)
openlp/core/widgets/__init__.py (+1/-1)
openlp/core/widgets/buttons.py (+1/-1)
openlp/core/widgets/dialogs.py (+2/-2)
openlp/core/widgets/docks.py (+1/-1)
openlp/core/widgets/edits.py (+1/-1)
openlp/core/widgets/enums.py (+1/-1)
openlp/core/widgets/toolbar.py (+1/-1)
openlp/core/widgets/views.py (+1/-1)
openlp/core/widgets/wizard.py (+1/-1)
openlp/plugins/__init__.py (+1/-1)
openlp/plugins/alerts/__init__.py (+1/-1)
openlp/plugins/alerts/alertsplugin.py (+1/-1)
openlp/plugins/alerts/endpoint.py (+3/-4)
openlp/plugins/alerts/forms/__init__.py (+1/-1)
openlp/plugins/alerts/forms/alertdialog.py (+1/-1)
openlp/plugins/alerts/forms/alertform.py (+1/-2)
openlp/plugins/alerts/lib/__init__.py (+1/-1)
openlp/plugins/alerts/lib/alertsmanager.py (+1/-1)
openlp/plugins/alerts/lib/alertstab.py (+1/-1)
openlp/plugins/alerts/lib/db.py (+1/-1)
openlp/plugins/bibles/__init__.py (+1/-1)
openlp/plugins/bibles/bibleplugin.py (+3/-3)
openlp/plugins/bibles/endpoint.py (+3/-4)
openlp/plugins/bibles/forms/__init__.py (+3/-3)
openlp/plugins/bibles/forms/bibleimportform.py (+3/-2)
openlp/plugins/bibles/forms/booknamedialog.py (+1/-1)
openlp/plugins/bibles/forms/booknameform.py (+2/-2)
openlp/plugins/bibles/forms/editbibledialog.py (+1/-1)
openlp/plugins/bibles/forms/editbibleform.py (+2/-2)
openlp/plugins/bibles/forms/languagedialog.py (+1/-1)
openlp/plugins/bibles/forms/languageform.py (+2/-3)
openlp/plugins/bibles/lib/__init__.py (+1/-2)
openlp/plugins/bibles/lib/bibleimport.py (+4/-3)
openlp/plugins/bibles/lib/biblestab.py (+1/-1)
openlp/plugins/bibles/lib/db.py (+2/-2)
openlp/plugins/bibles/lib/importers/__init__.py (+1/-1)
openlp/plugins/bibles/lib/importers/csvbible.py (+1/-1)
openlp/plugins/bibles/lib/importers/http.py (+2/-2)
openlp/plugins/bibles/lib/importers/opensong.py (+1/-1)
openlp/plugins/bibles/lib/importers/osis.py (+1/-1)
openlp/plugins/bibles/lib/importers/sword.py (+2/-2)
openlp/plugins/bibles/lib/importers/wordproject.py (+1/-1)
openlp/plugins/bibles/lib/importers/zefania.py (+1/-2)
openlp/plugins/bibles/lib/manager.py (+3/-2)
openlp/plugins/bibles/lib/mediaitem.py (+1/-1)
openlp/plugins/bibles/lib/upgrade.py (+1/-1)
openlp/plugins/bibles/lib/versereferencelist.py (+1/-1)
openlp/plugins/custom/__init__.py (+1/-1)
openlp/plugins/custom/customplugin.py (+1/-1)
openlp/plugins/custom/endpoint.py (+3/-4)
openlp/plugins/custom/forms/__init__.py (+1/-1)
openlp/plugins/custom/forms/editcustomdialog.py (+1/-1)
openlp/plugins/custom/forms/editcustomform.py (+1/-1)
openlp/plugins/custom/forms/editcustomslidedialog.py (+1/-1)
openlp/plugins/custom/forms/editcustomslideform.py (+1/-1)
openlp/plugins/custom/lib/__init__.py (+2/-2)
openlp/plugins/custom/lib/customtab.py (+1/-1)
openlp/plugins/custom/lib/customxmlhandler.py (+2/-2)
openlp/plugins/custom/lib/db.py (+1/-1)
openlp/plugins/custom/lib/mediaitem.py (+1/-1)
openlp/plugins/images/__init__.py (+1/-1)
openlp/plugins/images/endpoint.py (+3/-4)
openlp/plugins/images/forms/__init__.py (+1/-1)
openlp/plugins/images/forms/addgroupdialog.py (+1/-1)
openlp/plugins/images/forms/addgroupform.py (+1/-1)
openlp/plugins/images/forms/choosegroupdialog.py (+1/-1)
openlp/plugins/images/forms/choosegroupform.py (+1/-1)
openlp/plugins/images/imageplugin.py (+3/-3)
openlp/plugins/images/lib/__init__.py (+2/-2)
openlp/plugins/images/lib/db.py (+1/-1)
openlp/plugins/images/lib/imagetab.py (+1/-1)
openlp/plugins/images/lib/mediaitem.py (+1/-2)
openlp/plugins/images/lib/upgrade.py (+1/-1)
openlp/plugins/media/__init__.py (+1/-1)
openlp/plugins/media/endpoint.py (+3/-4)
openlp/plugins/media/forms/__init__.py (+1/-1)
openlp/plugins/media/forms/mediaclipselectordialog.py (+1/-1)
openlp/plugins/media/forms/mediaclipselectorform.py (+5/-5)
openlp/plugins/media/lib/__init__.py (+1/-1)
openlp/plugins/media/lib/mediaitem.py (+2/-2)
openlp/plugins/media/lib/mediatab.py (+1/-1)
openlp/plugins/media/mediaplugin.py (+1/-3)
openlp/plugins/presentations/__init__.py (+1/-1)
openlp/plugins/presentations/endpoint.py (+3/-4)
openlp/plugins/presentations/lib/__init__.py (+1/-1)
openlp/plugins/presentations/lib/impresscontroller.py (+1/-1)
openlp/plugins/presentations/lib/mediaitem.py (+3/-3)
openlp/plugins/presentations/lib/messagelistener.py (+2/-2)
openlp/plugins/presentations/lib/pdfcontroller.py (+1/-1)
openlp/plugins/presentations/lib/powerpointcontroller.py (+1/-1)
openlp/plugins/presentations/lib/pptviewcontroller.py (+2/-2)
openlp/plugins/presentations/lib/pptviewlib/README.TXT (+1/-1)
openlp/plugins/presentations/lib/pptviewlib/ppttest.py (+3/-2)
openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp (+1/-1)
openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h (+1/-1)
openlp/plugins/presentations/lib/presentationcontroller.py (+1/-1)
openlp/plugins/presentations/lib/presentationtab.py (+1/-1)
openlp/plugins/presentations/presentationplugin.py (+2/-2)
openlp/plugins/songs/__init__.py (+1/-1)
openlp/plugins/songs/endpoint.py (+3/-4)
openlp/plugins/songs/forms/__init__.py (+1/-1)
openlp/plugins/songs/forms/authorsdialog.py (+1/-1)
openlp/plugins/songs/forms/authorsform.py (+1/-1)
openlp/plugins/songs/forms/duplicatesongremovalform.py (+2/-2)
openlp/plugins/songs/forms/editsongdialog.py (+1/-1)
openlp/plugins/songs/forms/editsongform.py (+2/-2)
openlp/plugins/songs/forms/editversedialog.py (+2/-2)
openlp/plugins/songs/forms/editverseform.py (+3/-3)
openlp/plugins/songs/forms/mediafilesdialog.py (+1/-1)
openlp/plugins/songs/forms/mediafilesform.py (+1/-2)
openlp/plugins/songs/forms/songbookdialog.py (+1/-1)
openlp/plugins/songs/forms/songbookform.py (+1/-1)
openlp/plugins/songs/forms/songexportform.py (+1/-1)
openlp/plugins/songs/forms/songimportform.py (+1/-1)
openlp/plugins/songs/forms/songmaintenancedialog.py (+1/-1)
openlp/plugins/songs/forms/songmaintenanceform.py (+2/-2)
openlp/plugins/songs/forms/songreviewwidget.py (+1/-1)
openlp/plugins/songs/forms/songselectdialog.py (+1/-1)
openlp/plugins/songs/forms/songselectform.py (+1/-1)
openlp/plugins/songs/forms/topicsdialog.py (+1/-1)
openlp/plugins/songs/forms/topicsform.py (+1/-1)
openlp/plugins/songs/lib/__init__.py (+1/-1)
openlp/plugins/songs/lib/db.py (+1/-1)
openlp/plugins/songs/lib/importer.py (+15/-15)
openlp/plugins/songs/lib/importers/__init__.py (+1/-1)
openlp/plugins/songs/lib/importers/cclifile.py (+4/-3)
openlp/plugins/songs/lib/importers/dreambeam.py (+1/-1)
openlp/plugins/songs/lib/importers/easyslides.py (+1/-1)
openlp/plugins/songs/lib/importers/easyworship.py (+2/-3)
openlp/plugins/songs/lib/importers/foilpresenter.py (+3/-3)
openlp/plugins/songs/lib/importers/lyrix.py (+1/-1)
openlp/plugins/songs/lib/importers/mediashout.py (+3/-2)
openlp/plugins/songs/lib/importers/openlp.py (+1/-1)
openlp/plugins/songs/lib/importers/openlyrics.py (+2/-2)
openlp/plugins/songs/lib/importers/openoffice.py (+1/-1)
openlp/plugins/songs/lib/importers/opensong.py (+1/-1)
openlp/plugins/songs/lib/importers/opspro.py (+3/-2)
openlp/plugins/songs/lib/importers/powerpraise.py (+1/-1)
openlp/plugins/songs/lib/importers/powersong.py (+1/-1)
openlp/plugins/songs/lib/importers/presentationmanager.py (+2/-2)
openlp/plugins/songs/lib/importers/propresenter.py (+2/-1)
openlp/plugins/songs/lib/importers/songbeamer.py (+4/-4)
openlp/plugins/songs/lib/importers/songimport.py (+2/-2)
openlp/plugins/songs/lib/importers/songpro.py (+1/-1)
openlp/plugins/songs/lib/importers/songshowplus.py (+1/-1)
openlp/plugins/songs/lib/importers/songsoffellowship.py (+1/-3)
openlp/plugins/songs/lib/importers/sundayplus.py (+1/-2)
openlp/plugins/songs/lib/importers/videopsalm.py (+3/-3)
openlp/plugins/songs/lib/importers/wordsofworship.py (+2/-3)
openlp/plugins/songs/lib/importers/worshipassistant.py (+1/-1)
openlp/plugins/songs/lib/importers/worshipcenterpro.py (+2/-1)
openlp/plugins/songs/lib/importers/zionworx.py (+1/-1)
openlp/plugins/songs/lib/mediaitem.py (+1/-1)
openlp/plugins/songs/lib/openlyricsexport.py (+2/-2)
openlp/plugins/songs/lib/openlyricsxml.py (+2/-2)
openlp/plugins/songs/lib/songcompare.py (+1/-1)
openlp/plugins/songs/lib/songselect.py (+3/-3)
openlp/plugins/songs/lib/songstab.py (+1/-1)
openlp/plugins/songs/lib/ui.py (+1/-1)
openlp/plugins/songs/lib/upgrade.py (+1/-1)
openlp/plugins/songs/reporting.py (+1/-1)
openlp/plugins/songs/songsplugin.py (+1/-2)
openlp/plugins/songusage/__init__.py (+1/-1)
openlp/plugins/songusage/forms/__init__.py (+1/-1)
openlp/plugins/songusage/forms/songusagedeletedialog.py (+1/-1)
openlp/plugins/songusage/forms/songusagedeleteform.py (+2/-2)
openlp/plugins/songusage/forms/songusagedetaildialog.py (+1/-1)
openlp/plugins/songusage/forms/songusagedetailform.py (+2/-2)
openlp/plugins/songusage/lib/__init__.py (+1/-1)
openlp/plugins/songusage/lib/db.py (+1/-1)
openlp/plugins/songusage/lib/upgrade.py (+1/-1)
openlp/plugins/songusage/songusageplugin.py (+1/-1)
scripts/appveyor-webhook.py (+1/-1)
scripts/check_dependencies.py (+1/-1)
scripts/clean_up_resources.py (+1/-1)
scripts/generate_resources.sh (+1/-1)
scripts/jenkins_script.py (+5/-4)
scripts/lp-merge.py (+1/-1)
scripts/resources.patch (+1/-1)
scripts/translation_utils.py (+1/-1)
scripts/websocket_client.py (+1/-1)
setup.py (+1/-1)
tests/__init__.py (+1/-1)
tests/functional/__init__.py (+1/-2)
tests/functional/openlp_core/__init__.py (+21/-0)
tests/functional/openlp_core/api/__init__.py (+1/-1)
tests/functional/openlp_core/api/http/__init__.py (+1/-1)
tests/functional/openlp_core/api/http/test_error.py (+1/-1)
tests/functional/openlp_core/api/http/test_http.py (+2/-2)
tests/functional/openlp_core/api/http/test_wsgiapp.py (+2/-3)
tests/functional/openlp_core/api/test_deploy.py (+1/-1)
tests/functional/openlp_core/api/test_tab.py (+2/-2)
tests/functional/openlp_core/api/test_websockets.py (+3/-3)
tests/functional/openlp_core/common/__init__.py (+1/-1)
tests/functional/openlp_core/common/test_actions.py (+1/-2)
tests/functional/openlp_core/common/test_applocation.py (+1/-1)
tests/functional/openlp_core/common/test_common.py (+1/-1)
tests/functional/openlp_core/common/test_db.py (+1/-1)
tests/functional/openlp_core/common/test_httputils.py (+1/-2)
tests/functional/openlp_core/common/test_i18n.py (+1/-1)
tests/functional/openlp_core/common/test_init.py (+1/-3)
tests/functional/openlp_core/common/test_json.py (+2/-2)
tests/functional/openlp_core/common/test_mixins.py (+1/-1)
tests/functional/openlp_core/common/test_path.py (+1/-1)
tests/functional/openlp_core/common/test_projector_utilities.py (+1/-2)
tests/functional/openlp_core/common/test_registry.py (+1/-1)
tests/functional/openlp_core/common/test_settings.py (+1/-2)
tests/functional/openlp_core/display/__init__.py (+1/-1)
tests/functional/openlp_core/display/test_renderer.py (+2/-3)
tests/functional/openlp_core/display/test_screens.py (+1/-1)
tests/functional/openlp_core/lib/test_db.py (+2/-3)
tests/functional/openlp_core/lib/test_htmlbuilder.py (+0/-1)
tests/functional/openlp_core/lib/test_image_manager.py (+0/-1)
tests/functional/openlp_core/lib/test_mediamanageritem.py (+0/-1)
tests/functional/openlp_core/lib/test_pluginmanager.py (+1/-1)
tests/functional/openlp_core/lib/test_serviceitem.py (+0/-1)
tests/functional/openlp_core/lib/test_theme.py (+0/-1)
tests/functional/openlp_core/projectors/test_projector_bugfixes_01.py (+0/-1)
tests/functional/openlp_core/projectors/test_projector_db.py (+0/-2)
tests/functional/openlp_core/projectors/test_projector_pjlink_base.py (+0/-1)
tests/functional/openlp_core/projectors/test_projector_pjlink_commands_01.py (+0/-1)
tests/functional/openlp_core/projectors/test_projector_pjlink_commands_02.py (+0/-1)
tests/functional/openlp_core/test_app.py (+1/-3)
tests/functional/openlp_core/test_version.py (+1/-1)
tests/functional/openlp_core/ui/media/__init__.py (+1/-1)
tests/functional/openlp_core/ui/media/test_mediacontroller.py (+2/-3)
tests/functional/openlp_core/ui/media/test_systemplayer.py (+1/-1)
tests/functional/openlp_core/ui/media/test_vlcplayer.py (+1/-2)
tests/functional/openlp_core/ui/media/test_webkitplayer.py (+1/-1)
tests/functional/openlp_core/ui/test_aboutform.py (+0/-1)
tests/functional/openlp_core/ui/test_advancedtab.py (+1/-2)
tests/functional/openlp_core/ui/test_exceptionform.py (+1/-3)
tests/functional/openlp_core/ui/test_first_time.py (+0/-1)
tests/functional/openlp_core/ui/test_firsttimeform.py (+1/-3)
tests/functional/openlp_core/ui/test_maindisplay.py (+0/-1)
tests/functional/openlp_core/ui/test_mainwindow.py (+1/-2)
tests/functional/openlp_core/ui/test_media.py (+0/-1)
tests/functional/openlp_core/ui/test_style.py (+1/-1)
tests/functional/openlp_core/ui/test_thememanager.py (+1/-2)
tests/functional/openlp_core/ui/test_themetab.py (+1/-2)
tests/functional/openlp_core/widgets/__init__.py (+1/-1)
tests/functional/openlp_core/widgets/test_buttons.py (+1/-1)
tests/functional/openlp_core/widgets/test_edits.py (+2/-2)
tests/functional/openlp_core/widgets/test_views.py (+1/-1)
tests/functional/openlp_plugins/__init__.py (+1/-1)
tests/functional/openlp_plugins/alerts/__init__.py (+1/-1)
tests/functional/openlp_plugins/alerts/test_manager.py (+2/-4)
tests/functional/openlp_plugins/bibles/__init__.py (+1/-1)
tests/functional/openlp_plugins/bibles/test_bibleimport.py (+1/-1)
tests/functional/openlp_plugins/bibles/test_bibleserver.py (+1/-1)
tests/functional/openlp_plugins/bibles/test_csvimport.py (+1/-2)
tests/functional/openlp_plugins/bibles/test_db.py (+1/-1)
tests/functional/openlp_plugins/bibles/test_lib.py (+1/-2)
tests/functional/openlp_plugins/bibles/test_manager.py (+1/-1)
tests/functional/openlp_plugins/bibles/test_mediaitem.py (+2/-3)
tests/functional/openlp_plugins/bibles/test_opensongimport.py (+2/-3)
tests/functional/openlp_plugins/bibles/test_osisimport.py (+1/-2)
tests/functional/openlp_plugins/bibles/test_swordimport.py (+1/-1)
tests/functional/openlp_plugins/bibles/test_versereferencelist.py (+1/-1)
tests/functional/openlp_plugins/bibles/test_wordprojectimport.py (+1/-2)
tests/functional/openlp_plugins/bibles/test_zefaniaimport.py (+1/-2)
tests/functional/openlp_plugins/custom/__init__.py (+1/-1)
tests/functional/openlp_plugins/custom/test_mediaitem.py (+1/-2)
tests/functional/openlp_plugins/images/__init__.py (+1/-1)
tests/functional/openlp_plugins/images/test_imagetab.py (+1/-2)
tests/functional/openlp_plugins/images/test_lib.py (+2/-2)
tests/functional/openlp_plugins/images/test_upgrade.py (+1/-2)
tests/functional/openlp_plugins/media/test_mediaitem.py (+2/-3)
tests/functional/openlp_plugins/media/test_mediaplugin.py (+1/-2)
tests/functional/openlp_plugins/presentations/__init__.py (+1/-1)
tests/functional/openlp_plugins/presentations/test_impresscontroller.py (+4/-4)
tests/functional/openlp_plugins/presentations/test_mediaitem.py (+2/-3)
tests/functional/openlp_plugins/presentations/test_messagelistener.py (+1/-2)
tests/functional/openlp_plugins/presentations/test_pdfcontroller.py (+3/-4)
tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py (+2/-3)
tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py (+2/-3)
tests/functional/openlp_plugins/presentations/test_presentationcontroller.py (+1/-1)
tests/functional/openlp_plugins/songs/__init__.py (+1/-1)
tests/functional/openlp_plugins/songs/test_chordproimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_db.py (+4/-4)
tests/functional/openlp_plugins/songs/test_easyslidesimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_editsongform.py (+1/-2)
tests/functional/openlp_plugins/songs/test_editverseform.py (+1/-2)
tests/functional/openlp_plugins/songs/test_ewimport.py (+1/-2)
tests/functional/openlp_plugins/songs/test_foilpresenterimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_lib.py (+1/-1)
tests/functional/openlp_plugins/songs/test_lyriximport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_mediaitem.py (+1/-2)
tests/functional/openlp_plugins/songs/test_mediashout.py (+2/-1)
tests/functional/openlp_plugins/songs/test_openlpimporter.py (+1/-1)
tests/functional/openlp_plugins/songs/test_openlyricsexport.py (+2/-3)
tests/functional/openlp_plugins/songs/test_openlyricsimport.py (+1/-2)
tests/functional/openlp_plugins/songs/test_openoffice.py (+1/-2)
tests/functional/openlp_plugins/songs/test_opensongimport.py (+1/-2)
tests/functional/openlp_plugins/songs/test_opsproimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_powerpraiseimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_propresenterimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_songbeamerimport.py (+1/-2)
tests/functional/openlp_plugins/songs/test_songproimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_songselect.py (+1/-2)
tests/functional/openlp_plugins/songs/test_songshowplusimport.py (+1/-2)
tests/functional/openlp_plugins/songs/test_sundayplusimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_videopsalm.py (+1/-1)
tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_worshipassistantimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_worshipcenterproimport.py (+1/-1)
tests/functional/openlp_plugins/songs/test_zionworximport.py (+1/-2)
tests/functional/openlp_plugins/songusage/__init__.py (+1/-1)
tests/functional/openlp_plugins/songusage/test_songusage.py (+1/-1)
tests/helpers/__init__.py (+1/-1)
tests/helpers/songfileimport.py (+1/-1)
tests/helpers/testmixin.py (+2/-1)
tests/interfaces/__init__.py (+1/-1)
tests/interfaces/openlp_core/__init__.py (+1/-1)
tests/interfaces/openlp_core/api/__init__.py (+1/-1)
tests/interfaces/openlp_core/common/__init__.py (+1/-1)
tests/interfaces/openlp_core/common/test_utils.py (+2/-1)
tests/interfaces/openlp_core/lib/__init__.py (+1/-1)
tests/interfaces/openlp_core/lib/test_pluginmanager.py (+3/-4)
tests/interfaces/openlp_core/ui/__init__.py (+1/-1)
tests/interfaces/openlp_core/ui/lib/__init__.py (+1/-1)
tests/interfaces/openlp_core/ui/media/__init__.py (+1/-1)
tests/interfaces/openlp_core/ui/media/vendor/__init__.py (+1/-1)
tests/interfaces/openlp_core/ui/media/vendor/test_mediainfoWrapper.py (+1/-2)
tests/interfaces/openlp_core/ui/test_filerenamedialog.py (+1/-2)
tests/interfaces/openlp_core/ui/test_mainwindow.py (+1/-2)
tests/interfaces/openlp_core/ui/test_projectoreditform.py (+2/-4)
tests/interfaces/openlp_core/ui/test_projectormanager.py (+1/-2)
tests/interfaces/openlp_core/ui/test_projectorsourceform.py (+2/-3)
tests/interfaces/openlp_core/ui/test_servicemanager.py (+1/-2)
tests/interfaces/openlp_core/ui/test_servicenotedialog.py (+1/-2)
tests/interfaces/openlp_core/ui/test_settings_form.py (+2/-3)
tests/interfaces/openlp_core/ui/test_shortcutlistform.py (+1/-2)
tests/interfaces/openlp_core/ui/test_starttimedialog.py (+1/-2)
tests/interfaces/openlp_core/ui/test_thememanager.py (+2/-3)
tests/interfaces/openlp_core/widgets/__init__.py (+1/-1)
tests/interfaces/openlp_core/widgets/test_edits.py (+1/-2)
tests/interfaces/openlp_core/widgets/test_views.py (+2/-3)
tests/interfaces/openlp_plugins/__init__.py (+1/-1)
tests/interfaces/openlp_plugins/bibles/__init__.py (+1/-1)
tests/interfaces/openlp_plugins/bibles/forms/__init__.py (+21/-0)
tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py (+2/-3)
tests/interfaces/openlp_plugins/bibles/test_lib_http.py (+1/-1)
tests/interfaces/openlp_plugins/bibles/test_lib_manager.py (+2/-3)
tests/interfaces/openlp_plugins/bibles/test_lib_parse_reference.py (+2/-3)
tests/interfaces/openlp_plugins/custom/__init__.py (+1/-1)
tests/interfaces/openlp_plugins/custom/forms/__init__.py (+1/-1)
tests/interfaces/openlp_plugins/custom/forms/test_customform.py (+1/-3)
tests/interfaces/openlp_plugins/custom/forms/test_customslideform.py (+1/-2)
tests/interfaces/openlp_plugins/media/__init__.py (+1/-1)
tests/interfaces/openlp_plugins/media/forms/__init__.py (+1/-1)
tests/interfaces/openlp_plugins/media/forms/test_mediaclipselectorform.py (+1/-1)
tests/interfaces/openlp_plugins/songs/__init__.py (+1/-1)
tests/interfaces/openlp_plugins/songs/forms/__init__.py (+1/-1)
tests/interfaces/openlp_plugins/songs/forms/test_authorsform.py (+1/-1)
tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py (+1/-2)
tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py (+1/-1)
tests/interfaces/openlp_plugins/songs/forms/test_songmaintenanceform.py (+1/-2)
tests/interfaces/openlp_plugins/songs/forms/test_topicsform.py (+1/-1)
tests/resources/projector/data.py (+1/-4)
tests/utils/__init__.py (+2/-2)
tests/utils/constants.py (+20/-0)
tests/utils/osdinteraction.py (+2/-2)
tests/utils/test_bzr_tags.py (+2/-3)
tests/utils/test_pylint.py (+1/-2)
To merge this branch: bzr merge lp:~trb143/openlp/textcleanups
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+335601@code.launchpad.net

This proposal supersedes a proposal from 2017-12-29.

Description of the change

Update the year to 2018
Add some missing copyright files
Reorder and fix the imports for all files.
Fix a timing issue with the mac build which makes it fail all the time.

lp:~trb143/openlp/textcleanups (revision 2812)
https://ci.openlp.io/job/Branch-01-Pull/2406/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2307/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/102/ [SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/26/ [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/25/ [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1488/ [SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1301/ [SUCCESS]

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'copyright.txt'
2--- copyright.txt 2016-12-31 11:01:36 +0000
3+++ copyright.txt 2017-12-29 10:26:06 +0000
4@@ -4,7 +4,7 @@
5 ###############################################################################
6 # OpenLP - Open Source Lyrics Projection #
7 # --------------------------------------------------------------------------- #
8-# Copyright (c) 2008-2017 OpenLP Developers #
9+# Copyright (c) 2008-2018 OpenLP Developers #
10 # --------------------------------------------------------------------------- #
11 # This program is free software; you can redistribute it and/or modify it #
12 # under the terms of the GNU General Public License as published by the Free #
13
14=== modified file 'openlp.py'
15--- openlp.py 2017-12-17 04:29:53 +0000
16+++ openlp.py 2017-12-29 10:26:06 +0000
17@@ -5,7 +5,7 @@
18 ###############################################################################
19 # OpenLP - Open Source Lyrics Projection #
20 # --------------------------------------------------------------------------- #
21-# Copyright (c) 2008-2017 OpenLP Developers #
22+# Copyright (c) 2008-2018 OpenLP Developers #
23 # --------------------------------------------------------------------------- #
24 # This program is free software; you can redistribute it and/or modify it #
25 # under the terms of the GNU General Public License as published by the Free #
26
27=== modified file 'openlp/__init__.py'
28--- openlp/__init__.py 2017-10-10 07:08:44 +0000
29+++ openlp/__init__.py 2017-12-29 10:26:06 +0000
30@@ -4,7 +4,7 @@
31 ###############################################################################
32 # OpenLP - Open Source Lyrics Projection #
33 # --------------------------------------------------------------------------- #
34-# Copyright (c) 2008-2017 OpenLP Developers #
35+# Copyright (c) 2008-2018 OpenLP Developers #
36 # --------------------------------------------------------------------------- #
37 # This program is free software; you can redistribute it and/or modify it #
38 # under the terms of the GNU General Public License as published by the Free #
39
40=== modified file 'openlp/core/__init__.py'
41--- openlp/core/__init__.py 2017-10-10 07:08:44 +0000
42+++ openlp/core/__init__.py 2017-12-29 10:26:06 +0000
43@@ -4,7 +4,7 @@
44 ###############################################################################
45 # OpenLP - Open Source Lyrics Projection #
46 # --------------------------------------------------------------------------- #
47-# Copyright (c) 2008-2017 OpenLP Developers #
48+# Copyright (c) 2008-2018 OpenLP Developers #
49 # --------------------------------------------------------------------------- #
50 # This program is free software; you can redistribute it and/or modify it #
51 # under the terms of the GNU General Public License as published by the Free #
52
53=== modified file 'openlp/core/api/__init__.py'
54--- openlp/core/api/__init__.py 2017-03-04 19:17:59 +0000
55+++ openlp/core/api/__init__.py 2017-12-29 10:26:06 +0000
56@@ -4,7 +4,7 @@
57 ###############################################################################
58 # OpenLP - Open Source Lyrics Projection #
59 # --------------------------------------------------------------------------- #
60-# Copyright (c) 2008-2017 OpenLP Developers #
61+# Copyright (c) 2008-2018 OpenLP Developers #
62 # --------------------------------------------------------------------------- #
63 # This program is free software; you can redistribute it and/or modify it #
64 # under the terms of the GNU General Public License as published by the Free #
65@@ -20,9 +20,9 @@
66 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
67 ###############################################################################
68
69+from openlp.core.api.http import register_endpoint, requires_auth
70 from openlp.core.api.http.endpoint import Endpoint
71-from openlp.core.api.http import register_endpoint, requires_auth
72+from openlp.core.api.poll import Poller
73 from openlp.core.api.tab import ApiTab
74-from openlp.core.api.poll import Poller
75
76 __all__ = ['Endpoint', 'ApiTab', 'register_endpoint', 'requires_auth']
77
78=== modified file 'openlp/core/api/deploy.py'
79--- openlp/core/api/deploy.py 2017-12-02 21:47:11 +0000
80+++ openlp/core/api/deploy.py 2017-12-29 10:26:06 +0000
81@@ -4,7 +4,7 @@
82 ###############################################################################
83 # OpenLP - Open Source Lyrics Projection #
84 # --------------------------------------------------------------------------- #
85-# Copyright (c) 2008-2017 OpenLP Developers #
86+# Copyright (c) 2008-2018 OpenLP Developers #
87 # --------------------------------------------------------------------------- #
88 # This program is free software; you can redistribute it and/or modify it #
89 # under the terms of the GNU General Public License as published by the Free #
90@@ -25,8 +25,8 @@
91 from zipfile import ZipFile
92
93 from openlp.core.common.applocation import AppLocation
94+from openlp.core.common.httputils import url_get_file, get_web_page, get_url_file_size
95 from openlp.core.common.registry import Registry
96-from openlp.core.common.httputils import url_get_file, get_web_page, get_url_file_size
97
98
99 def deploy_zipfile(app_root_path, zip_name):
100
101=== modified file 'openlp/core/api/endpoint/__init__.py'
102--- openlp/core/api/endpoint/__init__.py 2017-03-04 19:17:59 +0000
103+++ openlp/core/api/endpoint/__init__.py 2017-12-29 10:26:06 +0000
104@@ -4,7 +4,7 @@
105 ###############################################################################
106 # OpenLP - Open Source Lyrics Projection #
107 # --------------------------------------------------------------------------- #
108-# Copyright (c) 2008-2017 OpenLP Developers #
109+# Copyright (c) 2008-2018 OpenLP Developers #
110 # --------------------------------------------------------------------------- #
111 # This program is free software; you can redistribute it and/or modify it #
112 # under the terms of the GNU General Public License as published by the Free #
113
114=== modified file 'openlp/core/api/endpoint/controller.py'
115--- openlp/core/api/endpoint/controller.py 2017-11-18 11:23:15 +0000
116+++ openlp/core/api/endpoint/controller.py 2017-12-29 10:26:06 +0000
117@@ -4,7 +4,7 @@
118 ###############################################################################
119 # OpenLP - Open Source Lyrics Projection #
120 # --------------------------------------------------------------------------- #
121-# Copyright (c) 2008-2017 OpenLP Developers #
122+# Copyright (c) 2008-2018 OpenLP Developers #
123 # --------------------------------------------------------------------------- #
124 # This program is free software; you can redistribute it and/or modify it #
125 # under the terms of the GNU General Public License as published by the Free #
126@@ -19,14 +19,14 @@
127 # with this program; if not, write to the Free Software Foundation, Inc., 59 #
128 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
129 ###############################################################################
130+import json
131 import logging
132 import os
133+import urllib.error
134 import urllib.request
135-import urllib.error
136-import json
137
138+from openlp.core.api.http import requires_auth
139 from openlp.core.api.http.endpoint import Endpoint
140-from openlp.core.api.http import requires_auth
141 from openlp.core.common.applocation import AppLocation
142 from openlp.core.common.path import Path
143 from openlp.core.common.registry import Registry
144
145=== modified file 'openlp/core/api/endpoint/core.py'
146--- openlp/core/api/endpoint/core.py 2017-11-18 22:37:24 +0000
147+++ openlp/core/api/endpoint/core.py 2017-12-29 10:26:06 +0000
148@@ -4,7 +4,7 @@
149 ###############################################################################
150 # OpenLP - Open Source Lyrics Projection #
151 # --------------------------------------------------------------------------- #
152-# Copyright (c) 2008-2017 OpenLP Developers #
153+# Copyright (c) 2008-2018 OpenLP Developers #
154 # --------------------------------------------------------------------------- #
155 # This program is free software; you can redistribute it and/or modify it #
156 # under the terms of the GNU General Public License as published by the Free #
157@@ -27,11 +27,10 @@
158
159 from openlp.core.api.http import requires_auth
160 from openlp.core.api.http.endpoint import Endpoint
161+from openlp.core.common.i18n import UiStrings, translate
162 from openlp.core.common.registry import Registry
163-from openlp.core.common.i18n import UiStrings, translate
164 from openlp.core.lib import PluginStatus, StringContent, image_to_byte
165
166-
167 template_dir = 'templates'
168 static_dir = 'static'
169 blank_dir = os.path.join(static_dir, 'index')
170
171=== modified file 'openlp/core/api/endpoint/pluginhelpers.py'
172--- openlp/core/api/endpoint/pluginhelpers.py 2017-11-18 11:23:15 +0000
173+++ openlp/core/api/endpoint/pluginhelpers.py 2017-12-29 10:26:06 +0000
174@@ -4,7 +4,7 @@
175 ###############################################################################
176 # OpenLP - Open Source Lyrics Projection #
177 # --------------------------------------------------------------------------- #
178-# Copyright (c) 2008-2017 OpenLP Developers #
179+# Copyright (c) 2008-2018 OpenLP Developers #
180 # --------------------------------------------------------------------------- #
181 # This program is free software; you can redistribute it and/or modify it #
182 # under the terms of the GNU General Public License as published by the Free #
183
184=== modified file 'openlp/core/api/endpoint/remote.py'
185--- openlp/core/api/endpoint/remote.py 2017-11-09 19:25:26 +0000
186+++ openlp/core/api/endpoint/remote.py 2017-12-29 10:26:06 +0000
187@@ -4,7 +4,7 @@
188 ###############################################################################
189 # OpenLP - Open Source Lyrics Projection #
190 # --------------------------------------------------------------------------- #
191-# Copyright (c) 2008-2017 OpenLP Developers #
192+# Copyright (c) 2008-2018 OpenLP Developers #
193 # --------------------------------------------------------------------------- #
194 # This program is free software; you can redistribute it and/or modify it #
195 # under the terms of the GNU General Public License as published by the Free #
196@@ -21,9 +21,8 @@
197 ###############################################################################
198 import logging
199
200+from openlp.core.api.endpoint.core import TRANSLATED_STRINGS
201 from openlp.core.api.http.endpoint import Endpoint
202-from openlp.core.api.endpoint.core import TRANSLATED_STRINGS
203-
204
205 log = logging.getLogger(__name__)
206
207
208=== modified file 'openlp/core/api/endpoint/service.py'
209--- openlp/core/api/endpoint/service.py 2017-10-07 07:05:07 +0000
210+++ openlp/core/api/endpoint/service.py 2017-12-29 10:26:06 +0000
211@@ -4,7 +4,7 @@
212 ###############################################################################
213 # OpenLP - Open Source Lyrics Projection #
214 # --------------------------------------------------------------------------- #
215-# Copyright (c) 2008-2017 OpenLP Developers #
216+# Copyright (c) 2008-2018 OpenLP Developers #
217 # --------------------------------------------------------------------------- #
218 # This program is free software; you can redistribute it and/or modify it #
219 # under the terms of the GNU General Public License as published by the Free #
220@@ -19,14 +19,13 @@
221 # with this program; if not, write to the Free Software Foundation, Inc., 59 #
222 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
223 ###############################################################################
224+import json
225 import logging
226-import json
227
228 from openlp.core.api.http import requires_auth
229 from openlp.core.api.http.endpoint import Endpoint
230 from openlp.core.common.registry import Registry
231
232-
233 log = logging.getLogger(__name__)
234
235 service_endpoint = Endpoint('service')
236
237=== modified file 'openlp/core/api/http/__init__.py'
238--- openlp/core/api/http/__init__.py 2017-03-04 19:17:59 +0000
239+++ openlp/core/api/http/__init__.py 2017-12-29 10:26:06 +0000
240@@ -4,7 +4,7 @@
241 ###############################################################################
242 # OpenLP - Open Source Lyrics Projection #
243 # --------------------------------------------------------------------------- #
244-# Copyright (c) 2008-2017 OpenLP Developers #
245+# Copyright (c) 2008-2018 OpenLP Developers #
246 # --------------------------------------------------------------------------- #
247 # This program is free software; you can redistribute it and/or modify it #
248 # under the terms of the GNU General Public License as published by the Free #
249@@ -22,10 +22,11 @@
250
251 import base64
252 from functools import wraps
253+
254 from webob import Response
255
256+from openlp.core.api.http.wsgiapp import WSGIApplication
257 from openlp.core.common.settings import Settings
258-from openlp.core.api.http.wsgiapp import WSGIApplication
259 from .errors import NotFound, ServerError, HttpError
260
261 application = WSGIApplication('api')
262
263=== modified file 'openlp/core/api/http/endpoint.py'
264--- openlp/core/api/http/endpoint.py 2017-11-18 11:23:15 +0000
265+++ openlp/core/api/http/endpoint.py 2017-12-29 10:26:06 +0000
266@@ -4,7 +4,7 @@
267 ###############################################################################
268 # OpenLP - Open Source Lyrics Projection #
269 # --------------------------------------------------------------------------- #
270-# Copyright (c) 2008-2017 OpenLP Developers #
271+# Copyright (c) 2008-2018 OpenLP Developers #
272 # --------------------------------------------------------------------------- #
273 # This program is free software; you can redistribute it and/or modify it #
274 # under the terms of the GNU General Public License as published by the Free #
275
276=== modified file 'openlp/core/api/http/errors.py'
277--- openlp/core/api/http/errors.py 2017-03-04 19:17:59 +0000
278+++ openlp/core/api/http/errors.py 2017-12-29 10:26:06 +0000
279@@ -4,7 +4,7 @@
280 ###############################################################################
281 # OpenLP - Open Source Lyrics Projection #
282 # --------------------------------------------------------------------------- #
283-# Copyright (c) 2008-2017 OpenLP Developers #
284+# Copyright (c) 2008-2018 OpenLP Developers #
285 # --------------------------------------------------------------------------- #
286 # This program is free software; you can redistribute it and/or modify it #
287 # under the terms of the GNU General Public License as published by the Free #
288
289=== modified file 'openlp/core/api/http/server.py'
290--- openlp/core/api/http/server.py 2017-12-02 21:47:11 +0000
291+++ openlp/core/api/http/server.py 2017-12-29 10:26:06 +0000
292@@ -4,7 +4,7 @@
293 ###############################################################################
294 # OpenLP - Open Source Lyrics Projection #
295 # --------------------------------------------------------------------------- #
296-# Copyright (c) 2008-2017 OpenLP Developers #
297+# Copyright (c) 2008-2018 OpenLP Developers #
298 # --------------------------------------------------------------------------- #
299 # This program is free software; you can redistribute it and/or modify it #
300 # under the terms of the GNU General Public License as published by the Free #
301@@ -32,18 +32,18 @@
302 from openlp.core.api.deploy import download_and_check, download_sha256
303 from openlp.core.api.endpoint.controller import controller_endpoint, api_controller_endpoint
304 from openlp.core.api.endpoint.core import chords_endpoint, stage_endpoint, blank_endpoint, main_endpoint
305+from openlp.core.api.endpoint.remote import remote_endpoint
306 from openlp.core.api.endpoint.service import service_endpoint, api_service_endpoint
307-from openlp.core.api.endpoint.remote import remote_endpoint
308+from openlp.core.api.http import application
309 from openlp.core.api.http import register_endpoint
310-from openlp.core.api.http import application
311 from openlp.core.api.poll import Poller
312 from openlp.core.common.applocation import AppLocation
313 from openlp.core.common.i18n import UiStrings
314+from openlp.core.common.i18n import translate
315 from openlp.core.common.mixins import LogMixin, RegistryProperties
316 from openlp.core.common.path import create_paths
317 from openlp.core.common.registry import Registry, RegistryBase
318 from openlp.core.common.settings import Settings
319-from openlp.core.common.i18n import translate
320
321 log = logging.getLogger(__name__)
322
323
324=== modified file 'openlp/core/api/http/wsgiapp.py'
325--- openlp/core/api/http/wsgiapp.py 2017-11-18 11:23:15 +0000
326+++ openlp/core/api/http/wsgiapp.py 2017-12-29 10:26:06 +0000
327@@ -5,7 +5,7 @@
328 ###############################################################################
329 # OpenLP - Open Source Lyrics Projection #
330 # --------------------------------------------------------------------------- #
331-# Copyright (c) 2008-2017 OpenLP Developers #
332+# Copyright (c) 2008-2018 OpenLP Developers #
333 # --------------------------------------------------------------------------- #
334 # This program is free software; you can redistribute it and/or modify it #
335 # under the terms of the GNU General Public License as published by the Free #
336@@ -30,9 +30,8 @@
337 from webob import Request, Response
338 from webob.static import DirectoryApp
339
340+from openlp.core.api.http.errors import HttpError, NotFound, ServerError
341 from openlp.core.common.applocation import AppLocation
342-from openlp.core.api.http.errors import HttpError, NotFound, ServerError
343-
344
345 ARGS_REGEX = re.compile(r'''\{(\w+)(?::([^}]+))?\}''', re.VERBOSE)
346
347
348=== modified file 'openlp/core/api/poll.py'
349--- openlp/core/api/poll.py 2017-10-23 22:09:57 +0000
350+++ openlp/core/api/poll.py 2017-12-29 10:26:06 +0000
351@@ -4,7 +4,7 @@
352 ###############################################################################
353 # OpenLP - Open Source Lyrics Projection #
354 # --------------------------------------------------------------------------- #
355-# Copyright (c) 2008-2017 OpenLP Developers #
356+# Copyright (c) 2008-2018 OpenLP Developers #
357 # --------------------------------------------------------------------------- #
358 # This program is free software; you can redistribute it and/or modify it #
359 # under the terms of the GNU General Public License as published by the Free #
360
361=== modified file 'openlp/core/api/tab.py'
362--- openlp/core/api/tab.py 2017-10-10 02:29:56 +0000
363+++ openlp/core/api/tab.py 2017-12-29 10:26:06 +0000
364@@ -4,7 +4,7 @@
365 ###############################################################################
366 # OpenLP - Open Source Lyrics Projection #
367 # --------------------------------------------------------------------------- #
368-# Copyright (c) 2008-2017 OpenLP Developers #
369+# Copyright (c) 2008-2018 OpenLP Developers #
370 # --------------------------------------------------------------------------- #
371 # This program is free software; you can redistribute it and/or modify it #
372 # under the terms of the GNU General Public License as published by the Free #
373
374=== modified file 'openlp/core/api/websockets.py'
375--- openlp/core/api/websockets.py 2017-12-02 09:11:22 +0000
376+++ openlp/core/api/websockets.py 2017-12-29 10:26:06 +0000
377@@ -4,7 +4,7 @@
378 ###############################################################################
379 # OpenLP - Open Source Lyrics Projection #
380 # --------------------------------------------------------------------------- #
381-# Copyright (c) 2008-2017 OpenLP Developers #
382+# Copyright (c) 2008-2018 OpenLP Developers #
383 # --------------------------------------------------------------------------- #
384 # This program is free software; you can redistribute it and/or modify it #
385 # under the terms of the GNU General Public License as published by the Free #
386@@ -24,11 +24,11 @@
387 with OpenLP. It uses JSON to communicate with the remotes.
388 """
389 import asyncio
390-import websockets
391 import json
392 import logging
393 import time
394
395+import websockets
396 from PyQt5 import QtCore
397
398 from openlp.core.common.mixins import LogMixin, RegistryProperties
399
400=== modified file 'openlp/core/app.py'
401--- openlp/core/app.py 2017-12-02 21:47:11 +0000
402+++ openlp/core/app.py 2017-12-29 10:26:06 +0000
403@@ -4,7 +4,7 @@
404 ###############################################################################
405 # OpenLP - Open Source Lyrics Projection #
406 # --------------------------------------------------------------------------- #
407-# Copyright (c) 2008-2017 OpenLP Developers #
408+# Copyright (c) 2008-2018 OpenLP Developers #
409 # --------------------------------------------------------------------------- #
410 # This program is free software; you can redistribute it and/or modify it #
411 # under the terms of the GNU General Public License as published by the Free #
412@@ -42,7 +42,6 @@
413 from openlp.core.common.path import create_paths, copytree
414 from openlp.core.common.registry import Registry
415 from openlp.core.common.settings import Settings
416-from openlp.core.version import check_for_update, get_version
417 from openlp.core.display.screens import ScreenList
418 from openlp.core.resources import qInitResources
419 from openlp.core.ui import SplashScreen
420@@ -51,7 +50,7 @@
421 from openlp.core.ui.firsttimelanguageform import FirstTimeLanguageForm
422 from openlp.core.ui.mainwindow import MainWindow
423 from openlp.core.ui.style import get_application_stylesheet
424-
425+from openlp.core.version import check_for_update, get_version
426
427 __all__ = ['OpenLP', 'main']
428
429
430=== modified file 'openlp/core/common/__init__.py'
431--- openlp/core/common/__init__.py 2017-12-17 15:25:54 +0000
432+++ openlp/core/common/__init__.py 2017-12-29 10:26:06 +0000
433@@ -4,7 +4,7 @@
434 ###############################################################################
435 # OpenLP - Open Source Lyrics Projection #
436 # --------------------------------------------------------------------------- #
437-# Copyright (c) 2008-2017 OpenLP Developers #
438+# Copyright (c) 2008-2018 OpenLP Developers #
439 # --------------------------------------------------------------------------- #
440 # This program is free software; you can redistribute it and/or modify it #
441 # under the terms of the GNU General Public License as published by the Free #
442@@ -30,13 +30,13 @@
443 import re
444 import sys
445 import traceback
446-from chardet.universaldetector import UniversalDetector
447 from ipaddress import IPv4Address, IPv6Address, AddressValueError
448 from shutil import which
449 from subprocess import check_output, CalledProcessError, STDOUT
450
451 from PyQt5 import QtGui
452 from PyQt5.QtCore import QCryptographicHash as QHash
453+from chardet.universaldetector import UniversalDetector
454
455 log = logging.getLogger(__name__ + '.__init__')
456
457
458=== modified file 'openlp/core/common/actions.py'
459--- openlp/core/common/actions.py 2017-11-09 19:11:37 +0000
460+++ openlp/core/common/actions.py 2017-12-29 10:26:06 +0000
461@@ -4,7 +4,7 @@
462 ###############################################################################
463 # OpenLP - Open Source Lyrics Projection #
464 # --------------------------------------------------------------------------- #
465-# Copyright (c) 2008-2017 OpenLP Developers #
466+# Copyright (c) 2008-2018 OpenLP Developers #
467 # --------------------------------------------------------------------------- #
468 # This program is free software; you can redistribute it and/or modify it #
469 # under the terms of the GNU General Public License as published by the Free #
470@@ -29,7 +29,6 @@
471
472 from openlp.core.common.settings import Settings
473
474-
475 log = logging.getLogger(__name__)
476
477
478
479=== modified file 'openlp/core/common/applocation.py'
480--- openlp/core/common/applocation.py 2017-11-11 12:20:45 +0000
481+++ openlp/core/common/applocation.py 2017-12-29 10:26:06 +0000
482@@ -4,7 +4,7 @@
483 ###############################################################################
484 # OpenLP - Open Source Lyrics Projection #
485 # --------------------------------------------------------------------------- #
486-# Copyright (c) 2008-2017 OpenLP Developers #
487+# Copyright (c) 2008-2018 OpenLP Developers #
488 # --------------------------------------------------------------------------- #
489 # This program is free software; you can redistribute it and/or modify it #
490 # under the terms of the GNU General Public License as published by the Free #
491
492=== modified file 'openlp/core/common/db.py'
493--- openlp/core/common/db.py 2016-12-31 11:01:36 +0000
494+++ openlp/core/common/db.py 2017-12-29 10:26:06 +0000
495@@ -4,7 +4,7 @@
496 ###############################################################################
497 # OpenLP - Open Source Lyrics Projection #
498 # --------------------------------------------------------------------------- #
499-# Copyright (c) 2008-2017 OpenLP Developers #
500+# Copyright (c) 2008-2018 OpenLP Developers #
501 # --------------------------------------------------------------------------- #
502 # This program is free software; you can redistribute it and/or modify it #
503 # under the terms of the GNU General Public License as published by the Free #
504@@ -27,7 +27,6 @@
505
506 import sqlalchemy
507
508-
509 log = logging.getLogger(__name__)
510
511
512
513=== modified file 'openlp/core/common/httputils.py'
514--- openlp/core/common/httputils.py 2017-11-03 20:55:41 +0000
515+++ openlp/core/common/httputils.py 2017-12-29 10:26:06 +0000
516@@ -4,7 +4,7 @@
517 ###############################################################################
518 # OpenLP - Open Source Lyrics Projection #
519 # --------------------------------------------------------------------------- #
520-# Copyright (c) 2008-2017 OpenLP Developers #
521+# Copyright (c) 2008-2018 OpenLP Developers #
522 # --------------------------------------------------------------------------- #
523 # This program is free software; you can redistribute it and/or modify it #
524 # under the terms of the GNU General Public License as published by the Free #
525
526=== modified file 'openlp/core/common/i18n.py'
527--- openlp/core/common/i18n.py 2017-10-28 10:04:09 +0000
528+++ openlp/core/common/i18n.py 2017-12-29 10:26:06 +0000
529@@ -4,7 +4,7 @@
530 ###############################################################################
531 # OpenLP - Open Source Lyrics Projection #
532 # --------------------------------------------------------------------------- #
533-# Copyright (c) 2008-2017 OpenLP Developers #
534+# Copyright (c) 2008-2018 OpenLP Developers #
535 # --------------------------------------------------------------------------- #
536 # This program is free software; you can redistribute it and/or modify it #
537 # under the terms of the GNU General Public License as published by the Free #
538
539=== modified file 'openlp/core/common/json.py'
540--- openlp/core/common/json.py 2017-09-07 20:27:11 +0000
541+++ openlp/core/common/json.py 2017-12-29 10:26:06 +0000
542@@ -4,7 +4,7 @@
543 ###############################################################################
544 # OpenLP - Open Source Lyrics Projection #
545 # --------------------------------------------------------------------------- #
546-# Copyright (c) 2008-2017 OpenLP Developers #
547+# Copyright (c) 2008-2018 OpenLP Developers #
548 # --------------------------------------------------------------------------- #
549 # This program is free software; you can redistribute it and/or modify it #
550 # under the terms of the GNU General Public License as published by the Free #
551
552=== modified file 'openlp/core/common/mixins.py'
553--- openlp/core/common/mixins.py 2017-11-10 04:11:03 +0000
554+++ openlp/core/common/mixins.py 2017-12-29 10:26:06 +0000
555@@ -4,7 +4,7 @@
556 ###############################################################################
557 # OpenLP - Open Source Lyrics Projection #
558 # --------------------------------------------------------------------------- #
559-# Copyright (c) 2008-2017 OpenLP Developers #
560+# Copyright (c) 2008-2018 OpenLP Developers #
561 # --------------------------------------------------------------------------- #
562 # This program is free software; you can redistribute it and/or modify it #
563 # under the terms of the GNU General Public License as published by the Free #
564@@ -22,8 +22,8 @@
565 """
566 Provide Error Handling and login Services
567 """
568+import inspect
569 import logging
570-import inspect
571
572 from openlp.core.common import is_win, trace_error_handler
573 from openlp.core.common.registry import Registry
574
575=== modified file 'openlp/core/common/path.py'
576--- openlp/core/common/path.py 2017-11-20 21:57:34 +0000
577+++ openlp/core/common/path.py 2017-12-29 10:26:06 +0000
578@@ -4,7 +4,7 @@
579 ###############################################################################
580 # OpenLP - Open Source Lyrics Projection #
581 # --------------------------------------------------------------------------- #
582-# Copyright (c) 2008-2017 OpenLP Developers #
583+# Copyright (c) 2008-2018 OpenLP Developers #
584 # --------------------------------------------------------------------------- #
585 # This program is free software; you can redistribute it and/or modify it #
586 # under the terms of the GNU General Public License as published by the Free #
587
588=== modified file 'openlp/core/common/registry.py'
589--- openlp/core/common/registry.py 2017-11-09 21:24:38 +0000
590+++ openlp/core/common/registry.py 2017-12-29 10:26:06 +0000
591@@ -4,7 +4,7 @@
592 ###############################################################################
593 # OpenLP - Open Source Lyrics Projection #
594 # --------------------------------------------------------------------------- #
595-# Copyright (c) 2008-2017 OpenLP Developers #
596+# Copyright (c) 2008-2018 OpenLP Developers #
597 # --------------------------------------------------------------------------- #
598 # This program is free software; you can redistribute it and/or modify it #
599 # under the terms of the GNU General Public License as published by the Free #
600
601=== modified file 'openlp/core/common/settings.py'
602--- openlp/core/common/settings.py 2017-12-02 21:47:11 +0000
603+++ openlp/core/common/settings.py 2017-12-29 10:26:06 +0000
604@@ -4,7 +4,7 @@
605 ###############################################################################
606 # OpenLP - Open Source Lyrics Projection #
607 # --------------------------------------------------------------------------- #
608-# Copyright (c) 2008-2017 OpenLP Developers #
609+# Copyright (c) 2008-2018 OpenLP Developers #
610 # --------------------------------------------------------------------------- #
611 # This program is free software; you can redistribute it and/or modify it #
612 # under the terms of the GNU General Public License as published by the Free #
613@@ -23,8 +23,8 @@
614 This class contains the core default settings.
615 """
616 import datetime
617+import json
618 import logging
619-import json
620 import os
621 from tempfile import gettempdir
622
623
624=== modified file 'openlp/core/display/__init__.py'
625--- openlp/core/display/__init__.py 2017-10-10 07:08:44 +0000
626+++ openlp/core/display/__init__.py 2017-12-29 10:26:06 +0000
627@@ -4,7 +4,7 @@
628 ###############################################################################
629 # OpenLP - Open Source Lyrics Projection #
630 # --------------------------------------------------------------------------- #
631-# Copyright (c) 2008-2017 OpenLP Developers #
632+# Copyright (c) 2008-2018 OpenLP Developers #
633 # --------------------------------------------------------------------------- #
634 # This program is free software; you can redistribute it and/or modify it #
635 # under the terms of the GNU General Public License as published by the Free #
636
637=== modified file 'openlp/core/display/renderer.py'
638--- openlp/core/display/renderer.py 2017-11-18 11:23:15 +0000
639+++ openlp/core/display/renderer.py 2017-12-29 10:26:06 +0000
640@@ -4,7 +4,7 @@
641 ###############################################################################
642 # OpenLP - Open Source Lyrics Projection #
643 # --------------------------------------------------------------------------- #
644-# Copyright (c) 2008-2017 OpenLP Developers #
645+# Copyright (c) 2008-2018 OpenLP Developers #
646 # --------------------------------------------------------------------------- #
647 # This program is free software; you can redistribute it and/or modify it #
648 # under the terms of the GNU General Public License as published by the Free #
649@@ -21,10 +21,11 @@
650 ###############################################################################
651
652 import re
653-
654 from string import Template
655+
656 from PyQt5 import QtGui, QtCore, QtWebKitWidgets
657
658+from openlp.core.common import ThemeLevel
659 from openlp.core.common.mixins import LogMixin, RegistryProperties
660 from openlp.core.common.path import path_to_str
661 from openlp.core.common.registry import Registry, RegistryBase
662@@ -32,7 +33,6 @@
663 from openlp.core.display.screens import ScreenList
664 from openlp.core.lib import FormattingTags, ImageSource, ItemCapabilities, ServiceItem, expand_tags, build_chords_css, \
665 build_lyrics_format_css, build_lyrics_outline_css
666-from openlp.core.common import ThemeLevel
667 from openlp.core.ui.maindisplay import MainDisplay
668
669 VERSE = 'The Lord said to {r}Noah{/r}: \n' \
670
671=== modified file 'openlp/core/display/screens.py'
672--- openlp/core/display/screens.py 2017-10-10 07:08:44 +0000
673+++ openlp/core/display/screens.py 2017-12-29 10:26:06 +0000
674@@ -4,7 +4,7 @@
675 ###############################################################################
676 # OpenLP - Open Source Lyrics Projection #
677 # --------------------------------------------------------------------------- #
678-# Copyright (c) 2008-2017 OpenLP Developers #
679+# Copyright (c) 2008-2018 OpenLP Developers #
680 # --------------------------------------------------------------------------- #
681 # This program is free software; you can redistribute it and/or modify it #
682 # under the terms of the GNU General Public License as published by the Free #
683@@ -23,14 +23,14 @@
684 The :mod:`screen` module provides management functionality for a machines'
685 displays.
686 """
687+import copy
688 import logging
689-import copy
690
691 from PyQt5 import QtCore
692
693+from openlp.core.common.i18n import translate
694 from openlp.core.common.registry import Registry
695 from openlp.core.common.settings import Settings
696-from openlp.core.common.i18n import translate
697
698 log = logging.getLogger(__name__)
699
700
701=== modified file 'openlp/core/lib/__init__.py'
702--- openlp/core/lib/__init__.py 2017-12-20 08:15:53 +0000
703+++ openlp/core/lib/__init__.py 2017-12-29 10:26:06 +0000
704@@ -4,7 +4,7 @@
705 ###############################################################################
706 # OpenLP - Open Source Lyrics Projection #
707 # --------------------------------------------------------------------------- #
708-# Copyright (c) 2008-2017 OpenLP Developers #
709+# Copyright (c) 2008-2018 OpenLP Developers #
710 # --------------------------------------------------------------------------- #
711 # This program is free software; you can redistribute it and/or modify it #
712 # under the terms of the GNU General Public License as published by the Free #
713@@ -25,8 +25,8 @@
714 """
715 import html
716 import logging
717+import math
718 import re
719-import math
720
721 from PyQt5 import QtCore, QtGui, QtWidgets
722
723
724=== modified file 'openlp/core/lib/db.py'
725--- openlp/core/lib/db.py 2017-10-23 22:09:57 +0000
726+++ openlp/core/lib/db.py 2017-12-29 10:26:06 +0000
727@@ -4,7 +4,7 @@
728 ###############################################################################
729 # OpenLP - Open Source Lyrics Projection #
730 # --------------------------------------------------------------------------- #
731-# Copyright (c) 2008-2017 OpenLP Developers #
732+# Copyright (c) 2008-2018 OpenLP Developers #
733 # --------------------------------------------------------------------------- #
734 # This program is free software; you can redistribute it and/or modify it #
735 # under the terms of the GNU General Public License as published by the Free #
736
737=== modified file 'openlp/core/lib/exceptions.py'
738--- openlp/core/lib/exceptions.py 2017-05-30 18:42:35 +0000
739+++ openlp/core/lib/exceptions.py 2017-12-29 10:26:06 +0000
740@@ -4,7 +4,7 @@
741 ###############################################################################
742 # OpenLP - Open Source Lyrics Projection #
743 # --------------------------------------------------------------------------- #
744-# Copyright (c) 2008-2017 OpenLP Developers #
745+# Copyright (c) 2008-2018 OpenLP Developers #
746 # --------------------------------------------------------------------------- #
747 # This program is free software; you can redistribute it and/or modify it #
748 # under the terms of the GNU General Public License as published by the Free #
749
750=== modified file 'openlp/core/lib/formattingtags.py'
751--- openlp/core/lib/formattingtags.py 2017-10-07 07:05:07 +0000
752+++ openlp/core/lib/formattingtags.py 2017-12-29 10:26:06 +0000
753@@ -4,7 +4,7 @@
754 ###############################################################################
755 # OpenLP - Open Source Lyrics Projection #
756 # --------------------------------------------------------------------------- #
757-# Copyright (c) 2008-2017 OpenLP Developers #
758+# Copyright (c) 2008-2018 OpenLP Developers #
759 # --------------------------------------------------------------------------- #
760 # This program is free software; you can redistribute it and/or modify it #
761 # under the terms of the GNU General Public License as published by the Free #
762@@ -24,8 +24,8 @@
763 """
764 import json
765
766+from openlp.core.common.i18n import translate
767 from openlp.core.common.settings import Settings
768-from openlp.core.common.i18n import translate
769
770
771 class FormattingTags(object):
772
773=== modified file 'openlp/core/lib/htmlbuilder.py'
774--- openlp/core/lib/htmlbuilder.py 2017-10-07 07:05:07 +0000
775+++ openlp/core/lib/htmlbuilder.py 2017-12-29 10:26:06 +0000
776@@ -4,7 +4,7 @@
777 ###############################################################################
778 # OpenLP - Open Source Lyrics Projection #
779 # --------------------------------------------------------------------------- #
780-# Copyright (c) 2008-2017 OpenLP Developers #
781+# Copyright (c) 2008-2018 OpenLP Developers #
782 # --------------------------------------------------------------------------- #
783 # This program is free software; you can redistribute it and/or modify it #
784 # under the terms of the GNU General Public License as published by the Free #
785@@ -407,8 +407,8 @@
786 </html>
787 """
788 import logging
789-
790 from string import Template
791+
792 from PyQt5 import QtWebKit
793
794 from openlp.core.common.settings import Settings
795
796=== modified file 'openlp/core/lib/imagemanager.py'
797--- openlp/core/lib/imagemanager.py 2017-10-10 07:08:44 +0000
798+++ openlp/core/lib/imagemanager.py 2017-12-29 10:26:06 +0000
799@@ -4,7 +4,7 @@
800 ###############################################################################
801 # OpenLP - Open Source Lyrics Projection #
802 # --------------------------------------------------------------------------- #
803-# Copyright (c) 2008-2017 OpenLP Developers #
804+# Copyright (c) 2008-2018 OpenLP Developers #
805 # --------------------------------------------------------------------------- #
806 # This program is free software; you can redistribute it and/or modify it #
807 # under the terms of the GNU General Public License as published by the Free #
808@@ -26,8 +26,8 @@
809 """
810 import logging
811 import os
812+import queue
813 import time
814-import queue
815
816 from PyQt5 import QtCore
817
818
819=== modified file 'openlp/core/lib/json/__init__.py'
820--- openlp/core/lib/json/__init__.py 2017-10-23 22:09:57 +0000
821+++ openlp/core/lib/json/__init__.py 2017-12-29 10:26:06 +0000
822@@ -4,7 +4,7 @@
823 ###############################################################################
824 # OpenLP - Open Source Lyrics Projection #
825 # --------------------------------------------------------------------------- #
826-# Copyright (c) 2008-2017 OpenLP Developers #
827+# Copyright (c) 2008-2018 OpenLP Developers #
828 # --------------------------------------------------------------------------- #
829 # This program is free software; you can redistribute it and/or modify it #
830 # under the terms of the GNU General Public License as published by the Free #
831
832=== modified file 'openlp/core/lib/mediamanageritem.py'
833--- openlp/core/lib/mediamanageritem.py 2017-12-22 21:21:39 +0000
834+++ openlp/core/lib/mediamanageritem.py 2017-12-29 10:26:06 +0000
835@@ -4,7 +4,7 @@
836 ###############################################################################
837 # OpenLP - Open Source Lyrics Projection #
838 # --------------------------------------------------------------------------- #
839-# Copyright (c) 2008-2017 OpenLP Developers #
840+# Copyright (c) 2008-2018 OpenLP Developers #
841 # --------------------------------------------------------------------------- #
842 # This program is free software; you can redistribute it and/or modify it #
843 # under the terms of the GNU General Public License as published by the Free #
844@@ -28,8 +28,8 @@
845 from PyQt5 import QtCore, QtWidgets
846
847 from openlp.core.common.i18n import UiStrings, translate
848+from openlp.core.common.mixins import RegistryProperties
849 from openlp.core.common.path import path_to_str, str_to_path
850-from openlp.core.common.mixins import RegistryProperties
851 from openlp.core.common.registry import Registry
852 from openlp.core.common.settings import Settings
853 from openlp.core.lib import ServiceItem, StringContent, ServiceItemContext
854
855=== modified file 'openlp/core/lib/plugin.py'
856--- openlp/core/lib/plugin.py 2017-11-18 11:23:15 +0000
857+++ openlp/core/lib/plugin.py 2017-12-29 10:26:06 +0000
858@@ -4,7 +4,7 @@
859 ###############################################################################
860 # OpenLP - Open Source Lyrics Projection #
861 # --------------------------------------------------------------------------- #
862-# Copyright (c) 2008-2017 OpenLP Developers #
863+# Copyright (c) 2008-2018 OpenLP Developers #
864 # --------------------------------------------------------------------------- #
865 # This program is free software; you can redistribute it and/or modify it #
866 # under the terms of the GNU General Public License as published by the Free #
867
868=== modified file 'openlp/core/lib/pluginmanager.py'
869--- openlp/core/lib/pluginmanager.py 2017-12-17 15:25:54 +0000
870+++ openlp/core/lib/pluginmanager.py 2017-12-29 10:26:06 +0000
871@@ -4,7 +4,7 @@
872 ###############################################################################
873 # OpenLP - Open Source Lyrics Projection #
874 # --------------------------------------------------------------------------- #
875-# Copyright (c) 2008-2017 OpenLP Developers #
876+# Copyright (c) 2008-2018 OpenLP Developers #
877 # --------------------------------------------------------------------------- #
878 # This program is free software; you can redistribute it and/or modify it #
879 # under the terms of the GNU General Public License as published by the Free #
880
881=== modified file 'openlp/core/lib/serviceitem.py'
882--- openlp/core/lib/serviceitem.py 2017-10-23 22:09:57 +0000
883+++ openlp/core/lib/serviceitem.py 2017-12-29 10:26:06 +0000
884@@ -4,7 +4,7 @@
885 ###############################################################################
886 # OpenLP - Open Source Lyrics Projection #
887 # --------------------------------------------------------------------------- #
888-# Copyright (c) 2008-2017 OpenLP Developers #
889+# Copyright (c) 2008-2018 OpenLP Developers #
890 # --------------------------------------------------------------------------- #
891 # This program is free software; you can redistribute it and/or modify it #
892 # under the terms of the GNU General Public License as published by the Free #
893@@ -26,9 +26,9 @@
894 import datetime
895 import html
896 import logging
897+import ntpath
898 import os
899 import uuid
900-import ntpath
901
902 from PyQt5 import QtGui
903
904
905=== modified file 'openlp/core/lib/settingstab.py'
906--- openlp/core/lib/settingstab.py 2017-10-23 22:09:57 +0000
907+++ openlp/core/lib/settingstab.py 2017-12-29 10:26:06 +0000
908@@ -4,7 +4,7 @@
909 ###############################################################################
910 # OpenLP - Open Source Lyrics Projection #
911 # --------------------------------------------------------------------------- #
912-# Copyright (c) 2008-2017 OpenLP Developers #
913+# Copyright (c) 2008-2018 OpenLP Developers #
914 # --------------------------------------------------------------------------- #
915 # This program is free software; you can redistribute it and/or modify it #
916 # under the terms of the GNU General Public License as published by the Free #
917
918=== modified file 'openlp/core/lib/theme.py'
919--- openlp/core/lib/theme.py 2017-10-10 07:08:44 +0000
920+++ openlp/core/lib/theme.py 2017-12-29 10:26:06 +0000
921@@ -4,7 +4,7 @@
922 ###############################################################################
923 # OpenLP - Open Source Lyrics Projection #
924 # --------------------------------------------------------------------------- #
925-# Copyright (c) 2008-2017 OpenLP Developers #
926+# Copyright (c) 2008-2018 OpenLP Developers #
927 # --------------------------------------------------------------------------- #
928 # This program is free software; you can redistribute it and/or modify it #
929 # under the terms of the GNU General Public License as published by the Free #
930
931=== modified file 'openlp/core/lib/ui.py'
932--- openlp/core/lib/ui.py 2017-10-07 07:05:07 +0000
933+++ openlp/core/lib/ui.py 2017-12-29 10:26:06 +0000
934@@ -4,7 +4,7 @@
935 ###############################################################################
936 # OpenLP - Open Source Lyrics Projection #
937 # --------------------------------------------------------------------------- #
938-# Copyright (c) 2008-2017 OpenLP Developers #
939+# Copyright (c) 2008-2018 OpenLP Developers #
940 # --------------------------------------------------------------------------- #
941 # This program is free software; you can redistribute it and/or modify it #
942 # under the terms of the GNU General Public License as published by the Free #
943@@ -32,7 +32,6 @@
944 from openlp.core.common.registry import Registry
945 from openlp.core.lib import build_icon
946
947-
948 log = logging.getLogger(__name__)
949
950
951
952=== modified file 'openlp/core/projectors/__init__.py'
953--- openlp/core/projectors/__init__.py 2017-12-04 00:24:47 +0000
954+++ openlp/core/projectors/__init__.py 2017-12-29 10:26:06 +0000
955@@ -4,7 +4,7 @@
956 ###############################################################################
957 # OpenLP - Open Source Lyrics Projection #
958 # --------------------------------------------------------------------------- #
959-# Copyright (c) 2008-2017 OpenLP Developers #
960+# Copyright (c) 2008-2018 OpenLP Developers #
961 # --------------------------------------------------------------------------- #
962 # This program is free software; you can redistribute it and/or modify it #
963 # under the terms of the GNU General Public License as published by the Free #
964
965=== modified file 'openlp/core/projectors/constants.py'
966--- openlp/core/projectors/constants.py 2017-12-09 11:17:05 +0000
967+++ openlp/core/projectors/constants.py 2017-12-29 10:26:06 +0000
968@@ -4,7 +4,7 @@
969 ###############################################################################
970 # OpenLP - Open Source Lyrics Projection #
971 # --------------------------------------------------------------------------- #
972-# Copyright (c) 2008-2017 OpenLP Developers #
973+# Copyright (c) 2008-2018 OpenLP Developers #
974 # --------------------------------------------------------------------------- #
975 # This program is free software; you can redistribute it and/or modify it #
976 # under the terms of the GNU General Public License as published by the Free #
977
978=== modified file 'openlp/core/projectors/db.py'
979--- openlp/core/projectors/db.py 2017-12-04 00:24:47 +0000
980+++ openlp/core/projectors/db.py 2017-12-29 10:26:06 +0000
981@@ -4,7 +4,7 @@
982 ###############################################################################
983 # OpenLP - Open Source Lyrics Projection #
984 # --------------------------------------------------------------------------- #
985-# Copyright (c) 2008-2017 OpenLP Developers #
986+# Copyright (c) 2008-2018 OpenLP Developers #
987 # --------------------------------------------------------------------------- #
988 # This program is free software; you can redistribute it and/or modify it #
989 # under the terms of the GNU General Public License as published by the Free #
990
991=== modified file 'openlp/core/projectors/editform.py'
992--- openlp/core/projectors/editform.py 2017-11-10 11:59:38 +0000
993+++ openlp/core/projectors/editform.py 2017-12-29 10:26:06 +0000
994@@ -4,7 +4,7 @@
995 ###############################################################################
996 # OpenLP - Open Source Lyrics Projection #
997 # --------------------------------------------------------------------------- #
998-# Copyright (c) 2008-2017 OpenLP Developers #
999+# Copyright (c) 2008-2018 OpenLP Developers #
1000 # --------------------------------------------------------------------------- #
1001 # This program is free software; you can redistribute it and/or modify it #
1002 # under the terms of the GNU General Public License as published by the Free #
1003@@ -30,8 +30,8 @@
1004 from openlp.core.common import verify_ip_address
1005 from openlp.core.common.i18n import translate
1006 from openlp.core.lib import build_icon
1007+from openlp.core.projectors.constants import PJLINK_PORT
1008 from openlp.core.projectors.db import Projector
1009-from openlp.core.projectors.constants import PJLINK_PORT
1010
1011 log = logging.getLogger(__name__)
1012 log.debug('editform loaded')
1013
1014=== modified file 'openlp/core/projectors/manager.py'
1015--- openlp/core/projectors/manager.py 2017-11-24 19:08:23 +0000
1016+++ openlp/core/projectors/manager.py 2017-12-29 10:26:06 +0000
1017@@ -4,7 +4,7 @@
1018 ###############################################################################
1019 # OpenLP - Open Source Lyrics Projection #
1020 # --------------------------------------------------------------------------- #
1021-# Copyright (c) 2008-2017 OpenLP Developers #
1022+# Copyright (c) 2008-2018 OpenLP Developers #
1023 # --------------------------------------------------------------------------- #
1024 # This program is free software; you can redistribute it and/or modify it #
1025 # under the terms of the GNU General Public License as published by the Free #
1026@@ -39,8 +39,8 @@
1027 E_NETWORK, E_NOT_CONNECTED, E_UNKNOWN_SOCKET_ERROR, STATUS_STRING, S_CONNECTED, S_CONNECTING, S_COOLDOWN, \
1028 S_INITIALIZE, S_NOT_CONNECTED, S_OFF, S_ON, S_STANDBY, S_WARMUP
1029 from openlp.core.projectors.db import ProjectorDB
1030+from openlp.core.projectors.editform import ProjectorEditForm
1031 from openlp.core.projectors.pjlink import PJLink, PJLinkUDP
1032-from openlp.core.projectors.editform import ProjectorEditForm
1033 from openlp.core.projectors.sourceselectform import SourceSelectTabs, SourceSelectSingle
1034 from openlp.core.widgets.toolbar import OpenLPToolbar
1035
1036
1037=== modified file 'openlp/core/projectors/pjlink.py'
1038--- openlp/core/projectors/pjlink.py 2017-12-09 11:17:05 +0000
1039+++ openlp/core/projectors/pjlink.py 2017-12-29 10:26:06 +0000
1040@@ -4,7 +4,7 @@
1041 ###############################################################################
1042 # OpenLP - Open Source Lyrics Projection #
1043 # --------------------------------------------------------------------------- #
1044-# Copyright (c) 2008-2017 OpenLP Developers #
1045+# Copyright (c) 2008-2018 OpenLP Developers #
1046 # --------------------------------------------------------------------------- #
1047 # This program is free software; you can redistribute it and/or modify it #
1048 # under the terms of the GNU General Public License as published by the Free #
1049
1050=== modified file 'openlp/core/projectors/sourceselectform.py'
1051--- openlp/core/projectors/sourceselectform.py 2017-11-10 11:59:38 +0000
1052+++ openlp/core/projectors/sourceselectform.py 2017-12-29 10:26:06 +0000
1053@@ -4,7 +4,7 @@
1054 ###############################################################################
1055 # OpenLP - Open Source Lyrics Projection #
1056 # --------------------------------------------------------------------------- #
1057-# Copyright (c) 2008-2017 OpenLP Developers #
1058+# Copyright (c) 2008-2018 OpenLP Developers #
1059 # --------------------------------------------------------------------------- #
1060 # This program is free software; you can redistribute it and/or modify it #
1061 # under the terms of the GNU General Public License as published by the Free #
1062@@ -31,8 +31,8 @@
1063 from openlp.core.common import is_macosx
1064 from openlp.core.common.i18n import translate
1065 from openlp.core.lib import build_icon
1066+from openlp.core.projectors.constants import PJLINK_DEFAULT_SOURCES, PJLINK_DEFAULT_CODES
1067 from openlp.core.projectors.db import ProjectorSource
1068-from openlp.core.projectors.constants import PJLINK_DEFAULT_SOURCES, PJLINK_DEFAULT_CODES
1069
1070 log = logging.getLogger(__name__)
1071
1072
1073=== modified file 'openlp/core/projectors/tab.py'
1074--- openlp/core/projectors/tab.py 2017-11-10 11:59:38 +0000
1075+++ openlp/core/projectors/tab.py 2017-12-29 10:26:06 +0000
1076@@ -4,7 +4,7 @@
1077 ###############################################################################
1078 # OpenLP - Open Source Lyrics Projection #
1079 # --------------------------------------------------------------------------- #
1080-# Copyright (c) 2008-2017 OpenLP Developers #
1081+# Copyright (c) 2008-2018 OpenLP Developers #
1082 # --------------------------------------------------------------------------- #
1083 # This program is free software; you can redistribute it and/or modify it #
1084 # under the terms of the GNU General Public License as published by the Free #
1085
1086=== modified file 'openlp/core/projectors/upgrade.py'
1087--- openlp/core/projectors/upgrade.py 2017-11-10 11:59:38 +0000
1088+++ openlp/core/projectors/upgrade.py 2017-12-29 10:26:06 +0000
1089@@ -4,7 +4,7 @@
1090 ###############################################################################
1091 # OpenLP - Open Source Lyrics Projection #
1092 # --------------------------------------------------------------------------- #
1093-# Copyright (c) 2008-2017 OpenLP Developers #
1094+# Copyright (c) 2008-2018 OpenLP Developers #
1095 # --------------------------------------------------------------------------- #
1096 # This program is free software; you can redistribute it and/or modify it #
1097 # under the terms of the GNU General Public License as published by the Free #
1098
1099=== modified file 'openlp/core/resources.py'
1100--- openlp/core/resources.py 2017-10-01 07:45:53 +0000
1101+++ openlp/core/resources.py 2017-12-29 10:26:06 +0000
1102@@ -4,7 +4,7 @@
1103 ###############################################################################
1104 # OpenLP - Open Source Lyrics Projection #
1105 # --------------------------------------------------------------------------- #
1106-# Copyright (c) 2008-2017 OpenLP Developers #
1107+# Copyright (c) 2008-2018 OpenLP Developers #
1108 # --------------------------------------------------------------------------- #
1109 # This program is free software; you can redistribute it and/or modify it #
1110 # under the terms of the GNU General Public License as published by the Free #
1111
1112=== modified file 'openlp/core/threading.py'
1113--- openlp/core/threading.py 2017-09-09 05:57:06 +0000
1114+++ openlp/core/threading.py 2017-12-29 10:26:06 +0000
1115@@ -4,7 +4,7 @@
1116 ###############################################################################
1117 # OpenLP - Open Source Lyrics Projection #
1118 # --------------------------------------------------------------------------- #
1119-# Copyright (c) 2008-2017 OpenLP Developers #
1120+# Copyright (c) 2008-2018 OpenLP Developers #
1121 # --------------------------------------------------------------------------- #
1122 # This program is free software; you can redistribute it and/or modify it #
1123 # under the terms of the GNU General Public License as published by the Free #
1124
1125=== modified file 'openlp/core/ui/__init__.py'
1126--- openlp/core/ui/__init__.py 2017-11-16 23:53:53 +0000
1127+++ openlp/core/ui/__init__.py 2017-12-29 10:26:06 +0000
1128@@ -4,7 +4,7 @@
1129 ###############################################################################
1130 # OpenLP - Open Source Lyrics Projection #
1131 # --------------------------------------------------------------------------- #
1132-# Copyright (c) 2008-2017 OpenLP Developers #
1133+# Copyright (c) 2008-2018 OpenLP Developers #
1134 # --------------------------------------------------------------------------- #
1135 # This program is free software; you can redistribute it and/or modify it #
1136 # under the terms of the GNU General Public License as published by the Free #
1137
1138=== modified file 'openlp/core/ui/aboutdialog.py'
1139--- openlp/core/ui/aboutdialog.py 2017-10-07 07:05:07 +0000
1140+++ openlp/core/ui/aboutdialog.py 2017-12-29 10:26:06 +0000
1141@@ -4,7 +4,7 @@
1142 ###############################################################################
1143 # OpenLP - Open Source Lyrics Projection #
1144 # --------------------------------------------------------------------------- #
1145-# Copyright (c) 2008-2017 OpenLP Developers #
1146+# Copyright (c) 2008-2018 OpenLP Developers #
1147 # --------------------------------------------------------------------------- #
1148 # This program is free software; you can redistribute it and/or modify it #
1149 # under the terms of the GNU General Public License as published by the Free #
1150
1151=== modified file 'openlp/core/ui/aboutform.py'
1152--- openlp/core/ui/aboutform.py 2017-10-07 07:05:07 +0000
1153+++ openlp/core/ui/aboutform.py 2017-12-29 10:26:06 +0000
1154@@ -4,7 +4,7 @@
1155 ###############################################################################
1156 # OpenLP - Open Source Lyrics Projection #
1157 # --------------------------------------------------------------------------- #
1158-# Copyright (c) 2008-2017 OpenLP Developers #
1159+# Copyright (c) 2008-2018 OpenLP Developers #
1160 # --------------------------------------------------------------------------- #
1161 # This program is free software; you can redistribute it and/or modify it #
1162 # under the terms of the GNU General Public License as published by the Free #
1163@@ -26,8 +26,8 @@
1164
1165 from PyQt5 import QtCore, QtWidgets
1166
1167+from openlp.core.common.i18n import translate
1168 from openlp.core.version import get_version
1169-from openlp.core.common.i18n import translate
1170 from .aboutdialog import UiAboutDialog
1171
1172
1173
1174=== modified file 'openlp/core/ui/advancedtab.py'
1175--- openlp/core/ui/advancedtab.py 2017-10-23 22:09:57 +0000
1176+++ openlp/core/ui/advancedtab.py 2017-12-29 10:26:06 +0000
1177@@ -4,7 +4,7 @@
1178 ###############################################################################
1179 # OpenLP - Open Source Lyrics Projection #
1180 # --------------------------------------------------------------------------- #
1181-# Copyright (c) 2008-2017 OpenLP Developers #
1182+# Copyright (c) 2008-2018 OpenLP Developers #
1183 # --------------------------------------------------------------------------- #
1184 # This program is free software; you can redistribute it and/or modify it #
1185 # under the terms of the GNU General Public License as published by the Free #
1186
1187=== modified file 'openlp/core/ui/exceptiondialog.py'
1188--- openlp/core/ui/exceptiondialog.py 2017-10-07 07:05:07 +0000
1189+++ openlp/core/ui/exceptiondialog.py 2017-12-29 10:26:06 +0000
1190@@ -4,7 +4,7 @@
1191 ###############################################################################
1192 # OpenLP - Open Source Lyrics Projection #
1193 # --------------------------------------------------------------------------- #
1194-# Copyright (c) 2008-2017 OpenLP Developers #
1195+# Copyright (c) 2008-2018 OpenLP Developers #
1196 # --------------------------------------------------------------------------- #
1197 # This program is free software; you can redistribute it and/or modify it #
1198 # under the terms of the GNU General Public License as published by the Free #
1199
1200=== modified file 'openlp/core/ui/exceptionform.py'
1201--- openlp/core/ui/exceptionform.py 2017-11-03 20:55:41 +0000
1202+++ openlp/core/ui/exceptionform.py 2017-12-29 10:26:06 +0000
1203@@ -4,7 +4,7 @@
1204 ###############################################################################
1205 # OpenLP - Open Source Lyrics Projection #
1206 # --------------------------------------------------------------------------- #
1207-# Copyright (c) 2008-2017 OpenLP Developers #
1208+# Copyright (c) 2008-2018 OpenLP Developers #
1209 # --------------------------------------------------------------------------- #
1210 # This program is free software; you can redistribute it and/or modify it #
1211 # under the terms of the GNU General Public License as published by the Free #
1212
1213=== modified file 'openlp/core/ui/filerenamedialog.py'
1214--- openlp/core/ui/filerenamedialog.py 2017-10-07 07:05:07 +0000
1215+++ openlp/core/ui/filerenamedialog.py 2017-12-29 10:26:06 +0000
1216@@ -4,7 +4,7 @@
1217 ###############################################################################
1218 # OpenLP - Open Source Lyrics Projection #
1219 # --------------------------------------------------------------------------- #
1220-# Copyright (c) 2008-2017 OpenLP Developers #
1221+# Copyright (c) 2008-2018 OpenLP Developers #
1222 # --------------------------------------------------------------------------- #
1223 # This program is free software; you can redistribute it and/or modify it #
1224 # under the terms of the GNU General Public License as published by the Free #
1225
1226=== modified file 'openlp/core/ui/filerenameform.py'
1227--- openlp/core/ui/filerenameform.py 2017-10-23 22:09:57 +0000
1228+++ openlp/core/ui/filerenameform.py 2017-12-29 10:26:06 +0000
1229@@ -4,7 +4,7 @@
1230 ###############################################################################
1231 # OpenLP - Open Source Lyrics Projection #
1232 # --------------------------------------------------------------------------- #
1233-# Copyright (c) 2008-2017 OpenLP Developers #
1234+# Copyright (c) 2008-2018 OpenLP Developers #
1235 # --------------------------------------------------------------------------- #
1236 # This program is free software; you can redistribute it and/or modify it #
1237 # under the terms of the GNU General Public License as published by the Free #
1238
1239=== modified file 'openlp/core/ui/firsttimeform.py'
1240--- openlp/core/ui/firsttimeform.py 2017-12-17 04:29:53 +0000
1241+++ openlp/core/ui/firsttimeform.py 2017-12-29 10:26:06 +0000
1242@@ -4,7 +4,7 @@
1243 ###############################################################################
1244 # OpenLP - Open Source Lyrics Projection #
1245 # --------------------------------------------------------------------------- #
1246-# Copyright (c) 2008-2017 OpenLP Developers #
1247+# Copyright (c) 2008-2018 OpenLP Developers #
1248 # --------------------------------------------------------------------------- #
1249 # This program is free software; you can redistribute it and/or modify it #
1250 # under the terms of the GNU General Public License as published by the Free #
1251@@ -26,9 +26,9 @@
1252 import os
1253 import socket
1254 import time
1255+import urllib.error
1256+import urllib.parse
1257 import urllib.request
1258-import urllib.parse
1259-import urllib.error
1260 from configparser import ConfigParser, MissingSectionHeaderError, NoOptionError, NoSectionError
1261 from tempfile import gettempdir
1262
1263@@ -36,14 +36,14 @@
1264
1265 from openlp.core.common import clean_button_text, trace_error_handler
1266 from openlp.core.common.applocation import AppLocation
1267+from openlp.core.common.httputils import get_web_page, get_url_file_size, url_get_file, CONNECTION_TIMEOUT
1268 from openlp.core.common.i18n import translate
1269+from openlp.core.common.mixins import RegistryProperties
1270 from openlp.core.common.path import Path, create_paths
1271-from openlp.core.common.mixins import RegistryProperties
1272 from openlp.core.common.registry import Registry
1273 from openlp.core.common.settings import Settings
1274 from openlp.core.lib import PluginStatus, build_icon
1275 from openlp.core.lib.ui import critical_error_message_box
1276-from openlp.core.common.httputils import get_web_page, get_url_file_size, url_get_file, CONNECTION_TIMEOUT
1277 from .firsttimewizard import UiFirstTimeWizard, FirstTimePage
1278
1279 log = logging.getLogger(__name__)
1280
1281=== modified file 'openlp/core/ui/firsttimelanguagedialog.py'
1282--- openlp/core/ui/firsttimelanguagedialog.py 2017-10-07 07:05:07 +0000
1283+++ openlp/core/ui/firsttimelanguagedialog.py 2017-12-29 10:26:06 +0000
1284@@ -4,7 +4,7 @@
1285 ###############################################################################
1286 # OpenLP - Open Source Lyrics Projection #
1287 # --------------------------------------------------------------------------- #
1288-# Copyright (c) 2008-2017 OpenLP Developers #
1289+# Copyright (c) 2008-2018 OpenLP Developers #
1290 # --------------------------------------------------------------------------- #
1291 # This program is free software; you can redistribute it and/or modify it #
1292 # under the terms of the GNU General Public License as published by the Free #
1293
1294=== modified file 'openlp/core/ui/firsttimelanguageform.py'
1295--- openlp/core/ui/firsttimelanguageform.py 2017-10-07 07:05:07 +0000
1296+++ openlp/core/ui/firsttimelanguageform.py 2017-12-29 10:26:06 +0000
1297@@ -4,7 +4,7 @@
1298 ###############################################################################
1299 # OpenLP - Open Source Lyrics Projection #
1300 # --------------------------------------------------------------------------- #
1301-# Copyright (c) 2008-2017 OpenLP Developers #
1302+# Copyright (c) 2008-2018 OpenLP Developers #
1303 # --------------------------------------------------------------------------- #
1304 # This program is free software; you can redistribute it and/or modify it #
1305 # under the terms of the GNU General Public License as published by the Free #
1306
1307=== modified file 'openlp/core/ui/firsttimewizard.py'
1308--- openlp/core/ui/firsttimewizard.py 2017-11-16 23:53:53 +0000
1309+++ openlp/core/ui/firsttimewizard.py 2017-12-29 10:26:06 +0000
1310@@ -4,7 +4,7 @@
1311 ###############################################################################
1312 # OpenLP - Open Source Lyrics Projection #
1313 # --------------------------------------------------------------------------- #
1314-# Copyright (c) 2008-2017 OpenLP Developers #
1315+# Copyright (c) 2008-2018 OpenLP Developers #
1316 # --------------------------------------------------------------------------- #
1317 # This program is free software; you can redistribute it and/or modify it #
1318 # under the terms of the GNU General Public License as published by the Free #
1319
1320=== modified file 'openlp/core/ui/formattingtagcontroller.py'
1321--- openlp/core/ui/formattingtagcontroller.py 2017-10-28 10:04:09 +0000
1322+++ openlp/core/ui/formattingtagcontroller.py 2017-12-29 10:26:06 +0000
1323@@ -4,7 +4,7 @@
1324 ###############################################################################
1325 # OpenLP - Open Source Lyrics Projection #
1326 # --------------------------------------------------------------------------- #
1327-# Copyright (c) 2008-2017 OpenLP Developers #
1328+# Copyright (c) 2008-2018 OpenLP Developers #
1329 # --------------------------------------------------------------------------- #
1330 # This program is free software; you can redistribute it and/or modify it #
1331 # under the terms of the GNU General Public License as published by the Free #
1332
1333=== modified file 'openlp/core/ui/formattingtagdialog.py'
1334--- openlp/core/ui/formattingtagdialog.py 2017-10-07 07:05:07 +0000
1335+++ openlp/core/ui/formattingtagdialog.py 2017-12-29 10:26:06 +0000
1336@@ -4,7 +4,7 @@
1337 ###############################################################################
1338 # OpenLP - Open Source Lyrics Projection #
1339 # --------------------------------------------------------------------------- #
1340-# Copyright (c) 2008-2017 OpenLP Developers #
1341+# Copyright (c) 2008-2018 OpenLP Developers #
1342 # --------------------------------------------------------------------------- #
1343 # This program is free software; you can redistribute it and/or modify it #
1344 # under the terms of the GNU General Public License as published by the Free #
1345
1346=== modified file 'openlp/core/ui/formattingtagform.py'
1347--- openlp/core/ui/formattingtagform.py 2017-10-07 07:05:07 +0000
1348+++ openlp/core/ui/formattingtagform.py 2017-12-29 10:26:06 +0000
1349@@ -4,7 +4,7 @@
1350 ###############################################################################
1351 # OpenLP - Open Source Lyrics Projection #
1352 # --------------------------------------------------------------------------- #
1353-# Copyright (c) 2008-2017 OpenLP Developers #
1354+# Copyright (c) 2008-2018 OpenLP Developers #
1355 # --------------------------------------------------------------------------- #
1356 # This program is free software; you can redistribute it and/or modify it #
1357 # under the terms of the GNU General Public License as published by the Free #
1358@@ -28,8 +28,8 @@
1359
1360 from openlp.core.common.i18n import translate
1361 from openlp.core.lib import FormattingTags
1362+from openlp.core.ui.formattingtagcontroller import FormattingTagController
1363 from openlp.core.ui.formattingtagdialog import Ui_FormattingTagDialog
1364-from openlp.core.ui.formattingtagcontroller import FormattingTagController
1365
1366
1367 class EditColumn(object):
1368
1369=== modified file 'openlp/core/ui/generaltab.py'
1370--- openlp/core/ui/generaltab.py 2017-10-23 22:09:57 +0000
1371+++ openlp/core/ui/generaltab.py 2017-12-29 10:26:06 +0000
1372@@ -4,7 +4,7 @@
1373 ###############################################################################
1374 # OpenLP - Open Source Lyrics Projection #
1375 # --------------------------------------------------------------------------- #
1376-# Copyright (c) 2008-2017 OpenLP Developers #
1377+# Copyright (c) 2008-2018 OpenLP Developers #
1378 # --------------------------------------------------------------------------- #
1379 # This program is free software; you can redistribute it and/or modify it #
1380 # under the terms of the GNU General Public License as published by the Free #
1381
1382=== modified file 'openlp/core/ui/maindisplay.py'
1383--- openlp/core/ui/maindisplay.py 2017-11-18 22:37:24 +0000
1384+++ openlp/core/ui/maindisplay.py 2017-12-29 10:26:06 +0000
1385@@ -4,7 +4,7 @@
1386 ###############################################################################
1387 # OpenLP - Open Source Lyrics Projection #
1388 # --------------------------------------------------------------------------- #
1389-# Copyright (c) 2008-2017 OpenLP Developers #
1390+# Copyright (c) 2008-2018 OpenLP Developers #
1391 # --------------------------------------------------------------------------- #
1392 # This program is free software; you can redistribute it and/or modify it #
1393 # under the terms of the GNU General Public License as published by the Free #
1394
1395=== modified file 'openlp/core/ui/mainwindow.py'
1396--- openlp/core/ui/mainwindow.py 2017-12-02 09:11:22 +0000
1397+++ openlp/core/ui/mainwindow.py 2017-12-29 10:26:06 +0000
1398@@ -4,7 +4,7 @@
1399 ###############################################################################
1400 # OpenLP - Open Source Lyrics Projection #
1401 # --------------------------------------------------------------------------- #
1402-# Copyright (c) 2008-2017 OpenLP Developers #
1403+# Copyright (c) 2008-2018 OpenLP Developers #
1404 # --------------------------------------------------------------------------- #
1405 # This program is free software; you can redistribute it and/or modify it #
1406 # under the terms of the GNU General Public License as published by the Free #
1407@@ -23,8 +23,6 @@
1408 This is the main window, where all the action happens.
1409 """
1410 import logging
1411-import os
1412-import shutil
1413 import sys
1414 import time
1415 from datetime import datetime
1416@@ -40,25 +38,24 @@
1417 from openlp.core.common.actions import ActionList, CategoryOrder
1418 from openlp.core.common.applocation import AppLocation
1419 from openlp.core.common.i18n import LanguageManager, UiStrings, translate
1420+from openlp.core.common.mixins import RegistryProperties
1421 from openlp.core.common.path import Path, copyfile, create_paths
1422-from openlp.core.common.mixins import RegistryProperties
1423 from openlp.core.common.registry import Registry
1424 from openlp.core.common.settings import Settings
1425+from openlp.core.display.renderer import Renderer
1426 from openlp.core.display.screens import ScreenList
1427-from openlp.core.display.renderer import Renderer
1428 from openlp.core.lib import PluginManager, ImageManager, PluginStatus, build_icon
1429 from openlp.core.lib.ui import create_action
1430 from openlp.core.projectors.manager import ProjectorManager
1431 from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, ThemeManager, LiveController, PluginForm, \
1432 ShortcutListForm, FormattingTagForm, PreviewController
1433 from openlp.core.ui.firsttimeform import FirstTimeForm
1434-from openlp.core.widgets.dialogs import FileDialog
1435-from openlp.core.widgets.docks import OpenLPDockWidget, MediaDockManager
1436 from openlp.core.ui.media import MediaController
1437 from openlp.core.ui.printserviceform import PrintServiceForm
1438 from openlp.core.ui.style import PROGRESSBAR_STYLE, get_library_stylesheet
1439 from openlp.core.version import get_version
1440-
1441+from openlp.core.widgets.dialogs import FileDialog
1442+from openlp.core.widgets.docks import OpenLPDockWidget, MediaDockManager
1443
1444 log = logging.getLogger(__name__)
1445
1446
1447=== modified file 'openlp/core/ui/media/__init__.py'
1448--- openlp/core/ui/media/__init__.py 2017-10-07 07:05:07 +0000
1449+++ openlp/core/ui/media/__init__.py 2017-12-29 10:26:06 +0000
1450@@ -4,7 +4,7 @@
1451 ###############################################################################
1452 # OpenLP - Open Source Lyrics Projection #
1453 # --------------------------------------------------------------------------- #
1454-# Copyright (c) 2008-2017 OpenLP Developers #
1455+# Copyright (c) 2008-2018 OpenLP Developers #
1456 # --------------------------------------------------------------------------- #
1457 # This program is free software; you can redistribute it and/or modify it #
1458 # under the terms of the GNU General Public License as published by the Free #
1459
1460=== modified file 'openlp/core/ui/media/endpoint.py'
1461--- openlp/core/ui/media/endpoint.py 2017-10-07 07:05:07 +0000
1462+++ openlp/core/ui/media/endpoint.py 2017-12-29 10:26:06 +0000
1463@@ -4,7 +4,7 @@
1464 ###############################################################################
1465 # OpenLP - Open Source Lyrics Projection #
1466 # --------------------------------------------------------------------------- #
1467-# Copyright (c) 2008-2017 OpenLP Developers #
1468+# Copyright (c) 2008-2018 OpenLP Developers #
1469 # --------------------------------------------------------------------------- #
1470 # This program is free software; you can redistribute it and/or modify it #
1471 # under the terms of the GNU General Public License as published by the Free #
1472@@ -24,8 +24,8 @@
1473 """
1474 import logging
1475
1476+from openlp.core.api.http import requires_auth
1477 from openlp.core.api.http.endpoint import Endpoint
1478-from openlp.core.api.http import requires_auth
1479 from openlp.core.common.registry import Registry
1480
1481 log = logging.getLogger(__name__)
1482
1483=== modified file 'openlp/core/ui/media/mediacontroller.py'
1484--- openlp/core/ui/media/mediacontroller.py 2017-12-17 15:25:54 +0000
1485+++ openlp/core/ui/media/mediacontroller.py 2017-12-29 10:26:06 +0000
1486@@ -4,7 +4,7 @@
1487 ###############################################################################
1488 # OpenLP - Open Source Lyrics Projection #
1489 # --------------------------------------------------------------------------- #
1490-# Copyright (c) 2008-2017 OpenLP Developers #
1491+# Copyright (c) 2008-2018 OpenLP Developers #
1492 # --------------------------------------------------------------------------- #
1493 # This program is free software; you can redistribute it and/or modify it #
1494 # under the terms of the GNU General Public License as published by the Free #
1495@@ -23,9 +23,10 @@
1496 The :mod:`~openlp.core.ui.media.mediacontroller` module contains a base class for media components and other widgets
1497 related to playing media, such as sliders.
1498 """
1499+import datetime
1500 import logging
1501 import os
1502-import datetime
1503+
1504 from PyQt5 import QtCore, QtWidgets
1505
1506 from openlp.core.api.http import register_endpoint
1507@@ -37,14 +38,13 @@
1508 from openlp.core.lib import ItemCapabilities
1509 from openlp.core.lib.ui import critical_error_message_box
1510 from openlp.core.ui import DisplayControllerType
1511+from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players, \
1512+ parse_optical_path
1513 from openlp.core.ui.media.endpoint import media_endpoint
1514+from openlp.core.ui.media.mediaplayer import MediaPlayer
1515 from openlp.core.ui.media.vendor.mediainfoWrapper import MediaInfoWrapper
1516-from openlp.core.ui.media.mediaplayer import MediaPlayer
1517-from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players,\
1518- parse_optical_path
1519 from openlp.core.widgets.toolbar import OpenLPToolbar
1520
1521-
1522 log = logging.getLogger(__name__)
1523
1524 TICK_TIME = 200
1525
1526=== modified file 'openlp/core/ui/media/mediaplayer.py'
1527--- openlp/core/ui/media/mediaplayer.py 2017-10-23 22:09:57 +0000
1528+++ openlp/core/ui/media/mediaplayer.py 2017-12-29 10:26:06 +0000
1529@@ -4,7 +4,7 @@
1530 ###############################################################################
1531 # OpenLP - Open Source Lyrics Projection #
1532 # --------------------------------------------------------------------------- #
1533-# Copyright (c) 2008-2017 OpenLP Developers #
1534+# Copyright (c) 2008-2018 OpenLP Developers #
1535 # --------------------------------------------------------------------------- #
1536 # This program is free software; you can redistribute it and/or modify it #
1537 # under the terms of the GNU General Public License as published by the Free #
1538
1539=== modified file 'openlp/core/ui/media/playertab.py'
1540--- openlp/core/ui/media/playertab.py 2017-10-23 22:09:57 +0000
1541+++ openlp/core/ui/media/playertab.py 2017-12-29 10:26:06 +0000
1542@@ -4,7 +4,7 @@
1543 ###############################################################################
1544 # OpenLP - Open Source Lyrics Projection #
1545 # --------------------------------------------------------------------------- #
1546-# Copyright (c) 2008-2017 OpenLP Developers #
1547+# Copyright (c) 2008-2018 OpenLP Developers #
1548 # --------------------------------------------------------------------------- #
1549 # This program is free software; you can redistribute it and/or modify it #
1550 # under the terms of the GNU General Public License as published by the Free #
1551
1552=== modified file 'openlp/core/ui/media/systemplayer.py'
1553--- openlp/core/ui/media/systemplayer.py 2017-10-07 07:05:07 +0000
1554+++ openlp/core/ui/media/systemplayer.py 2017-12-29 10:26:06 +0000
1555@@ -4,7 +4,7 @@
1556 ###############################################################################
1557 # OpenLP - Open Source Lyrics Projection #
1558 # --------------------------------------------------------------------------- #
1559-# Copyright (c) 2008-2017 OpenLP Developers #
1560+# Copyright (c) 2008-2018 OpenLP Developers #
1561 # --------------------------------------------------------------------------- #
1562 # This program is free software; you can redistribute it and/or modify it #
1563 # under the terms of the GNU General Public License as published by the Free #
1564@@ -32,7 +32,6 @@
1565 from openlp.core.ui.media import MediaState
1566 from openlp.core.ui.media.mediaplayer import MediaPlayer
1567
1568-
1569 log = logging.getLogger(__name__)
1570
1571 ADDITIONAL_EXT = {
1572
1573=== modified file 'openlp/core/ui/media/vendor/__init__.py'
1574--- openlp/core/ui/media/vendor/__init__.py 2016-12-31 11:01:36 +0000
1575+++ openlp/core/ui/media/vendor/__init__.py 2017-12-29 10:26:06 +0000
1576@@ -4,7 +4,7 @@
1577 ###############################################################################
1578 # OpenLP - Open Source Lyrics Projection #
1579 # --------------------------------------------------------------------------- #
1580-# Copyright (c) 2008-2017 OpenLP Developers #
1581+# Copyright (c) 2008-2018 OpenLP Developers #
1582 # --------------------------------------------------------------------------- #
1583 # This program is free software; you can redistribute it and/or modify it #
1584 # under the terms of the GNU General Public License as published by the Free #
1585
1586=== modified file 'openlp/core/ui/media/vendor/mediainfoWrapper.py'
1587--- openlp/core/ui/media/vendor/mediainfoWrapper.py 2017-11-16 17:43:17 +0000
1588+++ openlp/core/ui/media/vendor/mediainfoWrapper.py 2017-12-29 10:26:06 +0000
1589@@ -4,7 +4,7 @@
1590 ###############################################################################
1591 # OpenLP - Open Source Lyrics Projection #
1592 # --------------------------------------------------------------------------- #
1593-# Copyright (c) 2008-2017 OpenLP Developers #
1594+# Copyright (c) 2008-2018 OpenLP Developers #
1595 # --------------------------------------------------------------------------- #
1596 # This program is free software; you can redistribute it and/or modify it #
1597 # under the terms of the GNU General Public License as published by the Free #
1598
1599=== modified file 'openlp/core/ui/media/vendor/vlc.py'
1600--- openlp/core/ui/media/vendor/vlc.py 2016-01-25 18:14:03 +0000
1601+++ openlp/core/ui/media/vendor/vlc.py 2017-12-29 10:26:06 +0000
1602@@ -40,11 +40,10 @@
1603 """
1604
1605 import ctypes
1606-from ctypes.util import find_library
1607+import functools
1608 import os
1609 import sys
1610-import functools
1611-
1612+from ctypes.util import find_library
1613 # Used by EventManager in override.py
1614 from inspect import getargspec
1615
1616
1617=== modified file 'openlp/core/ui/media/vlcplayer.py'
1618--- openlp/core/ui/media/vlcplayer.py 2017-12-04 20:49:59 +0000
1619+++ openlp/core/ui/media/vlcplayer.py 2017-12-29 10:26:06 +0000
1620@@ -4,7 +4,7 @@
1621 ###############################################################################
1622 # OpenLP - Open Source Lyrics Projection #
1623 # --------------------------------------------------------------------------- #
1624-# Copyright (c) 2008-2017 OpenLP Developers #
1625+# Copyright (c) 2008-2018 OpenLP Developers #
1626 # --------------------------------------------------------------------------- #
1627 # This program is free software; you can redistribute it and/or modify it #
1628 # under the terms of the GNU General Public License as published by the Free #
1629@@ -22,13 +22,14 @@
1630 """
1631 The :mod:`~openlp.core.ui.media.vlcplayer` module contains our VLC component wrapper
1632 """
1633-from datetime import datetime
1634-from distutils.version import LooseVersion
1635+import ctypes
1636 import logging
1637 import os
1638+import sys
1639 import threading
1640-import sys
1641-import ctypes
1642+from datetime import datetime
1643+from distutils.version import LooseVersion
1644+
1645 from PyQt5 import QtWidgets
1646
1647 from openlp.core.common import is_win, is_macosx, is_linux
1648
1649=== modified file 'openlp/core/ui/media/webkitplayer.py'
1650--- openlp/core/ui/media/webkitplayer.py 2017-10-07 07:05:07 +0000
1651+++ openlp/core/ui/media/webkitplayer.py 2017-12-29 10:26:06 +0000
1652@@ -4,7 +4,7 @@
1653 ###############################################################################
1654 # OpenLP - Open Source Lyrics Projection #
1655 # --------------------------------------------------------------------------- #
1656-# Copyright (c) 2008-2017 OpenLP Developers #
1657+# Copyright (c) 2008-2018 OpenLP Developers #
1658 # --------------------------------------------------------------------------- #
1659 # This program is free software; you can redistribute it and/or modify it #
1660 # under the terms of the GNU General Public License as published by the Free #
1661@@ -26,8 +26,8 @@
1662
1663 from PyQt5 import QtGui, QtWebKitWidgets
1664
1665+from openlp.core.common.i18n import translate
1666 from openlp.core.common.settings import Settings
1667-from openlp.core.common.i18n import translate
1668 from openlp.core.ui.media import MediaState
1669 from openlp.core.ui.media.mediaplayer import MediaPlayer
1670
1671
1672=== modified file 'openlp/core/ui/plugindialog.py'
1673--- openlp/core/ui/plugindialog.py 2017-10-07 07:05:07 +0000
1674+++ openlp/core/ui/plugindialog.py 2017-12-29 10:26:06 +0000
1675@@ -4,7 +4,7 @@
1676 ###############################################################################
1677 # OpenLP - Open Source Lyrics Projection #
1678 # --------------------------------------------------------------------------- #
1679-# Copyright (c) 2008-2017 OpenLP Developers #
1680+# Copyright (c) 2008-2018 OpenLP Developers #
1681 # --------------------------------------------------------------------------- #
1682 # This program is free software; you can redistribute it and/or modify it #
1683 # under the terms of the GNU General Public License as published by the Free #
1684
1685=== modified file 'openlp/core/ui/pluginform.py'
1686--- openlp/core/ui/pluginform.py 2017-10-23 22:09:57 +0000
1687+++ openlp/core/ui/pluginform.py 2017-12-29 10:26:06 +0000
1688@@ -4,7 +4,7 @@
1689 ###############################################################################
1690 # OpenLP - Open Source Lyrics Projection #
1691 # --------------------------------------------------------------------------- #
1692-# Copyright (c) 2008-2017 OpenLP Developers #
1693+# Copyright (c) 2008-2018 OpenLP Developers #
1694 # --------------------------------------------------------------------------- #
1695 # This program is free software; you can redistribute it and/or modify it #
1696 # under the terms of the GNU General Public License as published by the Free #
1697
1698=== modified file 'openlp/core/ui/printservicedialog.py'
1699--- openlp/core/ui/printservicedialog.py 2017-10-23 22:09:57 +0000
1700+++ openlp/core/ui/printservicedialog.py 2017-12-29 10:26:06 +0000
1701@@ -4,7 +4,7 @@
1702 ###############################################################################
1703 # OpenLP - Open Source Lyrics Projection #
1704 # --------------------------------------------------------------------------- #
1705-# Copyright (c) 2008-2017 OpenLP Developers #
1706+# Copyright (c) 2008-2018 OpenLP Developers #
1707 # --------------------------------------------------------------------------- #
1708 # This program is free software; you can redistribute it and/or modify it #
1709 # under the terms of the GNU General Public License as published by the Free #
1710
1711=== modified file 'openlp/core/ui/printserviceform.py'
1712--- openlp/core/ui/printserviceform.py 2017-10-23 22:09:57 +0000
1713+++ openlp/core/ui/printserviceform.py 2017-12-29 10:26:06 +0000
1714@@ -4,7 +4,7 @@
1715 ###############################################################################
1716 # OpenLP - Open Source Lyrics Projection #
1717 # --------------------------------------------------------------------------- #
1718-# Copyright (c) 2008-2017 OpenLP Developers #
1719+# Copyright (c) 2008-2018 OpenLP Developers #
1720 # --------------------------------------------------------------------------- #
1721 # This program is free software; you can redistribute it and/or modify it #
1722 # under the terms of the GNU General Public License as published by the Free #
1723@@ -24,8 +24,8 @@
1724 """
1725 import datetime
1726 import html
1727+
1728 import lxml.html
1729-
1730 from PyQt5 import QtCore, QtGui, QtWidgets, QtPrintSupport
1731
1732 from openlp.core.common.applocation import AppLocation
1733
1734=== modified file 'openlp/core/ui/serviceitemeditdialog.py'
1735--- openlp/core/ui/serviceitemeditdialog.py 2017-10-07 07:05:07 +0000
1736+++ openlp/core/ui/serviceitemeditdialog.py 2017-12-29 10:26:06 +0000
1737@@ -4,7 +4,7 @@
1738 ###############################################################################
1739 # OpenLP - Open Source Lyrics Projection #
1740 # --------------------------------------------------------------------------- #
1741-# Copyright (c) 2008-2017 OpenLP Developers #
1742+# Copyright (c) 2008-2018 OpenLP Developers #
1743 # --------------------------------------------------------------------------- #
1744 # This program is free software; you can redistribute it and/or modify it #
1745 # under the terms of the GNU General Public License as published by the Free #
1746
1747=== modified file 'openlp/core/ui/serviceitemeditform.py'
1748--- openlp/core/ui/serviceitemeditform.py 2017-10-23 22:09:57 +0000
1749+++ openlp/core/ui/serviceitemeditform.py 2017-12-29 10:26:06 +0000
1750@@ -4,7 +4,7 @@
1751 ###############################################################################
1752 # OpenLP - Open Source Lyrics Projection #
1753 # --------------------------------------------------------------------------- #
1754-# Copyright (c) 2008-2017 OpenLP Developers #
1755+# Copyright (c) 2008-2018 OpenLP Developers #
1756 # --------------------------------------------------------------------------- #
1757 # This program is free software; you can redistribute it and/or modify it #
1758 # under the terms of the GNU General Public License as published by the Free #
1759
1760=== modified file 'openlp/core/ui/servicemanager.py'
1761--- openlp/core/ui/servicemanager.py 2017-12-22 21:21:39 +0000
1762+++ openlp/core/ui/servicemanager.py 2017-12-29 10:26:06 +0000
1763@@ -4,7 +4,7 @@
1764 ###############################################################################
1765 # OpenLP - Open Source Lyrics Projection #
1766 # --------------------------------------------------------------------------- #
1767-# Copyright (c) 2008-2017 OpenLP Developers #
1768+# Copyright (c) 2008-2018 OpenLP Developers #
1769 # --------------------------------------------------------------------------- #
1770 # This program is free software; you can redistribute it and/or modify it #
1771 # under the terms of the GNU General Public License as published by the Free #
1772
1773=== modified file 'openlp/core/ui/servicenoteform.py'
1774--- openlp/core/ui/servicenoteform.py 2017-10-23 22:09:57 +0000
1775+++ openlp/core/ui/servicenoteform.py 2017-12-29 10:26:06 +0000
1776@@ -4,7 +4,7 @@
1777 ###############################################################################
1778 # OpenLP - Open Source Lyrics Projection #
1779 # --------------------------------------------------------------------------- #
1780-# Copyright (c) 2008-2017 OpenLP Developers #
1781+# Copyright (c) 2008-2018 OpenLP Developers #
1782 # --------------------------------------------------------------------------- #
1783 # This program is free software; you can redistribute it and/or modify it #
1784 # under the terms of the GNU General Public License as published by the Free #
1785
1786=== modified file 'openlp/core/ui/settingsdialog.py'
1787--- openlp/core/ui/settingsdialog.py 2017-10-07 07:05:07 +0000
1788+++ openlp/core/ui/settingsdialog.py 2017-12-29 10:26:06 +0000
1789@@ -4,7 +4,7 @@
1790 ###############################################################################
1791 # OpenLP - Open Source Lyrics Projection #
1792 # --------------------------------------------------------------------------- #
1793-# Copyright (c) 2008-2017 OpenLP Developers #
1794+# Copyright (c) 2008-2018 OpenLP Developers #
1795 # --------------------------------------------------------------------------- #
1796 # This program is free software; you can redistribute it and/or modify it #
1797 # under the terms of the GNU General Public License as published by the Free #
1798
1799=== modified file 'openlp/core/ui/settingsform.py'
1800--- openlp/core/ui/settingsform.py 2017-11-16 23:53:53 +0000
1801+++ openlp/core/ui/settingsform.py 2017-12-29 10:26:06 +0000
1802@@ -4,7 +4,7 @@
1803 ###############################################################################
1804 # OpenLP - Open Source Lyrics Projection #
1805 # --------------------------------------------------------------------------- #
1806-# Copyright (c) 2008-2017 OpenLP Developers #
1807+# Copyright (c) 2008-2018 OpenLP Developers #
1808 # --------------------------------------------------------------------------- #
1809 # This program is free software; you can redistribute it and/or modify it #
1810 # under the terms of the GNU General Public License as published by the Free #
1811
1812=== modified file 'openlp/core/ui/shortcutlistdialog.py'
1813--- openlp/core/ui/shortcutlistdialog.py 2017-10-07 07:05:07 +0000
1814+++ openlp/core/ui/shortcutlistdialog.py 2017-12-29 10:26:06 +0000
1815@@ -4,7 +4,7 @@
1816 ###############################################################################
1817 # OpenLP - Open Source Lyrics Projection #
1818 # --------------------------------------------------------------------------- #
1819-# Copyright (c) 2008-2017 OpenLP Developers #
1820+# Copyright (c) 2008-2018 OpenLP Developers #
1821 # --------------------------------------------------------------------------- #
1822 # This program is free software; you can redistribute it and/or modify it #
1823 # under the terms of the GNU General Public License as published by the Free #
1824
1825=== modified file 'openlp/core/ui/shortcutlistform.py'
1826--- openlp/core/ui/shortcutlistform.py 2017-10-23 22:09:57 +0000
1827+++ openlp/core/ui/shortcutlistform.py 2017-12-29 10:26:06 +0000
1828@@ -4,7 +4,7 @@
1829 ###############################################################################
1830 # OpenLP - Open Source Lyrics Projection #
1831 # --------------------------------------------------------------------------- #
1832-# Copyright (c) 2008-2017 OpenLP Developers #
1833+# Copyright (c) 2008-2018 OpenLP Developers #
1834 # --------------------------------------------------------------------------- #
1835 # This program is free software; you can redistribute it and/or modify it #
1836 # under the terms of the GNU General Public License as published by the Free #
1837
1838=== modified file 'openlp/core/ui/slidecontroller.py'
1839--- openlp/core/ui/slidecontroller.py 2017-11-09 19:55:01 +0000
1840+++ openlp/core/ui/slidecontroller.py 2017-12-29 10:26:06 +0000
1841@@ -4,7 +4,7 @@
1842 ###############################################################################
1843 # OpenLP - Open Source Lyrics Projection #
1844 # --------------------------------------------------------------------------- #
1845-# Copyright (c) 2008-2017 OpenLP Developers #
1846+# Copyright (c) 2008-2018 OpenLP Developers #
1847 # --------------------------------------------------------------------------- #
1848 # This program is free software; you can redistribute it and/or modify it #
1849 # under the terms of the GNU General Public License as published by the Free #
1850@@ -42,7 +42,6 @@
1851 from openlp.core.widgets.toolbar import OpenLPToolbar
1852 from openlp.core.widgets.views import ListPreviewWidget
1853
1854-
1855 # Threshold which has to be trespassed to toggle.
1856 HIDE_MENU_THRESHOLD = 27
1857 AUDIO_TIME_LABEL_STYLESHEET = 'background-color: palette(background); ' \
1858
1859=== modified file 'openlp/core/ui/splashscreen.py'
1860--- openlp/core/ui/splashscreen.py 2016-12-31 11:01:36 +0000
1861+++ openlp/core/ui/splashscreen.py 2017-12-29 10:26:06 +0000
1862@@ -4,7 +4,7 @@
1863 ###############################################################################
1864 # OpenLP - Open Source Lyrics Projection #
1865 # --------------------------------------------------------------------------- #
1866-# Copyright (c) 2008-2017 OpenLP Developers #
1867+# Copyright (c) 2008-2018 OpenLP Developers #
1868 # --------------------------------------------------------------------------- #
1869 # This program is free software; you can redistribute it and/or modify it #
1870 # under the terms of the GNU General Public License as published by the Free #
1871
1872=== modified file 'openlp/core/ui/starttimedialog.py'
1873--- openlp/core/ui/starttimedialog.py 2017-10-07 07:05:07 +0000
1874+++ openlp/core/ui/starttimedialog.py 2017-12-29 10:26:06 +0000
1875@@ -4,7 +4,7 @@
1876 ###############################################################################
1877 # OpenLP - Open Source Lyrics Projection #
1878 # --------------------------------------------------------------------------- #
1879-# Copyright (c) 2008-2017 OpenLP Developers #
1880+# Copyright (c) 2008-2018 OpenLP Developers #
1881 # --------------------------------------------------------------------------- #
1882 # This program is free software; you can redistribute it and/or modify it #
1883 # under the terms of the GNU General Public License as published by the Free #
1884
1885=== modified file 'openlp/core/ui/starttimeform.py'
1886--- openlp/core/ui/starttimeform.py 2017-10-23 22:09:57 +0000
1887+++ openlp/core/ui/starttimeform.py 2017-12-29 10:26:06 +0000
1888@@ -4,7 +4,7 @@
1889 ###############################################################################
1890 # OpenLP - Open Source Lyrics Projection #
1891 # --------------------------------------------------------------------------- #
1892-# Copyright (c) 2008-2017 OpenLP Developers #
1893+# Copyright (c) 2008-2018 OpenLP Developers #
1894 # --------------------------------------------------------------------------- #
1895 # This program is free software; you can redistribute it and/or modify it #
1896 # under the terms of the GNU General Public License as published by the Free #
1897
1898=== modified file 'openlp/core/ui/style.py'
1899--- openlp/core/ui/style.py 2017-09-29 03:06:00 +0000
1900+++ openlp/core/ui/style.py 2017-12-29 10:26:06 +0000
1901@@ -4,7 +4,7 @@
1902 ###############################################################################
1903 # OpenLP - Open Source Lyrics Projection #
1904 # --------------------------------------------------------------------------- #
1905-# Copyright (c) 2008-2017 OpenLP Developers #
1906+# Copyright (c) 2008-2018 OpenLP Developers #
1907 # --------------------------------------------------------------------------- #
1908 # This program is free software; you can redistribute it and/or modify it #
1909 # under the terms of the GNU General Public License as published by the Free #
1910@@ -24,7 +24,7 @@
1911 """
1912 from PyQt5 import QtGui
1913
1914-from openlp.core.common import is_macosx, is_win
1915+from openlp.core.common import is_win
1916 from openlp.core.common.registry import Registry
1917 from openlp.core.common.settings import Settings
1918
1919
1920=== modified file 'openlp/core/ui/themeform.py'
1921--- openlp/core/ui/themeform.py 2017-10-23 22:09:57 +0000
1922+++ openlp/core/ui/themeform.py 2017-12-29 10:26:06 +0000
1923@@ -4,7 +4,7 @@
1924 ###############################################################################
1925 # OpenLP - Open Source Lyrics Projection #
1926 # --------------------------------------------------------------------------- #
1927-# Copyright (c) 2008-2017 OpenLP Developers #
1928+# Copyright (c) 2008-2018 OpenLP Developers #
1929 # --------------------------------------------------------------------------- #
1930 # This program is free software; you can redistribute it and/or modify it #
1931 # under the terms of the GNU General Public License as published by the Free #
1932
1933=== modified file 'openlp/core/ui/themelayoutdialog.py'
1934--- openlp/core/ui/themelayoutdialog.py 2017-10-07 07:05:07 +0000
1935+++ openlp/core/ui/themelayoutdialog.py 2017-12-29 10:26:06 +0000
1936@@ -4,7 +4,7 @@
1937 ###############################################################################
1938 # OpenLP - Open Source Lyrics Projection #
1939 # --------------------------------------------------------------------------- #
1940-# Copyright (c) 2008-2017 OpenLP Developers #
1941+# Copyright (c) 2008-2018 OpenLP Developers #
1942 # --------------------------------------------------------------------------- #
1943 # This program is free software; you can redistribute it and/or modify it #
1944 # under the terms of the GNU General Public License as published by the Free #
1945
1946=== modified file 'openlp/core/ui/themelayoutform.py'
1947--- openlp/core/ui/themelayoutform.py 2016-12-31 11:01:36 +0000
1948+++ openlp/core/ui/themelayoutform.py 2017-12-29 10:26:06 +0000
1949@@ -4,7 +4,7 @@
1950 ###############################################################################
1951 # OpenLP - Open Source Lyrics Projection #
1952 # --------------------------------------------------------------------------- #
1953-# Copyright (c) 2008-2017 OpenLP Developers #
1954+# Copyright (c) 2008-2018 OpenLP Developers #
1955 # --------------------------------------------------------------------------- #
1956 # This program is free software; you can redistribute it and/or modify it #
1957 # under the terms of the GNU General Public License as published by the Free #
1958
1959=== modified file 'openlp/core/ui/thememanager.py'
1960--- openlp/core/ui/thememanager.py 2017-11-20 21:57:34 +0000
1961+++ openlp/core/ui/thememanager.py 2017-12-29 10:26:06 +0000
1962@@ -4,7 +4,7 @@
1963 ###############################################################################
1964 # OpenLP - Open Source Lyrics Projection #
1965 # --------------------------------------------------------------------------- #
1966-# Copyright (c) 2008-2017 OpenLP Developers #
1967+# Copyright (c) 2008-2018 OpenLP Developers #
1968 # --------------------------------------------------------------------------- #
1969 # This program is free software; you can redistribute it and/or modify it #
1970 # under the terms of the GNU General Public License as published by the Free #
1971
1972=== modified file 'openlp/core/ui/themestab.py'
1973--- openlp/core/ui/themestab.py 2017-10-07 07:05:07 +0000
1974+++ openlp/core/ui/themestab.py 2017-12-29 10:26:06 +0000
1975@@ -4,7 +4,7 @@
1976 ###############################################################################
1977 # OpenLP - Open Source Lyrics Projection #
1978 # --------------------------------------------------------------------------- #
1979-# Copyright (c) 2008-2017 OpenLP Developers #
1980+# Copyright (c) 2008-2018 OpenLP Developers #
1981 # --------------------------------------------------------------------------- #
1982 # This program is free software; you can redistribute it and/or modify it #
1983 # under the terms of the GNU General Public License as published by the Free #
1984
1985=== modified file 'openlp/core/ui/themewizard.py'
1986--- openlp/core/ui/themewizard.py 2017-10-23 22:09:57 +0000
1987+++ openlp/core/ui/themewizard.py 2017-12-29 10:26:06 +0000
1988@@ -4,7 +4,7 @@
1989 ###############################################################################
1990 # OpenLP - Open Source Lyrics Projection #
1991 # --------------------------------------------------------------------------- #
1992-# Copyright (c) 2008-2017 OpenLP Developers #
1993+# Copyright (c) 2008-2018 OpenLP Developers #
1994 # --------------------------------------------------------------------------- #
1995 # This program is free software; you can redistribute it and/or modify it #
1996 # under the terms of the GNU General Public License as published by the Free #
1997
1998=== modified file 'openlp/core/version.py'
1999--- openlp/core/version.py 2017-11-18 11:23:15 +0000
2000+++ openlp/core/version.py 2017-12-29 10:26:06 +0000
2001@@ -4,7 +4,7 @@
2002 ###############################################################################
2003 # OpenLP - Open Source Lyrics Projection #
2004 # --------------------------------------------------------------------------- #
2005-# Copyright (c) 2008-2017 OpenLP Developers #
2006+# Copyright (c) 2008-2018 OpenLP Developers #
2007 # --------------------------------------------------------------------------- #
2008 # This program is free software; you can redistribute it and/or modify it #
2009 # under the terms of the GNU General Public License as published by the Free #
2010
2011=== modified file 'openlp/core/widgets/__init__.py'
2012--- openlp/core/widgets/__init__.py 2017-10-23 22:09:57 +0000
2013+++ openlp/core/widgets/__init__.py 2017-12-29 10:26:06 +0000
2014@@ -4,7 +4,7 @@
2015 ###############################################################################
2016 # OpenLP - Open Source Lyrics Projection #
2017 # --------------------------------------------------------------------------- #
2018-# Copyright (c) 2008-2017 OpenLP Developers #
2019+# Copyright (c) 2008-2018 OpenLP Developers #
2020 # --------------------------------------------------------------------------- #
2021 # This program is free software; you can redistribute it and/or modify it #
2022 # under the terms of the GNU General Public License as published by the Free #
2023
2024=== modified file 'openlp/core/widgets/buttons.py'
2025--- openlp/core/widgets/buttons.py 2017-10-23 22:09:57 +0000
2026+++ openlp/core/widgets/buttons.py 2017-12-29 10:26:06 +0000
2027@@ -4,7 +4,7 @@
2028 ###############################################################################
2029 # OpenLP - Open Source Lyrics Projection #
2030 # --------------------------------------------------------------------------- #
2031-# Copyright (c) 2008-2017 OpenLP Developers #
2032+# Copyright (c) 2008-2018 OpenLP Developers #
2033 # --------------------------------------------------------------------------- #
2034 # This program is free software; you can redistribute it and/or modify it #
2035 # under the terms of the GNU General Public License as published by the Free #
2036
2037=== modified file 'openlp/core/widgets/dialogs.py'
2038--- openlp/core/widgets/dialogs.py 2017-10-23 22:09:57 +0000
2039+++ openlp/core/widgets/dialogs.py 2017-12-29 10:26:06 +0000
2040@@ -4,7 +4,7 @@
2041 ###############################################################################
2042 # OpenLP - Open Source Lyrics Projection #
2043 # --------------------------------------------------------------------------- #
2044-# Copyright (c) 2008-2017 OpenLP Developers #
2045+# Copyright (c) 2008-2018 OpenLP Developers #
2046 # --------------------------------------------------------------------------- #
2047 # This program is free software; you can redistribute it and/or modify it #
2048 # under the terms of the GNU General Public License as published by the Free #
2049@@ -22,7 +22,7 @@
2050 """ Patch the QFileDialog so it accepts and returns Path objects"""
2051 from PyQt5 import QtWidgets
2052
2053-from openlp.core.common.path import Path, path_to_str, replace_params, str_to_path
2054+from openlp.core.common.path import path_to_str, replace_params, str_to_path
2055
2056
2057 class FileDialog(QtWidgets.QFileDialog):
2058
2059=== modified file 'openlp/core/widgets/docks.py'
2060--- openlp/core/widgets/docks.py 2017-10-23 22:09:57 +0000
2061+++ openlp/core/widgets/docks.py 2017-12-29 10:26:06 +0000
2062@@ -4,7 +4,7 @@
2063 ###############################################################################
2064 # OpenLP - Open Source Lyrics Projection #
2065 # --------------------------------------------------------------------------- #
2066-# Copyright (c) 2008-2017 OpenLP Developers #
2067+# Copyright (c) 2008-2018 OpenLP Developers #
2068 # --------------------------------------------------------------------------- #
2069 # This program is free software; you can redistribute it and/or modify it #
2070 # under the terms of the GNU General Public License as published by the Free #
2071
2072=== modified file 'openlp/core/widgets/edits.py'
2073--- openlp/core/widgets/edits.py 2017-11-11 12:20:45 +0000
2074+++ openlp/core/widgets/edits.py 2017-12-29 10:26:06 +0000
2075@@ -4,7 +4,7 @@
2076 ###############################################################################
2077 # OpenLP - Open Source Lyrics Projection #
2078 # --------------------------------------------------------------------------- #
2079-# Copyright (c) 2008-2017 OpenLP Developers #
2080+# Copyright (c) 2008-2018 OpenLP Developers #
2081 # --------------------------------------------------------------------------- #
2082 # This program is free software; you can redistribute it and/or modify it #
2083 # under the terms of the GNU General Public License as published by the Free #
2084
2085=== modified file 'openlp/core/widgets/enums.py'
2086--- openlp/core/widgets/enums.py 2017-10-23 22:09:57 +0000
2087+++ openlp/core/widgets/enums.py 2017-12-29 10:26:06 +0000
2088@@ -4,7 +4,7 @@
2089 ###############################################################################
2090 # OpenLP - Open Source Lyrics Projection #
2091 # --------------------------------------------------------------------------- #
2092-# Copyright (c) 2008-2017 OpenLP Developers #
2093+# Copyright (c) 2008-2018 OpenLP Developers #
2094 # --------------------------------------------------------------------------- #
2095 # This program is free software; you can redistribute it and/or modify it #
2096 # under the terms of the GNU General Public License as published by the Free #
2097
2098=== modified file 'openlp/core/widgets/toolbar.py'
2099--- openlp/core/widgets/toolbar.py 2017-10-23 22:09:57 +0000
2100+++ openlp/core/widgets/toolbar.py 2017-12-29 10:26:06 +0000
2101@@ -4,7 +4,7 @@
2102 ###############################################################################
2103 # OpenLP - Open Source Lyrics Projection #
2104 # --------------------------------------------------------------------------- #
2105-# Copyright (c) 2008-2017 OpenLP Developers #
2106+# Copyright (c) 2008-2018 OpenLP Developers #
2107 # --------------------------------------------------------------------------- #
2108 # This program is free software; you can redistribute it and/or modify it #
2109 # under the terms of the GNU General Public License as published by the Free #
2110
2111=== modified file 'openlp/core/widgets/views.py'
2112--- openlp/core/widgets/views.py 2017-12-17 04:29:53 +0000
2113+++ openlp/core/widgets/views.py 2017-12-29 10:26:06 +0000
2114@@ -4,7 +4,7 @@
2115 ###############################################################################
2116 # OpenLP - Open Source Lyrics Projection #
2117 # --------------------------------------------------------------------------- #
2118-# Copyright (c) 2008-2017 OpenLP Developers #
2119+# Copyright (c) 2008-2018 OpenLP Developers #
2120 # --------------------------------------------------------------------------- #
2121 # This program is free software; you can redistribute it and/or modify it #
2122 # under the terms of the GNU General Public License as published by the Free #
2123
2124=== modified file 'openlp/core/widgets/wizard.py'
2125--- openlp/core/widgets/wizard.py 2017-10-23 22:09:57 +0000
2126+++ openlp/core/widgets/wizard.py 2017-12-29 10:26:06 +0000
2127@@ -4,7 +4,7 @@
2128 ###############################################################################
2129 # OpenLP - Open Source Lyrics Projection #
2130 # --------------------------------------------------------------------------- #
2131-# Copyright (c) 2008-2017 OpenLP Developers #
2132+# Copyright (c) 2008-2018 OpenLP Developers #
2133 # --------------------------------------------------------------------------- #
2134 # This program is free software; you can redistribute it and/or modify it #
2135 # under the terms of the GNU General Public License as published by the Free #
2136
2137=== modified file 'openlp/plugins/__init__.py'
2138--- openlp/plugins/__init__.py 2016-12-31 11:01:36 +0000
2139+++ openlp/plugins/__init__.py 2017-12-29 10:26:06 +0000
2140@@ -4,7 +4,7 @@
2141 ###############################################################################
2142 # OpenLP - Open Source Lyrics Projection #
2143 # --------------------------------------------------------------------------- #
2144-# Copyright (c) 2008-2017 OpenLP Developers #
2145+# Copyright (c) 2008-2018 OpenLP Developers #
2146 # --------------------------------------------------------------------------- #
2147 # This program is free software; you can redistribute it and/or modify it #
2148 # under the terms of the GNU General Public License as published by the Free #
2149
2150=== modified file 'openlp/plugins/alerts/__init__.py'
2151--- openlp/plugins/alerts/__init__.py 2016-12-31 11:01:36 +0000
2152+++ openlp/plugins/alerts/__init__.py 2017-12-29 10:26:06 +0000
2153@@ -4,7 +4,7 @@
2154 ###############################################################################
2155 # OpenLP - Open Source Lyrics Projection #
2156 # --------------------------------------------------------------------------- #
2157-# Copyright (c) 2008-2017 OpenLP Developers #
2158+# Copyright (c) 2008-2018 OpenLP Developers #
2159 # --------------------------------------------------------------------------- #
2160 # This program is free software; you can redistribute it and/or modify it #
2161 # under the terms of the GNU General Public License as published by the Free #
2162
2163=== modified file 'openlp/plugins/alerts/alertsplugin.py'
2164--- openlp/plugins/alerts/alertsplugin.py 2017-10-07 07:05:07 +0000
2165+++ openlp/plugins/alerts/alertsplugin.py 2017-12-29 10:26:06 +0000
2166@@ -4,7 +4,7 @@
2167 ###############################################################################
2168 # OpenLP - Open Source Lyrics Projection #
2169 # --------------------------------------------------------------------------- #
2170-# Copyright (c) 2008-2017 OpenLP Developers #
2171+# Copyright (c) 2008-2018 OpenLP Developers #
2172 # --------------------------------------------------------------------------- #
2173 # This program is free software; you can redistribute it and/or modify it #
2174 # under the terms of the GNU General Public License as published by the Free #
2175
2176=== modified file 'openlp/plugins/alerts/endpoint.py'
2177--- openlp/plugins/alerts/endpoint.py 2017-10-07 07:05:07 +0000
2178+++ openlp/plugins/alerts/endpoint.py 2017-12-29 10:26:06 +0000
2179@@ -4,7 +4,7 @@
2180 ###############################################################################
2181 # OpenLP - Open Source Lyrics Projection #
2182 # --------------------------------------------------------------------------- #
2183-# Copyright (c) 2008-2017 OpenLP Developers #
2184+# Copyright (c) 2008-2018 OpenLP Developers #
2185 # --------------------------------------------------------------------------- #
2186 # This program is free software; you can redistribute it and/or modify it #
2187 # under the terms of the GNU General Public License as published by the Free #
2188@@ -19,17 +19,16 @@
2189 # with this program; if not, write to the Free Software Foundation, Inc., 59 #
2190 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
2191 ###############################################################################
2192+import json
2193 import logging
2194-import json
2195 import urllib
2196 from urllib.parse import urlparse
2197
2198+from openlp.core.api.http import requires_auth
2199 from openlp.core.api.http.endpoint import Endpoint
2200-from openlp.core.api.http import requires_auth
2201 from openlp.core.common.registry import Registry
2202 from openlp.core.lib import PluginStatus
2203
2204-
2205 log = logging.getLogger(__name__)
2206
2207 alerts_endpoint = Endpoint('alert')
2208
2209=== modified file 'openlp/plugins/alerts/forms/__init__.py'
2210--- openlp/plugins/alerts/forms/__init__.py 2016-12-31 11:01:36 +0000
2211+++ openlp/plugins/alerts/forms/__init__.py 2017-12-29 10:26:06 +0000
2212@@ -4,7 +4,7 @@
2213 ###############################################################################
2214 # OpenLP - Open Source Lyrics Projection #
2215 # --------------------------------------------------------------------------- #
2216-# Copyright (c) 2008-2017 OpenLP Developers #
2217+# Copyright (c) 2008-2018 OpenLP Developers #
2218 # --------------------------------------------------------------------------- #
2219 # This program is free software; you can redistribute it and/or modify it #
2220 # under the terms of the GNU General Public License as published by the Free #
2221
2222=== modified file 'openlp/plugins/alerts/forms/alertdialog.py'
2223--- openlp/plugins/alerts/forms/alertdialog.py 2017-10-07 07:05:07 +0000
2224+++ openlp/plugins/alerts/forms/alertdialog.py 2017-12-29 10:26:06 +0000
2225@@ -4,7 +4,7 @@
2226 ###############################################################################
2227 # OpenLP - Open Source Lyrics Projection #
2228 # --------------------------------------------------------------------------- #
2229-# Copyright (c) 2008-2017 OpenLP Developers #
2230+# Copyright (c) 2008-2018 OpenLP Developers #
2231 # --------------------------------------------------------------------------- #
2232 # This program is free software; you can redistribute it and/or modify it #
2233 # under the terms of the GNU General Public License as published by the Free #
2234
2235=== modified file 'openlp/plugins/alerts/forms/alertform.py'
2236--- openlp/plugins/alerts/forms/alertform.py 2017-10-07 07:05:07 +0000
2237+++ openlp/plugins/alerts/forms/alertform.py 2017-12-29 10:26:06 +0000
2238@@ -4,7 +4,7 @@
2239 ###############################################################################
2240 # OpenLP - Open Source Lyrics Projection #
2241 # --------------------------------------------------------------------------- #
2242-# Copyright (c) 2008-2017 OpenLP Developers #
2243+# Copyright (c) 2008-2018 OpenLP Developers #
2244 # --------------------------------------------------------------------------- #
2245 # This program is free software; you can redistribute it and/or modify it #
2246 # under the terms of the GNU General Public License as published by the Free #
2247@@ -25,7 +25,6 @@
2248 from openlp.core.common.i18n import translate
2249 from openlp.core.common.registry import Registry
2250 from openlp.plugins.alerts.lib.db import AlertItem
2251-
2252 from .alertdialog import Ui_AlertDialog
2253
2254
2255
2256=== modified file 'openlp/plugins/alerts/lib/__init__.py'
2257--- openlp/plugins/alerts/lib/__init__.py 2017-03-03 19:27:31 +0000
2258+++ openlp/plugins/alerts/lib/__init__.py 2017-12-29 10:26:06 +0000
2259@@ -4,7 +4,7 @@
2260 ###############################################################################
2261 # OpenLP - Open Source Lyrics Projection #
2262 # --------------------------------------------------------------------------- #
2263-# Copyright (c) 2008-2017 OpenLP Developers #
2264+# Copyright (c) 2008-2018 OpenLP Developers #
2265 # --------------------------------------------------------------------------- #
2266 # This program is free software; you can redistribute it and/or modify it #
2267 # under the terms of the GNU General Public License as published by the Free #
2268
2269=== modified file 'openlp/plugins/alerts/lib/alertsmanager.py'
2270--- openlp/plugins/alerts/lib/alertsmanager.py 2017-10-23 22:09:57 +0000
2271+++ openlp/plugins/alerts/lib/alertsmanager.py 2017-12-29 10:26:06 +0000
2272@@ -4,7 +4,7 @@
2273 ###############################################################################
2274 # OpenLP - Open Source Lyrics Projection #
2275 # --------------------------------------------------------------------------- #
2276-# Copyright (c) 2008-2017 OpenLP Developers #
2277+# Copyright (c) 2008-2018 OpenLP Developers #
2278 # --------------------------------------------------------------------------- #
2279 # This program is free software; you can redistribute it and/or modify it #
2280 # under the terms of the GNU General Public License as published by the Free #
2281
2282=== modified file 'openlp/plugins/alerts/lib/alertstab.py'
2283--- openlp/plugins/alerts/lib/alertstab.py 2017-10-23 22:09:57 +0000
2284+++ openlp/plugins/alerts/lib/alertstab.py 2017-12-29 10:26:06 +0000
2285@@ -4,7 +4,7 @@
2286 ###############################################################################
2287 # OpenLP - Open Source Lyrics Projection #
2288 # --------------------------------------------------------------------------- #
2289-# Copyright (c) 2008-2017 OpenLP Developers #
2290+# Copyright (c) 2008-2018 OpenLP Developers #
2291 # --------------------------------------------------------------------------- #
2292 # This program is free software; you can redistribute it and/or modify it #
2293 # under the terms of the GNU General Public License as published by the Free #
2294
2295=== modified file 'openlp/plugins/alerts/lib/db.py'
2296--- openlp/plugins/alerts/lib/db.py 2016-12-31 11:01:36 +0000
2297+++ openlp/plugins/alerts/lib/db.py 2017-12-29 10:26:06 +0000
2298@@ -4,7 +4,7 @@
2299 ###############################################################################
2300 # OpenLP - Open Source Lyrics Projection #
2301 # --------------------------------------------------------------------------- #
2302-# Copyright (c) 2008-2017 OpenLP Developers #
2303+# Copyright (c) 2008-2018 OpenLP Developers #
2304 # --------------------------------------------------------------------------- #
2305 # This program is free software; you can redistribute it and/or modify it #
2306 # under the terms of the GNU General Public License as published by the Free #
2307
2308=== modified file 'openlp/plugins/bibles/__init__.py'
2309--- openlp/plugins/bibles/__init__.py 2016-12-31 11:01:36 +0000
2310+++ openlp/plugins/bibles/__init__.py 2017-12-29 10:26:06 +0000
2311@@ -4,7 +4,7 @@
2312 ###############################################################################
2313 # OpenLP - Open Source Lyrics Projection #
2314 # --------------------------------------------------------------------------- #
2315-# Copyright (c) 2008-2017 OpenLP Developers #
2316+# Copyright (c) 2008-2018 OpenLP Developers #
2317 # --------------------------------------------------------------------------- #
2318 # This program is free software; you can redistribute it and/or modify it #
2319 # under the terms of the GNU General Public License as published by the Free #
2320
2321=== modified file 'openlp/plugins/bibles/bibleplugin.py'
2322--- openlp/plugins/bibles/bibleplugin.py 2017-10-07 07:05:07 +0000
2323+++ openlp/plugins/bibles/bibleplugin.py 2017-12-29 10:26:06 +0000
2324@@ -4,7 +4,7 @@
2325 ###############################################################################
2326 # OpenLP - Open Source Lyrics Projection #
2327 # --------------------------------------------------------------------------- #
2328-# Copyright (c) 2008-2017 OpenLP Developers #
2329+# Copyright (c) 2008-2018 OpenLP Developers #
2330 # --------------------------------------------------------------------------- #
2331 # This program is free software; you can redistribute it and/or modify it #
2332 # under the terms of the GNU General Public License as published by the Free #
2333@@ -23,11 +23,11 @@
2334 import logging
2335
2336 from openlp.core.api.http import register_endpoint
2337+from openlp.core.common.actions import ActionList
2338 from openlp.core.common.i18n import UiStrings, translate
2339-from openlp.core.common.actions import ActionList
2340 from openlp.core.lib import Plugin, StringContent, build_icon
2341+from openlp.core.lib.ui import create_action
2342 from openlp.plugins.bibles.endpoint import api_bibles_endpoint, bibles_endpoint
2343-from openlp.core.lib.ui import create_action
2344 from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem, LayoutStyle, DisplayStyle, \
2345 LanguageSelection
2346 from openlp.plugins.bibles.lib.mediaitem import BibleSearch
2347
2348=== modified file 'openlp/plugins/bibles/endpoint.py'
2349--- openlp/plugins/bibles/endpoint.py 2017-09-26 17:21:54 +0000
2350+++ openlp/plugins/bibles/endpoint.py 2017-12-29 10:26:06 +0000
2351@@ -4,7 +4,7 @@
2352 ###############################################################################
2353 # OpenLP - Open Source Lyrics Projection #
2354 # --------------------------------------------------------------------------- #
2355-# Copyright (c) 2008-2017 OpenLP Developers #
2356+# Copyright (c) 2008-2018 OpenLP Developers #
2357 # --------------------------------------------------------------------------- #
2358 # This program is free software; you can redistribute it and/or modify it #
2359 # under the terms of the GNU General Public License as published by the Free #
2360@@ -21,11 +21,10 @@
2361 ###############################################################################
2362 import logging
2363
2364+from openlp.core.api.endpoint.pluginhelpers import search, live, service
2365+from openlp.core.api.http import requires_auth
2366 from openlp.core.api.http.endpoint import Endpoint
2367 from openlp.core.api.http.errors import NotFound
2368-from openlp.core.api.endpoint.pluginhelpers import search, live, service
2369-from openlp.core.api.http import requires_auth
2370-
2371
2372 log = logging.getLogger(__name__)
2373
2374
2375=== modified file 'openlp/plugins/bibles/forms/__init__.py'
2376--- openlp/plugins/bibles/forms/__init__.py 2016-12-31 11:01:36 +0000
2377+++ openlp/plugins/bibles/forms/__init__.py 2017-12-29 10:26:06 +0000
2378@@ -4,7 +4,7 @@
2379 ###############################################################################
2380 # OpenLP - Open Source Lyrics Projection #
2381 # --------------------------------------------------------------------------- #
2382-# Copyright (c) 2008-2017 OpenLP Developers #
2383+# Copyright (c) 2008-2018 OpenLP Developers #
2384 # --------------------------------------------------------------------------- #
2385 # This program is free software; you can redistribute it and/or modify it #
2386 # under the terms of the GNU General Public License as published by the Free #
2387@@ -24,9 +24,9 @@
2388 The :mod:`forms` module contains all the ui functionality for the bibles
2389 plugin.
2390 """
2391+from .bibleimportform import BibleImportForm
2392 from .booknameform import BookNameForm
2393+from .editbibleform import EditBibleForm
2394 from .languageform import LanguageForm
2395-from .bibleimportform import BibleImportForm
2396-from .editbibleform import EditBibleForm
2397
2398 __all__ = ['BookNameForm', 'LanguageForm', 'BibleImportForm', 'EditBibleForm']
2399
2400=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
2401--- openlp/plugins/bibles/forms/bibleimportform.py 2017-12-17 15:23:38 +0000
2402+++ openlp/plugins/bibles/forms/bibleimportform.py 2017-12-29 10:26:06 +0000
2403@@ -4,7 +4,7 @@
2404 ###############################################################################
2405 # OpenLP - Open Source Lyrics Projection #
2406 # --------------------------------------------------------------------------- #
2407-# Copyright (c) 2008-2017 OpenLP Developers #
2408+# Copyright (c) 2008-2018 OpenLP Developers #
2409 # --------------------------------------------------------------------------- #
2410 # This program is free software; you can redistribute it and/or modify it #
2411 # under the terms of the GNU General Public License as published by the Free #
2412@@ -24,9 +24,10 @@
2413 """
2414 import logging
2415 import urllib.error
2416+
2417+from PyQt5 import QtWidgets
2418 from lxml import etree
2419
2420-from PyQt5 import QtWidgets
2421 try:
2422 from pysword import modules
2423 PYSWORD_AVAILABLE = True
2424
2425=== modified file 'openlp/plugins/bibles/forms/booknamedialog.py'
2426--- openlp/plugins/bibles/forms/booknamedialog.py 2017-10-07 07:05:07 +0000
2427+++ openlp/plugins/bibles/forms/booknamedialog.py 2017-12-29 10:26:06 +0000
2428@@ -4,7 +4,7 @@
2429 ###############################################################################
2430 # OpenLP - Open Source Lyrics Projection #
2431 # --------------------------------------------------------------------------- #
2432-# Copyright (c) 2008-2017 OpenLP Developers #
2433+# Copyright (c) 2008-2018 OpenLP Developers #
2434 # --------------------------------------------------------------------------- #
2435 # This program is free software; you can redistribute it and/or modify it #
2436 # under the terms of the GNU General Public License as published by the Free #
2437
2438=== modified file 'openlp/plugins/bibles/forms/booknameform.py'
2439--- openlp/plugins/bibles/forms/booknameform.py 2017-10-28 10:04:09 +0000
2440+++ openlp/plugins/bibles/forms/booknameform.py 2017-12-29 10:26:06 +0000
2441@@ -4,7 +4,7 @@
2442 ###############################################################################
2443 # OpenLP - Open Source Lyrics Projection #
2444 # --------------------------------------------------------------------------- #
2445-# Copyright (c) 2008-2017 OpenLP Developers #
2446+# Copyright (c) 2008-2018 OpenLP Developers #
2447 # --------------------------------------------------------------------------- #
2448 # This program is free software; you can redistribute it and/or modify it #
2449 # under the terms of the GNU General Public License as published by the Free #
2450@@ -26,8 +26,8 @@
2451 import logging
2452 import re
2453
2454+from PyQt5 import QtCore
2455 from PyQt5.QtWidgets import QDialog
2456-from PyQt5 import QtCore
2457
2458 from openlp.core.common.i18n import translate
2459 from openlp.core.lib.ui import critical_error_message_box
2460
2461=== modified file 'openlp/plugins/bibles/forms/editbibledialog.py'
2462--- openlp/plugins/bibles/forms/editbibledialog.py 2017-10-07 07:05:07 +0000
2463+++ openlp/plugins/bibles/forms/editbibledialog.py 2017-12-29 10:26:06 +0000
2464@@ -4,7 +4,7 @@
2465 ###############################################################################
2466 # OpenLP - Open Source Lyrics Projection #
2467 # --------------------------------------------------------------------------- #
2468-# Copyright (c) 2008-2017 OpenLP Developers #
2469+# Copyright (c) 2008-2018 OpenLP Developers #
2470 # --------------------------------------------------------------------------- #
2471 # This program is free software; you can redistribute it and/or modify it #
2472 # under the terms of the GNU General Public License as published by the Free #
2473
2474=== modified file 'openlp/plugins/bibles/forms/editbibleform.py'
2475--- openlp/plugins/bibles/forms/editbibleform.py 2017-10-23 22:09:57 +0000
2476+++ openlp/plugins/bibles/forms/editbibleform.py 2017-12-29 10:26:06 +0000
2477@@ -4,7 +4,7 @@
2478 ###############################################################################
2479 # OpenLP - Open Source Lyrics Projection #
2480 # --------------------------------------------------------------------------- #
2481-# Copyright (c) 2008-2017 OpenLP Developers #
2482+# Copyright (c) 2008-2018 OpenLP Developers #
2483 # --------------------------------------------------------------------------- #
2484 # This program is free software; you can redistribute it and/or modify it #
2485 # under the terms of the GNU General Public License as published by the Free #
2486@@ -28,9 +28,9 @@
2487 from openlp.core.common.i18n import UiStrings, translate
2488 from openlp.core.common.mixins import RegistryProperties
2489 from openlp.core.lib.ui import critical_error_message_box
2490-from .editbibledialog import Ui_EditBibleDialog
2491 from openlp.plugins.bibles.lib import BibleStrings
2492 from openlp.plugins.bibles.lib.db import BiblesResourcesDB
2493+from .editbibledialog import Ui_EditBibleDialog
2494
2495 log = logging.getLogger(__name__)
2496
2497
2498=== modified file 'openlp/plugins/bibles/forms/languagedialog.py'
2499--- openlp/plugins/bibles/forms/languagedialog.py 2017-10-07 07:05:07 +0000
2500+++ openlp/plugins/bibles/forms/languagedialog.py 2017-12-29 10:26:06 +0000
2501@@ -4,7 +4,7 @@
2502 ###############################################################################
2503 # OpenLP - Open Source Lyrics Projection #
2504 # --------------------------------------------------------------------------- #
2505-# Copyright (c) 2008-2017 OpenLP Developers #
2506+# Copyright (c) 2008-2018 OpenLP Developers #
2507 # --------------------------------------------------------------------------- #
2508 # This program is free software; you can redistribute it and/or modify it #
2509 # under the terms of the GNU General Public License as published by the Free #
2510
2511=== modified file 'openlp/plugins/bibles/forms/languageform.py'
2512--- openlp/plugins/bibles/forms/languageform.py 2017-10-07 07:05:07 +0000
2513+++ openlp/plugins/bibles/forms/languageform.py 2017-12-29 10:26:06 +0000
2514@@ -4,7 +4,7 @@
2515 ###############################################################################
2516 # OpenLP - Open Source Lyrics Projection #
2517 # --------------------------------------------------------------------------- #
2518-# Copyright (c) 2008-2017 OpenLP Developers #
2519+# Copyright (c) 2008-2018 OpenLP Developers #
2520 # --------------------------------------------------------------------------- #
2521 # This program is free software; you can redistribute it and/or modify it #
2522 # under the terms of the GNU General Public License as published by the Free #
2523@@ -25,14 +25,13 @@
2524 """
2525 import logging
2526
2527+from PyQt5 import QtCore
2528 from PyQt5.QtWidgets import QDialog
2529-from PyQt5 import QtCore
2530
2531 from openlp.core.common.i18n import LANGUAGES, translate
2532 from openlp.core.lib.ui import critical_error_message_box
2533 from openlp.plugins.bibles.forms.languagedialog import Ui_LanguageDialog
2534
2535-
2536 log = logging.getLogger(__name__)
2537
2538
2539
2540=== modified file 'openlp/plugins/bibles/lib/__init__.py'
2541--- openlp/plugins/bibles/lib/__init__.py 2017-10-28 10:04:09 +0000
2542+++ openlp/plugins/bibles/lib/__init__.py 2017-12-29 10:26:06 +0000
2543@@ -4,7 +4,7 @@
2544 ###############################################################################
2545 # OpenLP - Open Source Lyrics Projection #
2546 # --------------------------------------------------------------------------- #
2547-# Copyright (c) 2008-2017 OpenLP Developers #
2548+# Copyright (c) 2008-2018 OpenLP Developers #
2549 # --------------------------------------------------------------------------- #
2550 # This program is free software; you can redistribute it and/or modify it #
2551 # under the terms of the GNU General Public License as published by the Free #
2552@@ -29,7 +29,6 @@
2553 from openlp.core.common.i18n import translate
2554 from openlp.core.common.settings import Settings
2555
2556-
2557 log = logging.getLogger(__name__)
2558
2559
2560
2561=== modified file 'openlp/plugins/bibles/lib/bibleimport.py'
2562--- openlp/plugins/bibles/lib/bibleimport.py 2017-11-06 22:41:36 +0000
2563+++ openlp/plugins/bibles/lib/bibleimport.py 2017-12-29 10:26:06 +0000
2564@@ -4,7 +4,7 @@
2565 ###############################################################################
2566 # OpenLP - Open Source Lyrics Projection #
2567 # --------------------------------------------------------------------------- #
2568-# Copyright (c) 2008-2017 OpenLP Developers #
2569+# Copyright (c) 2008-2018 OpenLP Developers #
2570 # --------------------------------------------------------------------------- #
2571 # This program is free software; you can redistribute it and/or modify it #
2572 # under the terms of the GNU General Public License as published by the Free #
2573@@ -20,12 +20,13 @@
2574 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
2575 ###############################################################################
2576
2577+from zipfile import is_zipfile
2578+
2579 from lxml import etree, objectify
2580-from zipfile import is_zipfile
2581
2582+from openlp.core.common.i18n import get_language, translate
2583 from openlp.core.common.mixins import LogMixin, RegistryProperties
2584 from openlp.core.common.registry import Registry
2585-from openlp.core.common.i18n import get_language, translate
2586 from openlp.core.lib import ValidationError
2587 from openlp.core.lib.ui import critical_error_message_box
2588 from openlp.plugins.bibles.lib.db import AlternativeBookNamesDB, BibleDB, BiblesResourcesDB
2589
2590=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
2591--- openlp/plugins/bibles/lib/biblestab.py 2017-10-10 19:17:48 +0000
2592+++ openlp/plugins/bibles/lib/biblestab.py 2017-12-29 10:26:06 +0000
2593@@ -4,7 +4,7 @@
2594 ###############################################################################
2595 # OpenLP - Open Source Lyrics Projection #
2596 # --------------------------------------------------------------------------- #
2597-# Copyright (c) 2008-2017 OpenLP Developers #
2598+# Copyright (c) 2008-2018 OpenLP Developers #
2599 # --------------------------------------------------------------------------- #
2600 # This program is free software; you can redistribute it and/or modify it #
2601 # under the terms of the GNU General Public License as published by the Free #
2602
2603=== modified file 'openlp/plugins/bibles/lib/db.py'
2604--- openlp/plugins/bibles/lib/db.py 2017-11-11 12:20:45 +0000
2605+++ openlp/plugins/bibles/lib/db.py 2017-12-29 10:26:06 +0000
2606@@ -4,7 +4,7 @@
2607 ###############################################################################
2608 # OpenLP - Open Source Lyrics Projection #
2609 # --------------------------------------------------------------------------- #
2610-# Copyright (c) 2008-2017 OpenLP Developers #
2611+# Copyright (c) 2008-2018 OpenLP Developers #
2612 # --------------------------------------------------------------------------- #
2613 # This program is free software; you can redistribute it and/or modify it #
2614 # under the terms of the GNU General Public License as published by the Free #
2615@@ -19,9 +19,9 @@
2616 # with this program; if not, write to the Free Software Foundation, Inc., 59 #
2617 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
2618 ###############################################################################
2619+
2620 import chardet
2621 import logging
2622-import os
2623 import re
2624 import sqlite3
2625 import time
2626
2627=== modified file 'openlp/plugins/bibles/lib/importers/__init__.py'
2628--- openlp/plugins/bibles/lib/importers/__init__.py 2017-10-10 21:16:04 +0000
2629+++ openlp/plugins/bibles/lib/importers/__init__.py 2017-12-29 10:26:06 +0000
2630@@ -4,7 +4,7 @@
2631 ###############################################################################
2632 # OpenLP - Open Source Lyrics Projection #
2633 # --------------------------------------------------------------------------- #
2634-# Copyright (c) 2008-2017 OpenLP Developers #
2635+# Copyright (c) 2008-2018 OpenLP Developers #
2636 # --------------------------------------------------------------------------- #
2637 # This program is free software; you can redistribute it and/or modify it #
2638 # under the terms of the GNU General Public License as published by the Free #
2639
2640=== modified file 'openlp/plugins/bibles/lib/importers/csvbible.py'
2641--- openlp/plugins/bibles/lib/importers/csvbible.py 2017-10-10 19:17:48 +0000
2642+++ openlp/plugins/bibles/lib/importers/csvbible.py 2017-12-29 10:26:06 +0000
2643@@ -4,7 +4,7 @@
2644 ###############################################################################
2645 # OpenLP - Open Source Lyrics Projection #
2646 # --------------------------------------------------------------------------- #
2647-# Copyright (c) 2008-2017 OpenLP Developers #
2648+# Copyright (c) 2008-2018 OpenLP Developers #
2649 # --------------------------------------------------------------------------- #
2650 # This program is free software; you can redistribute it and/or modify it #
2651 # under the terms of the GNU General Public License as published by the Free #
2652
2653=== modified file 'openlp/plugins/bibles/lib/importers/http.py'
2654--- openlp/plugins/bibles/lib/importers/http.py 2017-10-23 22:09:57 +0000
2655+++ openlp/plugins/bibles/lib/importers/http.py 2017-12-29 10:26:06 +0000
2656@@ -4,7 +4,7 @@
2657 ###############################################################################
2658 # OpenLP - Open Source Lyrics Projection #
2659 # --------------------------------------------------------------------------- #
2660-# Copyright (c) 2008-2017 OpenLP Developers #
2661+# Copyright (c) 2008-2018 OpenLP Developers #
2662 # --------------------------------------------------------------------------- #
2663 # This program is free software; you can redistribute it and/or modify it #
2664 # under the terms of the GNU General Public License as published by the Free #
2665@@ -25,8 +25,8 @@
2666 import logging
2667 import re
2668 import socket
2669+import urllib.error
2670 import urllib.parse
2671-import urllib.error
2672
2673 from bs4 import BeautifulSoup, NavigableString, Tag
2674
2675
2676=== modified file 'openlp/plugins/bibles/lib/importers/opensong.py'
2677--- openlp/plugins/bibles/lib/importers/opensong.py 2017-10-10 19:09:20 +0000
2678+++ openlp/plugins/bibles/lib/importers/opensong.py 2017-12-29 10:26:06 +0000
2679@@ -4,7 +4,7 @@
2680 ###############################################################################
2681 # OpenLP - Open Source Lyrics Projection #
2682 # --------------------------------------------------------------------------- #
2683-# Copyright (c) 2008-2017 OpenLP Developers #
2684+# Copyright (c) 2008-2018 OpenLP Developers #
2685 # --------------------------------------------------------------------------- #
2686 # This program is free software; you can redistribute it and/or modify it #
2687 # under the terms of the GNU General Public License as published by the Free #
2688
2689=== modified file 'openlp/plugins/bibles/lib/importers/osis.py'
2690--- openlp/plugins/bibles/lib/importers/osis.py 2017-10-10 19:09:20 +0000
2691+++ openlp/plugins/bibles/lib/importers/osis.py 2017-12-29 10:26:06 +0000
2692@@ -4,7 +4,7 @@
2693 ###############################################################################
2694 # OpenLP - Open Source Lyrics Projection #
2695 # --------------------------------------------------------------------------- #
2696-# Copyright (c) 2008-2017 OpenLP Developers #
2697+# Copyright (c) 2008-2018 OpenLP Developers #
2698 # --------------------------------------------------------------------------- #
2699 # This program is free software; you can redistribute it and/or modify it #
2700 # under the terms of the GNU General Public License as published by the Free #
2701
2702=== modified file 'openlp/plugins/bibles/lib/importers/sword.py'
2703--- openlp/plugins/bibles/lib/importers/sword.py 2017-10-10 19:17:48 +0000
2704+++ openlp/plugins/bibles/lib/importers/sword.py 2017-12-29 10:26:06 +0000
2705@@ -4,7 +4,7 @@
2706 ###############################################################################
2707 # OpenLP - Open Source Lyrics Projection #
2708 # --------------------------------------------------------------------------- #
2709-# Copyright (c) 2008-2017 OpenLP Developers #
2710+# Copyright (c) 2008-2018 OpenLP Developers #
2711 # --------------------------------------------------------------------------- #
2712 # This program is free software; you can redistribute it and/or modify it #
2713 # under the terms of the GNU General Public License as published by the Free #
2714@@ -21,6 +21,7 @@
2715 ###############################################################################
2716
2717 import logging
2718+
2719 from pysword import modules
2720
2721 from openlp.core.common.i18n import translate
2722@@ -28,7 +29,6 @@
2723 from openlp.plugins.bibles.lib.bibleimport import BibleImport
2724 from openlp.plugins.bibles.lib.db import BiblesResourcesDB
2725
2726-
2727 log = logging.getLogger(__name__)
2728
2729
2730
2731=== modified file 'openlp/plugins/bibles/lib/importers/wordproject.py'
2732--- openlp/plugins/bibles/lib/importers/wordproject.py 2017-10-10 19:09:20 +0000
2733+++ openlp/plugins/bibles/lib/importers/wordproject.py 2017-12-29 10:26:06 +0000
2734@@ -4,7 +4,7 @@
2735 ###############################################################################
2736 # OpenLP - Open Source Lyrics Projection #
2737 # --------------------------------------------------------------------------- #
2738-# Copyright (c) 2008-2017 OpenLP Developers #
2739+# Copyright (c) 2008-2018 OpenLP Developers #
2740 # --------------------------------------------------------------------------- #
2741 # This program is free software; you can redistribute it and/or modify it #
2742 # under the terms of the GNU General Public License as published by the Free #
2743
2744=== modified file 'openlp/plugins/bibles/lib/importers/zefania.py'
2745--- openlp/plugins/bibles/lib/importers/zefania.py 2017-10-10 19:17:48 +0000
2746+++ openlp/plugins/bibles/lib/importers/zefania.py 2017-12-29 10:26:06 +0000
2747@@ -4,7 +4,7 @@
2748 ###############################################################################
2749 # OpenLP - Open Source Lyrics Projection #
2750 # --------------------------------------------------------------------------- #
2751-# Copyright (c) 2008-2017 OpenLP Developers #
2752+# Copyright (c) 2008-2018 OpenLP Developers #
2753 # --------------------------------------------------------------------------- #
2754 # This program is free software; you can redistribute it and/or modify it #
2755 # under the terms of the GNU General Public License as published by the Free #
2756@@ -27,7 +27,6 @@
2757 from openlp.plugins.bibles.lib.bibleimport import BibleImport
2758 from openlp.plugins.bibles.lib.db import BiblesResourcesDB
2759
2760-
2761 log = logging.getLogger(__name__)
2762
2763 # Tags we don't use and can remove the content
2764
2765=== modified file 'openlp/plugins/bibles/lib/manager.py'
2766--- openlp/plugins/bibles/lib/manager.py 2017-11-06 22:41:36 +0000
2767+++ openlp/plugins/bibles/lib/manager.py 2017-12-29 10:26:06 +0000
2768@@ -4,7 +4,7 @@
2769 ###############################################################################
2770 # OpenLP - Open Source Lyrics Projection #
2771 # --------------------------------------------------------------------------- #
2772-# Copyright (c) 2008-2017 OpenLP Developers #
2773+# Copyright (c) 2008-2018 OpenLP Developers #
2774 # --------------------------------------------------------------------------- #
2775 # This program is free software; you can redistribute it and/or modify it #
2776 # under the terms of the GNU General Public License as published by the Free #
2777@@ -33,8 +33,9 @@
2778 from .importers.http import HTTPBible
2779 from .importers.opensong import OpenSongBible
2780 from .importers.osis import OSISBible
2781+from .importers.wordproject import WordProjectBible
2782 from .importers.zefania import ZefaniaBible
2783-from .importers.wordproject import WordProjectBible
2784+
2785 try:
2786 from .importers.sword import SwordBible
2787 except:
2788
2789=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
2790--- openlp/plugins/bibles/lib/mediaitem.py 2017-10-23 22:09:57 +0000
2791+++ openlp/plugins/bibles/lib/mediaitem.py 2017-12-29 10:26:06 +0000
2792@@ -4,7 +4,7 @@
2793 ###############################################################################
2794 # OpenLP - Open Source Lyrics Projection #
2795 # --------------------------------------------------------------------------- #
2796-# Copyright (c) 2008-2017 OpenLP Developers #
2797+# Copyright (c) 2008-2018 OpenLP Developers #
2798 # --------------------------------------------------------------------------- #
2799 # This program is free software; you can redistribute it and/or modify it #
2800 # under the terms of the GNU General Public License as published by the Free #
2801
2802=== modified file 'openlp/plugins/bibles/lib/upgrade.py'
2803--- openlp/plugins/bibles/lib/upgrade.py 2016-12-31 11:01:36 +0000
2804+++ openlp/plugins/bibles/lib/upgrade.py 2017-12-29 10:26:06 +0000
2805@@ -4,7 +4,7 @@
2806 ###############################################################################
2807 # OpenLP - Open Source Lyrics Projection #
2808 # --------------------------------------------------------------------------- #
2809-# Copyright (c) 2008-2017 OpenLP Developers #
2810+# Copyright (c) 2008-2018 OpenLP Developers #
2811 # --------------------------------------------------------------------------- #
2812 # This program is free software; you can redistribute it and/or modify it #
2813 # under the terms of the GNU General Public License as published by the Free #
2814
2815=== modified file 'openlp/plugins/bibles/lib/versereferencelist.py'
2816--- openlp/plugins/bibles/lib/versereferencelist.py 2016-12-31 11:01:36 +0000
2817+++ openlp/plugins/bibles/lib/versereferencelist.py 2017-12-29 10:26:06 +0000
2818@@ -4,7 +4,7 @@
2819 ###############################################################################
2820 # OpenLP - Open Source Lyrics Projection #
2821 # --------------------------------------------------------------------------- #
2822-# Copyright (c) 2008-2017 OpenLP Developers #
2823+# Copyright (c) 2008-2018 OpenLP Developers #
2824 # --------------------------------------------------------------------------- #
2825 # This program is free software; you can redistribute it and/or modify it #
2826 # under the terms of the GNU General Public License as published by the Free #
2827
2828=== modified file 'openlp/plugins/custom/__init__.py'
2829--- openlp/plugins/custom/__init__.py 2016-12-31 11:01:36 +0000
2830+++ openlp/plugins/custom/__init__.py 2017-12-29 10:26:06 +0000
2831@@ -4,7 +4,7 @@
2832 ###############################################################################
2833 # OpenLP - Open Source Lyrics Projection #
2834 # --------------------------------------------------------------------------- #
2835-# Copyright (c) 2008-2017 OpenLP Developers #
2836+# Copyright (c) 2008-2018 OpenLP Developers #
2837 # --------------------------------------------------------------------------- #
2838 # This program is free software; you can redistribute it and/or modify it #
2839 # under the terms of the GNU General Public License as published by the Free #
2840
2841=== modified file 'openlp/plugins/custom/customplugin.py'
2842--- openlp/plugins/custom/customplugin.py 2017-10-07 07:05:07 +0000
2843+++ openlp/plugins/custom/customplugin.py 2017-12-29 10:26:06 +0000
2844@@ -4,7 +4,7 @@
2845 ###############################################################################
2846 # OpenLP - Open Source Lyrics Projection #
2847 # --------------------------------------------------------------------------- #
2848-# Copyright (c) 2008-2017 OpenLP Developers #
2849+# Copyright (c) 2008-2018 OpenLP Developers #
2850 # --------------------------------------------------------------------------- #
2851 # This program is free software; you can redistribute it and/or modify it #
2852 # under the terms of the GNU General Public License as published by the Free #
2853
2854=== modified file 'openlp/plugins/custom/endpoint.py'
2855--- openlp/plugins/custom/endpoint.py 2017-09-26 17:21:54 +0000
2856+++ openlp/plugins/custom/endpoint.py 2017-12-29 10:26:06 +0000
2857@@ -4,7 +4,7 @@
2858 ###############################################################################
2859 # OpenLP - Open Source Lyrics Projection #
2860 # --------------------------------------------------------------------------- #
2861-# Copyright (c) 2008-2017 OpenLP Developers #
2862+# Copyright (c) 2008-2018 OpenLP Developers #
2863 # --------------------------------------------------------------------------- #
2864 # This program is free software; you can redistribute it and/or modify it #
2865 # under the terms of the GNU General Public License as published by the Free #
2866@@ -21,11 +21,10 @@
2867 ###############################################################################
2868 import logging
2869
2870+from openlp.core.api.endpoint.pluginhelpers import search, live, service
2871+from openlp.core.api.http import requires_auth
2872 from openlp.core.api.http.endpoint import Endpoint
2873 from openlp.core.api.http.errors import NotFound
2874-from openlp.core.api.endpoint.pluginhelpers import search, live, service
2875-from openlp.core.api.http import requires_auth
2876-
2877
2878 log = logging.getLogger(__name__)
2879
2880
2881=== modified file 'openlp/plugins/custom/forms/__init__.py'
2882--- openlp/plugins/custom/forms/__init__.py 2016-12-31 11:01:36 +0000
2883+++ openlp/plugins/custom/forms/__init__.py 2017-12-29 10:26:06 +0000
2884@@ -4,7 +4,7 @@
2885 ###############################################################################
2886 # OpenLP - Open Source Lyrics Projection #
2887 # --------------------------------------------------------------------------- #
2888-# Copyright (c) 2008-2017 OpenLP Developers #
2889+# Copyright (c) 2008-2018 OpenLP Developers #
2890 # --------------------------------------------------------------------------- #
2891 # This program is free software; you can redistribute it and/or modify it #
2892 # under the terms of the GNU General Public License as published by the Free #
2893
2894=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
2895--- openlp/plugins/custom/forms/editcustomdialog.py 2017-10-07 07:05:07 +0000
2896+++ openlp/plugins/custom/forms/editcustomdialog.py 2017-12-29 10:26:06 +0000
2897@@ -4,7 +4,7 @@
2898 ###############################################################################
2899 # OpenLP - Open Source Lyrics Projection #
2900 # --------------------------------------------------------------------------- #
2901-# Copyright (c) 2008-2017 OpenLP Developers #
2902+# Copyright (c) 2008-2018 OpenLP Developers #
2903 # --------------------------------------------------------------------------- #
2904 # This program is free software; you can redistribute it and/or modify it #
2905 # under the terms of the GNU General Public License as published by the Free #
2906
2907=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
2908--- openlp/plugins/custom/forms/editcustomform.py 2017-10-07 07:05:07 +0000
2909+++ openlp/plugins/custom/forms/editcustomform.py 2017-12-29 10:26:06 +0000
2910@@ -4,7 +4,7 @@
2911 ###############################################################################
2912 # OpenLP - Open Source Lyrics Projection #
2913 # --------------------------------------------------------------------------- #
2914-# Copyright (c) 2008-2017 OpenLP Developers #
2915+# Copyright (c) 2008-2018 OpenLP Developers #
2916 # --------------------------------------------------------------------------- #
2917 # This program is free software; you can redistribute it and/or modify it #
2918 # under the terms of the GNU General Public License as published by the Free #
2919
2920=== modified file 'openlp/plugins/custom/forms/editcustomslidedialog.py'
2921--- openlp/plugins/custom/forms/editcustomslidedialog.py 2017-10-23 22:09:57 +0000
2922+++ openlp/plugins/custom/forms/editcustomslidedialog.py 2017-12-29 10:26:06 +0000
2923@@ -4,7 +4,7 @@
2924 ###############################################################################
2925 # OpenLP - Open Source Lyrics Projection #
2926 # --------------------------------------------------------------------------- #
2927-# Copyright (c) 2008-2017 OpenLP Developers #
2928+# Copyright (c) 2008-2018 OpenLP Developers #
2929 # --------------------------------------------------------------------------- #
2930 # This program is free software; you can redistribute it and/or modify it #
2931 # under the terms of the GNU General Public License as published by the Free #
2932
2933=== modified file 'openlp/plugins/custom/forms/editcustomslideform.py'
2934--- openlp/plugins/custom/forms/editcustomslideform.py 2017-06-04 12:14:23 +0000
2935+++ openlp/plugins/custom/forms/editcustomslideform.py 2017-12-29 10:26:06 +0000
2936@@ -4,7 +4,7 @@
2937 ###############################################################################
2938 # OpenLP - Open Source Lyrics Projection #
2939 # --------------------------------------------------------------------------- #
2940-# Copyright (c) 2008-2017 OpenLP Developers #
2941+# Copyright (c) 2008-2018 OpenLP Developers #
2942 # --------------------------------------------------------------------------- #
2943 # This program is free software; you can redistribute it and/or modify it #
2944 # under the terms of the GNU General Public License as published by the Free #
2945
2946=== modified file 'openlp/plugins/custom/lib/__init__.py'
2947--- openlp/plugins/custom/lib/__init__.py 2017-03-03 19:27:31 +0000
2948+++ openlp/plugins/custom/lib/__init__.py 2017-12-29 10:26:06 +0000
2949@@ -4,7 +4,7 @@
2950 ###############################################################################
2951 # OpenLP - Open Source Lyrics Projection #
2952 # --------------------------------------------------------------------------- #
2953-# Copyright (c) 2008-2017 OpenLP Developers #
2954+# Copyright (c) 2008-2018 OpenLP Developers #
2955 # --------------------------------------------------------------------------- #
2956 # This program is free software; you can redistribute it and/or modify it #
2957 # under the terms of the GNU General Public License as published by the Free #
2958@@ -20,6 +20,6 @@
2959 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
2960 ###############################################################################
2961
2962+from .customtab import CustomTab
2963 from .customxmlhandler import CustomXMLBuilder, CustomXMLParser
2964 from .mediaitem import CustomMediaItem
2965-from .customtab import CustomTab
2966
2967=== modified file 'openlp/plugins/custom/lib/customtab.py'
2968--- openlp/plugins/custom/lib/customtab.py 2017-10-07 07:05:07 +0000
2969+++ openlp/plugins/custom/lib/customtab.py 2017-12-29 10:26:06 +0000
2970@@ -4,7 +4,7 @@
2971 ###############################################################################
2972 # OpenLP - Open Source Lyrics Projection #
2973 # --------------------------------------------------------------------------- #
2974-# Copyright (c) 2008-2017 OpenLP Developers #
2975+# Copyright (c) 2008-2018 OpenLP Developers #
2976 # --------------------------------------------------------------------------- #
2977 # This program is free software; you can redistribute it and/or modify it #
2978 # under the terms of the GNU General Public License as published by the Free #
2979
2980=== modified file 'openlp/plugins/custom/lib/customxmlhandler.py'
2981--- openlp/plugins/custom/lib/customxmlhandler.py 2016-12-31 11:01:36 +0000
2982+++ openlp/plugins/custom/lib/customxmlhandler.py 2017-12-29 10:26:06 +0000
2983@@ -4,7 +4,7 @@
2984 ###############################################################################
2985 # OpenLP - Open Source Lyrics Projection #
2986 # --------------------------------------------------------------------------- #
2987-# Copyright (c) 2008-2017 OpenLP Developers #
2988+# Copyright (c) 2008-2018 OpenLP Developers #
2989 # --------------------------------------------------------------------------- #
2990 # This program is free software; you can redistribute it and/or modify it #
2991 # under the terms of the GNU General Public License as published by the Free #
2992@@ -36,9 +36,9 @@
2993 """
2994
2995 import logging
2996-
2997 from xml.dom.minidom import Document
2998 from xml.etree.ElementTree import dump
2999+
3000 from lxml import etree, objectify
3001
3002 log = logging.getLogger(__name__)
3003
3004=== modified file 'openlp/plugins/custom/lib/db.py'
3005--- openlp/plugins/custom/lib/db.py 2017-11-13 21:40:49 +0000
3006+++ openlp/plugins/custom/lib/db.py 2017-12-29 10:26:06 +0000
3007@@ -4,7 +4,7 @@
3008 ###############################################################################
3009 # OpenLP - Open Source Lyrics Projection #
3010 # --------------------------------------------------------------------------- #
3011-# Copyright (c) 2008-2017 OpenLP Developers #
3012+# Copyright (c) 2008-2018 OpenLP Developers #
3013 # --------------------------------------------------------------------------- #
3014 # This program is free software; you can redistribute it and/or modify it #
3015 # under the terms of the GNU General Public License as published by the Free #
3016
3017=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
3018--- openlp/plugins/custom/lib/mediaitem.py 2017-10-07 07:05:07 +0000
3019+++ openlp/plugins/custom/lib/mediaitem.py 2017-12-29 10:26:06 +0000
3020@@ -4,7 +4,7 @@
3021 ###############################################################################
3022 # OpenLP - Open Source Lyrics Projection #
3023 # --------------------------------------------------------------------------- #
3024-# Copyright (c) 2008-2017 OpenLP Developers #
3025+# Copyright (c) 2008-2018 OpenLP Developers #
3026 # --------------------------------------------------------------------------- #
3027 # This program is free software; you can redistribute it and/or modify it #
3028 # under the terms of the GNU General Public License as published by the Free #
3029
3030=== modified file 'openlp/plugins/images/__init__.py'
3031--- openlp/plugins/images/__init__.py 2016-12-31 11:01:36 +0000
3032+++ openlp/plugins/images/__init__.py 2017-12-29 10:26:06 +0000
3033@@ -4,7 +4,7 @@
3034 ###############################################################################
3035 # OpenLP - Open Source Lyrics Projection #
3036 # --------------------------------------------------------------------------- #
3037-# Copyright (c) 2008-2017 OpenLP Developers #
3038+# Copyright (c) 2008-2018 OpenLP Developers #
3039 # --------------------------------------------------------------------------- #
3040 # This program is free software; you can redistribute it and/or modify it #
3041 # under the terms of the GNU General Public License as published by the Free #
3042
3043=== modified file 'openlp/plugins/images/endpoint.py'
3044--- openlp/plugins/images/endpoint.py 2017-09-26 17:21:54 +0000
3045+++ openlp/plugins/images/endpoint.py 2017-12-29 10:26:06 +0000
3046@@ -4,7 +4,7 @@
3047 ###############################################################################
3048 # OpenLP - Open Source Lyrics Projection #
3049 # --------------------------------------------------------------------------- #
3050-# Copyright (c) 2008-2017 OpenLP Developers #
3051+# Copyright (c) 2008-2018 OpenLP Developers #
3052 # --------------------------------------------------------------------------- #
3053 # This program is free software; you can redistribute it and/or modify it #
3054 # under the terms of the GNU General Public License as published by the Free #
3055@@ -21,11 +21,10 @@
3056 ###############################################################################
3057 import logging
3058
3059+from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails
3060+from openlp.core.api.http import requires_auth
3061 from openlp.core.api.http.endpoint import Endpoint
3062 from openlp.core.api.http.errors import NotFound
3063-from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails
3064-from openlp.core.api.http import requires_auth
3065-
3066
3067 log = logging.getLogger(__name__)
3068
3069
3070=== modified file 'openlp/plugins/images/forms/__init__.py'
3071--- openlp/plugins/images/forms/__init__.py 2016-12-31 11:01:36 +0000
3072+++ openlp/plugins/images/forms/__init__.py 2017-12-29 10:26:06 +0000
3073@@ -4,7 +4,7 @@
3074 ###############################################################################
3075 # OpenLP - Open Source Lyrics Projection #
3076 # --------------------------------------------------------------------------- #
3077-# Copyright (c) 2008-2017 OpenLP Developers #
3078+# Copyright (c) 2008-2018 OpenLP Developers #
3079 # --------------------------------------------------------------------------- #
3080 # This program is free software; you can redistribute it and/or modify it #
3081 # under the terms of the GNU General Public License as published by the Free #
3082
3083=== modified file 'openlp/plugins/images/forms/addgroupdialog.py'
3084--- openlp/plugins/images/forms/addgroupdialog.py 2017-10-07 07:05:07 +0000
3085+++ openlp/plugins/images/forms/addgroupdialog.py 2017-12-29 10:26:06 +0000
3086@@ -4,7 +4,7 @@
3087 ###############################################################################
3088 # OpenLP - Open Source Lyrics Projection #
3089 # --------------------------------------------------------------------------- #
3090-# Copyright (c) 2008-2017 OpenLP Developers #
3091+# Copyright (c) 2008-2018 OpenLP Developers #
3092 # --------------------------------------------------------------------------- #
3093 # This program is free software; you can redistribute it and/or modify it #
3094 # under the terms of the GNU General Public License as published by the Free #
3095
3096=== modified file 'openlp/plugins/images/forms/addgroupform.py'
3097--- openlp/plugins/images/forms/addgroupform.py 2017-10-07 07:05:07 +0000
3098+++ openlp/plugins/images/forms/addgroupform.py 2017-12-29 10:26:06 +0000
3099@@ -4,7 +4,7 @@
3100 ###############################################################################
3101 # OpenLP - Open Source Lyrics Projection #
3102 # --------------------------------------------------------------------------- #
3103-# Copyright (c) 2008-2017 OpenLP Developers #
3104+# Copyright (c) 2008-2018 OpenLP Developers #
3105 # --------------------------------------------------------------------------- #
3106 # This program is free software; you can redistribute it and/or modify it #
3107 # under the terms of the GNU General Public License as published by the Free #
3108
3109=== modified file 'openlp/plugins/images/forms/choosegroupdialog.py'
3110--- openlp/plugins/images/forms/choosegroupdialog.py 2017-10-07 07:05:07 +0000
3111+++ openlp/plugins/images/forms/choosegroupdialog.py 2017-12-29 10:26:06 +0000
3112@@ -4,7 +4,7 @@
3113 ###############################################################################
3114 # OpenLP - Open Source Lyrics Projection #
3115 # --------------------------------------------------------------------------- #
3116-# Copyright (c) 2008-2017 OpenLP Developers #
3117+# Copyright (c) 2008-2018 OpenLP Developers #
3118 # --------------------------------------------------------------------------- #
3119 # This program is free software; you can redistribute it and/or modify it #
3120 # under the terms of the GNU General Public License as published by the Free #
3121
3122=== modified file 'openlp/plugins/images/forms/choosegroupform.py'
3123--- openlp/plugins/images/forms/choosegroupform.py 2017-06-04 12:14:23 +0000
3124+++ openlp/plugins/images/forms/choosegroupform.py 2017-12-29 10:26:06 +0000
3125@@ -4,7 +4,7 @@
3126 ###############################################################################
3127 # OpenLP - Open Source Lyrics Projection #
3128 # --------------------------------------------------------------------------- #
3129-# Copyright (c) 2008-2017 OpenLP Developers #
3130+# Copyright (c) 2008-2018 OpenLP Developers #
3131 # --------------------------------------------------------------------------- #
3132 # This program is free software; you can redistribute it and/or modify it #
3133 # under the terms of the GNU General Public License as published by the Free #
3134
3135=== modified file 'openlp/plugins/images/imageplugin.py'
3136--- openlp/plugins/images/imageplugin.py 2017-10-07 07:05:07 +0000
3137+++ openlp/plugins/images/imageplugin.py 2017-12-29 10:26:06 +0000
3138@@ -4,7 +4,7 @@
3139 ###############################################################################
3140 # OpenLP - Open Source Lyrics Projection #
3141 # --------------------------------------------------------------------------- #
3142-# Copyright (c) 2008-2017 OpenLP Developers #
3143+# Copyright (c) 2008-2018 OpenLP Developers #
3144 # --------------------------------------------------------------------------- #
3145 # This program is free software; you can redistribute it and/or modify it #
3146 # under the terms of the GNU General Public License as published by the Free #
3147@@ -20,10 +20,10 @@
3148 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
3149 ###############################################################################
3150
3151+import logging
3152+
3153 from PyQt5 import QtGui
3154
3155-import logging
3156-
3157 from openlp.core.api.http import register_endpoint
3158 from openlp.core.common.i18n import translate
3159 from openlp.core.common.settings import Settings
3160
3161=== modified file 'openlp/plugins/images/lib/__init__.py'
3162--- openlp/plugins/images/lib/__init__.py 2017-03-03 19:27:31 +0000
3163+++ openlp/plugins/images/lib/__init__.py 2017-12-29 10:26:06 +0000
3164@@ -4,7 +4,7 @@
3165 ###############################################################################
3166 # OpenLP - Open Source Lyrics Projection #
3167 # --------------------------------------------------------------------------- #
3168-# Copyright (c) 2008-2017 OpenLP Developers #
3169+# Copyright (c) 2008-2018 OpenLP Developers #
3170 # --------------------------------------------------------------------------- #
3171 # This program is free software; you can redistribute it and/or modify it #
3172 # under the terms of the GNU General Public License as published by the Free #
3173@@ -20,5 +20,5 @@
3174 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
3175 ###############################################################################
3176
3177+from .imagetab import ImageTab
3178 from .mediaitem import ImageMediaItem
3179-from .imagetab import ImageTab
3180
3181=== modified file 'openlp/plugins/images/lib/db.py'
3182--- openlp/plugins/images/lib/db.py 2017-09-23 13:06:42 +0000
3183+++ openlp/plugins/images/lib/db.py 2017-12-29 10:26:06 +0000
3184@@ -4,7 +4,7 @@
3185 ###############################################################################
3186 # OpenLP - Open Source Lyrics Projection #
3187 # --------------------------------------------------------------------------- #
3188-# Copyright (c) 2008-2017 OpenLP Developers #
3189+# Copyright (c) 2008-2018 OpenLP Developers #
3190 # --------------------------------------------------------------------------- #
3191 # This program is free software; you can redistribute it and/or modify it #
3192 # under the terms of the GNU General Public License as published by the Free #
3193
3194=== modified file 'openlp/plugins/images/lib/imagetab.py'
3195--- openlp/plugins/images/lib/imagetab.py 2017-10-23 22:09:57 +0000
3196+++ openlp/plugins/images/lib/imagetab.py 2017-12-29 10:26:06 +0000
3197@@ -4,7 +4,7 @@
3198 ###############################################################################
3199 # OpenLP - Open Source Lyrics Projection #
3200 # --------------------------------------------------------------------------- #
3201-# Copyright (c) 2008-2017 OpenLP Developers #
3202+# Copyright (c) 2008-2018 OpenLP Developers #
3203 # --------------------------------------------------------------------------- #
3204 # This program is free software; you can redistribute it and/or modify it #
3205 # under the terms of the GNU General Public License as published by the Free #
3206
3207=== modified file 'openlp/plugins/images/lib/mediaitem.py'
3208--- openlp/plugins/images/lib/mediaitem.py 2017-11-21 07:23:02 +0000
3209+++ openlp/plugins/images/lib/mediaitem.py 2017-12-29 10:26:06 +0000
3210@@ -4,7 +4,7 @@
3211 ###############################################################################
3212 # OpenLP - Open Source Lyrics Projection #
3213 # --------------------------------------------------------------------------- #
3214-# Copyright (c) 2008-2017 OpenLP Developers #
3215+# Copyright (c) 2008-2018 OpenLP Developers #
3216 # --------------------------------------------------------------------------- #
3217 # This program is free software; you can redistribute it and/or modify it #
3218 # under the terms of the GNU General Public License as published by the Free #
3219@@ -37,7 +37,6 @@
3220 from openlp.plugins.images.forms import AddGroupForm, ChooseGroupForm
3221 from openlp.plugins.images.lib.db import ImageFilenames, ImageGroups
3222
3223-
3224 log = logging.getLogger(__name__)
3225
3226
3227
3228=== modified file 'openlp/plugins/images/lib/upgrade.py'
3229--- openlp/plugins/images/lib/upgrade.py 2017-10-07 07:05:07 +0000
3230+++ openlp/plugins/images/lib/upgrade.py 2017-12-29 10:26:06 +0000
3231@@ -4,7 +4,7 @@
3232 ###############################################################################
3233 # OpenLP - Open Source Lyrics Projection #
3234 # --------------------------------------------------------------------------- #
3235-# Copyright (c) 2008-2017 OpenLP Developers #
3236+# Copyright (c) 2008-2018 OpenLP Developers #
3237 # --------------------------------------------------------------------------- #
3238 # This program is free software; you can redistribute it and/or modify it #
3239 # under the terms of the GNU General Public License as published by the Free #
3240
3241=== modified file 'openlp/plugins/media/__init__.py'
3242--- openlp/plugins/media/__init__.py 2016-12-31 11:01:36 +0000
3243+++ openlp/plugins/media/__init__.py 2017-12-29 10:26:06 +0000
3244@@ -4,7 +4,7 @@
3245 ###############################################################################
3246 # OpenLP - Open Source Lyrics Projection #
3247 # --------------------------------------------------------------------------- #
3248-# Copyright (c) 2008-2017 OpenLP Developers #
3249+# Copyright (c) 2008-2018 OpenLP Developers #
3250 # --------------------------------------------------------------------------- #
3251 # This program is free software; you can redistribute it and/or modify it #
3252 # under the terms of the GNU General Public License as published by the Free #
3253
3254=== modified file 'openlp/plugins/media/endpoint.py'
3255--- openlp/plugins/media/endpoint.py 2017-09-26 17:21:54 +0000
3256+++ openlp/plugins/media/endpoint.py 2017-12-29 10:26:06 +0000
3257@@ -4,7 +4,7 @@
3258 ###############################################################################
3259 # OpenLP - Open Source Lyrics Projection #
3260 # --------------------------------------------------------------------------- #
3261-# Copyright (c) 2008-2017 OpenLP Developers #
3262+# Copyright (c) 2008-2018 OpenLP Developers #
3263 # --------------------------------------------------------------------------- #
3264 # This program is free software; you can redistribute it and/or modify it #
3265 # under the terms of the GNU General Public License as published by the Free #
3266@@ -21,11 +21,10 @@
3267 ###############################################################################
3268 import logging
3269
3270+from openlp.core.api.endpoint.pluginhelpers import search, live, service
3271+from openlp.core.api.http import requires_auth
3272 from openlp.core.api.http.endpoint import Endpoint
3273 from openlp.core.api.http.errors import NotFound
3274-from openlp.core.api.endpoint.pluginhelpers import search, live, service
3275-from openlp.core.api.http import requires_auth
3276-
3277
3278 log = logging.getLogger(__name__)
3279
3280
3281=== modified file 'openlp/plugins/media/forms/__init__.py'
3282--- openlp/plugins/media/forms/__init__.py 2016-12-31 11:01:36 +0000
3283+++ openlp/plugins/media/forms/__init__.py 2017-12-29 10:26:06 +0000
3284@@ -4,7 +4,7 @@
3285 ###############################################################################
3286 # OpenLP - Open Source Lyrics Projection #
3287 # --------------------------------------------------------------------------- #
3288-# Copyright (c) 2008-2017 OpenLP Developers #
3289+# Copyright (c) 2008-2018 OpenLP Developers #
3290 # --------------------------------------------------------------------------- #
3291 # This program is free software; you can redistribute it and/or modify it #
3292 # under the terms of the GNU General Public License as published by the Free #
3293
3294=== modified file 'openlp/plugins/media/forms/mediaclipselectordialog.py'
3295--- openlp/plugins/media/forms/mediaclipselectordialog.py 2017-10-07 07:05:07 +0000
3296+++ openlp/plugins/media/forms/mediaclipselectordialog.py 2017-12-29 10:26:06 +0000
3297@@ -4,7 +4,7 @@
3298 ###############################################################################
3299 # OpenLP - Open Source Lyrics Projection #
3300 # --------------------------------------------------------------------------- #
3301-# Copyright (c) 2008-2017 OpenLP Developers #
3302+# Copyright (c) 2008-2018 OpenLP Developers #
3303 # --------------------------------------------------------------------------- #
3304 # This program is free software; you can redistribute it and/or modify it #
3305 # under the terms of the GNU General Public License as published by the Free #
3306
3307=== modified file 'openlp/plugins/media/forms/mediaclipselectorform.py'
3308--- openlp/plugins/media/forms/mediaclipselectorform.py 2017-11-22 21:56:56 +0000
3309+++ openlp/plugins/media/forms/mediaclipselectorform.py 2017-12-29 10:26:06 +0000
3310@@ -4,7 +4,7 @@
3311 ###############################################################################
3312 # OpenLP - Open Source Lyrics Projection #
3313 # --------------------------------------------------------------------------- #
3314-# Copyright (c) 2008-2017 OpenLP Developers #
3315+# Copyright (c) 2008-2018 OpenLP Developers #
3316 # --------------------------------------------------------------------------- #
3317 # This program is free software; you can redistribute it and/or modify it #
3318 # under the terms of the GNU General Public License as published by the Free #
3319@@ -19,21 +19,21 @@
3320 # with this program; if not, write to the Free Software Foundation, Inc., 59 #
3321 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
3322 ###############################################################################
3323+import logging
3324 import os
3325-import logging
3326 import re
3327+from datetime import datetime
3328 from time import sleep
3329-from datetime import datetime
3330
3331 from PyQt5 import QtCore, QtGui, QtWidgets
3332
3333 from openlp.core.common import is_win, is_linux, is_macosx
3334-from openlp.core.common.path import Path
3335 from openlp.core.common.i18n import translate
3336 from openlp.core.common.mixins import RegistryProperties
3337-from openlp.plugins.media.forms.mediaclipselectordialog import Ui_MediaClipSelector
3338+from openlp.core.common.path import Path
3339 from openlp.core.lib.ui import critical_error_message_box
3340 from openlp.core.ui.media.vlcplayer import get_vlc
3341+from openlp.plugins.media.forms.mediaclipselectordialog import Ui_MediaClipSelector
3342
3343 if is_win():
3344 from win32com.client import Dispatch
3345
3346=== modified file 'openlp/plugins/media/lib/__init__.py'
3347--- openlp/plugins/media/lib/__init__.py 2017-03-03 19:27:31 +0000
3348+++ openlp/plugins/media/lib/__init__.py 2017-12-29 10:26:06 +0000
3349@@ -4,7 +4,7 @@
3350 ###############################################################################
3351 # OpenLP - Open Source Lyrics Projection #
3352 # --------------------------------------------------------------------------- #
3353-# Copyright (c) 2008-2017 OpenLP Developers #
3354+# Copyright (c) 2008-2018 OpenLP Developers #
3355 # --------------------------------------------------------------------------- #
3356 # This program is free software; you can redistribute it and/or modify it #
3357 # under the terms of the GNU General Public License as published by the Free #
3358
3359=== modified file 'openlp/plugins/media/lib/mediaitem.py'
3360--- openlp/plugins/media/lib/mediaitem.py 2017-12-17 04:29:53 +0000
3361+++ openlp/plugins/media/lib/mediaitem.py 2017-12-29 10:26:06 +0000
3362@@ -4,7 +4,7 @@
3363 ###############################################################################
3364 # OpenLP - Open Source Lyrics Projection #
3365 # --------------------------------------------------------------------------- #
3366-# Copyright (c) 2008-2017 OpenLP Developers #
3367+# Copyright (c) 2008-2018 OpenLP Developers #
3368 # --------------------------------------------------------------------------- #
3369 # This program is free software; you can redistribute it and/or modify it #
3370 # under the terms of the GNU General Public License as published by the Free #
3371@@ -27,8 +27,8 @@
3372
3373 from openlp.core.common.applocation import AppLocation
3374 from openlp.core.common.i18n import UiStrings, translate, get_natural_key
3375+from openlp.core.common.mixins import RegistryProperties
3376 from openlp.core.common.path import Path, path_to_str, create_paths
3377-from openlp.core.common.mixins import RegistryProperties
3378 from openlp.core.common.registry import Registry
3379 from openlp.core.common.settings import Settings
3380 from openlp.core.lib import ItemCapabilities, MediaManagerItem, MediaType, ServiceItem, ServiceItemContext, \
3381
3382=== modified file 'openlp/plugins/media/lib/mediatab.py'
3383--- openlp/plugins/media/lib/mediatab.py 2017-10-07 07:05:07 +0000
3384+++ openlp/plugins/media/lib/mediatab.py 2017-12-29 10:26:06 +0000
3385@@ -4,7 +4,7 @@
3386 ###############################################################################
3387 # OpenLP - Open Source Lyrics Projection #
3388 # --------------------------------------------------------------------------- #
3389-# Copyright (c) 2008-2017 OpenLP Developers #
3390+# Copyright (c) 2008-2018 OpenLP Developers #
3391 # --------------------------------------------------------------------------- #
3392 # This program is free software; you can redistribute it and/or modify it #
3393 # under the terms of the GNU General Public License as published by the Free #
3394
3395=== modified file 'openlp/plugins/media/mediaplugin.py'
3396--- openlp/plugins/media/mediaplugin.py 2017-11-19 21:57:38 +0000
3397+++ openlp/plugins/media/mediaplugin.py 2017-12-29 10:26:06 +0000
3398@@ -4,7 +4,7 @@
3399 ###############################################################################
3400 # OpenLP - Open Source Lyrics Projection #
3401 # --------------------------------------------------------------------------- #
3402-# Copyright (c) 2008-2017 OpenLP Developers #
3403+# Copyright (c) 2008-2018 OpenLP Developers #
3404 # --------------------------------------------------------------------------- #
3405 # This program is free software; you can redistribute it and/or modify it #
3406 # under the terms of the GNU General Public License as published by the Free #
3407@@ -23,7 +23,6 @@
3408 The Media plugin
3409 """
3410 import logging
3411-import os
3412 import re
3413
3414 from PyQt5 import QtCore
3415@@ -37,7 +36,6 @@
3416 from openlp.plugins.media.endpoint import api_media_endpoint, media_endpoint
3417 from openlp.plugins.media.lib import MediaMediaItem, MediaTab
3418
3419-
3420 log = logging.getLogger(__name__)
3421
3422
3423
3424=== modified file 'openlp/plugins/presentations/__init__.py'
3425--- openlp/plugins/presentations/__init__.py 2016-12-31 11:01:36 +0000
3426+++ openlp/plugins/presentations/__init__.py 2017-12-29 10:26:06 +0000
3427@@ -4,7 +4,7 @@
3428 ###############################################################################
3429 # OpenLP - Open Source Lyrics Projection #
3430 # --------------------------------------------------------------------------- #
3431-# Copyright (c) 2008-2017 OpenLP Developers #
3432+# Copyright (c) 2008-2018 OpenLP Developers #
3433 # --------------------------------------------------------------------------- #
3434 # This program is free software; you can redistribute it and/or modify it #
3435 # under the terms of the GNU General Public License as published by the Free #
3436
3437=== modified file 'openlp/plugins/presentations/endpoint.py'
3438--- openlp/plugins/presentations/endpoint.py 2017-09-26 17:21:54 +0000
3439+++ openlp/plugins/presentations/endpoint.py 2017-12-29 10:26:06 +0000
3440@@ -4,7 +4,7 @@
3441 ###############################################################################
3442 # OpenLP - Open Source Lyrics Projection #
3443 # --------------------------------------------------------------------------- #
3444-# Copyright (c) 2008-2017 OpenLP Developers #
3445+# Copyright (c) 2008-2018 OpenLP Developers #
3446 # --------------------------------------------------------------------------- #
3447 # This program is free software; you can redistribute it and/or modify it #
3448 # under the terms of the GNU General Public License as published by the Free #
3449@@ -21,11 +21,10 @@
3450 ###############################################################################
3451 import logging
3452
3453+from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails
3454+from openlp.core.api.http import requires_auth
3455 from openlp.core.api.http.endpoint import Endpoint
3456 from openlp.core.api.http.errors import NotFound
3457-from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails
3458-from openlp.core.api.http import requires_auth
3459-
3460
3461 log = logging.getLogger(__name__)
3462
3463
3464=== modified file 'openlp/plugins/presentations/lib/__init__.py'
3465--- openlp/plugins/presentations/lib/__init__.py 2017-03-03 19:27:31 +0000
3466+++ openlp/plugins/presentations/lib/__init__.py 2017-12-29 10:26:06 +0000
3467@@ -4,7 +4,7 @@
3468 ###############################################################################
3469 # OpenLP - Open Source Lyrics Projection #
3470 # --------------------------------------------------------------------------- #
3471-# Copyright (c) 2008-2017 OpenLP Developers #
3472+# Copyright (c) 2008-2018 OpenLP Developers #
3473 # --------------------------------------------------------------------------- #
3474 # This program is free software; you can redistribute it and/or modify it #
3475 # under the terms of the GNU General Public License as published by the Free #
3476
3477=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
3478--- openlp/plugins/presentations/lib/impresscontroller.py 2017-10-10 07:08:44 +0000
3479+++ openlp/plugins/presentations/lib/impresscontroller.py 2017-12-29 10:26:06 +0000
3480@@ -4,7 +4,7 @@
3481 ###############################################################################
3482 # OpenLP - Open Source Lyrics Projection #
3483 # --------------------------------------------------------------------------- #
3484-# Copyright (c) 2008-2017 OpenLP Developers #
3485+# Copyright (c) 2008-2018 OpenLP Developers #
3486 # --------------------------------------------------------------------------- #
3487 # This program is free software; you can redistribute it and/or modify it #
3488 # under the terms of the GNU General Public License as published by the Free #
3489
3490=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
3491--- openlp/plugins/presentations/lib/mediaitem.py 2017-11-18 11:23:15 +0000
3492+++ openlp/plugins/presentations/lib/mediaitem.py 2017-12-29 10:26:06 +0000
3493@@ -4,7 +4,7 @@
3494 ###############################################################################
3495 # OpenLP - Open Source Lyrics Projection #
3496 # --------------------------------------------------------------------------- #
3497-# Copyright (c) 2008-2017 OpenLP Developers #
3498+# Copyright (c) 2008-2018 OpenLP Developers #
3499 # --------------------------------------------------------------------------- #
3500 # This program is free software; you can redistribute it and/or modify it #
3501 # under the terms of the GNU General Public License as published by the Free #
3502@@ -24,10 +24,10 @@
3503 from PyQt5 import QtCore, QtGui, QtWidgets
3504
3505 from openlp.core.common.i18n import UiStrings, translate, get_natural_key
3506-from openlp.core.common.path import Path, path_to_str, str_to_path
3507+from openlp.core.common.path import path_to_str, str_to_path
3508 from openlp.core.common.registry import Registry
3509 from openlp.core.common.settings import Settings
3510-from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext,\
3511+from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext, \
3512 build_icon, check_item_selected, create_thumb, validate_thumb
3513 from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box
3514 from openlp.plugins.presentations.lib import MessageListener
3515
3516=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
3517--- openlp/plugins/presentations/lib/messagelistener.py 2017-11-14 22:30:46 +0000
3518+++ openlp/plugins/presentations/lib/messagelistener.py 2017-12-29 10:26:06 +0000
3519@@ -4,7 +4,7 @@
3520 ###############################################################################
3521 # OpenLP - Open Source Lyrics Projection #
3522 # --------------------------------------------------------------------------- #
3523-# Copyright (c) 2008-2017 OpenLP Developers #
3524+# Copyright (c) 2008-2018 OpenLP Developers #
3525 # --------------------------------------------------------------------------- #
3526 # This program is free software; you can redistribute it and/or modify it #
3527 # under the terms of the GNU General Public License as published by the Free #
3528@@ -24,9 +24,9 @@
3529
3530 from PyQt5 import QtCore
3531
3532+from openlp.core.common.path import Path
3533 from openlp.core.common.registry import Registry
3534 from openlp.core.common.settings import Settings
3535-from openlp.core.common.path import Path
3536 from openlp.core.lib import ServiceItemContext
3537 from openlp.core.ui import HideMode
3538 from openlp.plugins.presentations.lib.pdfcontroller import PDF_CONTROLLER_FILETYPES
3539
3540=== modified file 'openlp/plugins/presentations/lib/pdfcontroller.py'
3541--- openlp/plugins/presentations/lib/pdfcontroller.py 2017-11-15 21:58:19 +0000
3542+++ openlp/plugins/presentations/lib/pdfcontroller.py 2017-12-29 10:26:06 +0000
3543@@ -4,7 +4,7 @@
3544 ###############################################################################
3545 # OpenLP - Open Source Lyrics Projection #
3546 # --------------------------------------------------------------------------- #
3547-# Copyright (c) 2008-2017 OpenLP Developers #
3548+# Copyright (c) 2008-2018 OpenLP Developers #
3549 # --------------------------------------------------------------------------- #
3550 # This program is free software; you can redistribute it and/or modify it #
3551 # under the terms of the GNU General Public License as published by the Free #
3552
3553=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
3554--- openlp/plugins/presentations/lib/powerpointcontroller.py 2017-10-10 07:08:44 +0000
3555+++ openlp/plugins/presentations/lib/powerpointcontroller.py 2017-12-29 10:26:06 +0000
3556@@ -4,7 +4,7 @@
3557 ###############################################################################
3558 # OpenLP - Open Source Lyrics Projection #
3559 # --------------------------------------------------------------------------- #
3560-# Copyright (c) 2008-2017 OpenLP Developers #
3561+# Copyright (c) 2008-2018 OpenLP Developers #
3562 # --------------------------------------------------------------------------- #
3563 # This program is free software; you can redistribute it and/or modify it #
3564 # under the terms of the GNU General Public License as published by the Free #
3565
3566=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
3567--- openlp/plugins/presentations/lib/pptviewcontroller.py 2017-11-03 20:55:41 +0000
3568+++ openlp/plugins/presentations/lib/pptviewcontroller.py 2017-12-29 10:26:06 +0000
3569@@ -4,7 +4,7 @@
3570 ###############################################################################
3571 # OpenLP - Open Source Lyrics Projection #
3572 # --------------------------------------------------------------------------- #
3573-# Copyright (c) 2008-2017 OpenLP Developers #
3574+# Copyright (c) 2008-2018 OpenLP Developers #
3575 # --------------------------------------------------------------------------- #
3576 # This program is free software; you can redistribute it and/or modify it #
3577 # under the terms of the GNU General Public License as published by the Free #
3578@@ -20,8 +20,8 @@
3579 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
3580 ###############################################################################
3581 import logging
3582+import re
3583 import zipfile
3584-import re
3585 from xml.etree import ElementTree
3586
3587 from openlp.core.common import is_win
3588
3589=== modified file 'openlp/plugins/presentations/lib/pptviewlib/README.TXT'
3590--- openlp/plugins/presentations/lib/pptviewlib/README.TXT 2016-12-31 11:01:36 +0000
3591+++ openlp/plugins/presentations/lib/pptviewlib/README.TXT 2017-12-29 10:26:06 +0000
3592@@ -1,6 +1,6 @@
3593
3594 PPTVIEWLIB - Control PowerPoint Viewer 2003/2007 (for openlp.org)
3595-Copyright (C) 2008-2017 Jonathan Corwin (j@corwin.co.uk)
3596+Copyright (C) 2008-2018 Jonathan Corwin (j@corwin.co.uk)
3597
3598 This library wrappers the free Microsoft PowerPoint Viewer (2003/2007) program,
3599 allowing it to be more easily controlled from another program.
3600
3601=== modified file 'openlp/plugins/presentations/lib/pptviewlib/ppttest.py'
3602--- openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2017-01-25 21:17:27 +0000
3603+++ openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2017-12-29 10:26:06 +0000
3604@@ -4,7 +4,7 @@
3605 ###############################################################################
3606 # OpenLP - Open Source Lyrics Projection #
3607 # --------------------------------------------------------------------------- #
3608-# Copyright (c) 2008-2017 OpenLP Developers #
3609+# Copyright (c) 2008-2018 OpenLP Developers #
3610 # --------------------------------------------------------------------------- #
3611 # This program is free software; you can redistribute it and/or modify it #
3612 # under the terms of the GNU General Public License as published by the Free #
3613@@ -21,10 +21,11 @@
3614 ###############################################################################
3615
3616 import sys
3617-from PyQt5 import QtWidgets
3618 from ctypes import *
3619 from ctypes.wintypes import RECT
3620
3621+from PyQt5 import QtWidgets
3622+
3623
3624 class PPTViewer(QtWidgets.QWidget):
3625 """
3626
3627=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp'
3628--- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp 2016-12-31 11:01:36 +0000
3629+++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp 2017-12-29 10:26:06 +0000
3630@@ -1,7 +1,7 @@
3631 /******************************************************************************
3632 * OpenLP - Open Source Lyrics Projection *
3633 * --------------------------------------------------------------------------- *
3634-* Copyright (c) 2008-2017 OpenLP Developers *
3635+* Copyright (c) 2008-2018 OpenLP Developers *
3636 * --------------------------------------------------------------------------- *
3637 * This program is free software; you can redistribute it and/or modify it *
3638 * under the terms of the GNU General Public License as published by the Free *
3639
3640=== modified file 'openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h'
3641--- openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h 2016-12-31 11:01:36 +0000
3642+++ openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h 2017-12-29 10:26:06 +0000
3643@@ -1,7 +1,7 @@
3644 /******************************************************************************
3645 * OpenLP - Open Source Lyrics Projection *
3646 * --------------------------------------------------------------------------- *
3647-* Copyright (c) 2008-2017 OpenLP Developers *
3648+* Copyright (c) 2008-2018 OpenLP Developers *
3649 * --------------------------------------------------------------------------- *
3650 * This program is free software; you can redistribute it and/or modify it *
3651 * under the terms of the GNU General Public License as published by the Free *
3652
3653=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py'
3654--- openlp/plugins/presentations/lib/presentationcontroller.py 2017-11-20 21:57:34 +0000
3655+++ openlp/plugins/presentations/lib/presentationcontroller.py 2017-12-29 10:26:06 +0000
3656@@ -4,7 +4,7 @@
3657 ###############################################################################
3658 # OpenLP - Open Source Lyrics Projection #
3659 # --------------------------------------------------------------------------- #
3660-# Copyright (c) 2008-2017 OpenLP Developers #
3661+# Copyright (c) 2008-2018 OpenLP Developers #
3662 # --------------------------------------------------------------------------- #
3663 # This program is free software; you can redistribute it and/or modify it #
3664 # under the terms of the GNU General Public License as published by the Free #
3665
3666=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
3667--- openlp/plugins/presentations/lib/presentationtab.py 2017-10-23 22:09:57 +0000
3668+++ openlp/plugins/presentations/lib/presentationtab.py 2017-12-29 10:26:06 +0000
3669@@ -4,7 +4,7 @@
3670 ###############################################################################
3671 # OpenLP - Open Source Lyrics Projection #
3672 # --------------------------------------------------------------------------- #
3673-# Copyright (c) 2008-2017 OpenLP Developers #
3674+# Copyright (c) 2008-2018 OpenLP Developers #
3675 # --------------------------------------------------------------------------- #
3676 # This program is free software; you can redistribute it and/or modify it #
3677 # under the terms of the GNU General Public License as published by the Free #
3678
3679=== modified file 'openlp/plugins/presentations/presentationplugin.py'
3680--- openlp/plugins/presentations/presentationplugin.py 2017-12-17 15:25:54 +0000
3681+++ openlp/plugins/presentations/presentationplugin.py 2017-12-29 10:26:06 +0000
3682@@ -4,7 +4,7 @@
3683 ###############################################################################
3684 # OpenLP - Open Source Lyrics Projection #
3685 # --------------------------------------------------------------------------- #
3686-# Copyright (c) 2008-2017 OpenLP Developers #
3687+# Copyright (c) 2008-2018 OpenLP Developers #
3688 # --------------------------------------------------------------------------- #
3689 # This program is free software; you can redistribute it and/or modify it #
3690 # under the terms of the GNU General Public License as published by the Free #
3691@@ -23,8 +23,8 @@
3692 The :mod:`openlp.plugins.presentations.presentationplugin` module provides the ability for OpenLP to display
3693 presentations from a variety of document formats.
3694 """
3695+import logging
3696 import os
3697-import logging
3698
3699 from PyQt5 import QtCore
3700
3701
3702=== modified file 'openlp/plugins/songs/__init__.py'
3703--- openlp/plugins/songs/__init__.py 2016-12-31 11:01:36 +0000
3704+++ openlp/plugins/songs/__init__.py 2017-12-29 10:26:06 +0000
3705@@ -4,7 +4,7 @@
3706 ###############################################################################
3707 # OpenLP - Open Source Lyrics Projection #
3708 # --------------------------------------------------------------------------- #
3709-# Copyright (c) 2008-2017 OpenLP Developers #
3710+# Copyright (c) 2008-2018 OpenLP Developers #
3711 # --------------------------------------------------------------------------- #
3712 # This program is free software; you can redistribute it and/or modify it #
3713 # under the terms of the GNU General Public License as published by the Free #
3714
3715=== modified file 'openlp/plugins/songs/endpoint.py'
3716--- openlp/plugins/songs/endpoint.py 2017-09-26 21:04:39 +0000
3717+++ openlp/plugins/songs/endpoint.py 2017-12-29 10:26:06 +0000
3718@@ -4,7 +4,7 @@
3719 ###############################################################################
3720 # OpenLP - Open Source Lyrics Projection #
3721 # --------------------------------------------------------------------------- #
3722-# Copyright (c) 2008-2017 OpenLP Developers #
3723+# Copyright (c) 2008-2018 OpenLP Developers #
3724 # --------------------------------------------------------------------------- #
3725 # This program is free software; you can redistribute it and/or modify it #
3726 # under the terms of the GNU General Public License as published by the Free #
3727@@ -21,11 +21,10 @@
3728 ###############################################################################
3729 import logging
3730
3731+from openlp.core.api.endpoint.pluginhelpers import search, live, service
3732+from openlp.core.api.http import requires_auth
3733 from openlp.core.api.http.endpoint import Endpoint
3734 from openlp.core.api.http.errors import NotFound
3735-from openlp.core.api.endpoint.pluginhelpers import search, live, service
3736-from openlp.core.api.http import requires_auth
3737-
3738
3739 log = logging.getLogger(__name__)
3740
3741
3742=== modified file 'openlp/plugins/songs/forms/__init__.py'
3743--- openlp/plugins/songs/forms/__init__.py 2016-12-31 11:01:36 +0000
3744+++ openlp/plugins/songs/forms/__init__.py 2017-12-29 10:26:06 +0000
3745@@ -4,7 +4,7 @@
3746 ###############################################################################
3747 # OpenLP - Open Source Lyrics Projection #
3748 # --------------------------------------------------------------------------- #
3749-# Copyright (c) 2008-2017 OpenLP Developers #
3750+# Copyright (c) 2008-2018 OpenLP Developers #
3751 # --------------------------------------------------------------------------- #
3752 # This program is free software; you can redistribute it and/or modify it #
3753 # under the terms of the GNU General Public License as published by the Free #
3754
3755=== modified file 'openlp/plugins/songs/forms/authorsdialog.py'
3756--- openlp/plugins/songs/forms/authorsdialog.py 2017-10-07 07:05:07 +0000
3757+++ openlp/plugins/songs/forms/authorsdialog.py 2017-12-29 10:26:06 +0000
3758@@ -4,7 +4,7 @@
3759 ###############################################################################
3760 # OpenLP - Open Source Lyrics Projection #
3761 # --------------------------------------------------------------------------- #
3762-# Copyright (c) 2008-2017 OpenLP Developers #
3763+# Copyright (c) 2008-2018 OpenLP Developers #
3764 # --------------------------------------------------------------------------- #
3765 # This program is free software; you can redistribute it and/or modify it #
3766 # under the terms of the GNU General Public License as published by the Free #
3767
3768=== modified file 'openlp/plugins/songs/forms/authorsform.py'
3769--- openlp/plugins/songs/forms/authorsform.py 2017-10-07 07:05:07 +0000
3770+++ openlp/plugins/songs/forms/authorsform.py 2017-12-29 10:26:06 +0000
3771@@ -4,7 +4,7 @@
3772 ###############################################################################
3773 # OpenLP - Open Source Lyrics Projection #
3774 # --------------------------------------------------------------------------- #
3775-# Copyright (c) 2008-2017 OpenLP Developers #
3776+# Copyright (c) 2008-2018 OpenLP Developers #
3777 # --------------------------------------------------------------------------- #
3778 # This program is free software; you can redistribute it and/or modify it #
3779 # under the terms of the GNU General Public License as published by the Free #
3780
3781=== modified file 'openlp/plugins/songs/forms/duplicatesongremovalform.py'
3782--- openlp/plugins/songs/forms/duplicatesongremovalform.py 2017-10-23 22:09:57 +0000
3783+++ openlp/plugins/songs/forms/duplicatesongremovalform.py 2017-12-29 10:26:06 +0000
3784@@ -4,7 +4,7 @@
3785 ###############################################################################
3786 # OpenLP - Open Source Lyrics Projection #
3787 # --------------------------------------------------------------------------- #
3788-# Copyright (c) 2008-2017 OpenLP Developers #
3789+# Copyright (c) 2008-2018 OpenLP Developers #
3790 # --------------------------------------------------------------------------- #
3791 # This program is free software; you can redistribute it and/or modify it #
3792 # under the terms of the GNU General Public License as published by the Free #
3793@@ -32,9 +32,9 @@
3794 from openlp.core.common.mixins import RegistryProperties
3795 from openlp.core.common.registry import Registry
3796 from openlp.core.widgets.wizard import OpenLPWizard, WizardStrings
3797+from openlp.plugins.songs.forms.songreviewwidget import SongReviewWidget
3798 from openlp.plugins.songs.lib import delete_song
3799 from openlp.plugins.songs.lib.db import Song
3800-from openlp.plugins.songs.forms.songreviewwidget import SongReviewWidget
3801 from openlp.plugins.songs.lib.songcompare import songs_probably_equal
3802
3803 log = logging.getLogger(__name__)
3804
3805=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
3806--- openlp/plugins/songs/forms/editsongdialog.py 2017-10-07 07:05:07 +0000
3807+++ openlp/plugins/songs/forms/editsongdialog.py 2017-12-29 10:26:06 +0000
3808@@ -4,7 +4,7 @@
3809 ###############################################################################
3810 # OpenLP - Open Source Lyrics Projection #
3811 # --------------------------------------------------------------------------- #
3812-# Copyright (c) 2008-2017 OpenLP Developers #
3813+# Copyright (c) 2008-2018 OpenLP Developers #
3814 # --------------------------------------------------------------------------- #
3815 # This program is free software; you can redistribute it and/or modify it #
3816 # under the terms of the GNU General Public License as published by the Free #
3817
3818=== modified file 'openlp/plugins/songs/forms/editsongform.py'
3819--- openlp/plugins/songs/forms/editsongform.py 2017-10-28 10:04:09 +0000
3820+++ openlp/plugins/songs/forms/editsongform.py 2017-12-29 10:26:06 +0000
3821@@ -4,7 +4,7 @@
3822 ###############################################################################
3823 # OpenLP - Open Source Lyrics Projection #
3824 # --------------------------------------------------------------------------- #
3825-# Copyright (c) 2008-2017 OpenLP Developers #
3826+# Copyright (c) 2008-2018 OpenLP Developers #
3827 # --------------------------------------------------------------------------- #
3828 # This program is free software; you can redistribute it and/or modify it #
3829 # under the terms of the GNU General Public License as published by the Free #
3830@@ -30,8 +30,8 @@
3831
3832 from openlp.core.common.applocation import AppLocation
3833 from openlp.core.common.i18n import UiStrings, translate, get_natural_key
3834+from openlp.core.common.mixins import RegistryProperties
3835 from openlp.core.common.path import create_paths, copyfile
3836-from openlp.core.common.mixins import RegistryProperties
3837 from openlp.core.common.registry import Registry
3838 from openlp.core.lib import PluginStatus, MediaType, create_separated_list
3839 from openlp.core.lib.ui import set_case_insensitive_completer, critical_error_message_box, find_and_set_in_combo_box
3840
3841=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
3842--- openlp/plugins/songs/forms/editversedialog.py 2017-10-23 22:09:57 +0000
3843+++ openlp/plugins/songs/forms/editversedialog.py 2017-12-29 10:26:06 +0000
3844@@ -4,7 +4,7 @@
3845 ###############################################################################
3846 # OpenLP - Open Source Lyrics Projection #
3847 # --------------------------------------------------------------------------- #
3848-# Copyright (c) 2008-2017 OpenLP Developers #
3849+# Copyright (c) 2008-2018 OpenLP Developers #
3850 # --------------------------------------------------------------------------- #
3851 # This program is free software; you can redistribute it and/or modify it #
3852 # under the terms of the GNU General Public License as published by the Free #
3853@@ -22,8 +22,8 @@
3854
3855 from PyQt5 import QtWidgets
3856
3857+from openlp.core.common.i18n import UiStrings, translate
3858 from openlp.core.common.settings import Settings
3859-from openlp.core.common.i18n import UiStrings, translate
3860 from openlp.core.lib import build_icon
3861 from openlp.core.lib.ui import create_button_box
3862 from openlp.core.widgets.edits import SpellTextEdit
3863
3864=== modified file 'openlp/plugins/songs/forms/editverseform.py'
3865--- openlp/plugins/songs/forms/editverseform.py 2017-10-10 02:29:56 +0000
3866+++ openlp/plugins/songs/forms/editverseform.py 2017-12-29 10:26:06 +0000
3867@@ -4,7 +4,7 @@
3868 ###############################################################################
3869 # OpenLP - Open Source Lyrics Projection #
3870 # --------------------------------------------------------------------------- #
3871-# Copyright (c) 2008-2017 OpenLP Developers #
3872+# Copyright (c) 2008-2018 OpenLP Developers #
3873 # --------------------------------------------------------------------------- #
3874 # This program is free software; you can redistribute it and/or modify it #
3875 # under the terms of the GNU General Public License as published by the Free #
3876@@ -20,14 +20,14 @@
3877 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
3878 ###############################################################################
3879
3880+import logging
3881 import re
3882-import logging
3883
3884 from PyQt5 import QtCore, QtGui, QtWidgets
3885
3886-from openlp.core.lib.ui import critical_error_message_box
3887 from openlp.core.common.i18n import translate
3888 from openlp.core.common.settings import Settings
3889+from openlp.core.lib.ui import critical_error_message_box
3890 from openlp.plugins.songs.forms.editversedialog import Ui_EditVerseDialog
3891 from openlp.plugins.songs.lib import VerseType, transpose_lyrics
3892
3893
3894=== modified file 'openlp/plugins/songs/forms/mediafilesdialog.py'
3895--- openlp/plugins/songs/forms/mediafilesdialog.py 2017-10-07 07:05:07 +0000
3896+++ openlp/plugins/songs/forms/mediafilesdialog.py 2017-12-29 10:26:06 +0000
3897@@ -4,7 +4,7 @@
3898 ###############################################################################
3899 # OpenLP - Open Source Lyrics Projection #
3900 # --------------------------------------------------------------------------- #
3901-# Copyright (c) 2008-2017 OpenLP Developers #
3902+# Copyright (c) 2008-2018 OpenLP Developers #
3903 # --------------------------------------------------------------------------- #
3904 # This program is free software; you can redistribute it and/or modify it #
3905 # under the terms of the GNU General Public License as published by the Free #
3906
3907=== modified file 'openlp/plugins/songs/forms/mediafilesform.py'
3908--- openlp/plugins/songs/forms/mediafilesform.py 2017-09-30 20:16:30 +0000
3909+++ openlp/plugins/songs/forms/mediafilesform.py 2017-12-29 10:26:06 +0000
3910@@ -4,7 +4,7 @@
3911 ###############################################################################
3912 # OpenLP - Open Source Lyrics Projection #
3913 # --------------------------------------------------------------------------- #
3914-# Copyright (c) 2008-2017 OpenLP Developers #
3915+# Copyright (c) 2008-2018 OpenLP Developers #
3916 # --------------------------------------------------------------------------- #
3917 # This program is free software; you can redistribute it and/or modify it #
3918 # under the terms of the GNU General Public License as published by the Free #
3919@@ -21,7 +21,6 @@
3920 ###############################################################################
3921
3922 import logging
3923-import os
3924
3925 from PyQt5 import QtCore, QtWidgets
3926
3927
3928=== modified file 'openlp/plugins/songs/forms/songbookdialog.py'
3929--- openlp/plugins/songs/forms/songbookdialog.py 2017-10-07 07:05:07 +0000
3930+++ openlp/plugins/songs/forms/songbookdialog.py 2017-12-29 10:26:06 +0000
3931@@ -4,7 +4,7 @@
3932 ###############################################################################
3933 # OpenLP - Open Source Lyrics Projection #
3934 # --------------------------------------------------------------------------- #
3935-# Copyright (c) 2008-2017 OpenLP Developers #
3936+# Copyright (c) 2008-2018 OpenLP Developers #
3937 # --------------------------------------------------------------------------- #
3938 # This program is free software; you can redistribute it and/or modify it #
3939 # under the terms of the GNU General Public License as published by the Free #
3940
3941=== modified file 'openlp/plugins/songs/forms/songbookform.py'
3942--- openlp/plugins/songs/forms/songbookform.py 2017-10-07 07:05:07 +0000
3943+++ openlp/plugins/songs/forms/songbookform.py 2017-12-29 10:26:06 +0000
3944@@ -4,7 +4,7 @@
3945 ###############################################################################
3946 # OpenLP - Open Source Lyrics Projection #
3947 # --------------------------------------------------------------------------- #
3948-# Copyright (c) 2008-2017 OpenLP Developers #
3949+# Copyright (c) 2008-2018 OpenLP Developers #
3950 # --------------------------------------------------------------------------- #
3951 # This program is free software; you can redistribute it and/or modify it #
3952 # under the terms of the GNU General Public License as published by the Free #
3953
3954=== modified file 'openlp/plugins/songs/forms/songexportform.py'
3955--- openlp/plugins/songs/forms/songexportform.py 2017-10-23 22:09:57 +0000
3956+++ openlp/plugins/songs/forms/songexportform.py 2017-12-29 10:26:06 +0000
3957@@ -4,7 +4,7 @@
3958 ###############################################################################
3959 # OpenLP - Open Source Lyrics Projection #
3960 # --------------------------------------------------------------------------- #
3961-# Copyright (c) 2008-2017 OpenLP Developers #
3962+# Copyright (c) 2008-2018 OpenLP Developers #
3963 # --------------------------------------------------------------------------- #
3964 # This program is free software; you can redistribute it and/or modify it #
3965 # under the terms of the GNU General Public License as published by the Free #
3966
3967=== modified file 'openlp/plugins/songs/forms/songimportform.py'
3968--- openlp/plugins/songs/forms/songimportform.py 2017-10-23 22:09:57 +0000
3969+++ openlp/plugins/songs/forms/songimportform.py 2017-12-29 10:26:06 +0000
3970@@ -4,7 +4,7 @@
3971 ###############################################################################
3972 # OpenLP - Open Source Lyrics Projection #
3973 # --------------------------------------------------------------------------- #
3974-# Copyright (c) 2008-2017 OpenLP Developers #
3975+# Copyright (c) 2008-2018 OpenLP Developers #
3976 # --------------------------------------------------------------------------- #
3977 # This program is free software; you can redistribute it and/or modify it #
3978 # under the terms of the GNU General Public License as published by the Free #
3979
3980=== modified file 'openlp/plugins/songs/forms/songmaintenancedialog.py'
3981--- openlp/plugins/songs/forms/songmaintenancedialog.py 2017-10-07 07:05:07 +0000
3982+++ openlp/plugins/songs/forms/songmaintenancedialog.py 2017-12-29 10:26:06 +0000
3983@@ -4,7 +4,7 @@
3984 ###############################################################################
3985 # OpenLP - Open Source Lyrics Projection #
3986 # --------------------------------------------------------------------------- #
3987-# Copyright (c) 2008-2017 OpenLP Developers #
3988+# Copyright (c) 2008-2018 OpenLP Developers #
3989 # --------------------------------------------------------------------------- #
3990 # This program is free software; you can redistribute it and/or modify it #
3991 # under the terms of the GNU General Public License as published by the Free #
3992
3993=== modified file 'openlp/plugins/songs/forms/songmaintenanceform.py'
3994--- openlp/plugins/songs/forms/songmaintenanceform.py 2017-10-23 22:09:57 +0000
3995+++ openlp/plugins/songs/forms/songmaintenanceform.py 2017-12-29 10:26:06 +0000
3996@@ -4,7 +4,7 @@
3997 ###############################################################################
3998 # OpenLP - Open Source Lyrics Projection #
3999 # --------------------------------------------------------------------------- #
4000-# Copyright (c) 2008-2017 OpenLP Developers #
4001+# Copyright (c) 2008-2018 OpenLP Developers #
4002 # --------------------------------------------------------------------------- #
4003 # This program is free software; you can redistribute it and/or modify it #
4004 # under the terms of the GNU General Public License as published by the Free #
4005@@ -29,8 +29,8 @@
4006 from openlp.core.common.registry import Registry
4007 from openlp.core.lib.ui import critical_error_message_box
4008 from openlp.plugins.songs.forms.authorsform import AuthorsForm
4009+from openlp.plugins.songs.forms.songbookform import SongBookForm
4010 from openlp.plugins.songs.forms.topicsform import TopicsForm
4011-from openlp.plugins.songs.forms.songbookform import SongBookForm
4012 from openlp.plugins.songs.lib.db import Author, Book, Topic, Song
4013 from .songmaintenancedialog import Ui_SongMaintenanceDialog
4014
4015
4016=== modified file 'openlp/plugins/songs/forms/songreviewwidget.py'
4017--- openlp/plugins/songs/forms/songreviewwidget.py 2016-12-31 11:01:36 +0000
4018+++ openlp/plugins/songs/forms/songreviewwidget.py 2017-12-29 10:26:06 +0000
4019@@ -4,7 +4,7 @@
4020 ###############################################################################
4021 # OpenLP - Open Source Lyrics Projection #
4022 # --------------------------------------------------------------------------- #
4023-# Copyright (c) 2008-2017 OpenLP Developers #
4024+# Copyright (c) 2008-2018 OpenLP Developers #
4025 # --------------------------------------------------------------------------- #
4026 # This program is free software; you can redistribute it and/or modify it #
4027 # under the terms of the GNU General Public License as published by the Free #
4028
4029=== modified file 'openlp/plugins/songs/forms/songselectdialog.py'
4030--- openlp/plugins/songs/forms/songselectdialog.py 2017-10-23 22:09:57 +0000
4031+++ openlp/plugins/songs/forms/songselectdialog.py 2017-12-29 10:26:06 +0000
4032@@ -4,7 +4,7 @@
4033 ###############################################################################
4034 # OpenLP - Open Source Lyrics Projection #
4035 # --------------------------------------------------------------------------- #
4036-# Copyright (c) 2008-2017 OpenLP Developers #
4037+# Copyright (c) 2008-2018 OpenLP Developers #
4038 # --------------------------------------------------------------------------- #
4039 # This program is free software; you can redistribute it and/or modify it #
4040 # under the terms of the GNU General Public License as published by the Free #
4041
4042=== modified file 'openlp/plugins/songs/forms/songselectform.py'
4043--- openlp/plugins/songs/forms/songselectform.py 2017-10-07 07:05:07 +0000
4044+++ openlp/plugins/songs/forms/songselectform.py 2017-12-29 10:26:06 +0000
4045@@ -4,7 +4,7 @@
4046 ###############################################################################
4047 # OpenLP - Open Source Lyrics Projection #
4048 # --------------------------------------------------------------------------- #
4049-# Copyright (c) 2008-2017 OpenLP Developers #
4050+# Copyright (c) 2008-2018 OpenLP Developers #
4051 # --------------------------------------------------------------------------- #
4052 # This program is free software; you can redistribute it and/or modify it #
4053 # under the terms of the GNU General Public License as published by the Free #
4054
4055=== modified file 'openlp/plugins/songs/forms/topicsdialog.py'
4056--- openlp/plugins/songs/forms/topicsdialog.py 2017-10-07 07:05:07 +0000
4057+++ openlp/plugins/songs/forms/topicsdialog.py 2017-12-29 10:26:06 +0000
4058@@ -4,7 +4,7 @@
4059 ###############################################################################
4060 # OpenLP - Open Source Lyrics Projection #
4061 # --------------------------------------------------------------------------- #
4062-# Copyright (c) 2008-2017 OpenLP Developers #
4063+# Copyright (c) 2008-2018 OpenLP Developers #
4064 # --------------------------------------------------------------------------- #
4065 # This program is free software; you can redistribute it and/or modify it #
4066 # under the terms of the GNU General Public License as published by the Free #
4067
4068=== modified file 'openlp/plugins/songs/forms/topicsform.py'
4069--- openlp/plugins/songs/forms/topicsform.py 2017-10-07 07:05:07 +0000
4070+++ openlp/plugins/songs/forms/topicsform.py 2017-12-29 10:26:06 +0000
4071@@ -4,7 +4,7 @@
4072 ###############################################################################
4073 # OpenLP - Open Source Lyrics Projection #
4074 # --------------------------------------------------------------------------- #
4075-# Copyright (c) 2008-2017 OpenLP Developers #
4076+# Copyright (c) 2008-2018 OpenLP Developers #
4077 # --------------------------------------------------------------------------- #
4078 # This program is free software; you can redistribute it and/or modify it #
4079 # under the terms of the GNU General Public License as published by the Free #
4080
4081=== modified file 'openlp/plugins/songs/lib/__init__.py'
4082--- openlp/plugins/songs/lib/__init__.py 2017-10-28 10:04:09 +0000
4083+++ openlp/plugins/songs/lib/__init__.py 2017-12-29 10:26:06 +0000
4084@@ -4,7 +4,7 @@
4085 ###############################################################################
4086 # OpenLP - Open Source Lyrics Projection #
4087 # --------------------------------------------------------------------------- #
4088-# Copyright (c) 2008-2017 OpenLP Developers #
4089+# Copyright (c) 2008-2018 OpenLP Developers #
4090 # --------------------------------------------------------------------------- #
4091 # This program is free software; you can redistribute it and/or modify it #
4092 # under the terms of the GNU General Public License as published by the Free #
4093
4094=== modified file 'openlp/plugins/songs/lib/db.py'
4095--- openlp/plugins/songs/lib/db.py 2017-10-10 02:29:56 +0000
4096+++ openlp/plugins/songs/lib/db.py 2017-12-29 10:26:06 +0000
4097@@ -4,7 +4,7 @@
4098 ###############################################################################
4099 # OpenLP - Open Source Lyrics Projection #
4100 # --------------------------------------------------------------------------- #
4101-# Copyright (c) 2008-2017 OpenLP Developers #
4102+# Copyright (c) 2008-2018 OpenLP Developers #
4103 # --------------------------------------------------------------------------- #
4104 # This program is free software; you can redistribute it and/or modify it #
4105 # under the terms of the GNU General Public License as published by the Free #
4106
4107=== modified file 'openlp/plugins/songs/lib/importer.py'
4108--- openlp/plugins/songs/lib/importer.py 2017-10-23 22:09:57 +0000
4109+++ openlp/plugins/songs/lib/importer.py 2017-12-29 10:26:06 +0000
4110@@ -4,7 +4,7 @@
4111 ###############################################################################
4112 # OpenLP - Open Source Lyrics Projection #
4113 # --------------------------------------------------------------------------- #
4114-# Copyright (c) 2008-2017 OpenLP Developers #
4115+# Copyright (c) 2008-2018 OpenLP Developers #
4116 # --------------------------------------------------------------------------- #
4117 # This program is free software; you can redistribute it and/or modify it #
4118 # under the terms of the GNU General Public License as published by the Free #
4119@@ -27,28 +27,28 @@
4120 from openlp.core.common import is_win
4121 from openlp.core.common.i18n import UiStrings, translate
4122 from openlp.core.widgets.wizard import WizardStrings
4123-from .importers.opensong import OpenSongImport
4124+from .importers.cclifile import CCLIFileImport
4125+from .importers.chordpro import ChordProImport
4126+from .importers.dreambeam import DreamBeamImport
4127 from .importers.easyslides import EasySlidesImport
4128+from .importers.easyworship import EasyWorshipSongImport
4129+from .importers.foilpresenter import FoilPresenterImport
4130+from .importers.lyrix import LyrixImport
4131 from .importers.openlp import OpenLPSongImport
4132 from .importers.openlyrics import OpenLyricsImport
4133-from .importers.wordsofworship import WordsOfWorshipImport
4134-from .importers.cclifile import CCLIFileImport
4135-from .importers.dreambeam import DreamBeamImport
4136+from .importers.opensong import OpenSongImport
4137+from .importers.powerpraise import PowerPraiseImport
4138 from .importers.powersong import PowerSongImport
4139-from .importers.easyworship import EasyWorshipSongImport
4140+from .importers.presentationmanager import PresentationManagerImport
4141+from .importers.propresenter import ProPresenterImport
4142 from .importers.songbeamer import SongBeamerImport
4143+from .importers.songpro import SongProImport
4144 from .importers.songshowplus import SongShowPlusImport
4145-from .importers.songpro import SongProImport
4146 from .importers.sundayplus import SundayPlusImport
4147-from .importers.foilpresenter import FoilPresenterImport
4148+from .importers.videopsalm import VideoPsalmImport
4149+from .importers.wordsofworship import WordsOfWorshipImport
4150+from .importers.worshipassistant import WorshipAssistantImport
4151 from .importers.zionworx import ZionWorxImport
4152-from .importers.propresenter import ProPresenterImport
4153-from .importers.worshipassistant import WorshipAssistantImport
4154-from .importers.powerpraise import PowerPraiseImport
4155-from .importers.presentationmanager import PresentationManagerImport
4156-from .importers.lyrix import LyrixImport
4157-from .importers.videopsalm import VideoPsalmImport
4158-from .importers.chordpro import ChordProImport
4159
4160 log = logging.getLogger(__name__)
4161
4162
4163=== modified file 'openlp/plugins/songs/lib/importers/__init__.py'
4164--- openlp/plugins/songs/lib/importers/__init__.py 2016-12-31 11:01:36 +0000
4165+++ openlp/plugins/songs/lib/importers/__init__.py 2017-12-29 10:26:06 +0000
4166@@ -4,7 +4,7 @@
4167 ###############################################################################
4168 # OpenLP - Open Source Lyrics Projection #
4169 # --------------------------------------------------------------------------- #
4170-# Copyright (c) 2008-2017 OpenLP Developers #
4171+# Copyright (c) 2008-2018 OpenLP Developers #
4172 # --------------------------------------------------------------------------- #
4173 # This program is free software; you can redistribute it and/or modify it #
4174 # under the terms of the GNU General Public License as published by the Free #
4175
4176=== modified file 'openlp/plugins/songs/lib/importers/cclifile.py'
4177--- openlp/plugins/songs/lib/importers/cclifile.py 2017-10-10 02:29:56 +0000
4178+++ openlp/plugins/songs/lib/importers/cclifile.py 2017-12-29 10:26:06 +0000
4179@@ -1,10 +1,13 @@
4180 # -*- coding: utf-8 -*-
4181 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
4182
4183+import codecs
4184+import logging
4185+
4186 ###############################################################################
4187 # OpenLP - Open Source Lyrics Projection #
4188 # --------------------------------------------------------------------------- #
4189-# Copyright (c) 2008-2017 OpenLP Developers #
4190+# Copyright (c) 2008-2018 OpenLP Developers #
4191 # --------------------------------------------------------------------------- #
4192 # This program is free software; you can redistribute it and/or modify it #
4193 # under the terms of the GNU General Public License as published by the Free #
4194@@ -20,8 +23,6 @@
4195 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
4196 ###############################################################################
4197 import chardet
4198-import codecs
4199-import logging
4200
4201 from openlp.core.common.i18n import translate
4202 from openlp.plugins.songs.lib import VerseType
4203
4204=== modified file 'openlp/plugins/songs/lib/importers/dreambeam.py'
4205--- openlp/plugins/songs/lib/importers/dreambeam.py 2017-10-10 02:29:56 +0000
4206+++ openlp/plugins/songs/lib/importers/dreambeam.py 2017-12-29 10:26:06 +0000
4207@@ -4,7 +4,7 @@
4208 ###############################################################################
4209 # OpenLP - Open Source Lyrics Projection #
4210 # --------------------------------------------------------------------------- #
4211-# Copyright (c) 2008-2017 OpenLP Developers #
4212+# Copyright (c) 2008-2018 OpenLP Developers #
4213 # --------------------------------------------------------------------------- #
4214 # This program is free software; you can redistribute it and/or modify it #
4215 # under the terms of the GNU General Public License as published by the Free #
4216
4217=== modified file 'openlp/plugins/songs/lib/importers/easyslides.py'
4218--- openlp/plugins/songs/lib/importers/easyslides.py 2017-10-28 10:04:09 +0000
4219+++ openlp/plugins/songs/lib/importers/easyslides.py 2017-12-29 10:26:06 +0000
4220@@ -4,7 +4,7 @@
4221 ###############################################################################
4222 # OpenLP - Open Source Lyrics Projection #
4223 # --------------------------------------------------------------------------- #
4224-# Copyright (c) 2008-2017 OpenLP Developers #
4225+# Copyright (c) 2008-2018 OpenLP Developers #
4226 # --------------------------------------------------------------------------- #
4227 # This program is free software; you can redistribute it and/or modify it #
4228 # under the terms of the GNU General Public License as published by the Free #
4229
4230=== modified file 'openlp/plugins/songs/lib/importers/easyworship.py'
4231--- openlp/plugins/songs/lib/importers/easyworship.py 2017-10-23 22:09:57 +0000
4232+++ openlp/plugins/songs/lib/importers/easyworship.py 2017-12-29 10:26:06 +0000
4233@@ -4,7 +4,7 @@
4234 ###############################################################################
4235 # OpenLP - Open Source Lyrics Projection #
4236 # --------------------------------------------------------------------------- #
4237-# Copyright (c) 2008-2017 OpenLP Developers #
4238+# Copyright (c) 2008-2018 OpenLP Developers #
4239 # --------------------------------------------------------------------------- #
4240 # This program is free software; you can redistribute it and/or modify it #
4241 # under the terms of the GNU General Public License as published by the Free #
4242@@ -25,11 +25,10 @@
4243 import logging
4244 import os
4245 import re
4246+import sqlite3
4247 import struct
4248 import zlib
4249
4250-import sqlite3
4251-
4252 from openlp.core.common.i18n import translate
4253 from openlp.core.common.path import Path
4254 from openlp.plugins.songs.lib import VerseType
4255
4256=== modified file 'openlp/plugins/songs/lib/importers/foilpresenter.py'
4257--- openlp/plugins/songs/lib/importers/foilpresenter.py 2017-10-23 22:09:57 +0000
4258+++ openlp/plugins/songs/lib/importers/foilpresenter.py 2017-12-29 10:26:06 +0000
4259@@ -4,7 +4,7 @@
4260 ###############################################################################
4261 # OpenLP - Open Source Lyrics Projection #
4262 # --------------------------------------------------------------------------- #
4263-# Copyright (c) 2008-2017 OpenLP Developers #
4264+# Copyright (c) 2008-2018 OpenLP Developers #
4265 # --------------------------------------------------------------------------- #
4266 # This program is free software; you can redistribute it and/or modify it #
4267 # under the terms of the GNU General Public License as published by the Free #
4268@@ -90,10 +90,10 @@
4269 from openlp.core.common.i18n import translate
4270 from openlp.core.widgets.wizard import WizardStrings
4271 from openlp.plugins.songs.lib import clean_song, VerseType
4272+from openlp.plugins.songs.lib.db import Author, Book, Song, Topic
4273 from openlp.plugins.songs.lib.importers.songimport import SongImport
4274-from openlp.plugins.songs.lib.db import Author, Book, Song, Topic
4275+from openlp.plugins.songs.lib.openlyricsxml import SongXML
4276 from openlp.plugins.songs.lib.ui import SongStrings
4277-from openlp.plugins.songs.lib.openlyricsxml import SongXML
4278
4279 log = logging.getLogger(__name__)
4280
4281
4282=== modified file 'openlp/plugins/songs/lib/importers/lyrix.py'
4283--- openlp/plugins/songs/lib/importers/lyrix.py 2017-10-10 02:29:56 +0000
4284+++ openlp/plugins/songs/lib/importers/lyrix.py 2017-12-29 10:26:06 +0000
4285@@ -4,7 +4,7 @@
4286 ###############################################################################
4287 # OpenLP - Open Source Lyrics Projection #
4288 # --------------------------------------------------------------------------- #
4289-# Copyright (c) 2008-2017 OpenLP Developers #
4290+# Copyright (c) 2008-2018 OpenLP Developers #
4291 # --------------------------------------------------------------------------- #
4292 # This program is free software; you can redistribute it and/or modify it #
4293 # under the terms of the GNU General Public License as published by the Free #
4294
4295=== modified file 'openlp/plugins/songs/lib/importers/mediashout.py'
4296--- openlp/plugins/songs/lib/importers/mediashout.py 2017-10-28 10:04:09 +0000
4297+++ openlp/plugins/songs/lib/importers/mediashout.py 2017-12-29 10:26:06 +0000
4298@@ -4,7 +4,7 @@
4299 ###############################################################################
4300 # OpenLP - Open Source Lyrics Projection #
4301 # --------------------------------------------------------------------------- #
4302-# Copyright (c) 2008-2017 OpenLP Developers #
4303+# Copyright (c) 2008-2018 OpenLP Developers #
4304 # --------------------------------------------------------------------------- #
4305 # This program is free software; you can redistribute it and/or modify it #
4306 # under the terms of the GNU General Public License as published by the Free #
4307@@ -27,8 +27,9 @@
4308 # WARNING: See https://docs.python.org/3/library/sqlite3.html for value substitution
4309 # in SQL statements
4310
4311+import logging
4312+
4313 import pyodbc
4314-import logging
4315
4316 from openlp.core.common.i18n import translate
4317 from openlp.plugins.songs.lib.importers.songimport import SongImport
4318
4319=== modified file 'openlp/plugins/songs/lib/importers/openlp.py'
4320--- openlp/plugins/songs/lib/importers/openlp.py 2017-10-23 22:09:57 +0000
4321+++ openlp/plugins/songs/lib/importers/openlp.py 2017-12-29 10:26:06 +0000
4322@@ -4,7 +4,7 @@
4323 ###############################################################################
4324 # OpenLP - Open Source Lyrics Projection #
4325 # --------------------------------------------------------------------------- #
4326-# Copyright (c) 2008-2017 OpenLP Developers #
4327+# Copyright (c) 2008-2018 OpenLP Developers #
4328 # --------------------------------------------------------------------------- #
4329 # This program is free software; you can redistribute it and/or modify it #
4330 # under the terms of the GNU General Public License as published by the Free #
4331
4332=== modified file 'openlp/plugins/songs/lib/importers/openlyrics.py'
4333--- openlp/plugins/songs/lib/importers/openlyrics.py 2017-10-23 22:09:57 +0000
4334+++ openlp/plugins/songs/lib/importers/openlyrics.py 2017-12-29 10:26:06 +0000
4335@@ -4,7 +4,7 @@
4336 ###############################################################################
4337 # OpenLP - Open Source Lyrics Projection #
4338 # --------------------------------------------------------------------------- #
4339-# Copyright (c) 2008-2017 OpenLP Developers #
4340+# Copyright (c) 2008-2018 OpenLP Developers #
4341 # --------------------------------------------------------------------------- #
4342 # This program is free software; you can redistribute it and/or modify it #
4343 # under the terms of the GNU General Public License as published by the Free #
4344@@ -29,8 +29,8 @@
4345
4346 from openlp.core.widgets.wizard import WizardStrings
4347 from openlp.plugins.songs.lib.importers.songimport import SongImport
4348+from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics, OpenLyricsError
4349 from openlp.plugins.songs.lib.ui import SongStrings
4350-from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics, OpenLyricsError
4351
4352 log = logging.getLogger(__name__)
4353
4354
4355=== modified file 'openlp/plugins/songs/lib/importers/openoffice.py'
4356--- openlp/plugins/songs/lib/importers/openoffice.py 2017-10-28 10:04:09 +0000
4357+++ openlp/plugins/songs/lib/importers/openoffice.py 2017-12-29 10:26:06 +0000
4358@@ -4,7 +4,7 @@
4359 ###############################################################################
4360 # OpenLP - Open Source Lyrics Projection #
4361 # --------------------------------------------------------------------------- #
4362-# Copyright (c) 2008-2017 OpenLP Developers #
4363+# Copyright (c) 2008-2018 OpenLP Developers #
4364 # --------------------------------------------------------------------------- #
4365 # This program is free software; you can redistribute it and/or modify it #
4366 # under the terms of the GNU General Public License as published by the Free #
4367
4368=== modified file 'openlp/plugins/songs/lib/importers/opensong.py'
4369--- openlp/plugins/songs/lib/importers/opensong.py 2017-10-28 10:04:09 +0000
4370+++ openlp/plugins/songs/lib/importers/opensong.py 2017-12-29 10:26:06 +0000
4371@@ -4,7 +4,7 @@
4372 ###############################################################################
4373 # OpenLP - Open Source Lyrics Projection #
4374 # --------------------------------------------------------------------------- #
4375-# Copyright (c) 2008-2017 OpenLP Developers #
4376+# Copyright (c) 2008-2018 OpenLP Developers #
4377 # --------------------------------------------------------------------------- #
4378 # This program is free software; you can redistribute it and/or modify it #
4379 # under the terms of the GNU General Public License as published by the Free #
4380
4381=== modified file 'openlp/plugins/songs/lib/importers/opspro.py'
4382--- openlp/plugins/songs/lib/importers/opspro.py 2017-10-10 02:29:56 +0000
4383+++ openlp/plugins/songs/lib/importers/opspro.py 2017-12-29 10:26:06 +0000
4384@@ -4,7 +4,7 @@
4385 ###############################################################################
4386 # OpenLP - Open Source Lyrics Projection #
4387 # --------------------------------------------------------------------------- #
4388-# Copyright (c) 2008-2017 OpenLP Developers #
4389+# Copyright (c) 2008-2018 OpenLP Developers #
4390 # --------------------------------------------------------------------------- #
4391 # This program is free software; you can redistribute it and/or modify it #
4392 # under the terms of the GNU General Public License as published by the Free #
4393@@ -29,8 +29,9 @@
4394
4395 import logging
4396 import re
4397+import struct
4398+
4399 import pyodbc
4400-import struct
4401
4402 from openlp.core.common.i18n import translate
4403 from openlp.plugins.songs.lib.importers.songimport import SongImport
4404
4405=== modified file 'openlp/plugins/songs/lib/importers/powerpraise.py'
4406--- openlp/plugins/songs/lib/importers/powerpraise.py 2017-10-23 22:09:57 +0000
4407+++ openlp/plugins/songs/lib/importers/powerpraise.py 2017-12-29 10:26:06 +0000
4408@@ -4,7 +4,7 @@
4409 ###############################################################################
4410 # OpenLP - Open Source Lyrics Projection #
4411 # --------------------------------------------------------------------------- #
4412-# Copyright (c) 2008-2017 OpenLP Developers #
4413+# Copyright (c) 2008-2018 OpenLP Developers #
4414 # --------------------------------------------------------------------------- #
4415 # This program is free software; you can redistribute it and/or modify it #
4416 # under the terms of the GNU General Public License as published by the Free #
4417
4418=== modified file 'openlp/plugins/songs/lib/importers/powersong.py'
4419--- openlp/plugins/songs/lib/importers/powersong.py 2017-12-17 04:29:53 +0000
4420+++ openlp/plugins/songs/lib/importers/powersong.py 2017-12-29 10:26:06 +0000
4421@@ -4,7 +4,7 @@
4422 ###############################################################################
4423 # OpenLP - Open Source Lyrics Projection #
4424 # --------------------------------------------------------------------------- #
4425-# Copyright (c) 2008-2017 OpenLP Developers #
4426+# Copyright (c) 2008-2018 OpenLP Developers #
4427 # --------------------------------------------------------------------------- #
4428 # This program is free software; you can redistribute it and/or modify it #
4429 # under the terms of the GNU General Public License as published by the Free #
4430
4431=== modified file 'openlp/plugins/songs/lib/importers/presentationmanager.py'
4432--- openlp/plugins/songs/lib/importers/presentationmanager.py 2017-10-23 22:09:57 +0000
4433+++ openlp/plugins/songs/lib/importers/presentationmanager.py 2017-12-29 10:26:06 +0000
4434@@ -4,7 +4,7 @@
4435 ###############################################################################
4436 # OpenLP - Open Source Lyrics Projection #
4437 # --------------------------------------------------------------------------- #
4438-# Copyright (c) 2008-2017 OpenLP Developers #
4439+# Copyright (c) 2008-2018 OpenLP Developers #
4440 # --------------------------------------------------------------------------- #
4441 # This program is free software; you can redistribute it and/or modify it #
4442 # under the terms of the GNU General Public License as published by the Free #
4443@@ -27,8 +27,8 @@
4444
4445 from lxml import objectify, etree
4446
4447+from openlp.core.common import get_file_encoding
4448 from openlp.core.common.i18n import translate
4449-from openlp.core.common import get_file_encoding
4450 from openlp.core.widgets.wizard import WizardStrings
4451 from openlp.plugins.songs.lib.importers.songimport import SongImport
4452
4453
4454=== modified file 'openlp/plugins/songs/lib/importers/propresenter.py'
4455--- openlp/plugins/songs/lib/importers/propresenter.py 2017-10-23 22:09:57 +0000
4456+++ openlp/plugins/songs/lib/importers/propresenter.py 2017-12-29 10:26:06 +0000
4457@@ -4,7 +4,7 @@
4458 ###############################################################################
4459 # OpenLP - Open Source Lyrics Projection #
4460 # --------------------------------------------------------------------------- #
4461-# Copyright (c) 2008-2017 OpenLP Developers #
4462+# Copyright (c) 2008-2018 OpenLP Developers #
4463 # --------------------------------------------------------------------------- #
4464 # This program is free software; you can redistribute it and/or modify it #
4465 # under the terms of the GNU General Public License as published by the Free #
4466@@ -25,6 +25,7 @@
4467 """
4468 import base64
4469 import logging
4470+
4471 from lxml import objectify
4472
4473 from openlp.core.widgets.wizard import WizardStrings
4474
4475=== modified file 'openlp/plugins/songs/lib/importers/songbeamer.py'
4476--- openlp/plugins/songs/lib/importers/songbeamer.py 2017-10-10 02:29:56 +0000
4477+++ openlp/plugins/songs/lib/importers/songbeamer.py 2017-12-29 10:26:06 +0000
4478@@ -4,7 +4,7 @@
4479 ###############################################################################
4480 # OpenLP - Open Source Lyrics Projection #
4481 # --------------------------------------------------------------------------- #
4482-# Copyright (c) 2008-2017 OpenLP Developers #
4483+# Copyright (c) 2008-2018 OpenLP Developers #
4484 # --------------------------------------------------------------------------- #
4485 # This program is free software; you can redistribute it and/or modify it #
4486 # under the terms of the GNU General Public License as published by the Free #
4487@@ -22,15 +22,15 @@
4488 """
4489 The :mod:`songbeamer` module provides the functionality for importing SongBeamer songs into the OpenLP database.
4490 """
4491+import base64
4492 import logging
4493+import math
4494 import os
4495 import re
4496-import base64
4497-import math
4498
4499 from openlp.core.common import is_win, is_macosx, get_file_encoding
4500+from openlp.core.common.path import Path
4501 from openlp.core.common.settings import Settings
4502-from openlp.core.common.path import Path
4503 from openlp.plugins.songs.lib import VerseType
4504 from openlp.plugins.songs.lib.importers.songimport import SongImport
4505
4506
4507=== modified file 'openlp/plugins/songs/lib/importers/songimport.py'
4508--- openlp/plugins/songs/lib/importers/songimport.py 2017-10-28 10:04:09 +0000
4509+++ openlp/plugins/songs/lib/importers/songimport.py 2017-12-29 10:26:06 +0000
4510@@ -4,7 +4,7 @@
4511 ###############################################################################
4512 # OpenLP - Open Source Lyrics Projection #
4513 # --------------------------------------------------------------------------- #
4514-# Copyright (c) 2008-2017 OpenLP Developers #
4515+# Copyright (c) 2008-2018 OpenLP Developers #
4516 # --------------------------------------------------------------------------- #
4517 # This program is free software; you can redistribute it and/or modify it #
4518 # under the terms of the GNU General Public License as published by the Free #
4519@@ -33,8 +33,8 @@
4520 from openlp.core.widgets.wizard import WizardStrings
4521 from openlp.plugins.songs.lib import clean_song, VerseType
4522 from openlp.plugins.songs.lib.db import Song, Author, Topic, Book, MediaFile
4523+from openlp.plugins.songs.lib.openlyricsxml import SongXML
4524 from openlp.plugins.songs.lib.ui import SongStrings
4525-from openlp.plugins.songs.lib.openlyricsxml import SongXML
4526
4527 log = logging.getLogger(__name__)
4528
4529
4530=== modified file 'openlp/plugins/songs/lib/importers/songpro.py'
4531--- openlp/plugins/songs/lib/importers/songpro.py 2017-09-30 20:16:30 +0000
4532+++ openlp/plugins/songs/lib/importers/songpro.py 2017-12-29 10:26:06 +0000
4533@@ -4,7 +4,7 @@
4534 ###############################################################################
4535 # OpenLP - Open Source Lyrics Projection #
4536 # --------------------------------------------------------------------------- #
4537-# Copyright (c) 2008-2017 OpenLP Developers #
4538+# Copyright (c) 2008-2018 OpenLP Developers #
4539 # --------------------------------------------------------------------------- #
4540 # This program is free software; you can redistribute it and/or modify it #
4541 # under the terms of the GNU General Public License as published by the Free #
4542
4543=== modified file 'openlp/plugins/songs/lib/importers/songshowplus.py'
4544--- openlp/plugins/songs/lib/importers/songshowplus.py 2017-10-23 22:09:57 +0000
4545+++ openlp/plugins/songs/lib/importers/songshowplus.py 2017-12-29 10:26:06 +0000
4546@@ -4,7 +4,7 @@
4547 ###############################################################################
4548 # OpenLP - Open Source Lyrics Projection #
4549 # --------------------------------------------------------------------------- #
4550-# Copyright (c) 2008-2017 OpenLP Developers #
4551+# Copyright (c) 2008-2018 OpenLP Developers #
4552 # --------------------------------------------------------------------------- #
4553 # This program is free software; you can redistribute it and/or modify it #
4554 # under the terms of the GNU General Public License as published by the Free #
4555
4556=== modified file 'openlp/plugins/songs/lib/importers/songsoffellowship.py'
4557--- openlp/plugins/songs/lib/importers/songsoffellowship.py 2017-10-28 10:04:09 +0000
4558+++ openlp/plugins/songs/lib/importers/songsoffellowship.py 2017-12-29 10:26:06 +0000
4559@@ -4,7 +4,7 @@
4560 ###############################################################################
4561 # OpenLP - Open Source Lyrics Projection #
4562 # --------------------------------------------------------------------------- #
4563-# Copyright (c) 2008-2017 OpenLP Developers #
4564+# Copyright (c) 2008-2018 OpenLP Developers #
4565 # --------------------------------------------------------------------------- #
4566 # This program is free software; you can redistribute it and/or modify it #
4567 # under the terms of the GNU General Public License as published by the Free #
4568@@ -27,13 +27,11 @@
4569 # http://wiki.services.openoffice.org/wiki/Python
4570
4571 import logging
4572-import os
4573 import re
4574
4575 from openlp.core.common import is_win
4576 from .openoffice import OpenOfficeImport
4577
4578-
4579 log = logging.getLogger(__name__)
4580
4581 if is_win():
4582
4583=== modified file 'openlp/plugins/songs/lib/importers/sundayplus.py'
4584--- openlp/plugins/songs/lib/importers/sundayplus.py 2017-12-22 22:35:09 +0000
4585+++ openlp/plugins/songs/lib/importers/sundayplus.py 2017-12-29 10:26:06 +0000
4586@@ -4,7 +4,7 @@
4587 ###############################################################################
4588 # OpenLP - Open Source Lyrics Projection #
4589 # --------------------------------------------------------------------------- #
4590-# Copyright (c) 2008-2017 OpenLP Developers #
4591+# Copyright (c) 2008-2018 OpenLP Developers #
4592 # --------------------------------------------------------------------------- #
4593 # This program is free software; you can redistribute it and/or modify it #
4594 # under the terms of the GNU General Public License as published by the Free #
4595@@ -19,7 +19,6 @@
4596 # with this program; if not, write to the Free Software Foundation, Inc., 59 #
4597 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
4598 ###############################################################################
4599-import os
4600 import re
4601
4602 from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding
4603
4604=== modified file 'openlp/plugins/songs/lib/importers/videopsalm.py'
4605--- openlp/plugins/songs/lib/importers/videopsalm.py 2017-10-10 02:29:56 +0000
4606+++ openlp/plugins/songs/lib/importers/videopsalm.py 2017-12-29 10:26:06 +0000
4607@@ -4,7 +4,7 @@
4608 ###############################################################################
4609 # OpenLP - Open Source Lyrics Projection #
4610 # --------------------------------------------------------------------------- #
4611-# Copyright (c) 2008-2017 OpenLP Developers #
4612+# Copyright (c) 2008-2018 OpenLP Developers #
4613 # --------------------------------------------------------------------------- #
4614 # This program is free software; you can redistribute it and/or modify it #
4615 # under the terms of the GNU General Public License as published by the Free #
4616@@ -27,10 +27,10 @@
4617 import re
4618
4619 from openlp.core.common.i18n import translate
4620+from openlp.core.common.path import Path
4621 from openlp.core.common.settings import Settings
4622-from openlp.core.common.path import Path
4623+from openlp.plugins.songs.lib.db import AuthorType
4624 from openlp.plugins.songs.lib.importers.songimport import SongImport
4625-from openlp.plugins.songs.lib.db import AuthorType
4626
4627 log = logging.getLogger(__name__)
4628
4629
4630=== modified file 'openlp/plugins/songs/lib/importers/wordsofworship.py'
4631--- openlp/plugins/songs/lib/importers/wordsofworship.py 2017-10-10 02:29:56 +0000
4632+++ openlp/plugins/songs/lib/importers/wordsofworship.py 2017-12-29 10:26:06 +0000
4633@@ -4,7 +4,7 @@
4634 ###############################################################################
4635 # OpenLP - Open Source Lyrics Projection #
4636 # --------------------------------------------------------------------------- #
4637-# Copyright (c) 2008-2017 OpenLP Developers #
4638+# Copyright (c) 2008-2018 OpenLP Developers #
4639 # --------------------------------------------------------------------------- #
4640 # This program is free software; you can redistribute it and/or modify it #
4641 # under the terms of the GNU General Public License as published by the Free #
4642@@ -23,9 +23,8 @@
4643 The :mod:`wordsofworship` module provides the functionality for importing Words of
4644 Worship songs into the OpenLP database.
4645 """
4646+import logging
4647 import os
4648-import logging
4649-from openlp.core.common.path import Path
4650
4651 from openlp.core.common.i18n import translate
4652 from openlp.plugins.songs.lib.importers.songimport import SongImport
4653
4654=== modified file 'openlp/plugins/songs/lib/importers/worshipassistant.py'
4655--- openlp/plugins/songs/lib/importers/worshipassistant.py 2017-10-10 02:29:56 +0000
4656+++ openlp/plugins/songs/lib/importers/worshipassistant.py 2017-12-29 10:26:06 +0000
4657@@ -4,7 +4,7 @@
4658 ###############################################################################
4659 # OpenLP - Open Source Lyrics Projection #
4660 # --------------------------------------------------------------------------- #
4661-# Copyright (c) 2008-2017 OpenLP Developers #
4662+# Copyright (c) 2008-2018 OpenLP Developers #
4663 # --------------------------------------------------------------------------- #
4664 # This program is free software; you can redistribute it and/or modify it #
4665 # under the terms of the GNU General Public License as published by the Free #
4666
4667=== modified file 'openlp/plugins/songs/lib/importers/worshipcenterpro.py'
4668--- openlp/plugins/songs/lib/importers/worshipcenterpro.py 2017-10-07 07:05:07 +0000
4669+++ openlp/plugins/songs/lib/importers/worshipcenterpro.py 2017-12-29 10:26:06 +0000
4670@@ -4,7 +4,7 @@
4671 ###############################################################################
4672 # OpenLP - Open Source Lyrics Projection #
4673 # --------------------------------------------------------------------------- #
4674-# Copyright (c) 2008-2017 OpenLP Developers #
4675+# Copyright (c) 2008-2018 OpenLP Developers #
4676 # --------------------------------------------------------------------------- #
4677 # This program is free software; you can redistribute it and/or modify it #
4678 # under the terms of the GNU General Public License as published by the Free #
4679@@ -25,6 +25,7 @@
4680 """
4681 import logging
4682 import re
4683+
4684 import pyodbc
4685
4686 from openlp.core.common.i18n import translate
4687
4688=== modified file 'openlp/plugins/songs/lib/importers/zionworx.py'
4689--- openlp/plugins/songs/lib/importers/zionworx.py 2017-10-28 18:58:34 +0000
4690+++ openlp/plugins/songs/lib/importers/zionworx.py 2017-12-29 10:26:06 +0000
4691@@ -4,7 +4,7 @@
4692 ###############################################################################
4693 # OpenLP - Open Source Lyrics Projection #
4694 # --------------------------------------------------------------------------- #
4695-# Copyright (c) 2008-2017 OpenLP Developers #
4696+# Copyright (c) 2008-2018 OpenLP Developers #
4697 # --------------------------------------------------------------------------- #
4698 # This program is free software; you can redistribute it and/or modify it #
4699 # under the terms of the GNU General Public License as published by the Free #
4700
4701=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
4702--- openlp/plugins/songs/lib/mediaitem.py 2017-10-10 02:29:56 +0000
4703+++ openlp/plugins/songs/lib/mediaitem.py 2017-12-29 10:26:06 +0000
4704@@ -4,7 +4,7 @@
4705 ###############################################################################
4706 # OpenLP - Open Source Lyrics Projection #
4707 # --------------------------------------------------------------------------- #
4708-# Copyright (c) 2008-2017 OpenLP Developers #
4709+# Copyright (c) 2008-2018 OpenLP Developers #
4710 # --------------------------------------------------------------------------- #
4711 # This program is free software; you can redistribute it and/or modify it #
4712 # under the terms of the GNU General Public License as published by the Free #
4713
4714=== modified file 'openlp/plugins/songs/lib/openlyricsexport.py'
4715--- openlp/plugins/songs/lib/openlyricsexport.py 2017-10-23 22:09:57 +0000
4716+++ openlp/plugins/songs/lib/openlyricsexport.py 2017-12-29 10:26:06 +0000
4717@@ -4,7 +4,7 @@
4718 ###############################################################################
4719 # OpenLP - Open Source Lyrics Projection #
4720 # --------------------------------------------------------------------------- #
4721-# Copyright (c) 2008-2017 OpenLP Developers #
4722+# Copyright (c) 2008-2018 OpenLP Developers #
4723 # --------------------------------------------------------------------------- #
4724 # This program is free software; you can redistribute it and/or modify it #
4725 # under the terms of the GNU General Public License as published by the Free #
4726@@ -29,8 +29,8 @@
4727
4728 from openlp.core.common import clean_filename
4729 from openlp.core.common.i18n import translate
4730+from openlp.core.common.mixins import RegistryProperties
4731 from openlp.core.common.path import create_paths
4732-from openlp.core.common.mixins import RegistryProperties
4733 from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics
4734
4735 log = logging.getLogger(__name__)
4736
4737=== modified file 'openlp/plugins/songs/lib/openlyricsxml.py'
4738--- openlp/plugins/songs/lib/openlyricsxml.py 2017-10-28 10:04:09 +0000
4739+++ openlp/plugins/songs/lib/openlyricsxml.py 2017-12-29 10:26:06 +0000
4740@@ -4,7 +4,7 @@
4741 ###############################################################################
4742 # OpenLP - Open Source Lyrics Projection #
4743 # --------------------------------------------------------------------------- #
4744-# Copyright (c) 2008-2017 OpenLP Developers #
4745+# Copyright (c) 2008-2018 OpenLP Developers #
4746 # --------------------------------------------------------------------------- #
4747 # This program is free software; you can redistribute it and/or modify it #
4748 # under the terms of the GNU General Public License as published by the Free #
4749@@ -63,8 +63,8 @@
4750
4751 from openlp.core.common.i18n import translate
4752 from openlp.core.common.settings import Settings
4753+from openlp.core.lib import FormattingTags
4754 from openlp.core.version import get_version
4755-from openlp.core.lib import FormattingTags
4756 from openlp.plugins.songs.lib import VerseType, clean_song
4757 from openlp.plugins.songs.lib.db import Author, AuthorType, Book, Song, Topic
4758
4759
4760=== modified file 'openlp/plugins/songs/lib/songcompare.py'
4761--- openlp/plugins/songs/lib/songcompare.py 2016-12-31 11:01:36 +0000
4762+++ openlp/plugins/songs/lib/songcompare.py 2017-12-29 10:26:06 +0000
4763@@ -4,7 +4,7 @@
4764 ###############################################################################
4765 # OpenLP - Open Source Lyrics Projection #
4766 # --------------------------------------------------------------------------- #
4767-# Copyright (c) 2008-2017 OpenLP Developers #
4768+# Copyright (c) 2008-2018 OpenLP Developers #
4769 # --------------------------------------------------------------------------- #
4770 # This program is free software; you can redistribute it and/or modify it #
4771 # under the terms of the GNU General Public License as published by the Free #
4772
4773=== modified file 'openlp/plugins/songs/lib/songselect.py'
4774--- openlp/plugins/songs/lib/songselect.py 2017-03-10 05:42:38 +0000
4775+++ openlp/plugins/songs/lib/songselect.py 2017-12-29 10:26:06 +0000
4776@@ -4,7 +4,7 @@
4777 ###############################################################################
4778 # OpenLP - Open Source Lyrics Projection #
4779 # --------------------------------------------------------------------------- #
4780-# Copyright (c) 2008-2017 OpenLP Developers #
4781+# Copyright (c) 2008-2018 OpenLP Developers #
4782 # --------------------------------------------------------------------------- #
4783 # This program is free software; you can redistribute it and/or modify it #
4784 # under the terms of the GNU General Public License as published by the Free #
4785@@ -25,11 +25,11 @@
4786 import logging
4787 import random
4788 import re
4789+from html import unescape
4790+from html.parser import HTMLParser
4791 from http.cookiejar import CookieJar
4792 from urllib.parse import urlencode
4793 from urllib.request import HTTPCookieProcessor, URLError, build_opener
4794-from html.parser import HTMLParser
4795-from html import unescape
4796
4797 from bs4 import BeautifulSoup, NavigableString
4798
4799
4800=== modified file 'openlp/plugins/songs/lib/songstab.py'
4801--- openlp/plugins/songs/lib/songstab.py 2017-10-07 07:05:07 +0000
4802+++ openlp/plugins/songs/lib/songstab.py 2017-12-29 10:26:06 +0000
4803@@ -4,7 +4,7 @@
4804 ###############################################################################
4805 # OpenLP - Open Source Lyrics Projection #
4806 # --------------------------------------------------------------------------- #
4807-# Copyright (c) 2008-2017 OpenLP Developers #
4808+# Copyright (c) 2008-2018 OpenLP Developers #
4809 # --------------------------------------------------------------------------- #
4810 # This program is free software; you can redistribute it and/or modify it #
4811 # under the terms of the GNU General Public License as published by the Free #
4812
4813=== modified file 'openlp/plugins/songs/lib/ui.py'
4814--- openlp/plugins/songs/lib/ui.py 2017-10-07 07:05:07 +0000
4815+++ openlp/plugins/songs/lib/ui.py 2017-12-29 10:26:06 +0000
4816@@ -4,7 +4,7 @@
4817 ###############################################################################
4818 # OpenLP - Open Source Lyrics Projection #
4819 # --------------------------------------------------------------------------- #
4820-# Copyright (c) 2008-2017 OpenLP Developers #
4821+# Copyright (c) 2008-2018 OpenLP Developers #
4822 # --------------------------------------------------------------------------- #
4823 # This program is free software; you can redistribute it and/or modify it #
4824 # under the terms of the GNU General Public License as published by the Free #
4825
4826=== modified file 'openlp/plugins/songs/lib/upgrade.py'
4827--- openlp/plugins/songs/lib/upgrade.py 2017-10-10 02:40:41 +0000
4828+++ openlp/plugins/songs/lib/upgrade.py 2017-12-29 10:26:06 +0000
4829@@ -4,7 +4,7 @@
4830 ###############################################################################
4831 # OpenLP - Open Source Lyrics Projection #
4832 # --------------------------------------------------------------------------- #
4833-# Copyright (c) 2008-2017 OpenLP Developers #
4834+# Copyright (c) 2008-2018 OpenLP Developers #
4835 # --------------------------------------------------------------------------- #
4836 # This program is free software; you can redistribute it and/or modify it #
4837 # under the terms of the GNU General Public License as published by the Free #
4838
4839=== modified file 'openlp/plugins/songs/reporting.py'
4840--- openlp/plugins/songs/reporting.py 2017-10-23 22:09:57 +0000
4841+++ openlp/plugins/songs/reporting.py 2017-12-29 10:26:06 +0000
4842@@ -4,7 +4,7 @@
4843 ###############################################################################
4844 # OpenLP - Open Source Lyrics Projection #
4845 # --------------------------------------------------------------------------- #
4846-# Copyright (c) 2008-2017 OpenLP Developers #
4847+# Copyright (c) 2008-2018 OpenLP Developers #
4848 # --------------------------------------------------------------------------- #
4849 # This program is free software; you can redistribute it and/or modify it #
4850 # under the terms of the GNU General Public License as published by the Free #
4851
4852=== modified file 'openlp/plugins/songs/songsplugin.py'
4853--- openlp/plugins/songs/songsplugin.py 2017-12-22 21:20:49 +0000
4854+++ openlp/plugins/songs/songsplugin.py 2017-12-29 10:26:06 +0000
4855@@ -4,7 +4,7 @@
4856 ###############################################################################
4857 # OpenLP - Open Source Lyrics Projection #
4858 # --------------------------------------------------------------------------- #
4859-# Copyright (c) 2008-2017 OpenLP Developers #
4860+# Copyright (c) 2008-2018 OpenLP Developers #
4861 # --------------------------------------------------------------------------- #
4862 # This program is free software; you can redistribute it and/or modify it #
4863 # under the terms of the GNU General Public License as published by the Free #
4864@@ -25,7 +25,6 @@
4865 """
4866
4867 import logging
4868-import os
4869 import sqlite3
4870 from pathlib import Path
4871 from tempfile import gettempdir
4872
4873=== modified file 'openlp/plugins/songusage/__init__.py'
4874--- openlp/plugins/songusage/__init__.py 2016-12-31 11:01:36 +0000
4875+++ openlp/plugins/songusage/__init__.py 2017-12-29 10:26:06 +0000
4876@@ -4,7 +4,7 @@
4877 ###############################################################################
4878 # OpenLP - Open Source Lyrics Projection #
4879 # --------------------------------------------------------------------------- #
4880-# Copyright (c) 2008-2017 OpenLP Developers #
4881+# Copyright (c) 2008-2018 OpenLP Developers #
4882 # --------------------------------------------------------------------------- #
4883 # This program is free software; you can redistribute it and/or modify it #
4884 # under the terms of the GNU General Public License as published by the Free #
4885
4886=== modified file 'openlp/plugins/songusage/forms/__init__.py'
4887--- openlp/plugins/songusage/forms/__init__.py 2016-12-31 11:01:36 +0000
4888+++ openlp/plugins/songusage/forms/__init__.py 2017-12-29 10:26:06 +0000
4889@@ -4,7 +4,7 @@
4890 ###############################################################################
4891 # OpenLP - Open Source Lyrics Projection #
4892 # --------------------------------------------------------------------------- #
4893-# Copyright (c) 2008-2017 OpenLP Developers #
4894+# Copyright (c) 2008-2018 OpenLP Developers #
4895 # --------------------------------------------------------------------------- #
4896 # This program is free software; you can redistribute it and/or modify it #
4897 # under the terms of the GNU General Public License as published by the Free #
4898
4899=== modified file 'openlp/plugins/songusage/forms/songusagedeletedialog.py'
4900--- openlp/plugins/songusage/forms/songusagedeletedialog.py 2017-10-07 07:05:07 +0000
4901+++ openlp/plugins/songusage/forms/songusagedeletedialog.py 2017-12-29 10:26:06 +0000
4902@@ -4,7 +4,7 @@
4903 ###############################################################################
4904 # OpenLP - Open Source Lyrics Projection #
4905 # --------------------------------------------------------------------------- #
4906-# Copyright (c) 2008-2017 OpenLP Developers #
4907+# Copyright (c) 2008-2018 OpenLP Developers #
4908 # --------------------------------------------------------------------------- #
4909 # This program is free software; you can redistribute it and/or modify it #
4910 # under the terms of the GNU General Public License as published by the Free #
4911
4912=== modified file 'openlp/plugins/songusage/forms/songusagedeleteform.py'
4913--- openlp/plugins/songusage/forms/songusagedeleteform.py 2017-10-23 22:09:57 +0000
4914+++ openlp/plugins/songusage/forms/songusagedeleteform.py 2017-12-29 10:26:06 +0000
4915@@ -4,7 +4,7 @@
4916 ###############################################################################
4917 # OpenLP - Open Source Lyrics Projection #
4918 # --------------------------------------------------------------------------- #
4919-# Copyright (c) 2008-2017 OpenLP Developers #
4920+# Copyright (c) 2008-2018 OpenLP Developers #
4921 # --------------------------------------------------------------------------- #
4922 # This program is free software; you can redistribute it and/or modify it #
4923 # under the terms of the GNU General Public License as published by the Free #
4924@@ -24,8 +24,8 @@
4925
4926 from openlp.core.common.i18n import translate
4927 from openlp.core.common.mixins import RegistryProperties
4928+from openlp.plugins.songusage.forms.songusagedeletedialog import Ui_SongUsageDeleteDialog
4929 from openlp.plugins.songusage.lib.db import SongUsageItem
4930-from openlp.plugins.songusage.forms.songusagedeletedialog import Ui_SongUsageDeleteDialog
4931
4932
4933 class SongUsageDeleteForm(QtWidgets.QDialog, Ui_SongUsageDeleteDialog, RegistryProperties):
4934
4935=== modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py'
4936--- openlp/plugins/songusage/forms/songusagedetaildialog.py 2017-10-23 22:09:57 +0000
4937+++ openlp/plugins/songusage/forms/songusagedetaildialog.py 2017-12-29 10:26:06 +0000
4938@@ -4,7 +4,7 @@
4939 ###############################################################################
4940 # OpenLP - Open Source Lyrics Projection #
4941 # --------------------------------------------------------------------------- #
4942-# Copyright (c) 2008-2017 OpenLP Developers #
4943+# Copyright (c) 2008-2018 OpenLP Developers #
4944 # --------------------------------------------------------------------------- #
4945 # This program is free software; you can redistribute it and/or modify it #
4946 # under the terms of the GNU General Public License as published by the Free #
4947
4948=== modified file 'openlp/plugins/songusage/forms/songusagedetailform.py'
4949--- openlp/plugins/songusage/forms/songusagedetailform.py 2017-11-02 21:46:02 +0000
4950+++ openlp/plugins/songusage/forms/songusagedetailform.py 2017-12-29 10:26:06 +0000
4951@@ -4,7 +4,7 @@
4952 ###############################################################################
4953 # OpenLP - Open Source Lyrics Projection #
4954 # --------------------------------------------------------------------------- #
4955-# Copyright (c) 2008-2017 OpenLP Developers #
4956+# Copyright (c) 2008-2018 OpenLP Developers #
4957 # --------------------------------------------------------------------------- #
4958 # This program is free software; you can redistribute it and/or modify it #
4959 # under the terms of the GNU General Public License as published by the Free #
4960@@ -26,8 +26,8 @@
4961
4962 from openlp.core.common.i18n import translate
4963 from openlp.core.common.mixins import RegistryProperties
4964+from openlp.core.common.path import create_paths
4965 from openlp.core.common.settings import Settings
4966-from openlp.core.common.path import create_paths
4967 from openlp.core.lib.ui import critical_error_message_box
4968 from openlp.plugins.songusage.lib.db import SongUsageItem
4969 from .songusagedetaildialog import Ui_SongUsageDetailDialog
4970
4971=== modified file 'openlp/plugins/songusage/lib/__init__.py'
4972--- openlp/plugins/songusage/lib/__init__.py 2016-12-31 11:01:36 +0000
4973+++ openlp/plugins/songusage/lib/__init__.py 2017-12-29 10:26:06 +0000
4974@@ -4,7 +4,7 @@
4975 ###############################################################################
4976 # OpenLP - Open Source Lyrics Projection #
4977 # --------------------------------------------------------------------------- #
4978-# Copyright (c) 2008-2017 OpenLP Developers #
4979+# Copyright (c) 2008-2018 OpenLP Developers #
4980 # --------------------------------------------------------------------------- #
4981 # This program is free software; you can redistribute it and/or modify it #
4982 # under the terms of the GNU General Public License as published by the Free #
4983
4984=== modified file 'openlp/plugins/songusage/lib/db.py'
4985--- openlp/plugins/songusage/lib/db.py 2016-12-31 11:01:36 +0000
4986+++ openlp/plugins/songusage/lib/db.py 2017-12-29 10:26:06 +0000
4987@@ -4,7 +4,7 @@
4988 ###############################################################################
4989 # OpenLP - Open Source Lyrics Projection #
4990 # --------------------------------------------------------------------------- #
4991-# Copyright (c) 2008-2017 OpenLP Developers #
4992+# Copyright (c) 2008-2018 OpenLP Developers #
4993 # --------------------------------------------------------------------------- #
4994 # This program is free software; you can redistribute it and/or modify it #
4995 # under the terms of the GNU General Public License as published by the Free #
4996
4997=== modified file 'openlp/plugins/songusage/lib/upgrade.py'
4998--- openlp/plugins/songusage/lib/upgrade.py 2017-06-09 12:12:39 +0000
4999+++ openlp/plugins/songusage/lib/upgrade.py 2017-12-29 10:26:06 +0000
5000@@ -4,7 +4,7 @@
The diff has been truncated for viewing.