openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #32995
[Merge] lp:~thelinuxguy/openlp/rework-imports into lp:openlp
Simon Hanna has proposed merging lp:~thelinuxguy/openlp/rework-imports into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~thelinuxguy/openlp/rework-imports/+merge/353747
Rework a couple of imports. Now a subset of tests can be run again, which previously failed due to circular imports (at least that's what I guess)
--
Your team OpenLP Core is requested to review the proposed merge of lp:~thelinuxguy/openlp/rework-imports into lp:openlp.
=== modified file 'openlp/core/api/endpoint/controller.py'
--- openlp/core/api/endpoint/controller.py 2018-02-23 12:16:13 +0000
+++ openlp/core/api/endpoint/controller.py 2018-08-25 14:41:33 +0000
@@ -31,7 +31,8 @@
from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import ItemCapabilities, create_thumb
+from openlp.core.lib import create_thumb
+from openlp.core.lib.serviceitem import ItemCapabilities
log = logging.getLogger(__name__)
=== modified file 'openlp/core/api/endpoint/core.py'
--- openlp/core/api/endpoint/core.py 2017-12-29 09:15:48 +0000
+++ openlp/core/api/endpoint/core.py 2018-08-25 14:41:33 +0000
@@ -29,7 +29,9 @@
from openlp.core.api.http.endpoint import Endpoint
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.registry import Registry
-from openlp.core.lib import PluginStatus, StringContent, image_to_byte
+from openlp.core.lib import image_to_byte
+from openlp.core.lib.plugin import StringContent
+from openlp.core.lib.plugin import PluginStatus
template_dir = 'templates'
static_dir = 'static'
=== modified file 'openlp/core/api/endpoint/pluginhelpers.py'
--- openlp/core/api/endpoint/pluginhelpers.py 2018-07-02 20:38:47 +0000
+++ openlp/core/api/endpoint/pluginhelpers.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,8 @@
from openlp.core.api.http.errors import NotFound
from openlp.core.common.applocation import AppLocation
from openlp.core.common.registry import Registry
-from openlp.core.lib import PluginStatus, image_to_byte
+from openlp.core.lib import image_to_byte
+from openlp.core.lib.plugin import PluginStatus
def search(request, plugin_name, log):
=== modified file 'openlp/core/api/tab.py'
--- openlp/core/api/tab.py 2018-08-04 20:58:13 +0000
+++ openlp/core/api/tab.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,7 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import SettingsTab
+from openlp.core.lib.settingstab import SettingsTab
from openlp.core.ui.icons import UiIcons
ZERO_URL = '0.0.0.0'
=== modified file 'openlp/core/app.py'
--- openlp/core/app.py 2018-04-07 16:16:42 +0000
+++ openlp/core/app.py 2018-08-25 14:41:33 +0000
@@ -43,7 +43,7 @@
from openlp.core.common.settings import Settings
from openlp.core.display.screens import ScreenList
from openlp.core.resources import qInitResources
-from openlp.core.ui import SplashScreen
+from openlp.core.ui.splashscreen import SplashScreen
from openlp.core.ui.exceptionform import ExceptionForm
from openlp.core.ui.firsttimeform import FirstTimeForm
from openlp.core.ui.firsttimelanguageform import FirstTimeLanguageForm
=== modified file 'openlp/core/display/renderer.py'
--- openlp/core/display/renderer.py 2017-12-29 09:15:48 +0000
+++ openlp/core/display/renderer.py 2018-08-25 14:41:33 +0000
@@ -31,8 +31,11 @@
from openlp.core.common.registry import Registry, RegistryBase
from openlp.core.common.settings import Settings
from openlp.core.display.screens import ScreenList
-from openlp.core.lib import FormattingTags, ImageSource, ItemCapabilities, ServiceItem, expand_tags, build_chords_css, \
- build_lyrics_format_css, build_lyrics_outline_css
+from openlp.core.lib import ImageSource, expand_tags
+from openlp.core.lib.htmlbuilder import build_chords_css, build_lyrics_format_css, \
+ build_lyrics_outline_css
+from openlp.core.lib.formattingtags import FormattingTags
+from openlp.core.lib.serviceitem import ServiceItem, ItemCapabilities
from openlp.core.ui.maindisplay import MainDisplay
VERSE = 'The Lord said to {r}Noah{/r}: \n' \
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2018-08-04 20:58:13 +0000
+++ openlp/core/lib/__init__.py 2018-08-25 14:41:33 +0000
@@ -32,6 +32,7 @@
from openlp.core.common.i18n import translate
from openlp.core.common.path import Path
+from openlp.core.lib.formattingtags import FormattingTags
log = logging.getLogger(__name__ + '.__init__')
@@ -608,15 +609,4 @@
last=string_list[-1])
else:
list_to_string = ''
- return list_to_string
-
-
-from .exceptions import ValidationError
-from .formattingtags import FormattingTags
-from .plugin import PluginStatus, StringContent, Plugin
-from .pluginmanager import PluginManager
-from .settingstab import SettingsTab
-from .serviceitem import ServiceItem, ServiceItemType, ItemCapabilities
-from .htmlbuilder import build_html, build_lyrics_format_css, build_lyrics_outline_css, build_chords_css
-from .imagemanager import ImageManager
-from .mediamanageritem import MediaManagerItem
+ return list_to_string
\ No newline at end of file
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2018-04-21 05:47:20 +0000
+++ openlp/core/lib/mediamanageritem.py 2018-08-25 14:41:33 +0000
@@ -33,7 +33,9 @@
from openlp.core.common.path import path_to_str, str_to_path
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import ServiceItem, StringContent, ServiceItemContext
+from openlp.core.lib import ServiceItemContext
+from openlp.core.lib.plugin import StringContent
+from openlp.core.lib.serviceitem import ServiceItem
from openlp.core.lib.ui import create_widget_action, critical_error_message_box
from openlp.core.widgets.dialogs import FileDialog
from openlp.core.widgets.edits import SearchEdit
=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py 2017-12-29 09:15:48 +0000
+++ openlp/core/lib/pluginmanager.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,7 @@
from openlp.core.common.applocation import AppLocation
from openlp.core.common.mixins import LogMixin, RegistryProperties
from openlp.core.common.registry import RegistryBase
-from openlp.core.lib import Plugin, PluginStatus
+from openlp.core.lib.plugin import Plugin, PluginStatus
class PluginManager(RegistryBase, LogMixin, RegistryProperties):
=== modified file 'openlp/core/projectors/tab.py'
--- openlp/core/projectors/tab.py 2018-06-26 17:08:36 +0000
+++ openlp/core/projectors/tab.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,7 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.settings import Settings
-from openlp.core.lib import SettingsTab
+from openlp.core.lib.settingstab import SettingsTab
from openlp.core.ui.icons import UiIcons
from openlp.core.projectors import DialogSourceStyle
=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py 2018-04-21 20:15:43 +0000
+++ openlp/core/ui/__init__.py 2018-08-25 14:41:33 +0000
@@ -93,36 +93,4 @@
self.resizeRowsToContents()
-from .firsttimeform import FirstTimeForm
-from .firsttimelanguageform import FirstTimeLanguageForm
-from .themelayoutform import ThemeLayoutForm
-from .themeform import ThemeForm
-from .filerenameform import FileRenameForm
-from .starttimeform import StartTimeForm
-from .maindisplay import MainDisplay, Display, AudioPlayer
-from .servicenoteform import ServiceNoteForm
-from .serviceitemeditform import ServiceItemEditForm
-from .slidecontroller import SlideController, DisplayController, PreviewController, LiveController
-from .splashscreen import SplashScreen
-from .generaltab import GeneralTab
-from .themestab import ThemesTab
-from .advancedtab import AdvancedTab
-from .aboutform import AboutForm
-from .pluginform import PluginForm
-from .settingsform import SettingsForm
-from .formattingtagform import FormattingTagForm
-from .formattingtagcontroller import FormattingTagController
-from .shortcutlistform import ShortcutListForm
-from .servicemanager import ServiceManager
-from .thememanager import ThemeManager
-
-from openlp.core.projectors.editform import ProjectorEditForm
-from openlp.core.projectors.manager import ProjectorManager
-from openlp.core.projectors.tab import ProjectorTab
-
-__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeForm',
- 'ThemeManager', 'ServiceItemEditForm', 'FirstTimeForm', 'FirstTimeLanguageForm', 'Display', 'AudioPlayer',
- 'ServiceNoteForm', 'ThemeLayoutForm', 'FileRenameForm', 'StartTimeForm', 'MainDisplay',
- 'SlideController', 'DisplayController', 'GeneralTab', 'ThemesTab', 'AdvancedTab', 'PluginForm',
- 'FormattingTagForm', 'ShortcutListForm', 'FormattingTagController', 'SingleColumnTableWidget',
- 'ProjectorManager', 'ProjectorTab', 'ProjectorEditForm', 'LiveController', 'PreviewController']
+__all__ = ['SingleColumnTableWidget']
=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py 2018-08-04 20:58:13 +0000
+++ openlp/core/ui/advancedtab.py 2018-08-25 14:41:33 +0000
@@ -31,7 +31,7 @@
from openlp.core.common.applocation import AppLocation
from openlp.core.common.i18n import UiStrings, format_time, translate
from openlp.core.common.settings import Settings
-from openlp.core.lib import SettingsTab, build_icon
+from openlp.core.lib.settingstab import SettingsTab
from openlp.core.ui.style import HAS_DARK_STYLE
from openlp.core.ui.icons import UiIcons
from openlp.core.widgets.edits import PathEdit
=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py 2018-01-13 23:24:26 +0000
+++ openlp/core/ui/firsttimeform.py 2018-08-25 14:41:33 +0000
@@ -40,7 +40,8 @@
from openlp.core.common.path import Path, create_paths
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import PluginStatus, build_icon
+from openlp.core.lib import build_icon
+from openlp.core.lib.plugin import PluginStatus
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.threading import ThreadWorker, run_thread, get_thread_worker, is_thread_finished
from openlp.core.ui.firsttimewizard import UiFirstTimeWizard, FirstTimePage
=== modified file 'openlp/core/ui/formattingtagcontroller.py'
--- openlp/core/ui/formattingtagcontroller.py 2017-12-29 09:15:48 +0000
+++ openlp/core/ui/formattingtagcontroller.py 2018-08-25 14:41:33 +0000
@@ -27,7 +27,7 @@
import re
from openlp.core.common.i18n import translate
-from openlp.core.lib import FormattingTags
+from openlp.core.lib.formattingtags import FormattingTags
class FormattingTagController(object):
=== modified file 'openlp/core/ui/formattingtagform.py'
--- openlp/core/ui/formattingtagform.py 2017-12-29 09:15:48 +0000
+++ openlp/core/ui/formattingtagform.py 2018-08-25 14:41:33 +0000
@@ -27,7 +27,7 @@
from PyQt5 import QtCore, QtWidgets
from openlp.core.common.i18n import translate
-from openlp.core.lib import FormattingTags
+from openlp.core.lib.formattingtags import FormattingTags
from openlp.core.ui.formattingtagcontroller import FormattingTagController
from openlp.core.ui.formattingtagdialog import Ui_FormattingTagDialog
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2017-12-29 09:15:48 +0000
+++ openlp/core/ui/generaltab.py 2018-08-25 14:41:33 +0000
@@ -32,7 +32,7 @@
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.core.display.screens import ScreenList
-from openlp.core.lib import SettingsTab
+from openlp.core.lib.settingstab import SettingsTab
from openlp.core.widgets.buttons import ColorButton
from openlp.core.widgets.edits import PathEdit
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2018-05-08 19:45:34 +0000
+++ openlp/core/ui/maindisplay.py 2018-08-25 14:41:33 +0000
@@ -40,7 +40,9 @@
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.core.display.screens import ScreenList
-from openlp.core.lib import ServiceItem, ImageSource, build_html, expand_tags, image_to_byte
+from openlp.core.lib import ImageSource, expand_tags, image_to_byte
+from openlp.core.lib.htmlbuilder import build_html
+from openlp.core.lib.serviceitem import ServiceItem
from openlp.core.lib.theme import BackgroundType
from openlp.core.ui import HideMode, AlertLocation, DisplayControllerType
from openlp.core.ui.icons import UiIcons
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2018-06-24 06:56:50 +0000
+++ openlp/core/ui/mainwindow.py 2018-08-25 14:41:33 +0000
@@ -43,11 +43,19 @@
from openlp.core.common.settings import Settings
from openlp.core.display.renderer import Renderer
from openlp.core.display.screens import ScreenList
-from openlp.core.lib import PluginManager, ImageManager, PluginStatus
+from openlp.core.lib.imagemanager import ImageManager
+from openlp.core.lib.plugin import PluginStatus
+from openlp.core.lib.pluginmanager import PluginManager
from openlp.core.lib.ui import create_action
from openlp.core.projectors.manager import ProjectorManager
-from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, ThemeManager, LiveController, PluginForm, \
- ShortcutListForm, FormattingTagForm, PreviewController
+from openlp.core.ui.shortcutlistform import ShortcutListForm
+from openlp.core.ui.formattingtagform import FormattingTagForm
+from openlp.core.ui.thememanager import ThemeManager
+from openlp.core.ui.servicemanager import ServiceManager
+from openlp.core.ui.aboutform import AboutForm
+from openlp.core.ui.pluginform import PluginForm
+from openlp.core.ui.slidecontroller import LiveController, PreviewController
+from openlp.core.ui.settingsform import SettingsForm
from openlp.core.ui.firsttimeform import FirstTimeForm
from openlp.core.ui.media import MediaController
from openlp.core.ui.printserviceform import PrintServiceForm
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2018-04-22 07:17:38 +0000
+++ openlp/core/ui/media/mediacontroller.py 2018-08-25 14:41:33 +0000
@@ -35,7 +35,7 @@
from openlp.core.common.mixins import LogMixin, RegistryProperties
from openlp.core.common.registry import Registry, RegistryBase
from openlp.core.common.settings import Settings
-from openlp.core.lib import ItemCapabilities
+from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import DisplayControllerType
from openlp.core.ui.icons import UiIcons
=== modified file 'openlp/core/ui/media/playertab.py'
--- openlp/core/ui/media/playertab.py 2018-06-03 16:07:20 +0000
+++ openlp/core/ui/media/playertab.py 2018-08-25 14:41:33 +0000
@@ -29,7 +29,7 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import SettingsTab
+from openlp.core.lib.settingstab import SettingsTab
from openlp.core.lib.ui import create_button
from openlp.core.ui.icons import UiIcons
from openlp.core.ui.media import get_media_players, set_media_players
=== modified file 'openlp/core/ui/pluginform.py'
--- openlp/core/ui/pluginform.py 2017-12-29 09:15:48 +0000
+++ openlp/core/ui/pluginform.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,7 @@
from openlp.core.common.i18n import translate
from openlp.core.common.mixins import RegistryProperties
-from openlp.core.lib import PluginStatus
+from openlp.core.lib.plugin import PluginStatus
from openlp.core.ui.plugindialog import Ui_PluginViewDialog
log = logging.getLogger(__name__)
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2018-05-08 19:45:34 +0000
+++ openlp/core/ui/servicemanager.py 2018-08-25 14:41:33 +0000
@@ -43,10 +43,14 @@
from openlp.core.common.path import Path, str_to_path
from openlp.core.common.registry import Registry, RegistryBase
from openlp.core.common.settings import Settings
-from openlp.core.lib import ServiceItem, ItemCapabilities, PluginStatus, build_icon
+from openlp.core.lib import build_icon
+from openlp.core.lib.plugin import PluginStatus
+from openlp.core.lib.serviceitem import ServiceItem, ItemCapabilities
from openlp.core.lib.exceptions import ValidationError
from openlp.core.lib.ui import critical_error_message_box, create_widget_action, find_and_set_in_combo_box
-from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm, StartTimeForm
+from openlp.core.ui.serviceitemeditform import ServiceItemEditForm
+from openlp.core.ui.servicenoteform import ServiceNoteForm
+from openlp.core.ui.starttimeform import StartTimeForm
from openlp.core.widgets.dialogs import FileDialog
from openlp.core.widgets.toolbar import OpenLPToolbar
=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py 2017-12-29 09:15:48 +0000
+++ openlp/core/ui/settingsform.py 2018-08-25 14:41:33 +0000
@@ -26,12 +26,14 @@
from PyQt5 import QtCore, QtWidgets
-from openlp.core.api import ApiTab
+from openlp.core.api.tab import ApiTab
from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.registry import Registry
from openlp.core.lib import build_icon
from openlp.core.projectors.tab import ProjectorTab
-from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab
+from openlp.core.ui.advancedtab import AdvancedTab
+from openlp.core.ui.generaltab import GeneralTab
+from openlp.core.ui.themestab import ThemesTab
from openlp.core.ui.media import PlayerTab
from openlp.core.ui.settingsdialog import Ui_SettingsDialog
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2018-08-04 20:58:13 +0000
+++ openlp/core/ui/slidecontroller.py 2018-08-25 14:41:33 +0000
@@ -36,9 +36,12 @@
from openlp.core.common.registry import Registry, RegistryBase
from openlp.core.common.settings import Settings
from openlp.core.display.screens import ScreenList
-from openlp.core.lib import ItemCapabilities, ServiceItem, ImageSource, ServiceItemAction, build_icon, build_html
+from openlp.core.lib import ImageSource, ServiceItemAction, build_icon
+from openlp.core.lib.htmlbuilder import build_html
+from openlp.core.lib.serviceitem import ServiceItem, ItemCapabilities
from openlp.core.lib.ui import create_action
-from openlp.core.ui import HideMode, MainDisplay, Display, DisplayControllerType
+from openlp.core.ui import HideMode, DisplayControllerType
+from openlp.core.ui.maindisplay import MainDisplay, Display
from openlp.core.ui.icons import UiIcons
from openlp.core.widgets.toolbar import OpenLPToolbar
from openlp.core.widgets.views import ListPreviewWidget
@@ -818,7 +821,7 @@
def add_service_manager_item(self, item, slide_no):
"""
Method to install the service item into the controller and request the correct toolbar for the plugin. Called by
- :class:`~openlp.core.ui.ServiceManager`
+ :class:`~openlp.core.ui.servicemanager.ServiceManager`
:param item: The current service item
:param slide_no: The slide number to select
=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py 2017-12-29 09:15:48 +0000
+++ openlp/core/ui/themeform.py 2018-08-25 14:41:33 +0000
@@ -32,7 +32,7 @@
from openlp.core.common.registry import Registry
from openlp.core.lib.theme import BackgroundType, BackgroundGradientType
from openlp.core.lib.ui import critical_error_message_box
-from openlp.core.ui import ThemeLayoutForm
+from openlp.core.ui.themelayoutform import ThemeLayoutForm
from openlp.core.ui.media.webkitplayer import VIDEO_EXT
from .themewizard import Ui_ThemeWizard
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py 2018-04-21 05:47:20 +0000
+++ openlp/core/ui/thememanager.py 2018-08-25 14:41:33 +0000
@@ -36,11 +36,13 @@
from openlp.core.common.path import Path, copyfile, create_paths, path_to_str
from openlp.core.common.registry import Registry, RegistryBase
from openlp.core.common.settings import Settings
-from openlp.core.lib import ImageSource, ValidationError, get_text_file_string, build_icon, \
+from openlp.core.lib import ImageSource, get_text_file_string, build_icon, \
check_item_selected, create_thumb, validate_thumb
+from openlp.core.lib.exceptions import ValidationError
from openlp.core.lib.theme import Theme, BackgroundType
from openlp.core.lib.ui import critical_error_message_box, create_widget_action
-from openlp.core.ui import FileRenameForm, ThemeForm
+from openlp.core.ui.filerenameform import FileRenameForm
+from openlp.core.ui.themeform import ThemeForm
from openlp.core.widgets.dialogs import FileDialog
from openlp.core.widgets.toolbar import OpenLPToolbar
=== modified file 'openlp/core/ui/themestab.py'
--- openlp/core/ui/themestab.py 2018-06-24 06:56:50 +0000
+++ openlp/core/ui/themestab.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,7 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import SettingsTab
+from openlp.core.lib.settingstab import SettingsTab
from openlp.core.lib.ui import find_and_set_in_combo_box
from openlp.core.ui.icons import UiIcons
=== modified file 'openlp/core/widgets/docks.py'
--- openlp/core/widgets/docks.py 2017-12-29 09:15:48 +0000
+++ openlp/core/widgets/docks.py 2018-08-25 14:41:33 +0000
@@ -27,7 +27,8 @@
from PyQt5 import QtWidgets
from openlp.core.display.screens import ScreenList
-from openlp.core.lib import StringContent, build_icon
+from openlp.core.lib import build_icon
+from openlp.core.lib.plugin import StringContent
log = logging.getLogger(__name__)
=== modified file 'openlp/core/widgets/edits.py'
--- openlp/core/widgets/edits.py 2018-04-21 05:59:03 +0000
+++ openlp/core/widgets/edits.py 2018-08-25 14:41:33 +0000
@@ -31,7 +31,8 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.path import Path, path_to_str, str_to_path
from openlp.core.common.settings import Settings
-from openlp.core.lib import FormattingTags, build_icon
+from openlp.core.lib import build_icon
+from openlp.core.lib.formattingtags import FormattingTags
from openlp.core.lib.ui import create_widget_action, create_action
from openlp.core.ui.icons import UiIcons
from openlp.core.widgets.dialogs import FileDialog
=== modified file 'openlp/core/widgets/views.py'
--- openlp/core/widgets/views.py 2018-02-23 09:11:07 +0000
+++ openlp/core/widgets/views.py 2018-08-25 14:41:33 +0000
@@ -31,7 +31,8 @@
from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import ImageSource, ItemCapabilities, ServiceItem
+from openlp.core.lib import ImageSource
+from openlp.core.lib.serviceitem import ItemCapabilities, ServiceItem
def handle_mime_data_urls(mime_data):
=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py 2018-05-08 19:45:34 +0000
+++ openlp/plugins/alerts/alertsplugin.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,7 @@
from openlp.core.common.actions import ActionList
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.settings import Settings
-from openlp.core.lib import Plugin, StringContent
+from openlp.core.lib.plugin import Plugin, StringContent
from openlp.core.lib.db import Manager
from openlp.core.lib.theme import VerticalType
from openlp.core.lib.ui import create_action
=== modified file 'openlp/plugins/alerts/endpoint.py'
--- openlp/plugins/alerts/endpoint.py 2017-12-29 09:15:48 +0000
+++ openlp/plugins/alerts/endpoint.py 2018-08-25 14:41:33 +0000
@@ -27,7 +27,7 @@
from openlp.core.api.http import requires_auth
from openlp.core.api.http.endpoint import Endpoint
from openlp.core.common.registry import Registry
-from openlp.core.lib import PluginStatus
+from openlp.core.lib.plugin import PluginStatus
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/alerts/lib/alertstab.py'
--- openlp/plugins/alerts/lib/alertstab.py 2017-12-29 09:15:48 +0000
+++ openlp/plugins/alerts/lib/alertstab.py 2018-08-25 14:41:33 +0000
@@ -24,7 +24,7 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.settings import Settings
-from openlp.core.lib import SettingsTab
+from openlp.core.lib.settingstab import SettingsTab
from openlp.core.lib.ui import create_valign_selection_widgets
from openlp.core.widgets.buttons import ColorButton
=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py 2018-04-10 19:26:56 +0000
+++ openlp/plugins/bibles/bibleplugin.py 2018-08-25 14:41:33 +0000
@@ -26,7 +26,8 @@
from openlp.core.common.actions import ActionList
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.ui.icons import UiIcons
-from openlp.core.lib import Plugin, StringContent, build_icon
+from openlp.core.lib import build_icon
+from openlp.core.lib.plugin import Plugin, StringContent
from openlp.core.lib.ui import create_action
from openlp.plugins.bibles.endpoint import api_bibles_endpoint, bibles_endpoint
from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem, LayoutStyle, DisplayStyle, \
=== modified file 'openlp/plugins/bibles/lib/bibleimport.py'
--- openlp/plugins/bibles/lib/bibleimport.py 2017-12-29 09:15:48 +0000
+++ openlp/plugins/bibles/lib/bibleimport.py 2018-08-25 14:41:33 +0000
@@ -27,7 +27,7 @@
from openlp.core.common.i18n import get_language, translate
from openlp.core.common.mixins import LogMixin, RegistryProperties
from openlp.core.common.registry import Registry
-from openlp.core.lib import ValidationError
+from openlp.core.lib.exceptions import ValidationError
from openlp.core.lib.ui import critical_error_message_box
from openlp.plugins.bibles.lib.db import AlternativeBookNamesDB, BibleDB, BiblesResourcesDB
=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py 2017-12-29 09:15:48 +0000
+++ openlp/plugins/bibles/lib/biblestab.py 2018-08-25 14:41:33 +0000
@@ -27,7 +27,7 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import SettingsTab
+from openlp.core.lib.settingstab import SettingsTab
from openlp.core.lib.ui import find_and_set_in_combo_box
from openlp.plugins.bibles.lib import LayoutStyle, DisplayStyle, update_reference_separators, \
get_reference_separator, LanguageSelection
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2018-08-04 20:58:13 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2018-08-25 14:41:33 +0000
@@ -29,7 +29,9 @@
from openlp.core.common.i18n import UiStrings, translate, get_locale_key
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext
+from openlp.core.lib import ServiceItemContext
+from openlp.core.lib.mediamanageritem import MediaManagerItem
+from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import set_case_insensitive_completer, create_horizontal_adjusting_combo_box, \
critical_error_message_box, find_and_set_in_combo_box
from openlp.core.ui.icons import UiIcons
=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py 2018-04-10 19:26:56 +0000
+++ openlp/plugins/custom/customplugin.py 2018-08-25 14:41:33 +0000
@@ -29,7 +29,8 @@
from openlp.core.api.http import register_endpoint
from openlp.core.common.i18n import translate
from openlp.core.ui.icons import UiIcons
-from openlp.core.lib import Plugin, StringContent, build_icon
+from openlp.core.lib import build_icon
+from openlp.core.lib.plugin import Plugin, StringContent
from openlp.core.lib.db import Manager
from openlp.plugins.custom.endpoint import api_custom_endpoint, custom_endpoint
from openlp.plugins.custom.lib import CustomMediaItem, CustomTab
=== modified file 'openlp/plugins/custom/lib/customtab.py'
--- openlp/plugins/custom/lib/customtab.py 2017-12-29 09:15:48 +0000
+++ openlp/plugins/custom/lib/customtab.py 2018-08-25 14:41:33 +0000
@@ -27,7 +27,7 @@
from openlp.core.common.i18n import translate
from openlp.core.common.settings import Settings
-from openlp.core.lib import SettingsTab
+from openlp.core.lib.settingstab import SettingsTab
class CustomTab(SettingsTab):
=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py 2018-06-03 16:07:20 +0000
+++ openlp/plugins/custom/lib/mediaitem.py 2018-08-25 14:41:33 +0000
@@ -28,8 +28,10 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext, PluginStatus, \
- check_item_selected
+from openlp.core.lib import ServiceItemContext, check_item_selected
+from openlp.core.lib.mediamanageritem import MediaManagerItem
+from openlp.core.lib.serviceitem import ItemCapabilities
+from openlp.core.lib.plugin import PluginStatus
from openlp.core.lib.ui import create_widget_action
from openlp.core.ui.icons import UiIcons
from openlp.plugins.custom.forms.editcustomform import EditCustomForm
=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py 2018-04-10 19:26:56 +0000
+++ openlp/plugins/images/imageplugin.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,8 @@
from openlp.core.common.i18n import translate
from openlp.core.ui.icons import UiIcons
from openlp.core.common.settings import Settings
-from openlp.core.lib import Plugin, StringContent, ImageSource, build_icon
+from openlp.core.lib import mageSource, build_icon
+from openlp.core.lib.plugin import Plugin, StringContent
from openlp.core.lib.db import Manager
from openlp.plugins.images.endpoint import api_images_endpoint, images_endpoint
from openlp.plugins.images.lib import ImageMediaItem, ImageTab, upgrade
=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py 2017-12-29 09:15:48 +0000
+++ openlp/plugins/images/lib/imagetab.py 2018-08-25 14:41:33 +0000
@@ -24,7 +24,7 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.settings import Settings
-from openlp.core.lib import SettingsTab
+from openlp.core.lib.settingstab import SettingsTab
from openlp.core.widgets.buttons import ColorButton
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2018-06-02 06:37:31 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2018-08-25 14:41:33 +0000
@@ -30,8 +30,11 @@
from openlp.core.common.path import Path, create_paths
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import ItemCapabilities, MediaManagerItem, ServiceItemContext, StringContent, build_icon, \
- check_item_selected, create_thumb, validate_thumb
+from openlp.core.lib import ServiceItemContext, build_icon, check_item_selected, \
+ create_thumb, validate_thumb
+from openlp.core.lib.mediamanageritem import MediaManagerItem
+from openlp.core.lib.serviceitem import ItemCapabilities
+from openlp.core.lib.plugin import StringContent
from openlp.core.lib.ui import create_widget_action, critical_error_message_box
from openlp.core.ui.icons import UiIcons
from openlp.core.widgets.views import TreeWidgetWithDnD
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py 2018-06-03 16:07:20 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2018-08-25 14:41:33 +0000
@@ -31,8 +31,9 @@
from openlp.core.common.path import Path, path_to_str, create_paths
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import ItemCapabilities, MediaManagerItem, MediaType, ServiceItem, ServiceItemContext, \
- check_item_selected
+from openlp.core.lib import MediaType, ServiceItemContext, check_item_selected
+from openlp.core.lib.mediamanageritem import MediaManagerItem
+from openlp.core.lib.serviceitem import ItemCapabilities, ServiceItem
from openlp.core.lib.ui import create_widget_action, critical_error_message_box, create_horizontal_adjusting_combo_box
from openlp.core.ui import DisplayControllerType
from openlp.core.ui.icons import UiIcons
=== modified file 'openlp/plugins/media/lib/mediatab.py'
--- openlp/plugins/media/lib/mediatab.py 2017-12-29 09:15:48 +0000
+++ openlp/plugins/media/lib/mediatab.py 2018-08-25 14:41:33 +0000
@@ -24,7 +24,7 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.settings import Settings
-from openlp.core.lib import SettingsTab
+from openlp.core.lib.settingstab import SettingsTab
class MediaTab(SettingsTab):
=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py 2018-04-10 19:26:56 +0000
+++ openlp/plugins/media/mediaplugin.py 2018-08-25 14:41:33 +0000
@@ -33,7 +33,8 @@
from openlp.core.common.i18n import translate
from openlp.core.ui.icons import UiIcons
from openlp.core.common.path import Path
-from openlp.core.lib import Plugin, StringContent, build_icon
+from openlp.core.lib import build_icon
+from openlp.core.lib.plugin import Plugin, StringContent
from openlp.plugins.media.endpoint import api_media_endpoint, media_endpoint
from openlp.plugins.media.lib import MediaMediaItem, MediaTab
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2018-04-22 07:17:38 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2018-08-25 14:41:33 +0000
@@ -27,8 +27,10 @@
from openlp.core.common.path import path_to_str, str_to_path
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext, \
- build_icon, check_item_selected, create_thumb, validate_thumb
+from openlp.core.lib import ServiceItemContext, build_icon, check_item_selected, \
+ create_thumb, validate_thumb
+from openlp.core.lib.mediamanageritem import MediaManagerItem
+from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box
from openlp.core.ui.icons import UiIcons
from openlp.plugins.presentations.lib import MessageListener
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py 2017-12-29 09:15:48 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py 2018-08-25 14:41:33 +0000
@@ -24,7 +24,7 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.settings import Settings
-from openlp.core.lib import SettingsTab
+from openlp.core.lib.settingstab import SettingsTab
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.widgets.edits import PathEdit
from openlp.plugins.presentations.lib.pdfcontroller import PdfController
=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py 2018-04-10 19:26:56 +0000
+++ openlp/plugins/presentations/presentationplugin.py 2018-08-25 14:41:33 +0000
@@ -33,7 +33,8 @@
from openlp.core.common.i18n import translate
from openlp.core.ui.icons import UiIcons
from openlp.core.common.settings import Settings
-from openlp.core.lib import Plugin, StringContent, build_icon
+from openlp.core.lib import build_icon
+from openlp.core.lib.plugin import Plugin, StringContent
from openlp.plugins.presentations.endpoint import api_presentations_endpoint, presentations_endpoint
from openlp.plugins.presentations.lib import PresentationController, PresentationMediaItem, PresentationTab
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2018-07-02 20:38:47 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2018-08-25 14:41:33 +0000
@@ -33,7 +33,8 @@
from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.path import create_paths, copyfile
from openlp.core.common.registry import Registry
-from openlp.core.lib import PluginStatus, MediaType, create_separated_list
+from openlp.core.lib import MediaType, create_separated_list
+from openlp.core.lib.plugin import PluginStatus
from openlp.core.lib.ui import set_case_insensitive_completer, critical_error_message_box, find_and_set_in_combo_box
from openlp.core.widgets.dialogs import FileDialog
from openlp.plugins.songs.forms.editsongdialog import Ui_EditSongDialog
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2018-06-03 16:07:20 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2018-08-25 14:41:33 +0000
@@ -31,8 +31,10 @@
from openlp.core.common.path import copyfile, create_paths
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import MediaManagerItem, ItemCapabilities, PluginStatus, ServiceItemContext, \
- check_item_selected, create_separated_list
+from openlp.core.lib import ServiceItemContext, check_item_selected, create_separated_list
+from openlp.core.lib.mediamanageritem import MediaManagerItem
+from openlp.core.lib.plugin import PluginStatus
+from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import create_widget_action
from openlp.plugins.songs.forms.editsongform import EditSongForm
from openlp.plugins.songs.forms.songexportform import SongExportForm
=== modified file 'openlp/plugins/songs/lib/openlyricsxml.py'
--- openlp/plugins/songs/lib/openlyricsxml.py 2017-12-29 09:15:48 +0000
+++ openlp/plugins/songs/lib/openlyricsxml.py 2018-08-25 14:41:33 +0000
@@ -63,7 +63,7 @@
from openlp.core.common.i18n import translate
from openlp.core.common.settings import Settings
-from openlp.core.lib import FormattingTags
+from openlp.core.lib.formattingtags import FormattingTags
from openlp.core.version import get_version
from openlp.plugins.songs.lib import VerseType, clean_song
from openlp.plugins.songs.lib.db import Author, AuthorType, Book, Song, Topic
=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py 2018-02-24 16:10:02 +0000
+++ openlp/plugins/songs/lib/songstab.py 2018-08-25 14:41:33 +0000
@@ -24,7 +24,7 @@
from openlp.core.common.i18n import translate
from openlp.core.common.settings import Settings
-from openlp.core.lib import SettingsTab
+from openlp.core.lib.settingstab import SettingsTab
from openlp.plugins.songs.lib.ui import SongStrings
=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py 2018-06-02 06:37:31 +0000
+++ openlp/plugins/songs/songsplugin.py 2018-08-25 14:41:33 +0000
@@ -36,7 +36,8 @@
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.ui.icons import UiIcons
from openlp.core.common.registry import Registry
-from openlp.core.lib import Plugin, StringContent, build_icon
+from openlp.core.lib import build_icon
+from openlp.core.lib.plugin import Plugin, StringContent
from openlp.core.lib.db import Manager
from openlp.core.lib.ui import create_action
from openlp.plugins.songs import reporting
=== modified file 'openlp/plugins/songusage/songusageplugin.py'
--- openlp/plugins/songusage/songusageplugin.py 2018-06-24 06:56:50 +0000
+++ openlp/plugins/songusage/songusageplugin.py 2018-08-25 14:41:33 +0000
@@ -29,7 +29,7 @@
from openlp.core.common.i18n import translate
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import Plugin, StringContent
+from openlp.core.lib.plugin import Plugin, StringContent
from openlp.core.lib.db import Manager
from openlp.core.lib.ui import create_action
from openlp.core.ui.icons import UiIcons
=== modified file 'tests/functional/openlp_core/api/endpoint/test_controller.py'
--- tests/functional/openlp_core/api/endpoint/test_controller.py 2018-03-18 18:18:17 +0000
+++ tests/functional/openlp_core/api/endpoint/test_controller.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,7 @@
from openlp.core.api.endpoint.controller import controller_text, controller_direction
from openlp.core.display.renderer import Renderer
from openlp.core.display.screens import ScreenList
-from openlp.core.lib import ServiceItem
+from openlp.core.lib.serviceitem import ServiceItem
from tests.utils import convert_file_service_item
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_core/display/test_renderer.py'
--- tests/functional/openlp_core/display/test_renderer.py 2017-12-29 09:15:48 +0000
+++ tests/functional/openlp_core/display/test_renderer.py 2018-08-25 14:41:33 +0000
@@ -30,7 +30,7 @@
from openlp.core.common.registry import Registry
from openlp.core.display.renderer import Renderer, words_split, get_start_tags
from openlp.core.display.screens import ScreenList
-from openlp.core.lib import ServiceItem
+from openlp.core.lib.serviceitem import ServiceItem
from openlp.core.lib.theme import Theme
SCREEN = {
=== modified file 'tests/functional/openlp_core/lib/test_formattingtags.py'
--- tests/functional/openlp_core/lib/test_formattingtags.py 2017-04-24 05:17:55 +0000
+++ tests/functional/openlp_core/lib/test_formattingtags.py 2018-08-25 14:41:33 +0000
@@ -26,7 +26,7 @@
from unittest import TestCase
from unittest.mock import patch
-from openlp.core.lib import FormattingTags
+from openlp.core.lib.formattingtags import FormattingTags
TAG = {
'end tag': '{/aa}',
=== modified file 'tests/functional/openlp_core/lib/test_lib.py'
--- tests/functional/openlp_core/lib/test_lib.py 2017-12-24 07:40:07 +0000
+++ tests/functional/openlp_core/lib/test_lib.py 2018-08-25 14:41:33 +0000
@@ -28,9 +28,10 @@
from PyQt5 import QtCore, QtGui
from openlp.core.common.path import Path
-from openlp.core.lib import FormattingTags, build_icon, check_item_selected, clean_tags, compare_chord_lyric, \
+from openlp.core.lib import build_icon, check_item_selected, clean_tags, compare_chord_lyric, \
create_separated_list, create_thumb, expand_chords, expand_chords_for_printing, expand_tags, find_formatting_tags, \
get_text_file_string, image_to_byte, resize_image, str_to_bool, validate_thumb
+from openlp.core.lib.formattingtags import FormattingTags
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_core/lib/test_mediamanageritem.py'
--- tests/functional/openlp_core/lib/test_mediamanageritem.py 2017-12-28 08:22:55 +0000
+++ tests/functional/openlp_core/lib/test_mediamanageritem.py 2018-08-25 14:41:33 +0000
@@ -25,7 +25,7 @@
from unittest import TestCase
from unittest.mock import MagicMock, patch
-from openlp.core.lib import MediaManagerItem
+from openlp.core.lib.mediamanageritem import MediaManagerItem
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/lib/test_pluginmanager.py'
--- tests/functional/openlp_core/lib/test_pluginmanager.py 2018-01-13 23:24:26 +0000
+++ tests/functional/openlp_core/lib/test_pluginmanager.py 2018-08-25 14:41:33 +0000
@@ -27,7 +27,7 @@
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import PluginStatus
+from openlp.core.lib.plugin import PluginStatus
from openlp.core.lib.pluginmanager import PluginManager
=== modified file 'tests/functional/openlp_core/lib/test_serviceitem.py'
--- tests/functional/openlp_core/lib/test_serviceitem.py 2018-01-13 07:24:20 +0000
+++ tests/functional/openlp_core/lib/test_serviceitem.py 2018-08-25 14:41:33 +0000
@@ -30,7 +30,8 @@
from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import ItemCapabilities, ServiceItem, ServiceItemType, FormattingTags
+from openlp.core.lib.formattingtags import FormattingTags
+from openlp.core.lib.serviceitem import ItemCapabilities, ServiceItem, ServiceItemType
from tests.helpers.testmixin import TestMixin
from tests.utils import assert_length, convert_file_service_item
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_core/ui/test_formattingtagscontroller.py'
--- tests/functional/openlp_core/ui/test_formattingtagscontroller.py 2017-12-20 17:44:52 +0000
+++ tests/functional/openlp_core/ui/test_formattingtagscontroller.py 2018-08-25 14:41:33 +0000
@@ -24,7 +24,7 @@
"""
from unittest import TestCase
-from openlp.core.ui import FormattingTagController
+from openlp.core.ui.formattingtagcontroller import FormattingTagController
class TestFormattingTagController(TestCase):
=== modified file 'tests/functional/openlp_core/ui/test_maindisplay.py'
--- tests/functional/openlp_core/ui/test_maindisplay.py 2017-12-28 08:22:55 +0000
+++ tests/functional/openlp_core/ui/test_maindisplay.py 2018-08-25 14:41:33 +0000
@@ -31,8 +31,8 @@
from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
from openlp.core.display.screens import ScreenList
-from openlp.core.lib import PluginManager
-from openlp.core.ui import MainDisplay, AudioPlayer
+from openlp.core.lib.pluginmanager import PluginManager
+from openlp.core.ui.maindisplay import MainDisplay, AudioPlayer
from openlp.core.ui.maindisplay import TRANSPARENT_STYLESHEET, OPAQUE_STYLESHEET
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_core/ui/test_servicemanager.py'
--- tests/functional/openlp_core/ui/test_servicemanager.py 2018-01-13 07:24:20 +0000
+++ tests/functional/openlp_core/ui/test_servicemanager.py 2018-08-25 14:41:33 +0000
@@ -30,8 +30,8 @@
from openlp.core.common import ThemeLevel
from openlp.core.common.registry import Registry
-from openlp.core.lib import ServiceItem, ServiceItemType, ItemCapabilities
-from openlp.core.ui import ServiceManager
+from openlp.core.lib.serviceitem import ServiceItem, ServiceItemType, ItemCapabilities
+from openlp.core.ui.servicemanager import ServiceManager
from openlp.core.widgets.toolbar import OpenLPToolbar
=== modified file 'tests/functional/openlp_core/ui/test_themeform.py'
--- tests/functional/openlp_core/ui/test_themeform.py 2017-12-20 21:18:44 +0000
+++ tests/functional/openlp_core/ui/test_themeform.py 2018-08-25 14:41:33 +0000
@@ -26,7 +26,7 @@
from unittest.mock import MagicMock, patch
from openlp.core.common.path import Path
-from openlp.core.ui import ThemeForm
+from openlp.core.ui.themeform import ThemeForm
class TestThemeManager(TestCase):
@@ -34,7 +34,7 @@
Test the functions in the ThemeManager Class
"""
def setUp(self):
- with patch('openlp.core.ui.ThemeForm._setup'):
+ with patch('openlp.core.ui.themeform.ThemeForm._setup'):
self.instance = ThemeForm(None)
def test_on_image_path_edit_path_changed(self):
=== modified file 'tests/functional/openlp_core/ui/test_thememanager.py'
--- tests/functional/openlp_core/ui/test_thememanager.py 2017-12-29 10:19:33 +0000
+++ tests/functional/openlp_core/ui/test_thememanager.py 2018-08-25 14:41:33 +0000
@@ -32,7 +32,7 @@
from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
-from openlp.core.ui import ThemeManager
+from openlp.core.ui.thememanager import ThemeManager
from tests.utils.constants import RESOURCE_PATH
=== modified file 'tests/functional/openlp_plugins/bibles/test_mediaitem.py'
--- tests/functional/openlp_plugins/bibles/test_mediaitem.py 2018-06-10 19:29:00 +0000
+++ tests/functional/openlp_plugins/bibles/test_mediaitem.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,7 @@
from PyQt5 import QtCore, QtWidgets
from openlp.core.common.registry import Registry
-from openlp.core.lib import MediaManagerItem
+from openlp.core.lib.mediamanageritem import MediaManagerItem
from openlp.plugins.bibles.lib.mediaitem import BibleMediaItem, BibleSearch, ResultsTab, SearchStatus, SearchTabs, \
get_reference_separators, VALID_TEXT_SEARCH
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_plugins/custom/test_mediaitem.py'
--- tests/functional/openlp_plugins/custom/test_mediaitem.py 2017-12-29 09:15:48 +0000
+++ tests/functional/openlp_plugins/custom/test_mediaitem.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,8 @@
from PyQt5 import QtCore
from openlp.core.common.registry import Registry
-from openlp.core.lib import ServiceItem, PluginStatus
+from openlp.core.lib.plugin import PluginStatus
+from openlp.core.lib.serviceitem import ServiceItem
from openlp.plugins.custom.lib import CustomMediaItem
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/functional/openlp_plugins/songs/test_mediaitem.py'
--- tests/functional/openlp_plugins/songs/test_mediaitem.py 2018-03-09 21:58:45 +0000
+++ tests/functional/openlp_plugins/songs/test_mediaitem.py 2018-08-25 14:41:33 +0000
@@ -29,7 +29,7 @@
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import ServiceItem
+from openlp.core.lib.serviceitem import ServiceItem
from openlp.plugins.songs.lib.db import AuthorType, Song
from openlp.plugins.songs.lib.mediaitem import SongMediaItem
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_core/ui/test_filerenamedialog.py'
--- tests/interfaces/openlp_core/ui/test_filerenamedialog.py 2018-07-02 20:38:47 +0000
+++ tests/interfaces/openlp_core/ui/test_filerenamedialog.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,7 @@
from PyQt5 import QtTest, QtWidgets
from openlp.core.common.registry import Registry
-from openlp.core.ui import filerenameform
+from openlp.core.ui.filerenameform import FileRenameForm
from tests.helpers.testmixin import TestMixin
@@ -42,7 +42,7 @@
self.setup_application()
self.main_window = QtWidgets.QMainWindow()
Registry().register('main_window', self.main_window)
- self.form = filerenameform.FileRenameForm()
+ self.form = FileRenameForm()
def tearDown(self):
"""
=== modified file 'tests/interfaces/openlp_core/ui/test_servicemanager.py'
--- tests/interfaces/openlp_core/ui/test_servicemanager.py 2017-12-29 09:15:48 +0000
+++ tests/interfaces/openlp_core/ui/test_servicemanager.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,7 @@
from PyQt5 import QtCore, QtGui, QtWidgets
from openlp.core.common.registry import Registry
-from openlp.core.lib import ServiceItem, ItemCapabilities
+from openlp.core.lib.serviceitem import ServiceItem, ItemCapabilities
from openlp.core.ui.servicemanager import ServiceManager
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_core/ui/test_thememanager.py'
--- tests/interfaces/openlp_core/ui/test_thememanager.py 2017-12-29 09:15:48 +0000
+++ tests/interfaces/openlp_core/ui/test_thememanager.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,7 @@
from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.ui import ThemeManager
+from openlp.core.ui.thememanager import ThemeManager
from tests.helpers.testmixin import TestMixin
=== modified file 'tests/interfaces/openlp_core/widgets/test_views.py'
--- tests/interfaces/openlp_core/widgets/test_views.py 2017-12-29 09:15:48 +0000
+++ tests/interfaces/openlp_core/widgets/test_views.py 2018-08-25 14:41:33 +0000
@@ -28,7 +28,7 @@
from PyQt5 import QtGui, QtWidgets
from openlp.core.common.registry import Registry
-from openlp.core.lib import ServiceItem
+from openlp.core.lib.serviceitem import ServiceItem
from openlp.core.widgets.views import ListPreviewWidget
from tests.helpers.testmixin import TestMixin
from tests.utils.osdinteraction import read_service_from_file
Follow ups
