Missed imports

openlp/core/lib/db.py

@@ -41,8 +41,7 @@ from sqlalchemy.pool import NullPool
 from alembic.migration import MigrationContext
 from alembic.operations import Operations
 
-from openlp.core.common import AppLocation, Settings
-from openlp.core.lib import translate
+from openlp.core.common import AppLocation, Settings, translate
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.core.utils import delete_file
 

openlp/core/lib/serviceitem.py

@@ -39,8 +39,8 @@ import uuid
 
 from PyQt4 import QtGui
 
-from openlp.core.common import Settings
-from openlp.core.lib import ImageSource, Registry, build_icon, clean_tags, expand_tags, translate
+from openlp.core.common import Settings, translate
+from openlp.core.lib import ImageSource, Registry, build_icon, clean_tags, expand_tags
 
 log = logging.getLogger(__name__)
 

openlp/core/lib/theme.py

@@ -510,7 +510,6 @@ class ThemeXML(object):
         """
         Create the attributes with the correct data types and name format
         """
-        #print(master, element, value)
         reject, master, element, value = self._translate_tags(master, element, value)
         if reject:
             return

openlp/core/ui/filerenameform.py

@@ -34,7 +34,8 @@ from PyQt4 import QtGui
 
 from .filerenamedialog import Ui_FileRenameDialog
 
-from openlp.core.lib import translate, Registry
+from openlp.core.common import translate
+from openlp.core.lib import Registry
 
 
 class FileRenameForm(QtGui.QDialog, Ui_FileRenameDialog):

openlp/core/ui/firsttimeform.py

@@ -41,8 +41,8 @@ from configparser import SafeConfigParser
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.common import AppLocation, Settings, check_directory_exists
-from openlp.core.lib import PluginStatus, Registry, build_icon, translate
+from openlp.core.common import AppLocation, Settings, check_directory_exists, translate
+from openlp.core.lib import PluginStatus, Registry, build_icon
 from openlp.core.utils import get_web_page
 from .firsttimewizard import Ui_FirstTimeWizard, FirstTimePage
 

openlp/core/ui/firsttimelanguagedialog.py

@@ -31,7 +31,7 @@ The UI widgets of the language selection dialog.
 """
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.common import translate
 from openlp.core.lib.ui import create_button_box
 
 

openlp/core/ui/firsttimewizard.py

@@ -33,7 +33,7 @@ from PyQt4 import QtCore, QtGui
 
 import sys
 
-from openlp.core.lib import translate
+from openlp.core.common import translate
 from openlp.core.lib.ui import add_welcome_page
 
 

openlp/core/ui/formattingtagcontroller.py

@@ -33,8 +33,8 @@ cannot be changed.
 """
 
 import re
-
-from openlp.core.lib import FormattingTags, translate
+from openlp.core.common import translate
+from openlp.core.lib import FormattingTags
 
 
 class FormattingTagController(object):

openlp/core/ui/formattingtagform.py

@@ -34,7 +34,8 @@ Base Tags cannot be changed.
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import FormattingTags, translate
+from openlp.core.common import translate
+from openlp.core.lib import FormattingTags
 from openlp.core.ui.formattingtagdialog import Ui_FormattingTagDialog
 from openlp.core.ui.formattingtagcontroller import FormattingTagController
 

openlp/core/ui/maindisplay.py

@@ -44,9 +44,8 @@ import sys
 from PyQt4 import QtCore, QtGui, QtWebKit, QtOpenGL
 from PyQt4.phonon import Phonon
 
-from openlp.core.common import Settings
-from openlp.core.lib import ServiceItem, ImageSource, Registry, build_html, expand_tags, \
-    image_to_byte, translate
+from openlp.core.common import Settings, translate
+from openlp.core.lib import ServiceItem, ImageSource, Registry, build_html, expand_tags, image_to_byte
 from openlp.core.lib.theme import BackgroundType
 
 from openlp.core.lib import ScreenList

openlp/core/ui/mainwindow.py

@@ -42,12 +42,12 @@ from datetime import datetime
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Renderer, OpenLPDockWidget, PluginManager, ImageManager, PluginStatus, Registry, \
-    ScreenList, build_icon, translate
+    ScreenList, build_icon
 from openlp.core.lib.ui import UiStrings, create_action
 from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, ThemeManager, SlideController, PluginForm, \
     MediaDockManager, ShortcutListForm, FormattingTagForm
 
