Remove imports from openlp/core/ui/__init__.py and update related files

openlp/core/app.py

@@ -43,7 +43,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.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

openlp/core/ui/__init__.py

@@ -93,30 +93,4 @@ class SingleColumnTableWidget(QtWidgets.QTableWidget):
             self.resizeRowsToContents()
 
 
-from .starttimeform import StartTimeForm
+__all__ = ['SingleColumnTableWidget']
-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 .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', 'MainDisplay', 'SlideController', 'ServiceManager',
-           'ThemeManager', 'ServiceItemEditForm', 'Display', 'AudioPlayer',
-           'ServiceNoteForm', 'StartTimeForm', 'MainDisplay',
-           'SlideController', 'DisplayController', 'GeneralTab', 'ThemesTab', 'AdvancedTab', 'PluginForm',
-           'FormattingTagForm', 'ShortcutListForm', 'FormattingTagController', 'SingleColumnTableWidget',
-           'ProjectorManager', 'ProjectorTab', 'ProjectorEditForm', 'LiveController', 'PreviewController']

openlp/core/ui/mainwindow.py

@@ -48,8 +48,13 @@ 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, ServiceManager, ThemeManager, LiveController, PluginForm, \
+from openlp.core.ui.shortcutlistform import ShortcutListForm
-    ShortcutListForm, FormattingTagForm, PreviewController
+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

openlp/core/ui/servicemanager.py

@@ -48,7 +48,9 @@ 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
 

openlp/core/ui/settingsform.py

@@ -31,7 +31,9 @@ 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
 

openlp/core/ui/slidecontroller.py

@@ -40,7 +40,8 @@ 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
@@ -820,7 +821,7 @@ class SlideController(DisplayController, LogMixin, RegistryProperties):
     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

tests/functional/openlp_core/ui/test_formattingtagscontroller.py

@@ -24,7 +24,7 @@ Package to test the openlp.core.ui.formattingtagscontroller package.
 """
 from unittest import TestCase
 
-from openlp.core.ui import FormattingTagController
+from openlp.core.ui.formattingtagcontroller import FormattingTagController
 
 
 class TestFormattingTagController(TestCase):

tests/functional/openlp_core/ui/test_maindisplay.py

@@ -32,7 +32,7 @@ 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.pluginmanager import PluginManager
-from openlp.core.ui import MainDisplay, AudioPlayer
+from openlp.core.ui.maindisplay import MainDisplay, AudioPlayer
 from openlp.core.ui.maindisplay import TRANSPARENT_STYLESHEET, OPAQUE_STYLESHEET
 from tests.helpers.testmixin import TestMixin
 

tests/functional/openlp_core/ui/test_servicemanager.py

@@ -31,7 +31,7 @@ import PyQt5
 from openlp.core.common import ThemeLevel
 from openlp.core.common.registry import Registry
 from openlp.core.lib.serviceitem import ServiceItem, ServiceItemType, ItemCapabilities
-from openlp.core.ui import ServiceManager
+from openlp.core.ui.servicemanager import ServiceManager
 from openlp.core.widgets.toolbar import OpenLPToolbar
 
 

tests/functional/openlp_core/ui/test_thememanager.py

@@ -32,7 +32,7 @@ from PyQt5 import QtWidgets
 
 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
 
 

tests/interfaces/openlp_core/ui/test_thememanager.py

@@ -28,7 +28,7 @@ from unittest.mock import patch, MagicMock
 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