← Back to branch summary

~raoul-snyman/openlp/dont-test-uno-on-macos

~raoul-snyman/openlp/dont-test-uno-on-macos

« back to all changes in this revision

Viewing changes to openlp/plugins/songs/lib/importer.py

Committer: Raoul Snyman
Date: 2017-10-25 21:18:38 UTC
mfrom: (2780.1.2 refactorings-3)
Revision ID: raoul@snyman.info-20171025211838-be4wutkihlytvkk3

Merge in refactorings-3

files added:
openlp/core/lib/json/__init__.py

openlp/core/widgets

openlp/core/widgets/__init__.py

openlp/core/widgets/enums.py

openlp/plugins/bibles/lib/importers/__init__.py

tests/functional/openlp_core/widgets

tests/functional/openlp_core/widgets/__init__.py

tests/interfaces/openlp_core

tests/interfaces/openlp_core/__init__.py

tests/interfaces/openlp_core/ui/media

tests/interfaces/openlp_core/ui/media/__init__.py

tests/interfaces/openlp_core/widgets

tests/interfaces/openlp_core/widgets/__init__.py

files removed:
openlp/core/ui/lib

openlp/core/ui/lib/__init__.py

openlp/core/ui/lib/historycombobox.py

openlp/core/ui/lib/listwidgetwithdnd.py

openlp/core/ui/lib/mediadockmanager.py

openlp/core/ui/lib/pathedit.py

openlp/core/ui/lib/spelltextedit.py

openlp/core/ui/lib/treewidgetwithdnd.py

tests/functional/openlp_core/ui/lib/test_listwidgetwithdnd.py

tests/interfaces/openlp_core_ui_lib/test_historycombobox.py

files renamed:
openlp/core/ui/lib/colorbutton.py => openlp/core/widgets/buttons.py

openlp/core/ui/lib/filedialog.py => openlp/core/widgets/dialogs.py

openlp/core/ui/lib/dockwidget.py => openlp/core/widgets/docks.py

openlp/core/lib/searchedit.py => openlp/core/widgets/edits.py

openlp/core/ui/lib/toolbar.py => openlp/core/widgets/toolbar.py

openlp/core/ui/lib/listpreviewwidget.py => openlp/core/widgets/views.py

openlp/core/ui/lib/wizard.py => openlp/core/widgets/wizard.py

tests/functional/openlp_core/ui/lib/test_colorbutton.py => tests/functional/openlp_core/widgets/test_buttons.py

tests/functional/openlp_core/ui/lib/test_filedialog.py => tests/functional/openlp_core/widgets/test_dialogs.py

tests/functional/openlp_core/ui/lib/test_pathedit.py => tests/functional/openlp_core/widgets/test_edits.py

tests/functional/openlp_core/ui/lib/test_listpreviewwidget.py => tests/functional/openlp_core/widgets/test_views.py

tests/interfaces/openlp_core_api/ => tests/interfaces/openlp_core/api/

tests/interfaces/openlp_core_common/ => tests/interfaces/openlp_core/common/

tests/interfaces/openlp_core_lib/ => tests/interfaces/openlp_core/lib/

tests/interfaces/openlp_core_ui/ => tests/interfaces/openlp_core/ui/

tests/interfaces/openlp_core_ui_lib/ => tests/interfaces/openlp_core/ui/lib/

tests/interfaces/openlp_core_ul_media_vendor/ => tests/interfaces/openlp_core/ui/media/vendor/

tests/interfaces/openlp_core_lib/test_searchedit.py => tests/interfaces/openlp_core/widgets/test_edits.py

tests/interfaces/openlp_core_ui_lib/test_listpreviewwidget.py => tests/interfaces/openlp_core/widgets/test_views.py

files modified:
openlp.py

openlp/core/api/http/server.py

openlp/core/api/poll.py

openlp/core/api/websockets.py

openlp/core/app.py

openlp/core/common/mixins.py

openlp/core/common/registry.py

openlp/core/display/renderer.py

openlp/core/lib/db.py

openlp/core/lib/mediamanageritem.py

openlp/core/lib/plugin.py

openlp/core/lib/pluginmanager.py

openlp/core/lib/projector/db.py

openlp/core/lib/projector/pjlink.py

openlp/core/lib/serviceitem.py