-from openlp.core.common import AppLocation, Settings, check_directory_exists
+from openlp.core.common import AppLocation, Settings, check_directory_exists, translate
 from openlp.core.ui.media import MediaController
 from openlp.core.utils import LanguageManager, add_actions, get_application_version
 from openlp.core.utils.actions import ActionList, CategoryOrder

openlp/core/ui/pluginform.py

@@ -34,7 +34,8 @@ import os
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import PluginStatus, Registry, translate
+from openlp.core.common import translate
+from openlp.core.lib import PluginStatus, Registry
 from .plugindialog import Ui_PluginViewDialog
 
 log = logging.getLogger(__name__)

openlp/core/ui/serviceitemeditdialog.py

@@ -31,7 +31,7 @@ The UI widgets for the service item edit dialog
 """
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.common import translate
 from openlp.core.lib.ui import create_button_box, create_button
 
 

openlp/core/ui/serviceitemeditform.py

@@ -29,7 +29,7 @@
 """
 The service item edit dialog
 """
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 from openlp.core.lib import Registry
 
 from .serviceitemeditdialog import Ui_ServiceItemEditDialog

openlp/core/ui/servicemanager.py

@@ -42,10 +42,8 @@ log = logging.getLogger(__name__)
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.common import AppLocation, Settings, check_directory_exists, UiStrings, translate
-from openlp.core.lib import OpenLPToolbar, ServiceItem, ItemCapabilities, PluginStatus, Registry, \
-    build_icon
-from openlp.core.common import ThemeLevel
+from openlp.core.common import AppLocation, Settings, ThemeLevel, check_directory_exists, UiStrings, translate
+from openlp.core.lib import OpenLPToolbar, ServiceItem, ItemCapabilities, PluginStatus, Registry, build_icon
 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.printserviceform import PrintServiceForm

openlp/core/ui/servicenoteform.py

@@ -31,7 +31,8 @@ The :mod:`~openlp.core.ui.servicenoteform` module contains the `ServiceNoteForm`
 """
 from PyQt4 import QtGui
 
-from openlp.core.lib import SpellTextEdit, Registry, translate
+from openlp.core.common import translate
+from openlp.core.lib import SpellTextEdit, Registry
 from openlp.core.lib.ui import create_button_box
 
 

openlp/core/ui/settingsdialog.py

@@ -31,7 +31,8 @@ The UI widgets of the settings dialog.
 """
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, build_icon
+from openlp.core.common import translate
+from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
 
 

openlp/core/ui/shortcutlistdialog.py

@@ -31,7 +31,8 @@ The list of shortcuts within a dialog.
 """
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, build_icon
+from openlp.core.common import translate
+from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
 
 

openlp/core/ui/slidecontroller.py

@@ -38,8 +38,8 @@ from collections import deque
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.common import Settings, SlideLimits, UiStrings, translate
-from openlp.core.lib import OpenLPToolbar, ItemCapabilities, ServiceItem, ImageSource, \
-    ServiceItemAction, Registry, ScreenList, build_icon, build_html
+from openlp.core.lib import OpenLPToolbar, ItemCapabilities, ServiceItem, ImageSource, ServiceItemAction, Registry, \
+    ScreenList, build_icon, build_html
 from openlp.core.ui import HideMode, MainDisplay, Display, DisplayControllerType
 from openlp.core.lib.ui import create_action
 from openlp.core.utils.actions import ActionList, CategoryOrder

openlp/core/ui/themelayoutdialog.py

