~suutari-olli/openlp/click-slide-to-go-live-from-blank

« back to all changes in this revision

Viewing changes to openlp/plugins/songs/lib/importers/songimport.py

Committer: suutari-olli
Date: 2016-04-28 20:12:34 UTC
mfrom: (2625.1.29 openlp)
mto: (2625.1.61 openlp)
mto: This revision was merged to the branch mainline in revision 2663.
Revision ID: suutari.olli@gmail.com-20160428201234-mg4nnxzs1b6ah82t

Merged trunk on 28.4.16, removed broken test.

files added:
openlp/core/ui/lib/colorbutton.py

openlp/core/ui/lib/dockwidget.py

openlp/core/ui/lib/listpreviewwidget.py

openlp/core/ui/lib/listwidgetwithdnd.py

openlp/core/ui/lib/mediadockmanager.py

openlp/core/ui/lib/toolbar.py

openlp/core/ui/lib/treewidgetwithdnd.py

openlp/core/ui/lib/wizard.py

openlp/core/ui/media/vendor/mediainfoWrapper.py

openlp/plugins/bibles/lib/sword.py

resources/images/ios_app_qr.png

resources/images/media_repeat.png

tests/functional/openlp_core_ui_lib

tests/functional/openlp_core_ui_lib/__init__.py

tests/functional/openlp_core_ui_lib/test_color_button.py

tests/functional/openlp_core_ui_lib/test_listpreviewwidget.py

tests/functional/openlp_plugins/bibles/test_swordimport.py

tests/functional/openlp_plugins/songs/test_openlpimporter.py

tests/interfaces/openlp_core_ui_lib/test_listpreviewwidget.py

tests/interfaces/openlp_core_ul_media_vendor

tests/interfaces/openlp_core_ul_media_vendor/__init__.py

tests/interfaces/openlp_core_ul_media_vendor/test_mediainfoWrapper.py

tests/resources/media

tests/resources/media/avi_file.avi

tests/resources/media/mp3_file.mp3

tests/resources/media/mp4_file.mp4

tests/resources/media/mpg_file.mpg

files removed:
openlp/core/lib/colorbutton.py

openlp/core/lib/dockwidget.py

openlp/core/lib/listwidgetwithdnd.py

openlp/core/lib/toolbar.py

openlp/core/lib/treewidgetwithdnd.py

openlp/core/ui/listpreviewwidget.py

openlp/core/ui/mediadockmanager.py

openlp/core/ui/wizard.py

tests/functional/openlp_core_lib/test_color_button.py

tests/functional/openlp_core_ui/test_listpreviewwidget.py

tests/interfaces/openlp_core_ui/test_listpreviewwidget.py

files modified:
.bzrignore

openlp/core/common/__init__.py

openlp/core/common/settings.py

openlp/core/common/uistrings.py

openlp/core/lib/__init__.py

openlp/core/lib/mediamanageritem.py

openlp/core/lib/projector/db.py

openlp/core/lib/projector/pjlink1.py

openlp/core/lib/serviceitem.py

openlp/core/resources.py

openlp/core/ui/__init__.py

openlp/core/ui/advancedtab.py

openlp/core/ui/firsttimewizard.py

openlp/core/ui/generaltab.py

openlp/core/ui/lib/__init__.py

openlp/core/ui/maindisplay.py

openlp/core/ui/mainwindow.py

openlp/core/ui/media/__init__.py

openlp/core/ui/media/mediacontroller.py

openlp/core/ui/media/mediaplayer.py

openlp/core/ui/media/playertab.py

openlp/core/ui/media/systemplayer.py

openlp/core/ui/media/vlcplayer.py

openlp/core/ui/media/webkitplayer.py

openlp/core/ui/projector/editform.py

openlp/core/ui/projector/manager.py

openlp/core/ui/projector/sourceselectform.py

openlp/core/ui/servicemanager.py

openlp/core/ui/slidecontroller.py

openlp/core/ui/themeform.py

openlp/core/ui/thememanager.py

openlp/core/ui/themewizard.py

openlp/plugins/alerts/lib/alertstab.py

openlp/plugins/bibles/forms/bibleimportform.py

openlp/plugins/bibles/forms/bibleupgradeform.py

openlp/plugins/bibles/lib/http.py

openlp/plugins/bibles/lib/manager.py

openlp/plugins/bibles/lib/mediaitem.py

openlp/plugins/bibles/lib/zefania.py

openlp/plugins/images/lib/imagetab.py

openlp/plugins/images/lib/mediaitem.py

openlp/plugins/media/lib/mediaitem.py

openlp/plugins/media/mediaplugin.py

openlp/plugins/presentations/lib/pdfcontroller.py

openlp/plugins/remotes/lib/remotetab.py

openlp/plugins/songs/forms/duplicatesongremovalform.py

openlp/plugins/songs/forms/editsongform.py

openlp/plugins/songs/forms/songexportform.py

openlp/plugins/songs/forms/songimportform.py

openlp/plugins/songs/forms/songmaintenanceform.py

openlp/plugins/songs/forms/songselectform.py

openlp/plugins/songs/lib/__init__.py

openlp/plugins/songs/lib/db.py

openlp/plugins/songs/lib/importer.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/importers/wordsofworship.py

openlp/plugins/songs/lib/mediaitem.py

resources/images/general_preview.png

resources/images/openlp-2.qrc

scripts/check_dependencies.py

tests/functional/__init__.py

tests/functional/openlp_core_common/test_projector_utilities.py

tests/functional/openlp_core_lib/test_htmlbuilder.py

tests/functional/openlp_core_lib/test_projector_pjlink1.py

tests/functional/openlp_core_ui/test_maindisplay.py

tests/functional/openlp_core_ui/test_mainwindow.py

tests/functional/openlp_core_ui_media/test_mediacontroller.py

tests/functional/openlp_core_ui_media/test_vlcplayer.py

tests/functional/openlp_plugins/bibles/test_mediaitem.py

tests/functional/openlp_plugins/media/test_mediaplugin.py

tests/functional/openlp_plugins/songs/test_lib.py

tests/functional/openlp_plugins/songs/test_mediaitem.py

tests/functional/openlp_plugins/songs/test_songselect.py

tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py

Show diffs side-by-side

added added

removed removed

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

from PyQt5 import QtCore

from openlp.core.common import Registry, AppLocation, check_directory_exists, translate

from openlp.core.ui.wizard import WizardStrings

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

from openlp.plugins.songs.lib import clean_song, VerseType

from openlp.plugins.songs.lib.db import Song, Author, Topic, Book, MediaFile

from openlp.plugins.songs.lib.ui import SongStrings

Older »