Merge lp:~trb143/openlp/textcleanups into lp:openlp
- textcleanups
- 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 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Raoul Snyman | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2017-12-29.
Commit message
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:/
https:/
https:/
https:/
https:/
https:/
https:/
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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 6 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 7 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 9 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 10 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 11 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 12 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 13 | 11 | 11 | ||
| 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 | 5 | ############################################################################### | 5 | ############################################################################### |
| 19 | 6 | # OpenLP - Open Source Lyrics Projection # | 6 | # OpenLP - Open Source Lyrics Projection # |
| 20 | 7 | # --------------------------------------------------------------------------- # | 7 | # --------------------------------------------------------------------------- # |
| 22 | 8 | # Copyright (c) 2008-2017 OpenLP Developers # | 8 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 23 | 9 | # --------------------------------------------------------------------------- # | 9 | # --------------------------------------------------------------------------- # |
| 24 | 10 | # This program is free software; you can redistribute it and/or modify it # | 10 | # This program is free software; you can redistribute it and/or modify it # |
| 25 | 11 | # under the terms of the GNU General Public License as published by the Free # | 11 | # under the terms of the GNU General Public License as published by the Free # |
| 26 | 12 | 12 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 32 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 33 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 35 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 36 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 37 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 38 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 39 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 45 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 46 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 48 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 49 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 50 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 51 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 52 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 58 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 59 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 61 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 62 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 63 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 64 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 65 | @@ -20,9 +20,9 @@ | |||
| 66 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 67 | 21 | ############################################################################### | 21 | ############################################################################### |
| 68 | 22 | 22 | ||
| 69 | 23 | from openlp.core.api.http import register_endpoint, requires_auth | ||
| 70 | 23 | from openlp.core.api.http.endpoint import Endpoint | 24 | from openlp.core.api.http.endpoint import Endpoint |
| 72 | 24 | from openlp.core.api.http import register_endpoint, requires_auth | 25 | from openlp.core.api.poll import Poller |
| 73 | 25 | from openlp.core.api.tab import ApiTab | 26 | from openlp.core.api.tab import ApiTab |
| 74 | 26 | from openlp.core.api.poll import Poller | ||
| 75 | 27 | 27 | ||
| 76 | 28 | __all__ = ['Endpoint', 'ApiTab', 'register_endpoint', 'requires_auth'] | 28 | __all__ = ['Endpoint', 'ApiTab', 'register_endpoint', 'requires_auth'] |
| 77 | 29 | 29 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 83 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 84 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 86 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 87 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 88 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 89 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 90 | @@ -25,8 +25,8 @@ | |||
| 91 | 25 | from zipfile import ZipFile | 25 | from zipfile import ZipFile |
| 92 | 26 | 26 | ||
| 93 | 27 | from openlp.core.common.applocation import AppLocation | 27 | from openlp.core.common.applocation import AppLocation |
| 94 | 28 | from openlp.core.common.httputils import url_get_file, get_web_page, get_url_file_size | ||
| 95 | 28 | from openlp.core.common.registry import Registry | 29 | from openlp.core.common.registry import Registry |
| 96 | 29 | from openlp.core.common.httputils import url_get_file, get_web_page, get_url_file_size | ||
| 97 | 30 | 30 | ||
| 98 | 31 | 31 | ||
| 99 | 32 | def deploy_zipfile(app_root_path, zip_name): | 32 | def deploy_zipfile(app_root_path, zip_name): |
| 100 | 33 | 33 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 106 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 107 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 109 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 110 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 111 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 112 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 113 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 119 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 120 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 122 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 123 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 124 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 125 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 126 | @@ -19,14 +19,14 @@ | |||
| 127 | 19 | # with this program; if not, write to the Free Software Foundation, Inc., 59 # | 19 | # with this program; if not, write to the Free Software Foundation, Inc., 59 # |
| 128 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 129 | 21 | ############################################################################### | 21 | ############################################################################### |
| 130 | 22 | import json | ||
| 131 | 22 | import logging | 23 | import logging |
| 132 | 23 | import os | 24 | import os |
| 133 | 25 | import urllib.error | ||
| 134 | 24 | import urllib.request | 26 | import urllib.request |
| 135 | 25 | import urllib.error | ||
| 136 | 26 | import json | ||
| 137 | 27 | 27 | ||
| 138 | 28 | from openlp.core.api.http import requires_auth | ||
| 139 | 28 | from openlp.core.api.http.endpoint import Endpoint | 29 | from openlp.core.api.http.endpoint import Endpoint |
| 140 | 29 | from openlp.core.api.http import requires_auth | ||
| 141 | 30 | from openlp.core.common.applocation import AppLocation | 30 | from openlp.core.common.applocation import AppLocation |
| 142 | 31 | from openlp.core.common.path import Path | 31 | from openlp.core.common.path import Path |
| 143 | 32 | from openlp.core.common.registry import Registry | 32 | from openlp.core.common.registry import Registry |
| 144 | 33 | 33 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 150 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 151 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 153 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 154 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 155 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 156 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 157 | @@ -27,11 +27,10 @@ | |||
| 158 | 27 | 27 | ||
| 159 | 28 | from openlp.core.api.http import requires_auth | 28 | from openlp.core.api.http import requires_auth |
| 160 | 29 | from openlp.core.api.http.endpoint import Endpoint | 29 | from openlp.core.api.http.endpoint import Endpoint |
| 161 | 30 | from openlp.core.common.i18n import UiStrings, translate | ||
| 162 | 30 | from openlp.core.common.registry import Registry | 31 | from openlp.core.common.registry import Registry |
| 163 | 31 | from openlp.core.common.i18n import UiStrings, translate | ||
| 164 | 32 | from openlp.core.lib import PluginStatus, StringContent, image_to_byte | 32 | from openlp.core.lib import PluginStatus, StringContent, image_to_byte |
| 165 | 33 | 33 | ||
| 166 | 34 | |||
| 167 | 35 | template_dir = 'templates' | 34 | template_dir = 'templates' |
| 168 | 36 | static_dir = 'static' | 35 | static_dir = 'static' |
| 169 | 37 | blank_dir = os.path.join(static_dir, 'index') | 36 | blank_dir = os.path.join(static_dir, 'index') |
| 170 | 38 | 37 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 176 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 177 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 179 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 180 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 181 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 182 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 183 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 189 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 190 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 192 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 193 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 194 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 195 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 196 | @@ -21,9 +21,8 @@ | |||
| 197 | 21 | ############################################################################### | 21 | ############################################################################### |
| 198 | 22 | import logging | 22 | import logging |
| 199 | 23 | 23 | ||
| 200 | 24 | from openlp.core.api.endpoint.core import TRANSLATED_STRINGS | ||
| 201 | 24 | from openlp.core.api.http.endpoint import Endpoint | 25 | from openlp.core.api.http.endpoint import Endpoint |
| 202 | 25 | from openlp.core.api.endpoint.core import TRANSLATED_STRINGS | ||
| 203 | 26 | |||
| 204 | 27 | 26 | ||
| 205 | 28 | log = logging.getLogger(__name__) | 27 | log = logging.getLogger(__name__) |
| 206 | 29 | 28 | ||
| 207 | 30 | 29 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 213 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 214 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 216 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 217 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 218 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 219 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 220 | @@ -19,14 +19,13 @@ | |||
| 221 | 19 | # with this program; if not, write to the Free Software Foundation, Inc., 59 # | 19 | # with this program; if not, write to the Free Software Foundation, Inc., 59 # |
| 222 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 223 | 21 | ############################################################################### | 21 | ############################################################################### |
| 224 | 22 | import json | ||
| 225 | 22 | import logging | 23 | import logging |
| 226 | 23 | import json | ||
| 227 | 24 | 24 | ||
| 228 | 25 | from openlp.core.api.http import requires_auth | 25 | from openlp.core.api.http import requires_auth |
| 229 | 26 | from openlp.core.api.http.endpoint import Endpoint | 26 | from openlp.core.api.http.endpoint import Endpoint |
| 230 | 27 | from openlp.core.common.registry import Registry | 27 | from openlp.core.common.registry import Registry |
| 231 | 28 | 28 | ||
| 232 | 29 | |||
| 233 | 30 | log = logging.getLogger(__name__) | 29 | log = logging.getLogger(__name__) |
| 234 | 31 | 30 | ||
| 235 | 32 | service_endpoint = Endpoint('service') | 31 | service_endpoint = Endpoint('service') |
| 236 | 33 | 32 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 242 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 243 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 245 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 246 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 247 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 248 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 249 | @@ -22,10 +22,11 @@ | |||
| 250 | 22 | 22 | ||
| 251 | 23 | import base64 | 23 | import base64 |
| 252 | 24 | from functools import wraps | 24 | from functools import wraps |
| 253 | 25 | |||
| 254 | 25 | from webob import Response | 26 | from webob import Response |
| 255 | 26 | 27 | ||
| 256 | 28 | from openlp.core.api.http.wsgiapp import WSGIApplication | ||
| 257 | 27 | from openlp.core.common.settings import Settings | 29 | from openlp.core.common.settings import Settings |
| 258 | 28 | from openlp.core.api.http.wsgiapp import WSGIApplication | ||
| 259 | 29 | from .errors import NotFound, ServerError, HttpError | 30 | from .errors import NotFound, ServerError, HttpError |
| 260 | 30 | 31 | ||
| 261 | 31 | application = WSGIApplication('api') | 32 | application = WSGIApplication('api') |
| 262 | 32 | 33 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 268 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 269 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 271 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 272 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 273 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 274 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 275 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 281 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 282 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 284 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 285 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 286 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 287 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 288 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 294 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 295 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 297 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 298 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 299 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 300 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 301 | @@ -32,18 +32,18 @@ | |||
| 302 | 32 | from openlp.core.api.deploy import download_and_check, download_sha256 | 32 | from openlp.core.api.deploy import download_and_check, download_sha256 |
| 303 | 33 | from openlp.core.api.endpoint.controller import controller_endpoint, api_controller_endpoint | 33 | from openlp.core.api.endpoint.controller import controller_endpoint, api_controller_endpoint |
| 304 | 34 | from openlp.core.api.endpoint.core import chords_endpoint, stage_endpoint, blank_endpoint, main_endpoint | 34 | from openlp.core.api.endpoint.core import chords_endpoint, stage_endpoint, blank_endpoint, main_endpoint |
| 305 | 35 | from openlp.core.api.endpoint.remote import remote_endpoint | ||
| 306 | 35 | from openlp.core.api.endpoint.service import service_endpoint, api_service_endpoint | 36 | from openlp.core.api.endpoint.service import service_endpoint, api_service_endpoint |
| 308 | 36 | from openlp.core.api.endpoint.remote import remote_endpoint | 37 | from openlp.core.api.http import application |
| 309 | 37 | from openlp.core.api.http import register_endpoint | 38 | from openlp.core.api.http import register_endpoint |
| 310 | 38 | from openlp.core.api.http import application | ||
| 311 | 39 | from openlp.core.api.poll import Poller | 39 | from openlp.core.api.poll import Poller |
| 312 | 40 | from openlp.core.common.applocation import AppLocation | 40 | from openlp.core.common.applocation import AppLocation |
| 313 | 41 | from openlp.core.common.i18n import UiStrings | 41 | from openlp.core.common.i18n import UiStrings |
| 314 | 42 | from openlp.core.common.i18n import translate | ||
| 315 | 42 | from openlp.core.common.mixins import LogMixin, RegistryProperties | 43 | from openlp.core.common.mixins import LogMixin, RegistryProperties |
| 316 | 43 | from openlp.core.common.path import create_paths | 44 | from openlp.core.common.path import create_paths |
| 317 | 44 | from openlp.core.common.registry import Registry, RegistryBase | 45 | from openlp.core.common.registry import Registry, RegistryBase |
| 318 | 45 | from openlp.core.common.settings import Settings | 46 | from openlp.core.common.settings import Settings |
| 319 | 46 | from openlp.core.common.i18n import translate | ||
| 320 | 47 | 47 | ||
| 321 | 48 | log = logging.getLogger(__name__) | 48 | log = logging.getLogger(__name__) |
| 322 | 49 | 49 | ||
| 323 | 50 | 50 | ||
| 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 | 5 | ############################################################################### | 5 | ############################################################################### |
| 329 | 6 | # OpenLP - Open Source Lyrics Projection # | 6 | # OpenLP - Open Source Lyrics Projection # |
| 330 | 7 | # --------------------------------------------------------------------------- # | 7 | # --------------------------------------------------------------------------- # |
| 332 | 8 | # Copyright (c) 2008-2017 OpenLP Developers # | 8 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 333 | 9 | # --------------------------------------------------------------------------- # | 9 | # --------------------------------------------------------------------------- # |
| 334 | 10 | # This program is free software; you can redistribute it and/or modify it # | 10 | # This program is free software; you can redistribute it and/or modify it # |
| 335 | 11 | # under the terms of the GNU General Public License as published by the Free # | 11 | # under the terms of the GNU General Public License as published by the Free # |
| 336 | @@ -30,9 +30,8 @@ | |||
| 337 | 30 | from webob import Request, Response | 30 | from webob import Request, Response |
| 338 | 31 | from webob.static import DirectoryApp | 31 | from webob.static import DirectoryApp |
| 339 | 32 | 32 | ||
| 340 | 33 | from openlp.core.api.http.errors import HttpError, NotFound, ServerError | ||
| 341 | 33 | from openlp.core.common.applocation import AppLocation | 34 | from openlp.core.common.applocation import AppLocation |
| 342 | 34 | from openlp.core.api.http.errors import HttpError, NotFound, ServerError | ||
| 343 | 35 | |||
| 344 | 36 | 35 | ||
| 345 | 37 | ARGS_REGEX = re.compile(r'''\{(\w+)(?::([^}]+))?\}''', re.VERBOSE) | 36 | ARGS_REGEX = re.compile(r'''\{(\w+)(?::([^}]+))?\}''', re.VERBOSE) |
| 346 | 38 | 37 | ||
| 347 | 39 | 38 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 353 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 354 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 356 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 357 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 358 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 359 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 360 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 366 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 367 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 369 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 370 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 371 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 372 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 373 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 379 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 380 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 382 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 383 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 384 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 385 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 386 | @@ -24,11 +24,11 @@ | |||
| 387 | 24 | with OpenLP. It uses JSON to communicate with the remotes. | 24 | with OpenLP. It uses JSON to communicate with the remotes. |
| 388 | 25 | """ | 25 | """ |
| 389 | 26 | import asyncio | 26 | import asyncio |
| 390 | 27 | import websockets | ||
| 391 | 28 | import json | 27 | import json |
| 392 | 29 | import logging | 28 | import logging |
| 393 | 30 | import time | 29 | import time |
| 394 | 31 | 30 | ||
| 395 | 31 | import websockets | ||
| 396 | 32 | from PyQt5 import QtCore | 32 | from PyQt5 import QtCore |
| 397 | 33 | 33 | ||
| 398 | 34 | from openlp.core.common.mixins import LogMixin, RegistryProperties | 34 | from openlp.core.common.mixins import LogMixin, RegistryProperties |
| 399 | 35 | 35 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 405 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 406 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 408 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 409 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 410 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 411 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 412 | @@ -42,7 +42,6 @@ | |||
| 413 | 42 | from openlp.core.common.path import create_paths, copytree | 42 | from openlp.core.common.path import create_paths, copytree |
| 414 | 43 | from openlp.core.common.registry import Registry | 43 | from openlp.core.common.registry import Registry |
| 415 | 44 | from openlp.core.common.settings import Settings | 44 | from openlp.core.common.settings import Settings |
| 416 | 45 | from openlp.core.version import check_for_update, get_version | ||
| 417 | 46 | from openlp.core.display.screens import ScreenList | 45 | from openlp.core.display.screens import ScreenList |
| 418 | 47 | from openlp.core.resources import qInitResources | 46 | from openlp.core.resources import qInitResources |
| 419 | 48 | from openlp.core.ui import SplashScreen | 47 | from openlp.core.ui import SplashScreen |
| 420 | @@ -51,7 +50,7 @@ | |||
| 421 | 51 | from openlp.core.ui.firsttimelanguageform import FirstTimeLanguageForm | 50 | from openlp.core.ui.firsttimelanguageform import FirstTimeLanguageForm |
| 422 | 52 | from openlp.core.ui.mainwindow import MainWindow | 51 | from openlp.core.ui.mainwindow import MainWindow |
| 423 | 53 | from openlp.core.ui.style import get_application_stylesheet | 52 | from openlp.core.ui.style import get_application_stylesheet |
| 425 | 54 | 53 | from openlp.core.version import check_for_update, get_version | |
| 426 | 55 | 54 | ||
| 427 | 56 | __all__ = ['OpenLP', 'main'] | 55 | __all__ = ['OpenLP', 'main'] |
| 428 | 57 | 56 | ||
| 429 | 58 | 57 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 435 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 436 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 438 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 439 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 440 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 441 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 442 | @@ -30,13 +30,13 @@ | |||
| 443 | 30 | import re | 30 | import re |
| 444 | 31 | import sys | 31 | import sys |
| 445 | 32 | import traceback | 32 | import traceback |
| 446 | 33 | from chardet.universaldetector import UniversalDetector | ||
| 447 | 34 | from ipaddress import IPv4Address, IPv6Address, AddressValueError | 33 | from ipaddress import IPv4Address, IPv6Address, AddressValueError |
| 448 | 35 | from shutil import which | 34 | from shutil import which |
| 449 | 36 | from subprocess import check_output, CalledProcessError, STDOUT | 35 | from subprocess import check_output, CalledProcessError, STDOUT |
| 450 | 37 | 36 | ||
| 451 | 38 | from PyQt5 import QtGui | 37 | from PyQt5 import QtGui |
| 452 | 39 | from PyQt5.QtCore import QCryptographicHash as QHash | 38 | from PyQt5.QtCore import QCryptographicHash as QHash |
| 453 | 39 | from chardet.universaldetector import UniversalDetector | ||
| 454 | 40 | 40 | ||
| 455 | 41 | log = logging.getLogger(__name__ + '.__init__') | 41 | log = logging.getLogger(__name__ + '.__init__') |
| 456 | 42 | 42 | ||
| 457 | 43 | 43 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 463 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 464 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 466 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 467 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 468 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 469 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 470 | @@ -29,7 +29,6 @@ | |||
| 471 | 29 | 29 | ||
| 472 | 30 | from openlp.core.common.settings import Settings | 30 | from openlp.core.common.settings import Settings |
| 473 | 31 | 31 | ||
| 474 | 32 | |||
| 475 | 33 | log = logging.getLogger(__name__) | 32 | log = logging.getLogger(__name__) |
| 476 | 34 | 33 | ||
| 477 | 35 | 34 | ||
| 478 | 36 | 35 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 484 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 485 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 487 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 488 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 489 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 490 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 491 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 497 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 498 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 500 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 501 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 502 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 503 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 504 | @@ -27,7 +27,6 @@ | |||
| 505 | 27 | 27 | ||
| 506 | 28 | import sqlalchemy | 28 | import sqlalchemy |
| 507 | 29 | 29 | ||
| 508 | 30 | |||
| 509 | 31 | log = logging.getLogger(__name__) | 30 | log = logging.getLogger(__name__) |
| 510 | 32 | 31 | ||
| 511 | 33 | 32 | ||
| 512 | 34 | 33 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 518 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 519 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 521 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 522 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 523 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 524 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 525 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 531 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 532 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 534 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 535 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 536 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 537 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 538 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 544 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 545 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 547 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 548 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 549 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 550 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 551 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 557 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 558 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 560 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 561 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 562 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 563 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 564 | @@ -22,8 +22,8 @@ | |||
| 565 | 22 | """ | 22 | """ |
| 566 | 23 | Provide Error Handling and login Services | 23 | Provide Error Handling and login Services |
| 567 | 24 | """ | 24 | """ |
| 568 | 25 | import inspect | ||
| 569 | 25 | import logging | 26 | import logging |
| 570 | 26 | import inspect | ||
| 571 | 27 | 27 | ||
| 572 | 28 | from openlp.core.common import is_win, trace_error_handler | 28 | from openlp.core.common import is_win, trace_error_handler |
| 573 | 29 | from openlp.core.common.registry import Registry | 29 | from openlp.core.common.registry import Registry |
| 574 | 30 | 30 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 580 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 581 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 583 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 584 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 585 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 586 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 587 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 593 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 594 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 596 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 597 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 598 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 599 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 600 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 606 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 607 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 609 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 610 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 611 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 612 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 613 | @@ -23,8 +23,8 @@ | |||
| 614 | 23 | This class contains the core default settings. | 23 | This class contains the core default settings. |
| 615 | 24 | """ | 24 | """ |
| 616 | 25 | import datetime | 25 | import datetime |
| 617 | 26 | import json | ||
| 618 | 26 | import logging | 27 | import logging |
| 619 | 27 | import json | ||
| 620 | 28 | import os | 28 | import os |
| 621 | 29 | from tempfile import gettempdir | 29 | from tempfile import gettempdir |
| 622 | 30 | 30 | ||
| 623 | 31 | 31 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 629 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 630 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 632 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 633 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 634 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 635 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 636 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 642 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 643 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 645 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 646 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 647 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 648 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 649 | @@ -21,10 +21,11 @@ | |||
| 650 | 21 | ############################################################################### | 21 | ############################################################################### |
| 651 | 22 | 22 | ||
| 652 | 23 | import re | 23 | import re |
| 653 | 24 | |||
| 654 | 25 | from string import Template | 24 | from string import Template |
| 655 | 25 | |||
| 656 | 26 | from PyQt5 import QtGui, QtCore, QtWebKitWidgets | 26 | from PyQt5 import QtGui, QtCore, QtWebKitWidgets |
| 657 | 27 | 27 | ||
| 658 | 28 | from openlp.core.common import ThemeLevel | ||
| 659 | 28 | from openlp.core.common.mixins import LogMixin, RegistryProperties | 29 | from openlp.core.common.mixins import LogMixin, RegistryProperties |
| 660 | 29 | from openlp.core.common.path import path_to_str | 30 | from openlp.core.common.path import path_to_str |
| 661 | 30 | from openlp.core.common.registry import Registry, RegistryBase | 31 | from openlp.core.common.registry import Registry, RegistryBase |
| 662 | @@ -32,7 +33,6 @@ | |||
| 663 | 32 | from openlp.core.display.screens import ScreenList | 33 | from openlp.core.display.screens import ScreenList |
| 664 | 33 | from openlp.core.lib import FormattingTags, ImageSource, ItemCapabilities, ServiceItem, expand_tags, build_chords_css, \ | 34 | from openlp.core.lib import FormattingTags, ImageSource, ItemCapabilities, ServiceItem, expand_tags, build_chords_css, \ |
| 665 | 34 | build_lyrics_format_css, build_lyrics_outline_css | 35 | build_lyrics_format_css, build_lyrics_outline_css |
| 666 | 35 | from openlp.core.common import ThemeLevel | ||
| 667 | 36 | from openlp.core.ui.maindisplay import MainDisplay | 36 | from openlp.core.ui.maindisplay import MainDisplay |
| 668 | 37 | 37 | ||
| 669 | 38 | VERSE = 'The Lord said to {r}Noah{/r}: \n' \ | 38 | VERSE = 'The Lord said to {r}Noah{/r}: \n' \ |
| 670 | 39 | 39 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 676 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 677 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 679 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 680 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 681 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 682 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 683 | @@ -23,14 +23,14 @@ | |||
| 684 | 23 | The :mod:`screen` module provides management functionality for a machines' | 23 | The :mod:`screen` module provides management functionality for a machines' |
| 685 | 24 | displays. | 24 | displays. |
| 686 | 25 | """ | 25 | """ |
| 687 | 26 | import copy | ||
| 688 | 26 | import logging | 27 | import logging |
| 689 | 27 | import copy | ||
| 690 | 28 | 28 | ||
| 691 | 29 | from PyQt5 import QtCore | 29 | from PyQt5 import QtCore |
| 692 | 30 | 30 | ||
| 693 | 31 | from openlp.core.common.i18n import translate | ||
| 694 | 31 | from openlp.core.common.registry import Registry | 32 | from openlp.core.common.registry import Registry |
| 695 | 32 | from openlp.core.common.settings import Settings | 33 | from openlp.core.common.settings import Settings |
| 696 | 33 | from openlp.core.common.i18n import translate | ||
| 697 | 34 | 34 | ||
| 698 | 35 | log = logging.getLogger(__name__) | 35 | log = logging.getLogger(__name__) |
| 699 | 36 | 36 | ||
| 700 | 37 | 37 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 706 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 707 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 709 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 710 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 711 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 712 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 713 | @@ -25,8 +25,8 @@ | |||
| 714 | 25 | """ | 25 | """ |
| 715 | 26 | import html | 26 | import html |
| 716 | 27 | import logging | 27 | import logging |
| 717 | 28 | import math | ||
| 718 | 28 | import re | 29 | import re |
| 719 | 29 | import math | ||
| 720 | 30 | 30 | ||
| 721 | 31 | from PyQt5 import QtCore, QtGui, QtWidgets | 31 | from PyQt5 import QtCore, QtGui, QtWidgets |
| 722 | 32 | 32 | ||
| 723 | 33 | 33 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 729 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 730 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 732 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 733 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 734 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 735 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 736 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 742 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 743 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 745 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 746 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 747 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 748 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 749 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 755 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 756 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 758 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 759 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 760 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 761 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 762 | @@ -24,8 +24,8 @@ | |||
| 763 | 24 | """ | 24 | """ |
| 764 | 25 | import json | 25 | import json |
| 765 | 26 | 26 | ||
| 766 | 27 | from openlp.core.common.i18n import translate | ||
| 767 | 27 | from openlp.core.common.settings import Settings | 28 | from openlp.core.common.settings import Settings |
| 768 | 28 | from openlp.core.common.i18n import translate | ||
| 769 | 29 | 29 | ||
| 770 | 30 | 30 | ||
| 771 | 31 | class FormattingTags(object): | 31 | class FormattingTags(object): |
| 772 | 32 | 32 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 778 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 779 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 781 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 782 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 783 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 784 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 785 | @@ -407,8 +407,8 @@ | |||
| 786 | 407 | </html> | 407 | </html> |
| 787 | 408 | """ | 408 | """ |
| 788 | 409 | import logging | 409 | import logging |
| 789 | 410 | |||
| 790 | 411 | from string import Template | 410 | from string import Template |
| 791 | 411 | |||
| 792 | 412 | from PyQt5 import QtWebKit | 412 | from PyQt5 import QtWebKit |
| 793 | 413 | 413 | ||
| 794 | 414 | from openlp.core.common.settings import Settings | 414 | from openlp.core.common.settings import Settings |
| 795 | 415 | 415 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 801 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 802 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 804 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 805 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 806 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 807 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 808 | @@ -26,8 +26,8 @@ | |||
| 809 | 26 | """ | 26 | """ |
| 810 | 27 | import logging | 27 | import logging |
| 811 | 28 | import os | 28 | import os |
| 812 | 29 | import queue | ||
| 813 | 29 | import time | 30 | import time |
| 814 | 30 | import queue | ||
| 815 | 31 | 31 | ||
| 816 | 32 | from PyQt5 import QtCore | 32 | from PyQt5 import QtCore |
| 817 | 33 | 33 | ||
| 818 | 34 | 34 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 824 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 825 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 827 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 828 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 829 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 830 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 831 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 837 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 838 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 840 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 841 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 842 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 843 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 844 | @@ -28,8 +28,8 @@ | |||
| 845 | 28 | from PyQt5 import QtCore, QtWidgets | 28 | from PyQt5 import QtCore, QtWidgets |
| 846 | 29 | 29 | ||
| 847 | 30 | from openlp.core.common.i18n import UiStrings, translate | 30 | from openlp.core.common.i18n import UiStrings, translate |
| 848 | 31 | from openlp.core.common.mixins import RegistryProperties | ||
| 849 | 31 | from openlp.core.common.path import path_to_str, str_to_path | 32 | from openlp.core.common.path import path_to_str, str_to_path |
| 850 | 32 | from openlp.core.common.mixins import RegistryProperties | ||
| 851 | 33 | from openlp.core.common.registry import Registry | 33 | from openlp.core.common.registry import Registry |
| 852 | 34 | from openlp.core.common.settings import Settings | 34 | from openlp.core.common.settings import Settings |
| 853 | 35 | from openlp.core.lib import ServiceItem, StringContent, ServiceItemContext | 35 | from openlp.core.lib import ServiceItem, StringContent, ServiceItemContext |
| 854 | 36 | 36 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 860 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 861 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 863 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 864 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 865 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 866 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 867 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 873 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 874 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 876 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 877 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 878 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 879 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 880 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 886 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 887 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 889 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 890 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 891 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 892 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 893 | @@ -26,9 +26,9 @@ | |||
| 894 | 26 | import datetime | 26 | import datetime |
| 895 | 27 | import html | 27 | import html |
| 896 | 28 | import logging | 28 | import logging |
| 897 | 29 | import ntpath | ||
| 898 | 29 | import os | 30 | import os |
| 899 | 30 | import uuid | 31 | import uuid |
| 900 | 31 | import ntpath | ||
| 901 | 32 | 32 | ||
| 902 | 33 | from PyQt5 import QtGui | 33 | from PyQt5 import QtGui |
| 903 | 34 | 34 | ||
| 904 | 35 | 35 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 910 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 911 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 913 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 914 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 915 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 916 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 917 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 923 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 924 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 926 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 927 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 928 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 929 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 930 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 936 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 937 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 939 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 940 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 941 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 942 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 943 | @@ -32,7 +32,6 @@ | |||
| 944 | 32 | from openlp.core.common.registry import Registry | 32 | from openlp.core.common.registry import Registry |
| 945 | 33 | from openlp.core.lib import build_icon | 33 | from openlp.core.lib import build_icon |
| 946 | 34 | 34 | ||
| 947 | 35 | |||
| 948 | 36 | log = logging.getLogger(__name__) | 35 | log = logging.getLogger(__name__) |
| 949 | 37 | 36 | ||
| 950 | 38 | 37 | ||
| 951 | 39 | 38 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 957 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 958 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 960 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 961 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 962 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 963 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 964 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 970 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 971 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 973 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 974 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 975 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 976 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 977 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 983 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 984 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 986 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 987 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 988 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 989 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 990 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 996 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 997 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 999 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1000 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1001 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1002 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1003 | @@ -30,8 +30,8 @@ | |||
| 1004 | 30 | from openlp.core.common import verify_ip_address | 30 | from openlp.core.common import verify_ip_address |
| 1005 | 31 | from openlp.core.common.i18n import translate | 31 | from openlp.core.common.i18n import translate |
| 1006 | 32 | from openlp.core.lib import build_icon | 32 | from openlp.core.lib import build_icon |
| 1007 | 33 | from openlp.core.projectors.constants import PJLINK_PORT | ||
| 1008 | 33 | from openlp.core.projectors.db import Projector | 34 | from openlp.core.projectors.db import Projector |
| 1009 | 34 | from openlp.core.projectors.constants import PJLINK_PORT | ||
| 1010 | 35 | 35 | ||
| 1011 | 36 | log = logging.getLogger(__name__) | 36 | log = logging.getLogger(__name__) |
| 1012 | 37 | log.debug('editform loaded') | 37 | log.debug('editform loaded') |
| 1013 | 38 | 38 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1019 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1020 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1022 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1023 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1024 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1025 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1026 | @@ -39,8 +39,8 @@ | |||
| 1027 | 39 | E_NETWORK, E_NOT_CONNECTED, E_UNKNOWN_SOCKET_ERROR, STATUS_STRING, S_CONNECTED, S_CONNECTING, S_COOLDOWN, \ | 39 | E_NETWORK, E_NOT_CONNECTED, E_UNKNOWN_SOCKET_ERROR, STATUS_STRING, S_CONNECTED, S_CONNECTING, S_COOLDOWN, \ |
| 1028 | 40 | S_INITIALIZE, S_NOT_CONNECTED, S_OFF, S_ON, S_STANDBY, S_WARMUP | 40 | S_INITIALIZE, S_NOT_CONNECTED, S_OFF, S_ON, S_STANDBY, S_WARMUP |
| 1029 | 41 | from openlp.core.projectors.db import ProjectorDB | 41 | from openlp.core.projectors.db import ProjectorDB |
| 1030 | 42 | from openlp.core.projectors.editform import ProjectorEditForm | ||
| 1031 | 42 | from openlp.core.projectors.pjlink import PJLink, PJLinkUDP | 43 | from openlp.core.projectors.pjlink import PJLink, PJLinkUDP |
| 1032 | 43 | from openlp.core.projectors.editform import ProjectorEditForm | ||
| 1033 | 44 | from openlp.core.projectors.sourceselectform import SourceSelectTabs, SourceSelectSingle | 44 | from openlp.core.projectors.sourceselectform import SourceSelectTabs, SourceSelectSingle |
| 1034 | 45 | from openlp.core.widgets.toolbar import OpenLPToolbar | 45 | from openlp.core.widgets.toolbar import OpenLPToolbar |
| 1035 | 46 | 46 | ||
| 1036 | 47 | 47 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1042 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1043 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1045 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1046 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1047 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1048 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1049 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1055 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1056 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1058 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1059 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1060 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1061 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1062 | @@ -31,8 +31,8 @@ | |||
| 1063 | 31 | from openlp.core.common import is_macosx | 31 | from openlp.core.common import is_macosx |
| 1064 | 32 | from openlp.core.common.i18n import translate | 32 | from openlp.core.common.i18n import translate |
| 1065 | 33 | from openlp.core.lib import build_icon | 33 | from openlp.core.lib import build_icon |
| 1066 | 34 | from openlp.core.projectors.constants import PJLINK_DEFAULT_SOURCES, PJLINK_DEFAULT_CODES | ||
| 1067 | 34 | from openlp.core.projectors.db import ProjectorSource | 35 | from openlp.core.projectors.db import ProjectorSource |
| 1068 | 35 | from openlp.core.projectors.constants import PJLINK_DEFAULT_SOURCES, PJLINK_DEFAULT_CODES | ||
| 1069 | 36 | 36 | ||
| 1070 | 37 | log = logging.getLogger(__name__) | 37 | log = logging.getLogger(__name__) |
| 1071 | 38 | 38 | ||
| 1072 | 39 | 39 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1078 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1079 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1081 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1082 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1083 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1084 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1085 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1091 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1092 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1094 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1095 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1096 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1097 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1098 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1104 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1105 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1107 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1108 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1109 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1110 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1111 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1117 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1118 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1120 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1121 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1122 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1123 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1124 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1130 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1131 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1133 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1134 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1135 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1136 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1137 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1143 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1144 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1146 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1147 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1148 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1149 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1150 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1156 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1157 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1159 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1160 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1161 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1162 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1163 | @@ -26,8 +26,8 @@ | |||
| 1164 | 26 | 26 | ||
| 1165 | 27 | from PyQt5 import QtCore, QtWidgets | 27 | from PyQt5 import QtCore, QtWidgets |
| 1166 | 28 | 28 | ||
| 1167 | 29 | from openlp.core.common.i18n import translate | ||
| 1168 | 29 | from openlp.core.version import get_version | 30 | from openlp.core.version import get_version |
| 1169 | 30 | from openlp.core.common.i18n import translate | ||
| 1170 | 31 | from .aboutdialog import UiAboutDialog | 31 | from .aboutdialog import UiAboutDialog |
| 1171 | 32 | 32 | ||
| 1172 | 33 | 33 | ||
| 1173 | 34 | 34 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1179 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1180 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1182 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1183 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1184 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1185 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1186 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1192 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1193 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1195 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1196 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1197 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1198 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1199 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1205 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1206 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1208 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1209 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1210 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1211 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1212 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1218 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1219 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1221 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1222 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1223 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1224 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1225 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1231 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1232 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1234 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1235 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1236 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1237 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1238 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1244 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1245 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1247 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1248 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1249 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1250 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1251 | @@ -26,9 +26,9 @@ | |||
| 1252 | 26 | import os | 26 | import os |
| 1253 | 27 | import socket | 27 | import socket |
| 1254 | 28 | import time | 28 | import time |
| 1255 | 29 | import urllib.error | ||
| 1256 | 30 | import urllib.parse | ||
| 1257 | 29 | import urllib.request | 31 | import urllib.request |
| 1258 | 30 | import urllib.parse | ||
| 1259 | 31 | import urllib.error | ||
| 1260 | 32 | from configparser import ConfigParser, MissingSectionHeaderError, NoOptionError, NoSectionError | 32 | from configparser import ConfigParser, MissingSectionHeaderError, NoOptionError, NoSectionError |
| 1261 | 33 | from tempfile import gettempdir | 33 | from tempfile import gettempdir |
| 1262 | 34 | 34 | ||
| 1263 | @@ -36,14 +36,14 @@ | |||
| 1264 | 36 | 36 | ||
| 1265 | 37 | from openlp.core.common import clean_button_text, trace_error_handler | 37 | from openlp.core.common import clean_button_text, trace_error_handler |
| 1266 | 38 | from openlp.core.common.applocation import AppLocation | 38 | from openlp.core.common.applocation import AppLocation |
| 1267 | 39 | from openlp.core.common.httputils import get_web_page, get_url_file_size, url_get_file, CONNECTION_TIMEOUT | ||
| 1268 | 39 | from openlp.core.common.i18n import translate | 40 | from openlp.core.common.i18n import translate |
| 1269 | 41 | from openlp.core.common.mixins import RegistryProperties | ||
| 1270 | 40 | from openlp.core.common.path import Path, create_paths | 42 | from openlp.core.common.path import Path, create_paths |
| 1271 | 41 | from openlp.core.common.mixins import RegistryProperties | ||
| 1272 | 42 | from openlp.core.common.registry import Registry | 43 | from openlp.core.common.registry import Registry |
| 1273 | 43 | from openlp.core.common.settings import Settings | 44 | from openlp.core.common.settings import Settings |
| 1274 | 44 | from openlp.core.lib import PluginStatus, build_icon | 45 | from openlp.core.lib import PluginStatus, build_icon |
| 1275 | 45 | from openlp.core.lib.ui import critical_error_message_box | 46 | from openlp.core.lib.ui import critical_error_message_box |
| 1276 | 46 | from openlp.core.common.httputils import get_web_page, get_url_file_size, url_get_file, CONNECTION_TIMEOUT | ||
| 1277 | 47 | from .firsttimewizard import UiFirstTimeWizard, FirstTimePage | 47 | from .firsttimewizard import UiFirstTimeWizard, FirstTimePage |
| 1278 | 48 | 48 | ||
| 1279 | 49 | log = logging.getLogger(__name__) | 49 | log = logging.getLogger(__name__) |
| 1280 | 50 | 50 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1286 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1287 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1289 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1290 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1291 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1292 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1293 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1299 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1300 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1302 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1303 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1304 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1305 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1306 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1312 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1313 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1315 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1316 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1317 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1318 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1319 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1325 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1326 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1328 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1329 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1330 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1331 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1332 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1338 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1339 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1341 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1342 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1343 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1344 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1345 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1351 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1352 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1354 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1355 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1356 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1357 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1358 | @@ -28,8 +28,8 @@ | |||
| 1359 | 28 | 28 | ||
| 1360 | 29 | from openlp.core.common.i18n import translate | 29 | from openlp.core.common.i18n import translate |
| 1361 | 30 | from openlp.core.lib import FormattingTags | 30 | from openlp.core.lib import FormattingTags |
| 1362 | 31 | from openlp.core.ui.formattingtagcontroller import FormattingTagController | ||
| 1363 | 31 | from openlp.core.ui.formattingtagdialog import Ui_FormattingTagDialog | 32 | from openlp.core.ui.formattingtagdialog import Ui_FormattingTagDialog |
| 1364 | 32 | from openlp.core.ui.formattingtagcontroller import FormattingTagController | ||
| 1365 | 33 | 33 | ||
| 1366 | 34 | 34 | ||
| 1367 | 35 | class EditColumn(object): | 35 | class EditColumn(object): |
| 1368 | 36 | 36 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1374 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1375 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1377 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1378 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1379 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1380 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1381 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1387 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1388 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1390 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1391 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1392 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1393 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1394 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1400 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1401 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1403 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1404 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1405 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1406 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1407 | @@ -23,8 +23,6 @@ | |||
| 1408 | 23 | This is the main window, where all the action happens. | 23 | This is the main window, where all the action happens. |
| 1409 | 24 | """ | 24 | """ |
| 1410 | 25 | import logging | 25 | import logging |
| 1411 | 26 | import os | ||
| 1412 | 27 | import shutil | ||
| 1413 | 28 | import sys | 26 | import sys |
| 1414 | 29 | import time | 27 | import time |
| 1415 | 30 | from datetime import datetime | 28 | from datetime import datetime |
| 1416 | @@ -40,25 +38,24 @@ | |||
| 1417 | 40 | from openlp.core.common.actions import ActionList, CategoryOrder | 38 | from openlp.core.common.actions import ActionList, CategoryOrder |
| 1418 | 41 | from openlp.core.common.applocation import AppLocation | 39 | from openlp.core.common.applocation import AppLocation |
| 1419 | 42 | from openlp.core.common.i18n import LanguageManager, UiStrings, translate | 40 | from openlp.core.common.i18n import LanguageManager, UiStrings, translate |
| 1420 | 41 | from openlp.core.common.mixins import RegistryProperties | ||
| 1421 | 43 | from openlp.core.common.path import Path, copyfile, create_paths | 42 | from openlp.core.common.path import Path, copyfile, create_paths |
| 1422 | 44 | from openlp.core.common.mixins import RegistryProperties | ||
| 1423 | 45 | from openlp.core.common.registry import Registry | 43 | from openlp.core.common.registry import Registry |
| 1424 | 46 | from openlp.core.common.settings import Settings | 44 | from openlp.core.common.settings import Settings |
| 1425 | 45 | from openlp.core.display.renderer import Renderer | ||
| 1426 | 47 | from openlp.core.display.screens import ScreenList | 46 | from openlp.core.display.screens import ScreenList |
| 1427 | 48 | from openlp.core.display.renderer import Renderer | ||
| 1428 | 49 | from openlp.core.lib import PluginManager, ImageManager, PluginStatus, build_icon | 47 | from openlp.core.lib import PluginManager, ImageManager, PluginStatus, build_icon |
| 1429 | 50 | from openlp.core.lib.ui import create_action | 48 | from openlp.core.lib.ui import create_action |
| 1430 | 51 | from openlp.core.projectors.manager import ProjectorManager | 49 | from openlp.core.projectors.manager import ProjectorManager |
| 1431 | 52 | from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, ThemeManager, LiveController, PluginForm, \ | 50 | from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, ThemeManager, LiveController, PluginForm, \ |
| 1432 | 53 | ShortcutListForm, FormattingTagForm, PreviewController | 51 | ShortcutListForm, FormattingTagForm, PreviewController |
| 1433 | 54 | from openlp.core.ui.firsttimeform import FirstTimeForm | 52 | from openlp.core.ui.firsttimeform import FirstTimeForm |
| 1434 | 55 | from openlp.core.widgets.dialogs import FileDialog | ||
| 1435 | 56 | from openlp.core.widgets.docks import OpenLPDockWidget, MediaDockManager | ||
| 1436 | 57 | from openlp.core.ui.media import MediaController | 53 | from openlp.core.ui.media import MediaController |
| 1437 | 58 | from openlp.core.ui.printserviceform import PrintServiceForm | 54 | from openlp.core.ui.printserviceform import PrintServiceForm |
| 1438 | 59 | from openlp.core.ui.style import PROGRESSBAR_STYLE, get_library_stylesheet | 55 | from openlp.core.ui.style import PROGRESSBAR_STYLE, get_library_stylesheet |
| 1439 | 60 | from openlp.core.version import get_version | 56 | from openlp.core.version import get_version |
| 1441 | 61 | 57 | from openlp.core.widgets.dialogs import FileDialog | |
| 1442 | 58 | from openlp.core.widgets.docks import OpenLPDockWidget, MediaDockManager | ||
| 1443 | 62 | 59 | ||
| 1444 | 63 | log = logging.getLogger(__name__) | 60 | log = logging.getLogger(__name__) |
| 1445 | 64 | 61 | ||
| 1446 | 65 | 62 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1452 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1453 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1455 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1456 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1457 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1458 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1459 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1465 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1466 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1468 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1469 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1470 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1471 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1472 | @@ -24,8 +24,8 @@ | |||
| 1473 | 24 | """ | 24 | """ |
| 1474 | 25 | import logging | 25 | import logging |
| 1475 | 26 | 26 | ||
| 1476 | 27 | from openlp.core.api.http import requires_auth | ||
| 1477 | 27 | from openlp.core.api.http.endpoint import Endpoint | 28 | from openlp.core.api.http.endpoint import Endpoint |
| 1478 | 28 | from openlp.core.api.http import requires_auth | ||
| 1479 | 29 | from openlp.core.common.registry import Registry | 29 | from openlp.core.common.registry import Registry |
| 1480 | 30 | 30 | ||
| 1481 | 31 | log = logging.getLogger(__name__) | 31 | log = logging.getLogger(__name__) |
| 1482 | 32 | 32 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1488 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1489 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1491 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1492 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1493 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1494 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1495 | @@ -23,9 +23,10 @@ | |||
| 1496 | 23 | The :mod:`~openlp.core.ui.media.mediacontroller` module contains a base class for media components and other widgets | 23 | The :mod:`~openlp.core.ui.media.mediacontroller` module contains a base class for media components and other widgets |
| 1497 | 24 | related to playing media, such as sliders. | 24 | related to playing media, such as sliders. |
| 1498 | 25 | """ | 25 | """ |
| 1499 | 26 | import datetime | ||
| 1500 | 26 | import logging | 27 | import logging |
| 1501 | 27 | import os | 28 | import os |
| 1503 | 28 | import datetime | 29 | |
| 1504 | 29 | from PyQt5 import QtCore, QtWidgets | 30 | from PyQt5 import QtCore, QtWidgets |
| 1505 | 30 | 31 | ||
| 1506 | 31 | from openlp.core.api.http import register_endpoint | 32 | from openlp.core.api.http import register_endpoint |
| 1507 | @@ -37,14 +38,13 @@ | |||
| 1508 | 37 | from openlp.core.lib import ItemCapabilities | 38 | from openlp.core.lib import ItemCapabilities |
| 1509 | 38 | from openlp.core.lib.ui import critical_error_message_box | 39 | from openlp.core.lib.ui import critical_error_message_box |
| 1510 | 39 | from openlp.core.ui import DisplayControllerType | 40 | from openlp.core.ui import DisplayControllerType |
| 1511 | 41 | from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players, \ | ||
| 1512 | 42 | parse_optical_path | ||
| 1513 | 40 | from openlp.core.ui.media.endpoint import media_endpoint | 43 | from openlp.core.ui.media.endpoint import media_endpoint |
| 1514 | 44 | from openlp.core.ui.media.mediaplayer import MediaPlayer | ||
| 1515 | 41 | from openlp.core.ui.media.vendor.mediainfoWrapper import MediaInfoWrapper | 45 | from openlp.core.ui.media.vendor.mediainfoWrapper import MediaInfoWrapper |
| 1516 | 42 | from openlp.core.ui.media.mediaplayer import MediaPlayer | ||
| 1517 | 43 | from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players,\ | ||
| 1518 | 44 | parse_optical_path | ||
| 1519 | 45 | from openlp.core.widgets.toolbar import OpenLPToolbar | 46 | from openlp.core.widgets.toolbar import OpenLPToolbar |
| 1520 | 46 | 47 | ||
| 1521 | 47 | |||
| 1522 | 48 | log = logging.getLogger(__name__) | 48 | log = logging.getLogger(__name__) |
| 1523 | 49 | 49 | ||
| 1524 | 50 | TICK_TIME = 200 | 50 | TICK_TIME = 200 |
| 1525 | 51 | 51 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1531 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1532 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1534 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1535 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1536 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1537 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1538 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1544 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1545 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1547 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1548 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1549 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1550 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1551 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1557 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1558 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1560 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1561 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1562 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1563 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1564 | @@ -32,7 +32,6 @@ | |||
| 1565 | 32 | from openlp.core.ui.media import MediaState | 32 | from openlp.core.ui.media import MediaState |
| 1566 | 33 | from openlp.core.ui.media.mediaplayer import MediaPlayer | 33 | from openlp.core.ui.media.mediaplayer import MediaPlayer |
| 1567 | 34 | 34 | ||
| 1568 | 35 | |||
| 1569 | 36 | log = logging.getLogger(__name__) | 35 | log = logging.getLogger(__name__) |
| 1570 | 37 | 36 | ||
| 1571 | 38 | ADDITIONAL_EXT = { | 37 | ADDITIONAL_EXT = { |
| 1572 | 39 | 38 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1578 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1579 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1581 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1582 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1583 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1584 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1585 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1591 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1592 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1594 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1595 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1596 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1597 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1598 | 11 | 11 | ||
| 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 | 40 | """ | 40 | """ |
| 1604 | 41 | 41 | ||
| 1605 | 42 | import ctypes | 42 | import ctypes |
| 1607 | 43 | from ctypes.util import find_library | 43 | import functools |
| 1608 | 44 | import os | 44 | import os |
| 1609 | 45 | import sys | 45 | import sys |
| 1612 | 46 | import functools | 46 | from ctypes.util import find_library |
| 1611 | 47 | |||
| 1613 | 48 | # Used by EventManager in override.py | 47 | # Used by EventManager in override.py |
| 1614 | 49 | from inspect import getargspec | 48 | from inspect import getargspec |
| 1615 | 50 | 49 | ||
| 1616 | 51 | 50 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1622 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1623 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1625 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1626 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1627 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1628 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1629 | @@ -22,13 +22,14 @@ | |||
| 1630 | 22 | """ | 22 | """ |
| 1631 | 23 | The :mod:`~openlp.core.ui.media.vlcplayer` module contains our VLC component wrapper | 23 | The :mod:`~openlp.core.ui.media.vlcplayer` module contains our VLC component wrapper |
| 1632 | 24 | """ | 24 | """ |
| 1635 | 25 | from datetime import datetime | 25 | import ctypes |
| 1634 | 26 | from distutils.version import LooseVersion | ||
| 1636 | 27 | import logging | 26 | import logging |
| 1637 | 28 | import os | 27 | import os |
| 1638 | 28 | import sys | ||
| 1639 | 29 | import threading | 29 | import threading |
| 1642 | 30 | import sys | 30 | from datetime import datetime |
| 1643 | 31 | import ctypes | 31 | from distutils.version import LooseVersion |
| 1644 | 32 | |||
| 1645 | 32 | from PyQt5 import QtWidgets | 33 | from PyQt5 import QtWidgets |
| 1646 | 33 | 34 | ||
| 1647 | 34 | from openlp.core.common import is_win, is_macosx, is_linux | 35 | from openlp.core.common import is_win, is_macosx, is_linux |
| 1648 | 35 | 36 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1654 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1655 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1657 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1658 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1659 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1660 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1661 | @@ -26,8 +26,8 @@ | |||
| 1662 | 26 | 26 | ||
| 1663 | 27 | from PyQt5 import QtGui, QtWebKitWidgets | 27 | from PyQt5 import QtGui, QtWebKitWidgets |
| 1664 | 28 | 28 | ||
| 1665 | 29 | from openlp.core.common.i18n import translate | ||
| 1666 | 29 | from openlp.core.common.settings import Settings | 30 | from openlp.core.common.settings import Settings |
| 1667 | 30 | from openlp.core.common.i18n import translate | ||
| 1668 | 31 | from openlp.core.ui.media import MediaState | 31 | from openlp.core.ui.media import MediaState |
| 1669 | 32 | from openlp.core.ui.media.mediaplayer import MediaPlayer | 32 | from openlp.core.ui.media.mediaplayer import MediaPlayer |
| 1670 | 33 | 33 | ||
| 1671 | 34 | 34 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1677 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1678 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1680 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1681 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1682 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1683 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1684 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1690 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1691 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1693 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1694 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1695 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1696 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1697 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1703 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1704 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1706 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1707 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1708 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1709 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1710 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1716 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1717 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1719 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1720 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1721 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1722 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1723 | @@ -24,8 +24,8 @@ | |||
| 1724 | 24 | """ | 24 | """ |
| 1725 | 25 | import datetime | 25 | import datetime |
| 1726 | 26 | import html | 26 | import html |
| 1727 | 27 | |||
| 1728 | 27 | import lxml.html | 28 | import lxml.html |
| 1729 | 28 | |||
| 1730 | 29 | from PyQt5 import QtCore, QtGui, QtWidgets, QtPrintSupport | 29 | from PyQt5 import QtCore, QtGui, QtWidgets, QtPrintSupport |
| 1731 | 30 | 30 | ||
| 1732 | 31 | from openlp.core.common.applocation import AppLocation | 31 | from openlp.core.common.applocation import AppLocation |
| 1733 | 32 | 32 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1739 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1740 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1742 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1743 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1744 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1745 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1746 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1752 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1753 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1755 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1756 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1757 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1758 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1759 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1765 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1766 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1768 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1769 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1770 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1771 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1772 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1778 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1779 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1781 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1782 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1783 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1784 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1785 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1791 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1792 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1794 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1795 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1796 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1797 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1798 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1804 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1805 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1807 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1808 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1809 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1810 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1811 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1817 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1818 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1820 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1821 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1822 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1823 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1824 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1830 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1831 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1833 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1834 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1835 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1836 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1837 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1843 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1844 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1846 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1847 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1848 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1849 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1850 | @@ -42,7 +42,6 @@ | |||
| 1851 | 42 | from openlp.core.widgets.toolbar import OpenLPToolbar | 42 | from openlp.core.widgets.toolbar import OpenLPToolbar |
| 1852 | 43 | from openlp.core.widgets.views import ListPreviewWidget | 43 | from openlp.core.widgets.views import ListPreviewWidget |
| 1853 | 44 | 44 | ||
| 1854 | 45 | |||
| 1855 | 46 | # Threshold which has to be trespassed to toggle. | 45 | # Threshold which has to be trespassed to toggle. |
| 1856 | 47 | HIDE_MENU_THRESHOLD = 27 | 46 | HIDE_MENU_THRESHOLD = 27 |
| 1857 | 48 | AUDIO_TIME_LABEL_STYLESHEET = 'background-color: palette(background); ' \ | 47 | AUDIO_TIME_LABEL_STYLESHEET = 'background-color: palette(background); ' \ |
| 1858 | 49 | 48 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1864 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1865 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1867 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1868 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1869 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1870 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1871 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1877 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1878 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1880 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1881 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1882 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1883 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1884 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1890 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1891 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1893 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1894 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1895 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1896 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1897 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1903 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1904 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1906 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1907 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1908 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1909 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1910 | @@ -24,7 +24,7 @@ | |||
| 1911 | 24 | """ | 24 | """ |
| 1912 | 25 | from PyQt5 import QtGui | 25 | from PyQt5 import QtGui |
| 1913 | 26 | 26 | ||
| 1915 | 27 | from openlp.core.common import is_macosx, is_win | 27 | from openlp.core.common import is_win |
| 1916 | 28 | from openlp.core.common.registry import Registry | 28 | from openlp.core.common.registry import Registry |
| 1917 | 29 | from openlp.core.common.settings import Settings | 29 | from openlp.core.common.settings import Settings |
| 1918 | 30 | 30 | ||
| 1919 | 31 | 31 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1925 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1926 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1928 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1929 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1930 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1931 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1932 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1938 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1939 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1941 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1942 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1943 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1944 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1945 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1951 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1952 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1954 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1955 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1956 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1957 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1958 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1964 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1965 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1967 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1968 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1969 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1970 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1971 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1977 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1978 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1980 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1981 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1982 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1983 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1984 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 1990 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 1991 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 1993 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 1994 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 1995 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 1996 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 1997 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2003 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2004 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2006 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2007 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2008 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2009 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2010 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2016 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2017 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2019 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2020 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2021 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2022 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2023 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2029 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2030 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2032 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2033 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2034 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2035 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2036 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2042 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2043 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2045 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2046 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2047 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2048 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2049 | @@ -22,7 +22,7 @@ | |||
| 2050 | 22 | """ Patch the QFileDialog so it accepts and returns Path objects""" | 22 | """ Patch the QFileDialog so it accepts and returns Path objects""" |
| 2051 | 23 | from PyQt5 import QtWidgets | 23 | from PyQt5 import QtWidgets |
| 2052 | 24 | 24 | ||
| 2054 | 25 | from openlp.core.common.path import Path, path_to_str, replace_params, str_to_path | 25 | from openlp.core.common.path import path_to_str, replace_params, str_to_path |
| 2055 | 26 | 26 | ||
| 2056 | 27 | 27 | ||
| 2057 | 28 | class FileDialog(QtWidgets.QFileDialog): | 28 | class FileDialog(QtWidgets.QFileDialog): |
| 2058 | 29 | 29 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2064 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2065 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2067 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2068 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2069 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2070 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2071 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2077 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2078 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2080 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2081 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2082 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2083 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2084 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2090 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2091 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2093 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2094 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2095 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2096 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2097 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2103 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2104 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2106 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2107 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2108 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2109 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2110 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2116 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2117 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2119 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2120 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2121 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2122 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2123 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2129 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2130 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2132 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2133 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2134 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2135 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2136 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2142 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2143 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2145 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2146 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2147 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2148 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2149 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2155 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2156 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2158 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2159 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2160 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2161 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2162 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2168 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2169 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2171 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2172 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2173 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2174 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2175 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2181 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2182 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2184 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2185 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2186 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2187 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2188 | @@ -19,17 +19,16 @@ | |||
| 2189 | 19 | # with this program; if not, write to the Free Software Foundation, Inc., 59 # | 19 | # with this program; if not, write to the Free Software Foundation, Inc., 59 # |
| 2190 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 2191 | 21 | ############################################################################### | 21 | ############################################################################### |
| 2192 | 22 | import json | ||
| 2193 | 22 | import logging | 23 | import logging |
| 2194 | 23 | import json | ||
| 2195 | 24 | import urllib | 24 | import urllib |
| 2196 | 25 | from urllib.parse import urlparse | 25 | from urllib.parse import urlparse |
| 2197 | 26 | 26 | ||
| 2198 | 27 | from openlp.core.api.http import requires_auth | ||
| 2199 | 27 | from openlp.core.api.http.endpoint import Endpoint | 28 | from openlp.core.api.http.endpoint import Endpoint |
| 2200 | 28 | from openlp.core.api.http import requires_auth | ||
| 2201 | 29 | from openlp.core.common.registry import Registry | 29 | from openlp.core.common.registry import Registry |
| 2202 | 30 | from openlp.core.lib import PluginStatus | 30 | from openlp.core.lib import PluginStatus |
| 2203 | 31 | 31 | ||
| 2204 | 32 | |||
| 2205 | 33 | log = logging.getLogger(__name__) | 32 | log = logging.getLogger(__name__) |
| 2206 | 34 | 33 | ||
| 2207 | 35 | alerts_endpoint = Endpoint('alert') | 34 | alerts_endpoint = Endpoint('alert') |
| 2208 | 36 | 35 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2214 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2215 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2217 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2218 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2219 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2220 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2221 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2227 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2228 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2230 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2231 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2232 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2233 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2234 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2240 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2241 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2243 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2244 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2245 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2246 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2247 | @@ -25,7 +25,6 @@ | |||
| 2248 | 25 | from openlp.core.common.i18n import translate | 25 | from openlp.core.common.i18n import translate |
| 2249 | 26 | from openlp.core.common.registry import Registry | 26 | from openlp.core.common.registry import Registry |
| 2250 | 27 | from openlp.plugins.alerts.lib.db import AlertItem | 27 | from openlp.plugins.alerts.lib.db import AlertItem |
| 2251 | 28 | |||
| 2252 | 29 | from .alertdialog import Ui_AlertDialog | 28 | from .alertdialog import Ui_AlertDialog |
| 2253 | 30 | 29 | ||
| 2254 | 31 | 30 | ||
| 2255 | 32 | 31 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2261 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2262 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2264 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2265 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2266 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2267 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2268 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2274 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2275 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2277 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2278 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2279 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2280 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2281 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2287 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2288 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2290 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2291 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2292 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2293 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2294 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2300 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2301 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2303 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2304 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2305 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2306 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2307 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2313 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2314 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2316 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2317 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2318 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2319 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2320 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2326 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2327 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2329 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2330 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2331 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2332 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2333 | @@ -23,11 +23,11 @@ | |||
| 2334 | 23 | import logging | 23 | import logging |
| 2335 | 24 | 24 | ||
| 2336 | 25 | from openlp.core.api.http import register_endpoint | 25 | from openlp.core.api.http import register_endpoint |
| 2337 | 26 | from openlp.core.common.actions import ActionList | ||
| 2338 | 26 | from openlp.core.common.i18n import UiStrings, translate | 27 | from openlp.core.common.i18n import UiStrings, translate |
| 2339 | 27 | from openlp.core.common.actions import ActionList | ||
| 2340 | 28 | from openlp.core.lib import Plugin, StringContent, build_icon | 28 | from openlp.core.lib import Plugin, StringContent, build_icon |
| 2341 | 29 | from openlp.core.lib.ui import create_action | ||
| 2342 | 29 | from openlp.plugins.bibles.endpoint import api_bibles_endpoint, bibles_endpoint | 30 | from openlp.plugins.bibles.endpoint import api_bibles_endpoint, bibles_endpoint |
| 2343 | 30 | from openlp.core.lib.ui import create_action | ||
| 2344 | 31 | from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem, LayoutStyle, DisplayStyle, \ | 31 | from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem, LayoutStyle, DisplayStyle, \ |
| 2345 | 32 | LanguageSelection | 32 | LanguageSelection |
| 2346 | 33 | from openlp.plugins.bibles.lib.mediaitem import BibleSearch | 33 | from openlp.plugins.bibles.lib.mediaitem import BibleSearch |
| 2347 | 34 | 34 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2353 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2354 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2356 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2357 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2358 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2359 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2360 | @@ -21,11 +21,10 @@ | |||
| 2361 | 21 | ############################################################################### | 21 | ############################################################################### |
| 2362 | 22 | import logging | 22 | import logging |
| 2363 | 23 | 23 | ||
| 2364 | 24 | from openlp.core.api.endpoint.pluginhelpers import search, live, service | ||
| 2365 | 25 | from openlp.core.api.http import requires_auth | ||
| 2366 | 24 | from openlp.core.api.http.endpoint import Endpoint | 26 | from openlp.core.api.http.endpoint import Endpoint |
| 2367 | 25 | from openlp.core.api.http.errors import NotFound | 27 | from openlp.core.api.http.errors import NotFound |
| 2368 | 26 | from openlp.core.api.endpoint.pluginhelpers import search, live, service | ||
| 2369 | 27 | from openlp.core.api.http import requires_auth | ||
| 2370 | 28 | |||
| 2371 | 29 | 28 | ||
| 2372 | 30 | log = logging.getLogger(__name__) | 29 | log = logging.getLogger(__name__) |
| 2373 | 31 | 30 | ||
| 2374 | 32 | 31 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2380 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2381 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2383 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2384 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2385 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2386 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2387 | @@ -24,9 +24,9 @@ | |||
| 2388 | 24 | The :mod:`forms` module contains all the ui functionality for the bibles | 24 | The :mod:`forms` module contains all the ui functionality for the bibles |
| 2389 | 25 | plugin. | 25 | plugin. |
| 2390 | 26 | """ | 26 | """ |
| 2391 | 27 | from .bibleimportform import BibleImportForm | ||
| 2392 | 27 | from .booknameform import BookNameForm | 28 | from .booknameform import BookNameForm |
| 2393 | 29 | from .editbibleform import EditBibleForm | ||
| 2394 | 28 | from .languageform import LanguageForm | 30 | from .languageform import LanguageForm |
| 2395 | 29 | from .bibleimportform import BibleImportForm | ||
| 2396 | 30 | from .editbibleform import EditBibleForm | ||
| 2397 | 31 | 31 | ||
| 2398 | 32 | __all__ = ['BookNameForm', 'LanguageForm', 'BibleImportForm', 'EditBibleForm'] | 32 | __all__ = ['BookNameForm', 'LanguageForm', 'BibleImportForm', 'EditBibleForm'] |
| 2399 | 33 | 33 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2405 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2406 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2408 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2409 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2410 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2411 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2412 | @@ -24,9 +24,10 @@ | |||
| 2413 | 24 | """ | 24 | """ |
| 2414 | 25 | import logging | 25 | import logging |
| 2415 | 26 | import urllib.error | 26 | import urllib.error |
| 2416 | 27 | |||
| 2417 | 28 | from PyQt5 import QtWidgets | ||
| 2418 | 27 | from lxml import etree | 29 | from lxml import etree |
| 2419 | 28 | 30 | ||
| 2420 | 29 | from PyQt5 import QtWidgets | ||
| 2421 | 30 | try: | 31 | try: |
| 2422 | 31 | from pysword import modules | 32 | from pysword import modules |
| 2423 | 32 | PYSWORD_AVAILABLE = True | 33 | PYSWORD_AVAILABLE = True |
| 2424 | 33 | 34 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2430 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2431 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2433 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2434 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2435 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2436 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2437 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2443 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2444 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2446 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2447 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2448 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2449 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2450 | @@ -26,8 +26,8 @@ | |||
| 2451 | 26 | import logging | 26 | import logging |
| 2452 | 27 | import re | 27 | import re |
| 2453 | 28 | 28 | ||
| 2454 | 29 | from PyQt5 import QtCore | ||
| 2455 | 29 | from PyQt5.QtWidgets import QDialog | 30 | from PyQt5.QtWidgets import QDialog |
| 2456 | 30 | from PyQt5 import QtCore | ||
| 2457 | 31 | 31 | ||
| 2458 | 32 | from openlp.core.common.i18n import translate | 32 | from openlp.core.common.i18n import translate |
| 2459 | 33 | from openlp.core.lib.ui import critical_error_message_box | 33 | from openlp.core.lib.ui import critical_error_message_box |
| 2460 | 34 | 34 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2466 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2467 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2469 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2470 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2471 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2472 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2473 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2479 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2480 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2482 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2483 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2484 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2485 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2486 | @@ -28,9 +28,9 @@ | |||
| 2487 | 28 | from openlp.core.common.i18n import UiStrings, translate | 28 | from openlp.core.common.i18n import UiStrings, translate |
| 2488 | 29 | from openlp.core.common.mixins import RegistryProperties | 29 | from openlp.core.common.mixins import RegistryProperties |
| 2489 | 30 | from openlp.core.lib.ui import critical_error_message_box | 30 | from openlp.core.lib.ui import critical_error_message_box |
| 2490 | 31 | from .editbibledialog import Ui_EditBibleDialog | ||
| 2491 | 32 | from openlp.plugins.bibles.lib import BibleStrings | 31 | from openlp.plugins.bibles.lib import BibleStrings |
| 2492 | 33 | from openlp.plugins.bibles.lib.db import BiblesResourcesDB | 32 | from openlp.plugins.bibles.lib.db import BiblesResourcesDB |
| 2493 | 33 | from .editbibledialog import Ui_EditBibleDialog | ||
| 2494 | 34 | 34 | ||
| 2495 | 35 | log = logging.getLogger(__name__) | 35 | log = logging.getLogger(__name__) |
| 2496 | 36 | 36 | ||
| 2497 | 37 | 37 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2503 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2504 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2506 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2507 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2508 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2509 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2510 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2516 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2517 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2519 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2520 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2521 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2522 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2523 | @@ -25,14 +25,13 @@ | |||
| 2524 | 25 | """ | 25 | """ |
| 2525 | 26 | import logging | 26 | import logging |
| 2526 | 27 | 27 | ||
| 2527 | 28 | from PyQt5 import QtCore | ||
| 2528 | 28 | from PyQt5.QtWidgets import QDialog | 29 | from PyQt5.QtWidgets import QDialog |
| 2529 | 29 | from PyQt5 import QtCore | ||
| 2530 | 30 | 30 | ||
| 2531 | 31 | from openlp.core.common.i18n import LANGUAGES, translate | 31 | from openlp.core.common.i18n import LANGUAGES, translate |
| 2532 | 32 | from openlp.core.lib.ui import critical_error_message_box | 32 | from openlp.core.lib.ui import critical_error_message_box |
| 2533 | 33 | from openlp.plugins.bibles.forms.languagedialog import Ui_LanguageDialog | 33 | from openlp.plugins.bibles.forms.languagedialog import Ui_LanguageDialog |
| 2534 | 34 | 34 | ||
| 2535 | 35 | |||
| 2536 | 36 | log = logging.getLogger(__name__) | 35 | log = logging.getLogger(__name__) |
| 2537 | 37 | 36 | ||
| 2538 | 38 | 37 | ||
| 2539 | 39 | 38 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2545 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2546 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2548 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2549 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2550 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2551 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2552 | @@ -29,7 +29,6 @@ | |||
| 2553 | 29 | from openlp.core.common.i18n import translate | 29 | from openlp.core.common.i18n import translate |
| 2554 | 30 | from openlp.core.common.settings import Settings | 30 | from openlp.core.common.settings import Settings |
| 2555 | 31 | 31 | ||
| 2556 | 32 | |||
| 2557 | 33 | log = logging.getLogger(__name__) | 32 | log = logging.getLogger(__name__) |
| 2558 | 34 | 33 | ||
| 2559 | 35 | 34 | ||
| 2560 | 36 | 35 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2566 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2567 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2569 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2570 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2571 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2572 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2573 | @@ -20,12 +20,13 @@ | |||
| 2574 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 2575 | 21 | ############################################################################### | 21 | ############################################################################### |
| 2576 | 22 | 22 | ||
| 2577 | 23 | from zipfile import is_zipfile | ||
| 2578 | 24 | |||
| 2579 | 23 | from lxml import etree, objectify | 25 | from lxml import etree, objectify |
| 2580 | 24 | from zipfile import is_zipfile | ||
| 2581 | 25 | 26 | ||
| 2582 | 27 | from openlp.core.common.i18n import get_language, translate | ||
| 2583 | 26 | from openlp.core.common.mixins import LogMixin, RegistryProperties | 28 | from openlp.core.common.mixins import LogMixin, RegistryProperties |
| 2584 | 27 | from openlp.core.common.registry import Registry | 29 | from openlp.core.common.registry import Registry |
| 2585 | 28 | from openlp.core.common.i18n import get_language, translate | ||
| 2586 | 29 | from openlp.core.lib import ValidationError | 30 | from openlp.core.lib import ValidationError |
| 2587 | 30 | from openlp.core.lib.ui import critical_error_message_box | 31 | from openlp.core.lib.ui import critical_error_message_box |
| 2588 | 31 | from openlp.plugins.bibles.lib.db import AlternativeBookNamesDB, BibleDB, BiblesResourcesDB | 32 | from openlp.plugins.bibles.lib.db import AlternativeBookNamesDB, BibleDB, BiblesResourcesDB |
| 2589 | 32 | 33 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2595 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2596 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2598 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2599 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2600 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2601 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2602 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2608 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2609 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2611 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2612 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2613 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2614 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2615 | @@ -19,9 +19,9 @@ | |||
| 2616 | 19 | # with this program; if not, write to the Free Software Foundation, Inc., 59 # | 19 | # with this program; if not, write to the Free Software Foundation, Inc., 59 # |
| 2617 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 2618 | 21 | ############################################################################### | 21 | ############################################################################### |
| 2619 | 22 | |||
| 2620 | 22 | import chardet | 23 | import chardet |
| 2621 | 23 | import logging | 24 | import logging |
| 2622 | 24 | import os | ||
| 2623 | 25 | import re | 25 | import re |
| 2624 | 26 | import sqlite3 | 26 | import sqlite3 |
| 2625 | 27 | import time | 27 | import time |
| 2626 | 28 | 28 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2632 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2633 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2635 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2636 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2637 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2638 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2639 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2645 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2646 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2648 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2649 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2650 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2651 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2652 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2658 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2659 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2661 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2662 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2663 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2664 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2665 | @@ -25,8 +25,8 @@ | |||
| 2666 | 25 | import logging | 25 | import logging |
| 2667 | 26 | import re | 26 | import re |
| 2668 | 27 | import socket | 27 | import socket |
| 2669 | 28 | import urllib.error | ||
| 2670 | 28 | import urllib.parse | 29 | import urllib.parse |
| 2671 | 29 | import urllib.error | ||
| 2672 | 30 | 30 | ||
| 2673 | 31 | from bs4 import BeautifulSoup, NavigableString, Tag | 31 | from bs4 import BeautifulSoup, NavigableString, Tag |
| 2674 | 32 | 32 | ||
| 2675 | 33 | 33 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2681 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2682 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2684 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2685 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2686 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2687 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2688 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2694 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2695 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2697 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2698 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2699 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2700 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2701 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2707 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2708 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2710 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2711 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2712 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2713 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2714 | @@ -21,6 +21,7 @@ | |||
| 2715 | 21 | ############################################################################### | 21 | ############################################################################### |
| 2716 | 22 | 22 | ||
| 2717 | 23 | import logging | 23 | import logging |
| 2718 | 24 | |||
| 2719 | 24 | from pysword import modules | 25 | from pysword import modules |
| 2720 | 25 | 26 | ||
| 2721 | 26 | from openlp.core.common.i18n import translate | 27 | from openlp.core.common.i18n import translate |
| 2722 | @@ -28,7 +29,6 @@ | |||
| 2723 | 28 | from openlp.plugins.bibles.lib.bibleimport import BibleImport | 29 | from openlp.plugins.bibles.lib.bibleimport import BibleImport |
| 2724 | 29 | from openlp.plugins.bibles.lib.db import BiblesResourcesDB | 30 | from openlp.plugins.bibles.lib.db import BiblesResourcesDB |
| 2725 | 30 | 31 | ||
| 2726 | 31 | |||
| 2727 | 32 | log = logging.getLogger(__name__) | 32 | log = logging.getLogger(__name__) |
| 2728 | 33 | 33 | ||
| 2729 | 34 | 34 | ||
| 2730 | 35 | 35 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2736 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2737 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2739 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2740 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2741 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2742 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2743 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2749 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2750 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2752 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2753 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2754 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2755 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2756 | @@ -27,7 +27,6 @@ | |||
| 2757 | 27 | from openlp.plugins.bibles.lib.bibleimport import BibleImport | 27 | from openlp.plugins.bibles.lib.bibleimport import BibleImport |
| 2758 | 28 | from openlp.plugins.bibles.lib.db import BiblesResourcesDB | 28 | from openlp.plugins.bibles.lib.db import BiblesResourcesDB |
| 2759 | 29 | 29 | ||
| 2760 | 30 | |||
| 2761 | 31 | log = logging.getLogger(__name__) | 30 | log = logging.getLogger(__name__) |
| 2762 | 32 | 31 | ||
| 2763 | 33 | # Tags we don't use and can remove the content | 32 | # Tags we don't use and can remove the content |
| 2764 | 34 | 33 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2770 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2771 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2773 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2774 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2775 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2776 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2777 | @@ -33,8 +33,9 @@ | |||
| 2778 | 33 | from .importers.http import HTTPBible | 33 | from .importers.http import HTTPBible |
| 2779 | 34 | from .importers.opensong import OpenSongBible | 34 | from .importers.opensong import OpenSongBible |
| 2780 | 35 | from .importers.osis import OSISBible | 35 | from .importers.osis import OSISBible |
| 2781 | 36 | from .importers.wordproject import WordProjectBible | ||
| 2782 | 36 | from .importers.zefania import ZefaniaBible | 37 | from .importers.zefania import ZefaniaBible |
| 2784 | 37 | from .importers.wordproject import WordProjectBible | 38 | |
| 2785 | 38 | try: | 39 | try: |
| 2786 | 39 | from .importers.sword import SwordBible | 40 | from .importers.sword import SwordBible |
| 2787 | 40 | except: | 41 | except: |
| 2788 | 41 | 42 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2794 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2795 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2797 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2798 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2799 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2800 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2801 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2807 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2808 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2810 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2811 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2812 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2813 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2814 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2820 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2821 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2823 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2824 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2825 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2826 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2827 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2833 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2834 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2836 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2837 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2838 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2839 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2840 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2846 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2847 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2849 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2850 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2851 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2852 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2853 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2859 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2860 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2862 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2863 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2864 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2865 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2866 | @@ -21,11 +21,10 @@ | |||
| 2867 | 21 | ############################################################################### | 21 | ############################################################################### |
| 2868 | 22 | import logging | 22 | import logging |
| 2869 | 23 | 23 | ||
| 2870 | 24 | from openlp.core.api.endpoint.pluginhelpers import search, live, service | ||
| 2871 | 25 | from openlp.core.api.http import requires_auth | ||
| 2872 | 24 | from openlp.core.api.http.endpoint import Endpoint | 26 | from openlp.core.api.http.endpoint import Endpoint |
| 2873 | 25 | from openlp.core.api.http.errors import NotFound | 27 | from openlp.core.api.http.errors import NotFound |
| 2874 | 26 | from openlp.core.api.endpoint.pluginhelpers import search, live, service | ||
| 2875 | 27 | from openlp.core.api.http import requires_auth | ||
| 2876 | 28 | |||
| 2877 | 29 | 28 | ||
| 2878 | 30 | log = logging.getLogger(__name__) | 29 | log = logging.getLogger(__name__) |
| 2879 | 31 | 30 | ||
| 2880 | 32 | 31 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2886 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2887 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2889 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2890 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2891 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2892 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2893 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2899 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2900 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2902 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2903 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2904 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2905 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2906 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2912 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2913 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2915 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2916 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2917 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2918 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2919 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2925 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2926 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2928 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2929 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2930 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2931 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2932 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2938 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2939 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2941 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2942 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2943 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2944 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2945 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2951 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2952 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2954 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2955 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2956 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2957 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2958 | @@ -20,6 +20,6 @@ | |||
| 2959 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 2960 | 21 | ############################################################################### | 21 | ############################################################################### |
| 2961 | 22 | 22 | ||
| 2962 | 23 | from .customtab import CustomTab | ||
| 2963 | 23 | from .customxmlhandler import CustomXMLBuilder, CustomXMLParser | 24 | from .customxmlhandler import CustomXMLBuilder, CustomXMLParser |
| 2964 | 24 | from .mediaitem import CustomMediaItem | 25 | from .mediaitem import CustomMediaItem |
| 2965 | 25 | from .customtab import CustomTab | ||
| 2966 | 26 | 26 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2972 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2973 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2975 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2976 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2977 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2978 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2979 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 2985 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 2986 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 2988 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 2989 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 2990 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 2991 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 2992 | @@ -36,9 +36,9 @@ | |||
| 2993 | 36 | """ | 36 | """ |
| 2994 | 37 | 37 | ||
| 2995 | 38 | import logging | 38 | import logging |
| 2996 | 39 | |||
| 2997 | 40 | from xml.dom.minidom import Document | 39 | from xml.dom.minidom import Document |
| 2998 | 41 | from xml.etree.ElementTree import dump | 40 | from xml.etree.ElementTree import dump |
| 2999 | 41 | |||
| 3000 | 42 | from lxml import etree, objectify | 42 | from lxml import etree, objectify |
| 3001 | 43 | 43 | ||
| 3002 | 44 | log = logging.getLogger(__name__) | 44 | log = logging.getLogger(__name__) |
| 3003 | 45 | 45 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3009 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3010 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3012 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3013 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3014 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3015 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3016 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3022 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3023 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3025 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3026 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3027 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3028 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3029 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3035 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3036 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3038 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3039 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3040 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3041 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3042 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3048 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3049 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3051 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3052 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3053 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3054 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3055 | @@ -21,11 +21,10 @@ | |||
| 3056 | 21 | ############################################################################### | 21 | ############################################################################### |
| 3057 | 22 | import logging | 22 | import logging |
| 3058 | 23 | 23 | ||
| 3059 | 24 | from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails | ||
| 3060 | 25 | from openlp.core.api.http import requires_auth | ||
| 3061 | 24 | from openlp.core.api.http.endpoint import Endpoint | 26 | from openlp.core.api.http.endpoint import Endpoint |
| 3062 | 25 | from openlp.core.api.http.errors import NotFound | 27 | from openlp.core.api.http.errors import NotFound |
| 3063 | 26 | from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails | ||
| 3064 | 27 | from openlp.core.api.http import requires_auth | ||
| 3065 | 28 | |||
| 3066 | 29 | 28 | ||
| 3067 | 30 | log = logging.getLogger(__name__) | 29 | log = logging.getLogger(__name__) |
| 3068 | 31 | 30 | ||
| 3069 | 32 | 31 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3075 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3076 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3078 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3079 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3080 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3081 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3082 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3088 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3089 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3091 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3092 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3093 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3094 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3095 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3101 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3102 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3104 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3105 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3106 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3107 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3108 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3114 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3115 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3117 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3118 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3119 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3120 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3121 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3127 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3128 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3130 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3131 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3132 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3133 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3134 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3140 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3141 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3143 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3144 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3145 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3146 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3147 | @@ -20,10 +20,10 @@ | |||
| 3148 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 3149 | 21 | ############################################################################### | 21 | ############################################################################### |
| 3150 | 22 | 22 | ||
| 3151 | 23 | import logging | ||
| 3152 | 24 | |||
| 3153 | 23 | from PyQt5 import QtGui | 25 | from PyQt5 import QtGui |
| 3154 | 24 | 26 | ||
| 3155 | 25 | import logging | ||
| 3156 | 26 | |||
| 3157 | 27 | from openlp.core.api.http import register_endpoint | 27 | from openlp.core.api.http import register_endpoint |
| 3158 | 28 | from openlp.core.common.i18n import translate | 28 | from openlp.core.common.i18n import translate |
| 3159 | 29 | from openlp.core.common.settings import Settings | 29 | from openlp.core.common.settings import Settings |
| 3160 | 30 | 30 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3166 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3167 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3169 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3170 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3171 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3172 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3173 | @@ -20,5 +20,5 @@ | |||
| 3174 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 3175 | 21 | ############################################################################### | 21 | ############################################################################### |
| 3176 | 22 | 22 | ||
| 3177 | 23 | from .imagetab import ImageTab | ||
| 3178 | 23 | from .mediaitem import ImageMediaItem | 24 | from .mediaitem import ImageMediaItem |
| 3179 | 24 | from .imagetab import ImageTab | ||
| 3180 | 25 | 25 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3186 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3187 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3189 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3190 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3191 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3192 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3193 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3199 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3200 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3202 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3203 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3204 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3205 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3206 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3212 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3213 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3215 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3216 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3217 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3218 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3219 | @@ -37,7 +37,6 @@ | |||
| 3220 | 37 | from openlp.plugins.images.forms import AddGroupForm, ChooseGroupForm | 37 | from openlp.plugins.images.forms import AddGroupForm, ChooseGroupForm |
| 3221 | 38 | from openlp.plugins.images.lib.db import ImageFilenames, ImageGroups | 38 | from openlp.plugins.images.lib.db import ImageFilenames, ImageGroups |
| 3222 | 39 | 39 | ||
| 3223 | 40 | |||
| 3224 | 41 | log = logging.getLogger(__name__) | 40 | log = logging.getLogger(__name__) |
| 3225 | 42 | 41 | ||
| 3226 | 43 | 42 | ||
| 3227 | 44 | 43 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3233 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3234 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3236 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3237 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3238 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3239 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3240 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3246 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3247 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3249 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3250 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3251 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3252 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3253 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3259 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3260 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3262 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3263 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3264 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3265 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3266 | @@ -21,11 +21,10 @@ | |||
| 3267 | 21 | ############################################################################### | 21 | ############################################################################### |
| 3268 | 22 | import logging | 22 | import logging |
| 3269 | 23 | 23 | ||
| 3270 | 24 | from openlp.core.api.endpoint.pluginhelpers import search, live, service | ||
| 3271 | 25 | from openlp.core.api.http import requires_auth | ||
| 3272 | 24 | from openlp.core.api.http.endpoint import Endpoint | 26 | from openlp.core.api.http.endpoint import Endpoint |
| 3273 | 25 | from openlp.core.api.http.errors import NotFound | 27 | from openlp.core.api.http.errors import NotFound |
| 3274 | 26 | from openlp.core.api.endpoint.pluginhelpers import search, live, service | ||
| 3275 | 27 | from openlp.core.api.http import requires_auth | ||
| 3276 | 28 | |||
| 3277 | 29 | 28 | ||
| 3278 | 30 | log = logging.getLogger(__name__) | 29 | log = logging.getLogger(__name__) |
| 3279 | 31 | 30 | ||
| 3280 | 32 | 31 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3286 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3287 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3289 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3290 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3291 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3292 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3293 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3299 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3300 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3302 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3303 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3304 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3305 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3306 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3312 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3313 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3315 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3316 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3317 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3318 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3319 | @@ -19,21 +19,21 @@ | |||
| 3320 | 19 | # with this program; if not, write to the Free Software Foundation, Inc., 59 # | 19 | # with this program; if not, write to the Free Software Foundation, Inc., 59 # |
| 3321 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 3322 | 21 | ############################################################################### | 21 | ############################################################################### |
| 3323 | 22 | import logging | ||
| 3324 | 22 | import os | 23 | import os |
| 3325 | 23 | import logging | ||
| 3326 | 24 | import re | 24 | import re |
| 3327 | 25 | from datetime import datetime | ||
| 3328 | 25 | from time import sleep | 26 | from time import sleep |
| 3329 | 26 | from datetime import datetime | ||
| 3330 | 27 | 27 | ||
| 3331 | 28 | from PyQt5 import QtCore, QtGui, QtWidgets | 28 | from PyQt5 import QtCore, QtGui, QtWidgets |
| 3332 | 29 | 29 | ||
| 3333 | 30 | from openlp.core.common import is_win, is_linux, is_macosx | 30 | from openlp.core.common import is_win, is_linux, is_macosx |
| 3334 | 31 | from openlp.core.common.path import Path | ||
| 3335 | 32 | from openlp.core.common.i18n import translate | 31 | from openlp.core.common.i18n import translate |
| 3336 | 33 | from openlp.core.common.mixins import RegistryProperties | 32 | from openlp.core.common.mixins import RegistryProperties |
| 3338 | 34 | from openlp.plugins.media.forms.mediaclipselectordialog import Ui_MediaClipSelector | 33 | from openlp.core.common.path import Path |
| 3339 | 35 | from openlp.core.lib.ui import critical_error_message_box | 34 | from openlp.core.lib.ui import critical_error_message_box |
| 3340 | 36 | from openlp.core.ui.media.vlcplayer import get_vlc | 35 | from openlp.core.ui.media.vlcplayer import get_vlc |
| 3341 | 36 | from openlp.plugins.media.forms.mediaclipselectordialog import Ui_MediaClipSelector | ||
| 3342 | 37 | 37 | ||
| 3343 | 38 | if is_win(): | 38 | if is_win(): |
| 3344 | 39 | from win32com.client import Dispatch | 39 | from win32com.client import Dispatch |
| 3345 | 40 | 40 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3351 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3352 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3354 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3355 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3356 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3357 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3358 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3364 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3365 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3367 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3368 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3369 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3370 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3371 | @@ -27,8 +27,8 @@ | |||
| 3372 | 27 | 27 | ||
| 3373 | 28 | from openlp.core.common.applocation import AppLocation | 28 | from openlp.core.common.applocation import AppLocation |
| 3374 | 29 | from openlp.core.common.i18n import UiStrings, translate, get_natural_key | 29 | from openlp.core.common.i18n import UiStrings, translate, get_natural_key |
| 3375 | 30 | from openlp.core.common.mixins import RegistryProperties | ||
| 3376 | 30 | from openlp.core.common.path import Path, path_to_str, create_paths | 31 | from openlp.core.common.path import Path, path_to_str, create_paths |
| 3377 | 31 | from openlp.core.common.mixins import RegistryProperties | ||
| 3378 | 32 | from openlp.core.common.registry import Registry | 32 | from openlp.core.common.registry import Registry |
| 3379 | 33 | from openlp.core.common.settings import Settings | 33 | from openlp.core.common.settings import Settings |
| 3380 | 34 | from openlp.core.lib import ItemCapabilities, MediaManagerItem, MediaType, ServiceItem, ServiceItemContext, \ | 34 | from openlp.core.lib import ItemCapabilities, MediaManagerItem, MediaType, ServiceItem, ServiceItemContext, \ |
| 3381 | 35 | 35 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3387 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3388 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3390 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3391 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3392 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3393 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3394 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3400 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3401 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3403 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3404 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3405 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3406 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3407 | @@ -23,7 +23,6 @@ | |||
| 3408 | 23 | The Media plugin | 23 | The Media plugin |
| 3409 | 24 | """ | 24 | """ |
| 3410 | 25 | import logging | 25 | import logging |
| 3411 | 26 | import os | ||
| 3412 | 27 | import re | 26 | import re |
| 3413 | 28 | 27 | ||
| 3414 | 29 | from PyQt5 import QtCore | 28 | from PyQt5 import QtCore |
| 3415 | @@ -37,7 +36,6 @@ | |||
| 3416 | 37 | from openlp.plugins.media.endpoint import api_media_endpoint, media_endpoint | 36 | from openlp.plugins.media.endpoint import api_media_endpoint, media_endpoint |
| 3417 | 38 | from openlp.plugins.media.lib import MediaMediaItem, MediaTab | 37 | from openlp.plugins.media.lib import MediaMediaItem, MediaTab |
| 3418 | 39 | 38 | ||
| 3419 | 40 | |||
| 3420 | 41 | log = logging.getLogger(__name__) | 39 | log = logging.getLogger(__name__) |
| 3421 | 42 | 40 | ||
| 3422 | 43 | 41 | ||
| 3423 | 44 | 42 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3429 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3430 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3432 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3433 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3434 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3435 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3436 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3442 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3443 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3445 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3446 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3447 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3448 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3449 | @@ -21,11 +21,10 @@ | |||
| 3450 | 21 | ############################################################################### | 21 | ############################################################################### |
| 3451 | 22 | import logging | 22 | import logging |
| 3452 | 23 | 23 | ||
| 3453 | 24 | from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails | ||
| 3454 | 25 | from openlp.core.api.http import requires_auth | ||
| 3455 | 24 | from openlp.core.api.http.endpoint import Endpoint | 26 | from openlp.core.api.http.endpoint import Endpoint |
| 3456 | 25 | from openlp.core.api.http.errors import NotFound | 27 | from openlp.core.api.http.errors import NotFound |
| 3457 | 26 | from openlp.core.api.endpoint.pluginhelpers import search, live, service, display_thumbnails | ||
| 3458 | 27 | from openlp.core.api.http import requires_auth | ||
| 3459 | 28 | |||
| 3460 | 29 | 28 | ||
| 3461 | 30 | log = logging.getLogger(__name__) | 29 | log = logging.getLogger(__name__) |
| 3462 | 31 | 30 | ||
| 3463 | 32 | 31 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3469 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3470 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3472 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3473 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3474 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3475 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3476 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3482 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3483 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3485 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3486 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3487 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3488 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3489 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3495 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3496 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3498 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3499 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3500 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3501 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3502 | @@ -24,10 +24,10 @@ | |||
| 3503 | 24 | from PyQt5 import QtCore, QtGui, QtWidgets | 24 | from PyQt5 import QtCore, QtGui, QtWidgets |
| 3504 | 25 | 25 | ||
| 3505 | 26 | from openlp.core.common.i18n import UiStrings, translate, get_natural_key | 26 | from openlp.core.common.i18n import UiStrings, translate, get_natural_key |
| 3507 | 27 | from openlp.core.common.path import Path, path_to_str, str_to_path | 27 | from openlp.core.common.path import path_to_str, str_to_path |
| 3508 | 28 | from openlp.core.common.registry import Registry | 28 | from openlp.core.common.registry import Registry |
| 3509 | 29 | from openlp.core.common.settings import Settings | 29 | from openlp.core.common.settings import Settings |
| 3511 | 30 | from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext,\ | 30 | from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext, \ |
| 3512 | 31 | build_icon, check_item_selected, create_thumb, validate_thumb | 31 | build_icon, check_item_selected, create_thumb, validate_thumb |
| 3513 | 32 | from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box | 32 | from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box |
| 3514 | 33 | from openlp.plugins.presentations.lib import MessageListener | 33 | from openlp.plugins.presentations.lib import MessageListener |
| 3515 | 34 | 34 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3521 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3522 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3524 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3525 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3526 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3527 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3528 | @@ -24,9 +24,9 @@ | |||
| 3529 | 24 | 24 | ||
| 3530 | 25 | from PyQt5 import QtCore | 25 | from PyQt5 import QtCore |
| 3531 | 26 | 26 | ||
| 3532 | 27 | from openlp.core.common.path import Path | ||
| 3533 | 27 | from openlp.core.common.registry import Registry | 28 | from openlp.core.common.registry import Registry |
| 3534 | 28 | from openlp.core.common.settings import Settings | 29 | from openlp.core.common.settings import Settings |
| 3535 | 29 | from openlp.core.common.path import Path | ||
| 3536 | 30 | from openlp.core.lib import ServiceItemContext | 30 | from openlp.core.lib import ServiceItemContext |
| 3537 | 31 | from openlp.core.ui import HideMode | 31 | from openlp.core.ui import HideMode |
| 3538 | 32 | from openlp.plugins.presentations.lib.pdfcontroller import PDF_CONTROLLER_FILETYPES | 32 | from openlp.plugins.presentations.lib.pdfcontroller import PDF_CONTROLLER_FILETYPES |
| 3539 | 33 | 33 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3545 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3546 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3548 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3549 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3550 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3551 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3552 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3558 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3559 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3561 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3562 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3563 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3564 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3565 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3571 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3572 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3574 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3575 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3576 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3577 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3578 | @@ -20,8 +20,8 @@ | |||
| 3579 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 3580 | 21 | ############################################################################### | 21 | ############################################################################### |
| 3581 | 22 | import logging | 22 | import logging |
| 3582 | 23 | import re | ||
| 3583 | 23 | import zipfile | 24 | import zipfile |
| 3584 | 24 | import re | ||
| 3585 | 25 | from xml.etree import ElementTree | 25 | from xml.etree import ElementTree |
| 3586 | 26 | 26 | ||
| 3587 | 27 | from openlp.core.common import is_win | 27 | from openlp.core.common import is_win |
| 3588 | 28 | 28 | ||
| 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 | 1 | 1 | ||
| 3594 | 2 | PPTVIEWLIB - Control PowerPoint Viewer 2003/2007 (for openlp.org) | 2 | PPTVIEWLIB - Control PowerPoint Viewer 2003/2007 (for openlp.org) |
| 3596 | 3 | Copyright (C) 2008-2017 Jonathan Corwin (j@corwin.co.uk) | 3 | Copyright (C) 2008-2018 Jonathan Corwin (j@corwin.co.uk) |
| 3597 | 4 | 4 | ||
| 3598 | 5 | This library wrappers the free Microsoft PowerPoint Viewer (2003/2007) program, | 5 | This library wrappers the free Microsoft PowerPoint Viewer (2003/2007) program, |
| 3599 | 6 | allowing it to be more easily controlled from another program. | 6 | allowing it to be more easily controlled from another program. |
| 3600 | 7 | 7 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3606 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3607 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3609 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3610 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3611 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3612 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3613 | @@ -21,10 +21,11 @@ | |||
| 3614 | 21 | ############################################################################### | 21 | ############################################################################### |
| 3615 | 22 | 22 | ||
| 3616 | 23 | import sys | 23 | import sys |
| 3617 | 24 | from PyQt5 import QtWidgets | ||
| 3618 | 25 | from ctypes import * | 24 | from ctypes import * |
| 3619 | 26 | from ctypes.wintypes import RECT | 25 | from ctypes.wintypes import RECT |
| 3620 | 27 | 26 | ||
| 3621 | 27 | from PyQt5 import QtWidgets | ||
| 3622 | 28 | |||
| 3623 | 28 | 29 | ||
| 3624 | 29 | class PPTViewer(QtWidgets.QWidget): | 30 | class PPTViewer(QtWidgets.QWidget): |
| 3625 | 30 | """ | 31 | """ |
| 3626 | 31 | 32 | ||
| 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 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
| 3632 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
| 3633 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
| 3635 | 4 | * Copyright (c) 2008-2017 OpenLP Developers * | 4 | * Copyright (c) 2008-2018 OpenLP Developers * |
| 3636 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
| 3637 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
| 3638 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
| 3639 | 8 | 8 | ||
| 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 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
| 3645 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
| 3646 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
| 3648 | 4 | * Copyright (c) 2008-2017 OpenLP Developers * | 4 | * Copyright (c) 2008-2018 OpenLP Developers * |
| 3649 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
| 3650 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
| 3651 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
| 3652 | 8 | 8 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3658 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3659 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3661 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3662 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3663 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3664 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3665 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3671 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3672 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3674 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3675 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3676 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3677 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3678 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3684 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3685 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3687 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3688 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3689 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3690 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3691 | @@ -23,8 +23,8 @@ | |||
| 3692 | 23 | The :mod:`openlp.plugins.presentations.presentationplugin` module provides the ability for OpenLP to display | 23 | The :mod:`openlp.plugins.presentations.presentationplugin` module provides the ability for OpenLP to display |
| 3693 | 24 | presentations from a variety of document formats. | 24 | presentations from a variety of document formats. |
| 3694 | 25 | """ | 25 | """ |
| 3695 | 26 | import logging | ||
| 3696 | 26 | import os | 27 | import os |
| 3697 | 27 | import logging | ||
| 3698 | 28 | 28 | ||
| 3699 | 29 | from PyQt5 import QtCore | 29 | from PyQt5 import QtCore |
| 3700 | 30 | 30 | ||
| 3701 | 31 | 31 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3707 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3708 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3710 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3711 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3712 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3713 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3714 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3720 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3721 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3723 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3724 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3725 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3726 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3727 | @@ -21,11 +21,10 @@ | |||
| 3728 | 21 | ############################################################################### | 21 | ############################################################################### |
| 3729 | 22 | import logging | 22 | import logging |
| 3730 | 23 | 23 | ||
| 3731 | 24 | from openlp.core.api.endpoint.pluginhelpers import search, live, service | ||
| 3732 | 25 | from openlp.core.api.http import requires_auth | ||
| 3733 | 24 | from openlp.core.api.http.endpoint import Endpoint | 26 | from openlp.core.api.http.endpoint import Endpoint |
| 3734 | 25 | from openlp.core.api.http.errors import NotFound | 27 | from openlp.core.api.http.errors import NotFound |
| 3735 | 26 | from openlp.core.api.endpoint.pluginhelpers import search, live, service | ||
| 3736 | 27 | from openlp.core.api.http import requires_auth | ||
| 3737 | 28 | |||
| 3738 | 29 | 28 | ||
| 3739 | 30 | log = logging.getLogger(__name__) | 29 | log = logging.getLogger(__name__) |
| 3740 | 31 | 30 | ||
| 3741 | 32 | 31 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3747 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3748 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3750 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3751 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3752 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3753 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3754 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3760 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3761 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3763 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3764 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3765 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3766 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3767 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3773 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3774 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3776 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3777 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3778 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3779 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3780 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3786 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3787 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3789 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3790 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3791 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3792 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3793 | @@ -32,9 +32,9 @@ | |||
| 3794 | 32 | from openlp.core.common.mixins import RegistryProperties | 32 | from openlp.core.common.mixins import RegistryProperties |
| 3795 | 33 | from openlp.core.common.registry import Registry | 33 | from openlp.core.common.registry import Registry |
| 3796 | 34 | from openlp.core.widgets.wizard import OpenLPWizard, WizardStrings | 34 | from openlp.core.widgets.wizard import OpenLPWizard, WizardStrings |
| 3797 | 35 | from openlp.plugins.songs.forms.songreviewwidget import SongReviewWidget | ||
| 3798 | 35 | from openlp.plugins.songs.lib import delete_song | 36 | from openlp.plugins.songs.lib import delete_song |
| 3799 | 36 | from openlp.plugins.songs.lib.db import Song | 37 | from openlp.plugins.songs.lib.db import Song |
| 3800 | 37 | from openlp.plugins.songs.forms.songreviewwidget import SongReviewWidget | ||
| 3801 | 38 | from openlp.plugins.songs.lib.songcompare import songs_probably_equal | 38 | from openlp.plugins.songs.lib.songcompare import songs_probably_equal |
| 3802 | 39 | 39 | ||
| 3803 | 40 | log = logging.getLogger(__name__) | 40 | log = logging.getLogger(__name__) |
| 3804 | 41 | 41 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3810 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3811 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3813 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3814 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3815 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3816 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3817 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3823 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3824 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3826 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3827 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3828 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3829 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3830 | @@ -30,8 +30,8 @@ | |||
| 3831 | 30 | 30 | ||
| 3832 | 31 | from openlp.core.common.applocation import AppLocation | 31 | from openlp.core.common.applocation import AppLocation |
| 3833 | 32 | from openlp.core.common.i18n import UiStrings, translate, get_natural_key | 32 | from openlp.core.common.i18n import UiStrings, translate, get_natural_key |
| 3834 | 33 | from openlp.core.common.mixins import RegistryProperties | ||
| 3835 | 33 | from openlp.core.common.path import create_paths, copyfile | 34 | from openlp.core.common.path import create_paths, copyfile |
| 3836 | 34 | from openlp.core.common.mixins import RegistryProperties | ||
| 3837 | 35 | from openlp.core.common.registry import Registry | 35 | from openlp.core.common.registry import Registry |
| 3838 | 36 | from openlp.core.lib import PluginStatus, MediaType, create_separated_list | 36 | from openlp.core.lib import PluginStatus, MediaType, create_separated_list |
| 3839 | 37 | from openlp.core.lib.ui import set_case_insensitive_completer, critical_error_message_box, find_and_set_in_combo_box | 37 | from openlp.core.lib.ui import set_case_insensitive_completer, critical_error_message_box, find_and_set_in_combo_box |
| 3840 | 38 | 38 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3846 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3847 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3849 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3850 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3851 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3852 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3853 | @@ -22,8 +22,8 @@ | |||
| 3854 | 22 | 22 | ||
| 3855 | 23 | from PyQt5 import QtWidgets | 23 | from PyQt5 import QtWidgets |
| 3856 | 24 | 24 | ||
| 3857 | 25 | from openlp.core.common.i18n import UiStrings, translate | ||
| 3858 | 25 | from openlp.core.common.settings import Settings | 26 | from openlp.core.common.settings import Settings |
| 3859 | 26 | from openlp.core.common.i18n import UiStrings, translate | ||
| 3860 | 27 | from openlp.core.lib import build_icon | 27 | from openlp.core.lib import build_icon |
| 3861 | 28 | from openlp.core.lib.ui import create_button_box | 28 | from openlp.core.lib.ui import create_button_box |
| 3862 | 29 | from openlp.core.widgets.edits import SpellTextEdit | 29 | from openlp.core.widgets.edits import SpellTextEdit |
| 3863 | 30 | 30 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3869 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3870 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3872 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3873 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3874 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3875 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3876 | @@ -20,14 +20,14 @@ | |||
| 3877 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 3878 | 21 | ############################################################################### | 21 | ############################################################################### |
| 3879 | 22 | 22 | ||
| 3880 | 23 | import logging | ||
| 3881 | 23 | import re | 24 | import re |
| 3882 | 24 | import logging | ||
| 3883 | 25 | 25 | ||
| 3884 | 26 | from PyQt5 import QtCore, QtGui, QtWidgets | 26 | from PyQt5 import QtCore, QtGui, QtWidgets |
| 3885 | 27 | 27 | ||
| 3886 | 28 | from openlp.core.lib.ui import critical_error_message_box | ||
| 3887 | 29 | from openlp.core.common.i18n import translate | 28 | from openlp.core.common.i18n import translate |
| 3888 | 30 | from openlp.core.common.settings import Settings | 29 | from openlp.core.common.settings import Settings |
| 3889 | 30 | from openlp.core.lib.ui import critical_error_message_box | ||
| 3890 | 31 | from openlp.plugins.songs.forms.editversedialog import Ui_EditVerseDialog | 31 | from openlp.plugins.songs.forms.editversedialog import Ui_EditVerseDialog |
| 3891 | 32 | from openlp.plugins.songs.lib import VerseType, transpose_lyrics | 32 | from openlp.plugins.songs.lib import VerseType, transpose_lyrics |
| 3892 | 33 | 33 | ||
| 3893 | 34 | 34 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3899 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3900 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3902 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3903 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3904 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3905 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3906 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3912 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3913 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3915 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3916 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3917 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3918 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3919 | @@ -21,7 +21,6 @@ | |||
| 3920 | 21 | ############################################################################### | 21 | ############################################################################### |
| 3921 | 22 | 22 | ||
| 3922 | 23 | import logging | 23 | import logging |
| 3923 | 24 | import os | ||
| 3924 | 25 | 24 | ||
| 3925 | 26 | from PyQt5 import QtCore, QtWidgets | 25 | from PyQt5 import QtCore, QtWidgets |
| 3926 | 27 | 26 | ||
| 3927 | 28 | 27 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3933 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3934 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3936 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3937 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3938 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3939 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3940 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3946 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3947 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3949 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3950 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3951 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3952 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3953 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3959 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3960 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3962 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3963 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3964 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3965 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3966 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3972 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3973 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3975 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3976 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3977 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3978 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3979 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3985 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3986 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 3988 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 3989 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 3990 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 3991 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 3992 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 3998 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 3999 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4001 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4002 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4003 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4004 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4005 | @@ -29,8 +29,8 @@ | |||
| 4006 | 29 | from openlp.core.common.registry import Registry | 29 | from openlp.core.common.registry import Registry |
| 4007 | 30 | from openlp.core.lib.ui import critical_error_message_box | 30 | from openlp.core.lib.ui import critical_error_message_box |
| 4008 | 31 | from openlp.plugins.songs.forms.authorsform import AuthorsForm | 31 | from openlp.plugins.songs.forms.authorsform import AuthorsForm |
| 4009 | 32 | from openlp.plugins.songs.forms.songbookform import SongBookForm | ||
| 4010 | 32 | from openlp.plugins.songs.forms.topicsform import TopicsForm | 33 | from openlp.plugins.songs.forms.topicsform import TopicsForm |
| 4011 | 33 | from openlp.plugins.songs.forms.songbookform import SongBookForm | ||
| 4012 | 34 | from openlp.plugins.songs.lib.db import Author, Book, Topic, Song | 34 | from openlp.plugins.songs.lib.db import Author, Book, Topic, Song |
| 4013 | 35 | from .songmaintenancedialog import Ui_SongMaintenanceDialog | 35 | from .songmaintenancedialog import Ui_SongMaintenanceDialog |
| 4014 | 36 | 36 | ||
| 4015 | 37 | 37 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4021 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4022 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4024 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4025 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4026 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4027 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4028 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4034 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4035 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4037 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4038 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4039 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4040 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4041 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4047 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4048 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4050 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4051 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4052 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4053 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4054 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4060 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4061 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4063 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4064 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4065 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4066 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4067 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4073 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4074 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4076 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4077 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4078 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4079 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4080 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4086 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4087 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4089 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4090 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4091 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4092 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4093 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4099 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4100 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4102 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4103 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4104 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4105 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4106 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4112 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4113 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4115 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4116 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4117 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4118 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4119 | @@ -27,28 +27,28 @@ | |||
| 4120 | 27 | from openlp.core.common import is_win | 27 | from openlp.core.common import is_win |
| 4121 | 28 | from openlp.core.common.i18n import UiStrings, translate | 28 | from openlp.core.common.i18n import UiStrings, translate |
| 4122 | 29 | from openlp.core.widgets.wizard import WizardStrings | 29 | from openlp.core.widgets.wizard import WizardStrings |
| 4124 | 30 | from .importers.opensong import OpenSongImport | 30 | from .importers.cclifile import CCLIFileImport |
| 4125 | 31 | from .importers.chordpro import ChordProImport | ||
| 4126 | 32 | from .importers.dreambeam import DreamBeamImport | ||
| 4127 | 31 | from .importers.easyslides import EasySlidesImport | 33 | from .importers.easyslides import EasySlidesImport |
| 4128 | 34 | from .importers.easyworship import EasyWorshipSongImport | ||
| 4129 | 35 | from .importers.foilpresenter import FoilPresenterImport | ||
| 4130 | 36 | from .importers.lyrix import LyrixImport | ||
| 4131 | 32 | from .importers.openlp import OpenLPSongImport | 37 | from .importers.openlp import OpenLPSongImport |
| 4132 | 33 | from .importers.openlyrics import OpenLyricsImport | 38 | from .importers.openlyrics import OpenLyricsImport |
| 4136 | 34 | from .importers.wordsofworship import WordsOfWorshipImport | 39 | from .importers.opensong import OpenSongImport |
| 4137 | 35 | from .importers.cclifile import CCLIFileImport | 40 | from .importers.powerpraise import PowerPraiseImport |
| 4135 | 36 | from .importers.dreambeam import DreamBeamImport | ||
| 4138 | 37 | from .importers.powersong import PowerSongImport | 41 | from .importers.powersong import PowerSongImport |
| 4140 | 38 | from .importers.easyworship import EasyWorshipSongImport | 42 | from .importers.presentationmanager import PresentationManagerImport |
| 4141 | 43 | from .importers.propresenter import ProPresenterImport | ||
| 4142 | 39 | from .importers.songbeamer import SongBeamerImport | 44 | from .importers.songbeamer import SongBeamerImport |
| 4143 | 45 | from .importers.songpro import SongProImport | ||
| 4144 | 40 | from .importers.songshowplus import SongShowPlusImport | 46 | from .importers.songshowplus import SongShowPlusImport |
| 4145 | 41 | from .importers.songpro import SongProImport | ||
| 4146 | 42 | from .importers.sundayplus import SundayPlusImport | 47 | from .importers.sundayplus import SundayPlusImport |
| 4148 | 43 | from .importers.foilpresenter import FoilPresenterImport | 48 | from .importers.videopsalm import VideoPsalmImport |
| 4149 | 49 | from .importers.wordsofworship import WordsOfWorshipImport | ||
| 4150 | 50 | from .importers.worshipassistant import WorshipAssistantImport | ||
| 4151 | 44 | from .importers.zionworx import ZionWorxImport | 51 | from .importers.zionworx import ZionWorxImport |
| 4152 | 45 | from .importers.propresenter import ProPresenterImport | ||
| 4153 | 46 | from .importers.worshipassistant import WorshipAssistantImport | ||
| 4154 | 47 | from .importers.powerpraise import PowerPraiseImport | ||
| 4155 | 48 | from .importers.presentationmanager import PresentationManagerImport | ||
| 4156 | 49 | from .importers.lyrix import LyrixImport | ||
| 4157 | 50 | from .importers.videopsalm import VideoPsalmImport | ||
| 4158 | 51 | from .importers.chordpro import ChordProImport | ||
| 4159 | 52 | 52 | ||
| 4160 | 53 | log = logging.getLogger(__name__) | 53 | log = logging.getLogger(__name__) |
| 4161 | 54 | 54 | ||
| 4162 | 55 | 55 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4168 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4169 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4171 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4172 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4173 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4174 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4175 | 11 | 11 | ||
| 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 | 1 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
| 4181 | 2 | # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 | 2 | # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 |
| 4182 | 3 | 3 | ||
| 4183 | 4 | import codecs | ||
| 4184 | 5 | import logging | ||
| 4185 | 6 | |||
| 4186 | 4 | ############################################################################### | 7 | ############################################################################### |
| 4187 | 5 | # OpenLP - Open Source Lyrics Projection # | 8 | # OpenLP - Open Source Lyrics Projection # |
| 4188 | 6 | # --------------------------------------------------------------------------- # | 9 | # --------------------------------------------------------------------------- # |
| 4190 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 10 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4191 | 8 | # --------------------------------------------------------------------------- # | 11 | # --------------------------------------------------------------------------- # |
| 4192 | 9 | # This program is free software; you can redistribute it and/or modify it # | 12 | # This program is free software; you can redistribute it and/or modify it # |
| 4193 | 10 | # under the terms of the GNU General Public License as published by the Free # | 13 | # under the terms of the GNU General Public License as published by the Free # |
| 4194 | @@ -20,8 +23,6 @@ | |||
| 4195 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 23 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 4196 | 21 | ############################################################################### | 24 | ############################################################################### |
| 4197 | 22 | import chardet | 25 | import chardet |
| 4198 | 23 | import codecs | ||
| 4199 | 24 | import logging | ||
| 4200 | 25 | 26 | ||
| 4201 | 26 | from openlp.core.common.i18n import translate | 27 | from openlp.core.common.i18n import translate |
| 4202 | 27 | from openlp.plugins.songs.lib import VerseType | 28 | from openlp.plugins.songs.lib import VerseType |
| 4203 | 28 | 29 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4209 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4210 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4212 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4213 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4214 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4215 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4216 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4222 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4223 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4225 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4226 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4227 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4228 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4229 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4235 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4236 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4238 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4239 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4240 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4241 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4242 | @@ -25,11 +25,10 @@ | |||
| 4243 | 25 | import logging | 25 | import logging |
| 4244 | 26 | import os | 26 | import os |
| 4245 | 27 | import re | 27 | import re |
| 4246 | 28 | import sqlite3 | ||
| 4247 | 28 | import struct | 29 | import struct |
| 4248 | 29 | import zlib | 30 | import zlib |
| 4249 | 30 | 31 | ||
| 4250 | 31 | import sqlite3 | ||
| 4251 | 32 | |||
| 4252 | 33 | from openlp.core.common.i18n import translate | 32 | from openlp.core.common.i18n import translate |
| 4253 | 34 | from openlp.core.common.path import Path | 33 | from openlp.core.common.path import Path |
| 4254 | 35 | from openlp.plugins.songs.lib import VerseType | 34 | from openlp.plugins.songs.lib import VerseType |
| 4255 | 36 | 35 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4261 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4262 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4264 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4265 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4266 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4267 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4268 | @@ -90,10 +90,10 @@ | |||
| 4269 | 90 | from openlp.core.common.i18n import translate | 90 | from openlp.core.common.i18n import translate |
| 4270 | 91 | from openlp.core.widgets.wizard import WizardStrings | 91 | from openlp.core.widgets.wizard import WizardStrings |
| 4271 | 92 | from openlp.plugins.songs.lib import clean_song, VerseType | 92 | from openlp.plugins.songs.lib import clean_song, VerseType |
| 4272 | 93 | from openlp.plugins.songs.lib.db import Author, Book, Song, Topic | ||
| 4273 | 93 | from openlp.plugins.songs.lib.importers.songimport import SongImport | 94 | from openlp.plugins.songs.lib.importers.songimport import SongImport |
| 4275 | 94 | from openlp.plugins.songs.lib.db import Author, Book, Song, Topic | 95 | from openlp.plugins.songs.lib.openlyricsxml import SongXML |
| 4276 | 95 | from openlp.plugins.songs.lib.ui import SongStrings | 96 | from openlp.plugins.songs.lib.ui import SongStrings |
| 4277 | 96 | from openlp.plugins.songs.lib.openlyricsxml import SongXML | ||
| 4278 | 97 | 97 | ||
| 4279 | 98 | log = logging.getLogger(__name__) | 98 | log = logging.getLogger(__name__) |
| 4280 | 99 | 99 | ||
| 4281 | 100 | 100 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4287 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4288 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4290 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4291 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4292 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4293 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4294 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4300 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4301 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4303 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4304 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4305 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4306 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4307 | @@ -27,8 +27,9 @@ | |||
| 4308 | 27 | # WARNING: See https://docs.python.org/3/library/sqlite3.html for value substitution | 27 | # WARNING: See https://docs.python.org/3/library/sqlite3.html for value substitution |
| 4309 | 28 | # in SQL statements | 28 | # in SQL statements |
| 4310 | 29 | 29 | ||
| 4311 | 30 | import logging | ||
| 4312 | 31 | |||
| 4313 | 30 | import pyodbc | 32 | import pyodbc |
| 4314 | 31 | import logging | ||
| 4315 | 32 | 33 | ||
| 4316 | 33 | from openlp.core.common.i18n import translate | 34 | from openlp.core.common.i18n import translate |
| 4317 | 34 | from openlp.plugins.songs.lib.importers.songimport import SongImport | 35 | from openlp.plugins.songs.lib.importers.songimport import SongImport |
| 4318 | 35 | 36 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4324 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4325 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4327 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4328 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4329 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4330 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4331 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4337 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4338 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4340 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4341 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4342 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4343 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4344 | @@ -29,8 +29,8 @@ | |||
| 4345 | 29 | 29 | ||
| 4346 | 30 | from openlp.core.widgets.wizard import WizardStrings | 30 | from openlp.core.widgets.wizard import WizardStrings |
| 4347 | 31 | from openlp.plugins.songs.lib.importers.songimport import SongImport | 31 | from openlp.plugins.songs.lib.importers.songimport import SongImport |
| 4348 | 32 | from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics, OpenLyricsError | ||
| 4349 | 32 | from openlp.plugins.songs.lib.ui import SongStrings | 33 | from openlp.plugins.songs.lib.ui import SongStrings |
| 4350 | 33 | from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics, OpenLyricsError | ||
| 4351 | 34 | 34 | ||
| 4352 | 35 | log = logging.getLogger(__name__) | 35 | log = logging.getLogger(__name__) |
| 4353 | 36 | 36 | ||
| 4354 | 37 | 37 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4360 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4361 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4363 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4364 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4365 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4366 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4367 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4373 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4374 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4376 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4377 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4378 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4379 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4380 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4386 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4387 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4389 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4390 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4391 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4392 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4393 | @@ -29,8 +29,9 @@ | |||
| 4394 | 29 | 29 | ||
| 4395 | 30 | import logging | 30 | import logging |
| 4396 | 31 | import re | 31 | import re |
| 4397 | 32 | import struct | ||
| 4398 | 33 | |||
| 4399 | 32 | import pyodbc | 34 | import pyodbc |
| 4400 | 33 | import struct | ||
| 4401 | 34 | 35 | ||
| 4402 | 35 | from openlp.core.common.i18n import translate | 36 | from openlp.core.common.i18n import translate |
| 4403 | 36 | from openlp.plugins.songs.lib.importers.songimport import SongImport | 37 | from openlp.plugins.songs.lib.importers.songimport import SongImport |
| 4404 | 37 | 38 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4410 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4411 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4413 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4414 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4415 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4416 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4417 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4423 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4424 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4426 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4427 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4428 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4429 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4430 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4436 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4437 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4439 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4440 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4441 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4442 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4443 | @@ -27,8 +27,8 @@ | |||
| 4444 | 27 | 27 | ||
| 4445 | 28 | from lxml import objectify, etree | 28 | from lxml import objectify, etree |
| 4446 | 29 | 29 | ||
| 4447 | 30 | from openlp.core.common import get_file_encoding | ||
| 4448 | 30 | from openlp.core.common.i18n import translate | 31 | from openlp.core.common.i18n import translate |
| 4449 | 31 | from openlp.core.common import get_file_encoding | ||
| 4450 | 32 | from openlp.core.widgets.wizard import WizardStrings | 32 | from openlp.core.widgets.wizard import WizardStrings |
| 4451 | 33 | from openlp.plugins.songs.lib.importers.songimport import SongImport | 33 | from openlp.plugins.songs.lib.importers.songimport import SongImport |
| 4452 | 34 | 34 | ||
| 4453 | 35 | 35 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4459 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4460 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4462 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4463 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4464 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4465 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4466 | @@ -25,6 +25,7 @@ | |||
| 4467 | 25 | """ | 25 | """ |
| 4468 | 26 | import base64 | 26 | import base64 |
| 4469 | 27 | import logging | 27 | import logging |
| 4470 | 28 | |||
| 4471 | 28 | from lxml import objectify | 29 | from lxml import objectify |
| 4472 | 29 | 30 | ||
| 4473 | 30 | from openlp.core.widgets.wizard import WizardStrings | 31 | from openlp.core.widgets.wizard import WizardStrings |
| 4474 | 31 | 32 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4480 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4481 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4483 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4484 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4485 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4486 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4487 | @@ -22,15 +22,15 @@ | |||
| 4488 | 22 | """ | 22 | """ |
| 4489 | 23 | The :mod:`songbeamer` module provides the functionality for importing SongBeamer songs into the OpenLP database. | 23 | The :mod:`songbeamer` module provides the functionality for importing SongBeamer songs into the OpenLP database. |
| 4490 | 24 | """ | 24 | """ |
| 4491 | 25 | import base64 | ||
| 4492 | 25 | import logging | 26 | import logging |
| 4493 | 27 | import math | ||
| 4494 | 26 | import os | 28 | import os |
| 4495 | 27 | import re | 29 | import re |
| 4496 | 28 | import base64 | ||
| 4497 | 29 | import math | ||
| 4498 | 30 | 30 | ||
| 4499 | 31 | from openlp.core.common import is_win, is_macosx, get_file_encoding | 31 | from openlp.core.common import is_win, is_macosx, get_file_encoding |
| 4500 | 32 | from openlp.core.common.path import Path | ||
| 4501 | 32 | from openlp.core.common.settings import Settings | 33 | from openlp.core.common.settings import Settings |
| 4502 | 33 | from openlp.core.common.path import Path | ||
| 4503 | 34 | from openlp.plugins.songs.lib import VerseType | 34 | from openlp.plugins.songs.lib import VerseType |
| 4504 | 35 | from openlp.plugins.songs.lib.importers.songimport import SongImport | 35 | from openlp.plugins.songs.lib.importers.songimport import SongImport |
| 4505 | 36 | 36 | ||
| 4506 | 37 | 37 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4512 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4513 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4515 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4516 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4517 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4518 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4519 | @@ -33,8 +33,8 @@ | |||
| 4520 | 33 | from openlp.core.widgets.wizard import WizardStrings | 33 | from openlp.core.widgets.wizard import WizardStrings |
| 4521 | 34 | from openlp.plugins.songs.lib import clean_song, VerseType | 34 | from openlp.plugins.songs.lib import clean_song, VerseType |
| 4522 | 35 | from openlp.plugins.songs.lib.db import Song, Author, Topic, Book, MediaFile | 35 | from openlp.plugins.songs.lib.db import Song, Author, Topic, Book, MediaFile |
| 4523 | 36 | from openlp.plugins.songs.lib.openlyricsxml import SongXML | ||
| 4524 | 36 | from openlp.plugins.songs.lib.ui import SongStrings | 37 | from openlp.plugins.songs.lib.ui import SongStrings |
| 4525 | 37 | from openlp.plugins.songs.lib.openlyricsxml import SongXML | ||
| 4526 | 38 | 38 | ||
| 4527 | 39 | log = logging.getLogger(__name__) | 39 | log = logging.getLogger(__name__) |
| 4528 | 40 | 40 | ||
| 4529 | 41 | 41 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4535 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4536 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4538 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4539 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4540 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4541 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4542 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4548 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4549 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4551 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4552 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4553 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4554 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4555 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4561 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4562 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4564 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4565 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4566 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4567 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4568 | @@ -27,13 +27,11 @@ | |||
| 4569 | 27 | # http://wiki.services.openoffice.org/wiki/Python | 27 | # http://wiki.services.openoffice.org/wiki/Python |
| 4570 | 28 | 28 | ||
| 4571 | 29 | import logging | 29 | import logging |
| 4572 | 30 | import os | ||
| 4573 | 31 | import re | 30 | import re |
| 4574 | 32 | 31 | ||
| 4575 | 33 | from openlp.core.common import is_win | 32 | from openlp.core.common import is_win |
| 4576 | 34 | from .openoffice import OpenOfficeImport | 33 | from .openoffice import OpenOfficeImport |
| 4577 | 35 | 34 | ||
| 4578 | 36 | |||
| 4579 | 37 | log = logging.getLogger(__name__) | 35 | log = logging.getLogger(__name__) |
| 4580 | 38 | 36 | ||
| 4581 | 39 | if is_win(): | 37 | if is_win(): |
| 4582 | 40 | 38 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4588 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4589 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4591 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4592 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4593 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4594 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4595 | @@ -19,7 +19,6 @@ | |||
| 4596 | 19 | # with this program; if not, write to the Free Software Foundation, Inc., 59 # | 19 | # with this program; if not, write to the Free Software Foundation, Inc., 59 # |
| 4597 | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # | 20 | # Temple Place, Suite 330, Boston, MA 02111-1307 USA # |
| 4598 | 21 | ############################################################################### | 21 | ############################################################################### |
| 4599 | 22 | import os | ||
| 4600 | 23 | import re | 22 | import re |
| 4601 | 24 | 23 | ||
| 4602 | 25 | from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding | 24 | from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding |
| 4603 | 26 | 25 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4609 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4610 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4612 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4613 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4614 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4615 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4616 | @@ -27,10 +27,10 @@ | |||
| 4617 | 27 | import re | 27 | import re |
| 4618 | 28 | 28 | ||
| 4619 | 29 | from openlp.core.common.i18n import translate | 29 | from openlp.core.common.i18n import translate |
| 4620 | 30 | from openlp.core.common.path import Path | ||
| 4621 | 30 | from openlp.core.common.settings import Settings | 31 | from openlp.core.common.settings import Settings |
| 4623 | 31 | from openlp.core.common.path import Path | 32 | from openlp.plugins.songs.lib.db import AuthorType |
| 4624 | 32 | from openlp.plugins.songs.lib.importers.songimport import SongImport | 33 | from openlp.plugins.songs.lib.importers.songimport import SongImport |
| 4625 | 33 | from openlp.plugins.songs.lib.db import AuthorType | ||
| 4626 | 34 | 34 | ||
| 4627 | 35 | log = logging.getLogger(__name__) | 35 | log = logging.getLogger(__name__) |
| 4628 | 36 | 36 | ||
| 4629 | 37 | 37 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4635 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4636 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4638 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4639 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4640 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4641 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4642 | @@ -23,9 +23,8 @@ | |||
| 4643 | 23 | The :mod:`wordsofworship` module provides the functionality for importing Words of | 23 | The :mod:`wordsofworship` module provides the functionality for importing Words of |
| 4644 | 24 | Worship songs into the OpenLP database. | 24 | Worship songs into the OpenLP database. |
| 4645 | 25 | """ | 25 | """ |
| 4646 | 26 | import logging | ||
| 4647 | 26 | import os | 27 | import os |
| 4648 | 27 | import logging | ||
| 4649 | 28 | from openlp.core.common.path import Path | ||
| 4650 | 29 | 28 | ||
| 4651 | 30 | from openlp.core.common.i18n import translate | 29 | from openlp.core.common.i18n import translate |
| 4652 | 31 | from openlp.plugins.songs.lib.importers.songimport import SongImport | 30 | from openlp.plugins.songs.lib.importers.songimport import SongImport |
| 4653 | 32 | 31 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4659 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4660 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4662 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4663 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4664 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4665 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4666 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4672 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4673 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4675 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4676 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4677 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4678 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4679 | @@ -25,6 +25,7 @@ | |||
| 4680 | 25 | """ | 25 | """ |
| 4681 | 26 | import logging | 26 | import logging |
| 4682 | 27 | import re | 27 | import re |
| 4683 | 28 | |||
| 4684 | 28 | import pyodbc | 29 | import pyodbc |
| 4685 | 29 | 30 | ||
| 4686 | 30 | from openlp.core.common.i18n import translate | 31 | from openlp.core.common.i18n import translate |
| 4687 | 31 | 32 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4693 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4694 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4696 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4697 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4698 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4699 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4700 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4706 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4707 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4709 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4710 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4711 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4712 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4713 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4719 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4720 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4722 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4723 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4724 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4725 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4726 | @@ -29,8 +29,8 @@ | |||
| 4727 | 29 | 29 | ||
| 4728 | 30 | from openlp.core.common import clean_filename | 30 | from openlp.core.common import clean_filename |
| 4729 | 31 | from openlp.core.common.i18n import translate | 31 | from openlp.core.common.i18n import translate |
| 4730 | 32 | from openlp.core.common.mixins import RegistryProperties | ||
| 4731 | 32 | from openlp.core.common.path import create_paths | 33 | from openlp.core.common.path import create_paths |
| 4732 | 33 | from openlp.core.common.mixins import RegistryProperties | ||
| 4733 | 34 | from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics | 34 | from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics |
| 4734 | 35 | 35 | ||
| 4735 | 36 | log = logging.getLogger(__name__) | 36 | log = logging.getLogger(__name__) |
| 4736 | 37 | 37 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4742 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4743 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4745 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4746 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4747 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4748 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4749 | @@ -63,8 +63,8 @@ | |||
| 4750 | 63 | 63 | ||
| 4751 | 64 | from openlp.core.common.i18n import translate | 64 | from openlp.core.common.i18n import translate |
| 4752 | 65 | from openlp.core.common.settings import Settings | 65 | from openlp.core.common.settings import Settings |
| 4753 | 66 | from openlp.core.lib import FormattingTags | ||
| 4754 | 66 | from openlp.core.version import get_version | 67 | from openlp.core.version import get_version |
| 4755 | 67 | from openlp.core.lib import FormattingTags | ||
| 4756 | 68 | from openlp.plugins.songs.lib import VerseType, clean_song | 68 | from openlp.plugins.songs.lib import VerseType, clean_song |
| 4757 | 69 | from openlp.plugins.songs.lib.db import Author, AuthorType, Book, Song, Topic | 69 | from openlp.plugins.songs.lib.db import Author, AuthorType, Book, Song, Topic |
| 4758 | 70 | 70 | ||
| 4759 | 71 | 71 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4765 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4766 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4768 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4769 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4770 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4771 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4772 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4778 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4779 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4781 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4782 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4783 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4784 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4785 | @@ -25,11 +25,11 @@ | |||
| 4786 | 25 | import logging | 25 | import logging |
| 4787 | 26 | import random | 26 | import random |
| 4788 | 27 | import re | 27 | import re |
| 4789 | 28 | from html import unescape | ||
| 4790 | 29 | from html.parser import HTMLParser | ||
| 4791 | 28 | from http.cookiejar import CookieJar | 30 | from http.cookiejar import CookieJar |
| 4792 | 29 | from urllib.parse import urlencode | 31 | from urllib.parse import urlencode |
| 4793 | 30 | from urllib.request import HTTPCookieProcessor, URLError, build_opener | 32 | from urllib.request import HTTPCookieProcessor, URLError, build_opener |
| 4794 | 31 | from html.parser import HTMLParser | ||
| 4795 | 32 | from html import unescape | ||
| 4796 | 33 | 33 | ||
| 4797 | 34 | from bs4 import BeautifulSoup, NavigableString | 34 | from bs4 import BeautifulSoup, NavigableString |
| 4798 | 35 | 35 | ||
| 4799 | 36 | 36 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4805 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4806 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4808 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4809 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4810 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4811 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4812 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4818 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4819 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4821 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4822 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4823 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4824 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4825 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4831 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4832 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4834 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4835 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4836 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4837 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4838 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4844 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4845 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4847 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4848 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4849 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4850 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4851 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4857 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4858 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4860 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4861 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4862 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4863 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4864 | @@ -25,7 +25,6 @@ | |||
| 4865 | 25 | """ | 25 | """ |
| 4866 | 26 | 26 | ||
| 4867 | 27 | import logging | 27 | import logging |
| 4868 | 28 | import os | ||
| 4869 | 29 | import sqlite3 | 28 | import sqlite3 |
| 4870 | 30 | from pathlib import Path | 29 | from pathlib import Path |
| 4871 | 31 | from tempfile import gettempdir | 30 | from tempfile import gettempdir |
| 4872 | 32 | 31 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4878 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4879 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4881 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4882 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4883 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4884 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4885 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4891 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4892 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4894 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4895 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4896 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4897 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4898 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4904 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4905 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4907 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4908 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4909 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4910 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4911 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4917 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4918 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4920 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4921 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4922 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4923 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4924 | @@ -24,8 +24,8 @@ | |||
| 4925 | 24 | 24 | ||
| 4926 | 25 | from openlp.core.common.i18n import translate | 25 | from openlp.core.common.i18n import translate |
| 4927 | 26 | from openlp.core.common.mixins import RegistryProperties | 26 | from openlp.core.common.mixins import RegistryProperties |
| 4928 | 27 | from openlp.plugins.songusage.forms.songusagedeletedialog import Ui_SongUsageDeleteDialog | ||
| 4929 | 27 | from openlp.plugins.songusage.lib.db import SongUsageItem | 28 | from openlp.plugins.songusage.lib.db import SongUsageItem |
| 4930 | 28 | from openlp.plugins.songusage.forms.songusagedeletedialog import Ui_SongUsageDeleteDialog | ||
| 4931 | 29 | 29 | ||
| 4932 | 30 | 30 | ||
| 4933 | 31 | class SongUsageDeleteForm(QtWidgets.QDialog, Ui_SongUsageDeleteDialog, RegistryProperties): | 31 | class SongUsageDeleteForm(QtWidgets.QDialog, Ui_SongUsageDeleteDialog, RegistryProperties): |
| 4934 | 32 | 32 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4940 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4941 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4943 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4944 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4945 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4946 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4947 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4953 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4954 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4956 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4957 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4958 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4959 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4960 | @@ -26,8 +26,8 @@ | |||
| 4961 | 26 | 26 | ||
| 4962 | 27 | from openlp.core.common.i18n import translate | 27 | from openlp.core.common.i18n import translate |
| 4963 | 28 | from openlp.core.common.mixins import RegistryProperties | 28 | from openlp.core.common.mixins import RegistryProperties |
| 4964 | 29 | from openlp.core.common.path import create_paths | ||
| 4965 | 29 | from openlp.core.common.settings import Settings | 30 | from openlp.core.common.settings import Settings |
| 4966 | 30 | from openlp.core.common.path import create_paths | ||
| 4967 | 31 | from openlp.core.lib.ui import critical_error_message_box | 31 | from openlp.core.lib.ui import critical_error_message_box |
| 4968 | 32 | from openlp.plugins.songusage.lib.db import SongUsageItem | 32 | from openlp.plugins.songusage.lib.db import SongUsageItem |
| 4969 | 33 | from .songusagedetaildialog import Ui_SongUsageDetailDialog | 33 | from .songusagedetaildialog import Ui_SongUsageDetailDialog |
| 4970 | 34 | 34 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4976 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4977 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4979 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4980 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4981 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4982 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4983 | 11 | 11 | ||
| 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 | 4 | ############################################################################### | 4 | ############################################################################### |
| 4989 | 5 | # OpenLP - Open Source Lyrics Projection # | 5 | # OpenLP - Open Source Lyrics Projection # |
| 4990 | 6 | # --------------------------------------------------------------------------- # | 6 | # --------------------------------------------------------------------------- # |
| 4992 | 7 | # Copyright (c) 2008-2017 OpenLP Developers # | 7 | # Copyright (c) 2008-2018 OpenLP Developers # |
| 4993 | 8 | # --------------------------------------------------------------------------- # | 8 | # --------------------------------------------------------------------------- # |
| 4994 | 9 | # This program is free software; you can redistribute it and/or modify it # | 9 | # This program is free software; you can redistribute it and/or modify it # |
| 4995 | 10 | # under the terms of the GNU General Public License as published by the Free # | 10 | # under the terms of the GNU General Public License as published by the Free # |
| 4996 | 11 | 11 | ||
| 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.