@@ -31,7 +31,7 @@ The layout of the theme
 """
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.common import translate
 from openlp.core.lib.ui import create_button_box
 
 

openlp/core/ui/thememanager.py

@@ -39,8 +39,8 @@ from xml.etree.ElementTree import ElementTree, XML
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.common import AppLocation, Settings, check_directory_exists, UiStrings, translate
-from openlp.core.lib import ImageSource, OpenLPToolbar, Registry, get_text_file_string, \
-    build_icon, check_item_selected, create_thumb, validate_thumb
+from openlp.core.lib import ImageSource, OpenLPToolbar, Registry, get_text_file_string, build_icon, \
+    check_item_selected, create_thumb, validate_thumb
 from openlp.core.lib.theme import ThemeXML, BackgroundType
 from openlp.core.lib.ui import critical_error_message_box, create_widget_action
 from openlp.core.ui import FileRenameForm, ThemeForm, ThemeManagerHelper

openlp/core/utils/__init__.py

@@ -54,7 +54,7 @@ if sys.platform != 'win32' and sys.platform != 'darwin':
     except ImportError:
         XDG_BASE_AVAILABLE = False
 
-from openlp.core.lib import translate
+from openlp.core.common import translate
 
 log = logging.getLogger(__name__)
 APPLICATION_VERSION = {}

openlp/core/utils/languagemanager.py

@@ -35,8 +35,7 @@ import sys
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.common import AppLocation, Settings
-from openlp.core.lib import translate
+from openlp.core.common import AppLocation, Settings, translate
 
 log = logging.getLogger(__name__)
 

openlp/plugins/alerts/alertsplugin.py

@@ -31,8 +31,8 @@ import logging
 
 from PyQt4 import QtGui
 
-from openlp.core.common import Settings
-from openlp.core.lib import Plugin, StringContent, build_icon, translate
+from openlp.core.common import Settings, translate
+from openlp.core.lib import Plugin, StringContent, build_icon
 from openlp.core.lib.db import Manager
 from openlp.core.lib.ui import create_action, UiStrings
 from openlp.core.lib.theme import VerticalType

openlp/plugins/alerts/forms/alertdialog.py

@@ -29,7 +29,8 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import build_icon, translate
+from openlp.core.common import translate
+from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button, create_button_box
 
 

openlp/plugins/alerts/forms/alertform.py

@@ -29,7 +29,7 @@
 
 from PyQt4 import QtGui, QtCore
 
-from openlp.core.lib import translate
+from openlp.core.common import translate
 from openlp.plugins.alerts.lib.db import AlertItem
 
 from .alertdialog import Ui_AlertDialog

openlp/plugins/alerts/lib/alertsmanager.py

@@ -35,7 +35,8 @@ import logging
 
 from PyQt4 import QtCore
 
-from openlp.core.lib import Registry, translate
+from openlp.core.common import translate
+from openlp.core.lib import Registry
 
 
 log = logging.getLogger(__name__)

openlp/plugins/bibles/lib/csvbible.py

@@ -60,7 +60,7 @@ import logging
 import chardet
 import csv
 
-from openlp.core.lib import translate
+from openlp.core.common import translate
 from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB
 
 

openlp/plugins/bibles/lib/db.py

@@ -38,8 +38,8 @@ from sqlalchemy import Column, ForeignKey, Table, or_, types, func
 from sqlalchemy.orm import class_mapper, mapper, relation
 from sqlalchemy.orm.exc import UnmappedClassError
 
-from openlp.core.common import AppLocation
-from openlp.core.lib import Registry, translate
+from openlp.core.common import AppLocation, translate
+from openlp.core.lib import Registry
 from openlp.core.lib.db import BaseModel, init_db, Manager
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.core.utils import clean_filename

openlp/plugins/bibles/lib/http.py

@@ -38,7 +38,8 @@ from html.parser import HTMLParseError
 
 from bs4 import BeautifulSoup, NavigableString, Tag
 
-from openlp.core.lib import Registry, translate
+from openlp.core.common import translate
+from openlp.core.lib import Registry
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.core.utils import get_web_page
 from openlp.plugins.bibles.lib import SearchResults

openlp/plugins/bibles/lib/manager.py

@@ -30,8 +30,8 @@
 import logging
 import os
 
-from openlp.core.common import AppLocation, Settings
-from openlp.core.lib import Registry, translate
+from openlp.core.common import AppLocation, Settings, translate
+from openlp.core.lib import Registry
 from openlp.core.utils import delete_file
 from openlp.plugins.bibles.lib import parse_reference, get_reference_separator, LanguageSelection
 from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta

openlp/plugins/bibles/lib/mediaitem.py

@@ -32,8 +32,7 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.common import Settings, UiStrings, translate
-from openlp.core.lib import Registry, MediaManagerItem, ItemCapabilities, ServiceItemContext,  \
-    create_separated_list
+from openlp.core.lib import Registry, MediaManagerItem, ItemCapabilities, ServiceItemContext, create_separated_list
 from openlp.core.lib.searchedit import SearchEdit
 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, build_icon

openlp/plugins/bibles/lib/opensong.py

@@ -30,7 +30,7 @@
 import logging
 from lxml import etree, objectify
 
-from openlp.core.lib import translate
+from openlp.core.common import translate
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB
 

openlp/plugins/bibles/lib/osis.py

@@ -33,8 +33,7 @@ import chardet
 import codecs
 import re
 
-from openlp.core.common import AppLocation
-from openlp.core.lib import translate
+from openlp.core.common import AppLocation, translate
 from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB
 
 log = logging.getLogger(__name__)

openlp/plugins/bibles/lib/versereferencelist.py

@@ -27,6 +27,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
+
 class VerseReferenceList(object):
     """
     The VerseReferenceList class encapsulates a list of verse references, but maintains the order in which they were