openlp/core/lib/settingstab.py

openlp/core/ui/advancedtab.py

openlp/core/ui/exceptionform.py

openlp/core/ui/filerenameform.py

openlp/core/ui/firsttimeform.py

openlp/core/ui/generaltab.py

openlp/core/ui/maindisplay.py

openlp/core/ui/mainwindow.py

openlp/core/ui/media/mediacontroller.py

openlp/core/ui/media/mediaplayer.py

openlp/core/ui/media/playertab.py

openlp/core/ui/pluginform.py

openlp/core/ui/printservicedialog.py

openlp/core/ui/printserviceform.py

openlp/core/ui/projector/manager.py

openlp/core/ui/serviceitemeditform.py

openlp/core/ui/servicemanager.py

openlp/core/ui/servicenoteform.py

openlp/core/ui/settingsform.py

openlp/core/ui/shortcutlistform.py

openlp/core/ui/slidecontroller.py

openlp/core/ui/starttimeform.py

openlp/core/ui/themeform.py

openlp/core/ui/thememanager.py

openlp/core/ui/themewizard.py

openlp/plugins/alerts/lib/alertsmanager.py

openlp/plugins/alerts/lib/alertstab.py

openlp/plugins/bibles/forms/bibleimportform.py

openlp/plugins/bibles/forms/editbibleform.py

openlp/plugins/bibles/lib/bibleimport.py

openlp/plugins/bibles/lib/db.py

openlp/plugins/bibles/lib/importers/http.py

openlp/plugins/bibles/lib/manager.py

openlp/plugins/bibles/lib/mediaitem.py

openlp/plugins/custom/forms/editcustomslidedialog.py

openlp/plugins/images/lib/imagetab.py

openlp/plugins/images/lib/mediaitem.py

openlp/plugins/media/forms/mediaclipselectorform.py

openlp/plugins/media/lib/mediaitem.py

openlp/plugins/presentations/lib/presentationtab.py

openlp/plugins/songs/forms/duplicatesongremovalform.py

openlp/plugins/songs/forms/editsongform.py

openlp/plugins/songs/forms/editversedialog.py

openlp/plugins/songs/forms/songexportform.py

openlp/plugins/songs/forms/songimportform.py

openlp/plugins/songs/forms/songmaintenanceform.py

openlp/plugins/songs/forms/songselectdialog.py

openlp/plugins/songs/lib/importer.py

openlp/plugins/songs/lib/importers/easyworship.py

openlp/plugins/songs/lib/importers/foilpresenter.py

openlp/plugins/songs/lib/importers/openlp.py

openlp/plugins/songs/lib/importers/openlyrics.py

openlp/plugins/songs/lib/importers/powerpraise.py

openlp/plugins/songs/lib/importers/presentationmanager.py

openlp/plugins/songs/lib/importers/propresenter.py

openlp/plugins/songs/lib/importers/songimport.py

openlp/plugins/songs/lib/importers/songshowplus.py

openlp/plugins/songs/lib/openlyricsexport.py

openlp/plugins/songs/reporting.py

openlp/plugins/songusage/forms/songusagedeleteform.py

openlp/plugins/songusage/forms/songusagedetaildialog.py

openlp/plugins/songusage/forms/songusagedetailform.py

tests/functional/openlp_core/common/test_mixins.py

tests/functional/openlp_core/common/test_registry.py

tests/functional/openlp_core/test_app.py

tests/functional/openlp_core/ui/test_mainwindow.py

tests/functional/openlp_core/ui/test_servicemanager.py

tests/functional/openlp_core/ui/test_thememanager.py

tests/interfaces/openlp_core/ui/media/vendor/test_mediainfoWrapper.py

tests/interfaces/openlp_core/ui/test_servicemanager.py

Show diffs side-by-side

added added

removed removed

openlp/plugins/songs/lib/importer.py

26

26

27

27

from openlp.core.common import is_win

28

28

from openlp.core.common.i18n import UiStrings, translate

29

from openlp.core.ui.lib.wizard import WizardStrings

29

from openlp.core.widgets.wizard import WizardStrings

30

30

from .importers.opensong import OpenSongImport

31

31

from .importers.easyslides import EasySlidesImport

32

32

from .importers.openlp import OpenLPSongImport

Older »