openlp/plugins/images/forms/addgroupdialog.py

@@ -29,7 +29,7 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.common import translate
 from openlp.core.lib.ui import create_button_box
 
 

openlp/plugins/images/forms/addgroupform.py

@@ -29,7 +29,7 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.common import translate
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.plugins.images.forms.addgroupdialog import Ui_AddGroupDialog
 

openlp/plugins/images/forms/choosegroupdialog.py

@@ -29,7 +29,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate
+from openlp.core.common import translate
 from openlp.core.lib.ui import create_button_box
 
 

openlp/plugins/images/imageplugin.py

@@ -31,8 +31,8 @@ from PyQt4 import QtGui
 
 import logging
 
-from openlp.core.common import Settings
-from openlp.core.lib import Plugin, StringContent, Registry, ImageSource, build_icon, translate
+from openlp.core.common import Settings, translate
+from openlp.core.lib import Plugin, StringContent, Registry, ImageSource, build_icon
 from openlp.core.lib.db import Manager
 from openlp.plugins.images.lib import ImageMediaItem, ImageTab
 from openlp.plugins.images.lib.db import init_schema

openlp/plugins/images/lib/mediaitem.py

@@ -34,8 +34,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.common import AppLocation, Settings, UiStrings, check_directory_exists, translate
 from openlp.core.lib import ItemCapabilities, MediaManagerItem, Registry, ServiceItemContext, \
-    StringContent, TreeWidgetWithDnD, build_icon, check_item_selected, create_thumb, \
-    validate_thumb
+    StringContent, TreeWidgetWithDnD, build_icon, check_item_selected, create_thumb, validate_thumb
 from openlp.core.lib.ui import create_widget_action, critical_error_message_box
 from openlp.core.utils import delete_file, get_locale_key, get_images_filter
 from openlp.plugins.images.forms import AddGroupForm, ChooseGroupForm

openlp/plugins/media/mediaplugin.py

@@ -31,7 +31,8 @@ import logging
 
 from PyQt4 import QtCore
 
-from openlp.core.lib import Plugin, Registry, StringContent, build_icon, translate
+from openlp.core.common import translate
+from openlp.core.lib import Plugin, Registry, StringContent, build_icon
 from openlp.plugins.media.lib import MediaMediaItem, MediaTab
 
 

openlp/plugins/presentations/lib/mediaitem.py

@@ -33,7 +33,7 @@ import os
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.common import Settings, UiStrings, translate
-from openlp.core.lib import MediaManagerItem, Registry, ItemCapabilities, ServiceItemContext, \
+from openlp.core.lib import MediaManagerItem, Registry, ItemCapabilities, ServiceItemContext,\
     build_icon, check_item_selected, create_thumb, validate_thumb
 from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box
 from openlp.core.utils import get_locale_key

openlp/plugins/presentations/presentationplugin.py

@@ -35,8 +35,8 @@ import logging
 
 from PyQt4 import QtCore
 
-from openlp.core.common import AppLocation
-from openlp.core.lib import Plugin, StringContent, build_icon, translate
+from openlp.core.common import AppLocation, translate
+from openlp.core.lib import Plugin, StringContent, build_icon
 from openlp.plugins.presentations.lib import PresentationController, PresentationMediaItem, PresentationTab