Merge lp:~suutari-olli/openlp/fix-openlp-importer into lp:openlp/2.4

[Azaziah]

- For diff

[lp:~suutari-olli/openlp/fix-openlp-importer]

2717. By Azaziah on 2017-01-08

- Fixed bug #1632567

2718. By Azaziah on 2017-01-12

- This is broken, attempted to fix author types on import

Unmerged revisions

2718. By Azaziah on 2017-01-12

- This is broken, attempted to fix author types on import

2717. By Azaziah on 2017-01-08

- Fixed bug #1632567

2716. By Azaziah on 2017-01-08

- Better fix, now checks for songbook entry 1st.

2715. By Azaziah on 2017-01-08

- Fixed bug: 1652003

2714. By Tim Bentley on 2017-01-04

Update year in headers and about form

2713. By Tim Bentley on 2016-12-21

Move some http code around to allow it to be reused in the remote updates.

lp:~trb143/openlp/httpfixes (revision 2718)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1888/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1799/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1738/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1474/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1064/
[SUCCESS] https://ci.openlp.io/jo...

2712. By Tomas Groth on 2016-12-18

Update to the appveyor integration script to work with the new packaging builder.

2711. By Raoul Snyman on 2016-12-17

Fix segfault on click on a spinner on macOS
Fix spurious traceback on some platforms or configurations of media players
Make the tab style affect only the media library tabs, not everything else too
Hide the splash screen when the backup dialog shows and when the exception form shows

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/mac-niggles (revision 2713)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1873/
[SUCCESS] https://ci.openlp.io/job/B...

2710. By Raoul Snyman on 2016-12-15

Fix bug #1642684 by removing the blank item and clearing the text box instead.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1642684 (revision 2710)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1869/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1780/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1718/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1458/
[SUCCESS] https://ci.openlp.io/...

2709. By Raoul Snyman on 2016-12-14

Woo! Brand new OpenLP look and feel!

Unfortunately, the Crosswalk servers seem a little dodgy at the moment.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/new-branding (revision 2703)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1862/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1773/
[FAILURE] https://ci.openlp.io/job/Branch-03-Interface-Tests/1711/

=== modified file '.bzrignore'
--- .bzrignore	2016-04-27 18:45:39 +0000
+++ .bzrignore	2017-01-08 22:05:36 +0000
@@ -45,4 +45,9 @@
 *.kdev4
 coverage
 tags
-output
+<<<<<<< TREE
+output
+=======
+output
+htmlcov
+>>>>>>> MERGE-SOURCE
 
=== removed file '.coveragerc'
--- .coveragerc	2016-01-04 00:01:23 +0000
+++ .coveragerc	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-[run]
-source = openlp
-
-[html]
-directory = coverage
 
=== added file 'nose2.cfg'
--- nose2.cfg	1970-01-01 00:00:00 +0000
+++ nose2.cfg	2017-01-08 22:05:36 +0000
@@ -0,0 +1,22 @@
+[unittest]
+verbose = true
+plugins = nose2.plugins.mp
+
+[log-capture]
+always-on = true
+clear-handlers = true
+filter = -nose
+log-level = ERROR
+
+[test-result]
+always-on = true
+descriptions = true
+
+[coverage]
+always-on = true
+coverage = openlp
+coverage-report = html
+
+[multiprocess]
+always-on = false
+processes = 4
 
=== modified file 'openlp/.version'
--- openlp/.version	2016-11-26 15:09:53 +0000
+++ openlp/.version	2017-01-08 22:05:36 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 2.4.4
+=======
+2.5.0
+>>>>>>> MERGE-SOURCE
 
=== modified file 'openlp/core/__init__.py'
--- openlp/core/__init__.py	2016-12-31 11:05:48 +0000
+++ openlp/core/__init__.py	2017-01-08 22:05:36 +0000
@@ -27,26 +27,26 @@
 logging and a plugin framework are contained within the openlp.core module.
 """
 
+import argparse
+import logging
 import os
+import shutil
 import sys
-import logging
-import argparse
+import time
 from traceback import format_exception
-import shutil
-import time
+
 from PyQt5 import QtCore, QtGui, QtWidgets
 
-from openlp.core.common import Registry, OpenLPMixin, AppLocation, Settings, UiStrings, check_directory_exists, \
-    is_macosx, is_win, translate
+from openlp.core.common import Registry, OpenLPMixin, AppLocation, LanguageManager, Settings, UiStrings, \
+    check_directory_exists, is_macosx, is_win, translate
+from openlp.core.common.versionchecker import VersionThread, get_application_version
 from openlp.core.lib import ScreenList
 from openlp.core.resources import qInitResources
+from openlp.core.ui import SplashScreen
+from openlp.core.ui.exceptionform import ExceptionForm
+from openlp.core.ui.firsttimeform import FirstTimeForm
+from openlp.core.ui.firsttimelanguageform import FirstTimeLanguageForm
 from openlp.core.ui.mainwindow import MainWindow
-from openlp.core.ui.firsttimelanguageform import FirstTimeLanguageForm
-from openlp.core.ui.firsttimeform import FirstTimeForm
-from openlp.core.ui.exceptionform import ExceptionForm
-from openlp.core.ui import SplashScreen
-from openlp.core.utils import LanguageManager, VersionThread, get_application_version
-
 
 __all__ = ['OpenLP', 'main']
 
@@ -177,6 +177,38 @@
             self.shared_memory.create(1)
             return False
 
+    def is_data_path_missing(self):
+        """
+        Check if the data folder path exists.
+        """
+        data_folder_path = AppLocation.get_data_path()
+        if not os.path.exists(data_folder_path):
+            log.critical('Database was not found in: ' + data_folder_path)
+            status = QtWidgets.QMessageBox.critical(None, translate('OpenLP', 'Data Directory Error'),
+                                                    translate('OpenLP', 'OpenLP data folder was not found in:\n\n{path}'
+                                                                        '\n\nThe location of the data folder was '
+                                                                        'previously changed from the OpenLP\'s '
+                                                                        'default location. If the data was stored on '
+                                                                        'removable device, that device needs to be '
+                                                                        'made available.\n\nYou may reset the data '
+                                                                        'location back to the default location, '
+                                                                        'or you can try to make the current location '
+                                                                        'available.\n\nDo you want to reset to the '
+                                                                        'default data location? If not, OpenLP will be '
+                                                                        'closed so you can try to fix the the problem.')
+                                                    .format(path=data_folder_path),
+                                                    QtWidgets.QMessageBox.StandardButtons(QtWidgets.QMessageBox.Yes |
+                                                                                          QtWidgets.QMessageBox.No),
+                                                    QtWidgets.QMessageBox.No)
+            if status == QtWidgets.QMessageBox.No:
+                # If answer was "No", return "True", it will shutdown OpenLP in def main
+                log.info('User requested termination')
+                return True
+            # If answer was "Yes", remove the custom data path thus resetting the default location.
+            Settings().remove('advanced/data path')
+            log.info('Database location has been reset to the default settings.')
+            return False
+
     def hook_exception(self, exc_type, value, traceback):
         """
         Add an exception hook so that any uncaught exceptions are displayed in this window rather than somewhere where
@@ -205,6 +237,7 @@
         Check if OpenLP has been upgraded, and ask if a backup of data should be made
 
         :param has_run_wizard: OpenLP has been run before
+        :param can_show_splash: Should OpenLP show the splash screen
         """
         data_version = Settings().value('core/application version')
         openlp_version = get_application_version()['version']
@@ -216,8 +249,8 @@
             if self.splash.isVisible():
                 self.splash.hide()
             if QtWidgets.QMessageBox.question(None, translate('OpenLP', 'Backup'),
-                                              translate('OpenLP', 'OpenLP has been upgraded, do you want to create '
-                                                                  'a backup of OpenLPs data folder?'),
+                                              translate('OpenLP', 'OpenLP has been upgraded, do you want to create\n'
+                                                                  'a backup of the old data folder?'),
                                               QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No,
                                               QtWidgets.QMessageBox.Yes) == QtWidgets.QMessageBox.Yes:
                 # Create copy of data folder
@@ -230,10 +263,11 @@
                     QtWidgets.QMessageBox.warning(None, translate('OpenLP', 'Backup'),
                                                   translate('OpenLP', 'Backup of the data folder failed!'))
                     return
-                QtWidgets.QMessageBox.information(None, translate('OpenLP', 'Backup'),
-                                                  translate('OpenLP',
-                                                            'A backup of the data folder has been created at %s')
-                                                  % data_folder_backup_path)
+                message = translate('OpenLP',
+                                    'A backup of the data folder has been created at:\n\n'
+                                    '{text}').format(text=data_folder_backup_path)
+                QtWidgets.QMessageBox.information(None, translate('OpenLP', 'Backup'), message)
+
             # Update the version in the settings
             Settings().setValue('core/application version', openlp_version)
             if can_show_splash:
@@ -267,7 +301,7 @@
         """
         if event.type() == QtCore.QEvent.FileOpen:
             file_name = event.file()
-            log.debug('Got open file event for %s!', file_name)
+            log.debug('Got open file event for {name}!'.format(name=file_name))
             self.args.insert(0, file_name)
             return True
         # Mac OS X should restore app window when user clicked on the OpenLP icon
@@ -321,7 +355,7 @@
     logfile.setFormatter(logging.Formatter('%(asctime)s %(name)-55s %(levelname)-8s %(message)s'))
     log.addHandler(logfile)
     if log.isEnabledFor(logging.DEBUG):
-        print('Logging to: %s' % filename)
+        print('Logging to: {name}'.format(name=filename))
 
 
 def main(args=None):
@@ -362,12 +396,12 @@
         log.info('Running portable')
         portable_settings_file = os.path.abspath(os.path.join(application_path, '..', '..', 'Data', 'OpenLP.ini'))
         # Make this our settings file
-        log.info('INI file: %s', portable_settings_file)
+        log.info('INI file: {name}'.format(name=portable_settings_file))
         Settings.set_filename(portable_settings_file)
         portable_settings = Settings()
         # Set our data path
         data_path = os.path.abspath(os.path.join(application_path, '..', '..', 'Data',))
-        log.info('Data path: %s', data_path)
+        log.info('Data path: {name}'.format(name=data_path))
         # Point to our data path
         portable_settings.setValue('advanced/data path', data_path)
         portable_settings.setValue('advanced/is portable', True)
@@ -378,9 +412,13 @@
     Registry.create()
     Registry().register('application', application)
     application.setApplicationVersion(get_application_version()['version'])
-    # Instance check
+    # Check if an instance of OpenLP is already running. Quit if there is a running instance and the user only wants one
     if application.is_already_running():
         sys.exit()
+    # If the custom data path is missing and the user wants to restore the data path, quit OpenLP.
+    if application.is_data_path_missing():
+        application.shared_memory.detach()
+        sys.exit()
     # Remove/convert obsolete settings.
     Settings().remove_obsolete_settings()
     # First time checks in settings
 
=== modified file 'openlp/core/common/__init__.py'
--- openlp/core/common/__init__.py	2016-12-31 11:05:48 +0000
+++ openlp/core/common/__init__.py	2017-01-08 22:05:36 +0000
@@ -24,15 +24,18 @@
 OpenLP work.
 """
 import hashlib
+
+import logging
+import os
 import re
-import os
-import logging
 import sys
 import traceback
+from chardet.universaldetector import UniversalDetector
 from ipaddress import IPv4Address, IPv6Address, AddressValueError
-from codecs import decode, encode
+from shutil import which
+from subprocess import check_output, CalledProcessError, STDOUT
 
-from PyQt5 import QtCore
+from PyQt5 import QtCore, QtGui
 from PyQt5.QtCore import QCryptographicHash as QHash
 
 log = logging.getLogger(__name__ + '.__init__')
@@ -40,6 +43,9 @@
 
 FIRST_CAMEL_REGEX = re.compile('(.)([A-Z][a-z]+)')
 SECOND_CAMEL_REGEX = re.compile('([a-z0-9])([A-Z])')
+CONTROL_CHARS = re.compile(r'[\x00-\x1F\x7F-\x9F]', re.UNICODE)
+INVALID_FILE_CHARS = re.compile(r'[\\/:\*\?"<>\|\+\[\]%]', re.UNICODE)
+IMAGES_FILTER = None
 
 
 def trace_error_handler(logger):
@@ -50,7 +56,9 @@
     """
     log_string = "OpenLP Error trace"
     for tb in traceback.extract_stack():
-        log_string = '%s\n   File %s at line %d \n\t called %s' % (log_string, tb[0], tb[1], tb[3])
+        log_string += '\n   File {file} at line {line} \n\t called {data}'.format(file=tb[0],
+                                                                                  line=tb[1],
+                                                                                  data=tb[3])
     logger.error(log_string)
 
 
@@ -62,7 +70,7 @@
     :param do_not_log: To not log anything. This is need for the start up, when the log isn't ready.
     """
     if not do_not_log:
-        log.debug('check_directory_exists %s' % directory)
+        log.debug('check_directory_exists {text}'.format(text=directory))
     try:
         if not os.path.exists(directory):
             os.makedirs(directory)
@@ -188,7 +196,7 @@
     return True if verify_ipv4(addr) else verify_ipv6(addr)
 
 
-def md5_hash(salt, data=None):
+def md5_hash(salt=None, data=None):
     """
     Returns the hashed output of md5sum on salt,data
     using Python3 hashlib
@@ -197,33 +205,49 @@
     :param data: OPTIONAL Data to hash
     :returns: str
     """
-    log.debug('md5_hash(salt="%s")' % salt)
+    log.debug('md5_hash(salt="{text}")'.format(text=salt))
+    if not salt and not data:
+        return None
     hash_obj = hashlib.new('md5')
-    hash_obj.update(salt)
+    if salt:
+        hash_obj.update(salt)
     if data:
         hash_obj.update(data)
     hash_value = hash_obj.hexdigest()
-    log.debug('md5_hash() returning "%s"' % hash_value)
+    log.debug('md5_hash() returning "{text}"'.format(text=hash_value))
     return hash_value
 
 
-def qmd5_hash(salt, data=None):
+def qmd5_hash(salt=None, data=None):
     """
     Returns the hashed output of MD5Sum on salt, data
-    using PyQt5.QCryptographicHash.
+    using PyQt5.QCryptographicHash. Function returns a
+    QByteArray instead of a text string.
+    If you need a string instead, call with
+
+        result = str(qmd5_hash(salt=..., data=...), encoding='ascii')
 
     :param salt: Initial salt
     :param data: OPTIONAL Data to hash
-    :returns: str
+    :returns: QByteArray
     """
-    log.debug('qmd5_hash(salt="%s"' % salt)
+    log.debug('qmd5_hash(salt="{text}"'.format(text=salt))
+    if salt is None and data is None:
+        return None
     hash_obj = QHash(QHash.Md5)
+<<<<<<< TREE
     hash_obj.addData(salt)
     if data:
         hash_obj.addData(data)
+=======
+    if salt:
+        hash_obj.addData(salt)
+    if data:
+        hash_obj.addData(data)
+>>>>>>> MERGE-SOURCE
     hash_value = hash_obj.result().toHex()
-    log.debug('qmd5_hash() returning "%s"' % hash_value)
-    return hash_value.data()
+    log.debug('qmd5_hash() returning "{hash}"'.format(hash=hash_value))
+    return hash_value
 
 
 def clean_button_text(button_text):
@@ -242,4 +266,181 @@
 from .uistrings import UiStrings
 from .settings import Settings
 from .applocation import AppLocation
-from .historycombobox import HistoryComboBox
+from .actions import ActionList
+from .languagemanager import LanguageManager
+
+if is_win():
+    from subprocess import STARTUPINFO, STARTF_USESHOWWINDOW
+
+
+def add_actions(target, actions):
+    """
+    Adds multiple actions to a menu or toolbar in one command.
+
+    :param target: The menu or toolbar to add actions to
+    :param actions: The actions to be added. An action consisting of the keyword ``None``
+        will result in a separator being inserted into the target.
+    """
+    for action in actions:
+        if action is None:
+            target.addSeparator()
+        else:
+            target.addAction(action)
+
+
+def get_uno_command(connection_type='pipe'):
+    """
+    Returns the UNO command to launch an libreoffice.org instance.
+    """
+    for command in ['libreoffice', 'soffice']:
+        if which(command):
+            break
+    else:
+        raise FileNotFoundError('Command not found')
+
+    OPTIONS = '--nologo --norestore --minimized --nodefault --nofirststartwizard'
+    if connection_type == 'pipe':
+        CONNECTION = '"--accept=pipe,name=openlp_pipe;urp;"'
+    else:
+        CONNECTION = '"--accept=socket,host=localhost,port=2002;urp;"'
+    return '{cmd} {opt} {conn}'.format(cmd=command, opt=OPTIONS, conn=CONNECTION)
+
+
+def get_uno_instance(resolver, connection_type='pipe'):
+    """
+    Returns a running libreoffice.org instance.
+
+    :param resolver: The UNO resolver to use to find a running instance.
+    """
+    log.debug('get UNO Desktop Openoffice - resolve')
+    if connection_type == 'pipe':
+        return resolver.resolve('uno:pipe,name=openlp_pipe;urp;StarOffice.ComponentContext')
+    else:
+        return resolver.resolve('uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext')
+
+
+def get_filesystem_encoding():
+    """
+    Returns the name of the encoding used to convert Unicode filenames into system file names.
+    """
+    encoding = sys.getfilesystemencoding()
+    if encoding is None:
+        encoding = sys.getdefaultencoding()
+    return encoding
+
+
+def split_filename(path):
+    """
+    Return a list of the parts in a given path.
+    """
+    path = os.path.abspath(path)
+    if not os.path.isfile(path):
+        return path, ''
+    else:
+        return os.path.split(path)
+
+
+def delete_file(file_path_name):
+    """
+    Deletes a file from the system.
+
+    :param file_path_name: The file, including path, to delete.
+    """
+    if not file_path_name:
+        return False
+    try:
+        if os.path.exists(file_path_name):
+            os.remove(file_path_name)
+        return True
+    except (IOError, OSError):
+        log.exception("Unable to delete file {text}".format(text=file_path_name))
+        return False
+
+
+def get_images_filter():
+    """
+    Returns a filter string for a file dialog containing all the supported image formats.
+    """
+    global IMAGES_FILTER
+    if not IMAGES_FILTER:
+        log.debug('Generating images filter.')
+        formats = list(map(bytes.decode, list(map(bytes, QtGui.QImageReader.supportedImageFormats()))))
+        visible_formats = '(*.{text})'.format(text='; *.'.join(formats))
+        actual_formats = '(*.{text})'.format(text=' *.'.join(formats))
+        IMAGES_FILTER = '{text} {visible} {actual}'.format(text=translate('OpenLP', 'Image Files'),
+                                                           visible=visible_formats,
+                                                           actual=actual_formats)
+    return IMAGES_FILTER
+
+
+def is_not_image_file(file_name):
+    """
+    Validate that the file is not an image file.
+
+    :param file_name: File name to be checked.
+    """
+    if not file_name:
+        return True
+    else:
+        formats = [bytes(fmt).decode().lower() for fmt in QtGui.QImageReader.supportedImageFormats()]
+        file_part, file_extension = os.path.splitext(str(file_name))
+        if file_extension[1:].lower() in formats and os.path.exists(file_name):
+            return False
+        return True
+
+
+def clean_filename(filename):
+    """
+    Removes invalid characters from the given ``filename``.
+
+    :param filename:  The "dirty" file name to clean.
+    """
+    if not isinstance(filename, str):
+        filename = str(filename, 'utf-8')
+    return INVALID_FILE_CHARS.sub('_', CONTROL_CHARS.sub('', filename))
+
+
+def check_binary_exists(program_path):
+    """
+    Function that checks whether a binary exists.
+
+    :param program_path:The full path to the binary to check.
+    :return: program output to be parsed
+    """
+    log.debug('testing program_path: {text}'.format(text=program_path))
+    try:
+        # Setup startupinfo options for check_output to avoid console popping up on windows
+        if is_win():
+            startupinfo = STARTUPINFO()
+            startupinfo.dwFlags |= STARTF_USESHOWWINDOW
+        else:
+            startupinfo = None
+        runlog = check_output([program_path, '--help'], stderr=STDOUT, startupinfo=startupinfo)
+    except CalledProcessError as e:
+        runlog = e.output
+    except Exception:
+        trace_error_handler(log)
+        runlog = ''
+    log.debug('check_output returned: {text}'.format(text=runlog))
+    return runlog
+
+
+def get_file_encoding(filename):
+    """
+    Utility function to incrementally detect the file encoding.
+
+    :param filename: Filename for the file to determine the encoding for. Str
+    :return: A dict with the keys 'encoding' and 'confidence'
+    """
+    detector = UniversalDetector()
+    try:
+        with open(filename, 'rb') as detect_file:
+            while not detector.done:
+                chunk = detect_file.read(1024)
+                if not chunk:
+                    break
+                detector.feed(chunk)
+            detector.close()
+        return detector.result
+    except OSError:
+        log.exception('Error detecting file encoding')
 
=== added file 'openlp/core/common/actions.py'
--- openlp/core/common/actions.py	1970-01-01 00:00:00 +0000
+++ openlp/core/common/actions.py	2017-01-08 22:05:36 +0000
@@ -0,0 +1,390 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+The :mod:`~openlp.core.utils.actions` module provides action list classes used
+by the shortcuts system.
+"""
+import logging
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+from openlp.core.common import Settings
+
+
+log = logging.getLogger(__name__)
+
+
+class ActionCategory(object):
+    """
+    The :class:`~openlp.core.utils.ActionCategory` class encapsulates a category for the
+    :class:`~openlp.core.utils.CategoryList` class.
+    """
+    def __init__(self, name, weight=0):
+        """
+        Constructor
+        """
+        self.name = name
+        self.weight = weight
+        self.actions = CategoryActionList()
+
+
+class CategoryActionList(object):
+    """
+    The :class:`~openlp.core.utils.CategoryActionList` class provides a sorted list of actions within a category.
+    """
+    def __init__(self):
+        """
+        Constructor
+        """
+        self.index = 0
+        self.actions = []
+
+    def __contains__(self, key):
+        """
+        Implement the __contains__() method to make this class a dictionary type
+        """
+        for weight, action in self.actions:
+            if action == key:
+                return True
+        return False
+
+    def __len__(self):
+        """
+        Implement the __len__() method to make this class a dictionary type
+        """
+        return len(self.actions)
+
+    def __iter__(self):
+        """
+        Implement the __getitem__() method to make this class iterable
+        """
+        return self
+
+    def __next__(self):
+        """
+        Python 3 "next" method.
+        """
+        if self.index >= len(self.actions):
+            self.index = 0
+            raise StopIteration
+        else:
+            self.index += 1
+            return self.actions[self.index - 1][1]
+
+    def append(self, action):
+        """
+        Append an action
+        """
+        weight = 0
+        if self.actions:
+            weight = self.actions[-1][0] + 1
+        self.add(action, weight)
+
+    def add(self, action, weight=0):
+        """
+        Add an action.
+        """
+        self.actions.append((weight, action))
+        self.actions.sort(key=lambda act: act[0])
+
+    def remove(self, action):
+        """
+        Remove an action
+        """
+        for item in self.actions:
+            if item[1] == action:
+                self.actions.remove(item)
+                return
+        raise ValueError('Action "{action}" does not exist.'.format(action=action))
+
+
+class CategoryList(object):
+    """
+    The :class:`~openlp.core.utils.CategoryList` class encapsulates a category list for the
+    :class:`~openlp.core.utils.ActionList` class and provides an iterator interface for walking through the list of
+    actions in this category.
+    """
+
+    def __init__(self):
+        """
+        Constructor
+        """
+        self.index = 0
+        self.categories = []
+
+    def __getitem__(self, key):
+        """
+        Implement the __getitem__() method to make this class like a dictionary
+        """
+        for category in self.categories:
+            if category.name == key:
+                return category
+        raise KeyError('Category "{key}" does not exist.'.format(key=key))
+
+    def __len__(self):
+        """
+        Implement the __len__() method to make this class like a dictionary
+        """
+        return len(self.categories)
+
+    def __iter__(self):
+        """
+        Implement the __iter__() method to make this class like a dictionary
+        """
+        return self
+
+    def __next__(self):
+        """
+        Python 3 "next" method for iterator.
+        """
+        if self.index >= len(self.categories):
+            self.index = 0
+            raise StopIteration
+        else:
+            self.index += 1
+            return self.categories[self.index - 1]
+
+    def __contains__(self, key):
+        """
+        Implement the __contains__() method to make this class like a dictionary
+        """
+        for category in self.categories:
+            if category.name == key:
+                return True
+        return False
+
+    def append(self, name, actions=None):
+        """
+        Append a category
+        """
+        weight = 0
+        if self.categories:
+            weight = self.categories[-1].weight + 1
+        self.add(name, weight, actions)
+
+    def add(self, name, weight=0, actions=None):
+        """
+        Add a category
+        """
+        category = ActionCategory(name, weight)
+        if actions:
+            for action in actions:
+                if isinstance(action, tuple):
+                    category.actions.add(action[0], action[1])
+                else:
+                    category.actions.append(action)
+        self.categories.append(category)
+        self.categories.sort(key=lambda cat: cat.weight)
+
+    def remove(self, name):
+        """
+        Remove a category
+        """
+        for category in self.categories:
+            if category.name == name:
+                self.categories.remove(category)
+                return
+        raise ValueError('Category "{name}" does not exist.'.format(name=name))
+
+
+class ActionList(object):
+    """
+    The :class:`~openlp.core.utils.ActionList` class contains a list of menu actions and categories associated with
+    those actions. Each category also has a weight by which it is sorted when iterating through the list of actions or
+    categories.
+    """
+    instance = None
+    shortcut_map = {}
+
+    def __init__(self):
+        """
+        Constructor
+        """
+        self.categories = CategoryList()
+
+    @staticmethod
+    def get_instance():
+        """
+        Get the instance of this class.
+        """
+        if ActionList.instance is None:
+            ActionList.instance = ActionList()
+        return ActionList.instance
+
+    def add_action(self, action, category=None, weight=None):
+        """
+        Add an action to the list of actions.
+
+        **Note**: The action's objectName must be set when you want to add it!
+
+        :param action: The action to add (QAction). **Note**, the action must not have an empty ``objectName``.
+        :param category: The category this action belongs to. The category has to be a python string. . **Note**,
+            if the category is ``None``, the category and its actions are being hidden in the shortcut dialog. However,
+            if they are added, it is possible to avoid assigning shortcuts twice, which is important.
+        :param weight: The weight specifies how important a category is. However, this only has an impact on the order
+            the categories are displayed.
+        """
+        if category not in self.categories:
+            self.categories.append(category)
+        settings = Settings()
+        settings.beginGroup('shortcuts')
+        # Get the default shortcut from the config.
+        action.default_shortcuts = settings.get_default_value(action.objectName())
+        if weight is None:
+            self.categories[category].actions.append(action)
+        else:
+            self.categories[category].actions.add(action, weight)
+        # Load the shortcut from the config.
+        shortcuts = settings.value(action.objectName())
+        settings.endGroup()
+        if not shortcuts:
+            action.setShortcuts([])
+            return
+        # We have to do this to ensure that the loaded shortcut list e. g. STRG+O (German) is converted to CTRL+O,
+        # which is only done when we convert the strings in this way (QKeySequencet -> uncode).
+        shortcuts = list(map(QtGui.QKeySequence.toString, list(map(QtGui.QKeySequence, shortcuts))))
+        # Check the alternate shortcut first, to avoid problems when the alternate shortcut becomes the primary shortcut
+        #  after removing the (initial) primary shortcut due to conflicts.
+        if len(shortcuts) == 2:
+            existing_actions = ActionList.shortcut_map.get(shortcuts[1], [])
+            # Check for conflicts with other actions considering the shortcut context.
+            if self._is_shortcut_available(existing_actions, action):
+                actions = ActionList.shortcut_map.get(shortcuts[1], [])
+                actions.append(action)
+                ActionList.shortcut_map[shortcuts[1]] = actions
+            else:
+                log.warning('Shortcut "{shortcut}" is removed from "{action}" because another '
+                            'action already uses this shortcut.'.format(shortcut=shortcuts[1],
+                                                                        action=action.objectName()))
+                shortcuts.remove(shortcuts[1])
+        # Check the primary shortcut.
+        existing_actions = ActionList.shortcut_map.get(shortcuts[0], [])
+        # Check for conflicts with other actions considering the shortcut context.
+        if self._is_shortcut_available(existing_actions, action):
+            actions = ActionList.shortcut_map.get(shortcuts[0], [])
+            actions.append(action)
+            ActionList.shortcut_map[shortcuts[0]] = actions
+        else:
+            log.warning('Shortcut "{shortcut}" is removed from "{action}" '
+                        'because another action already uses this shortcut.'.format(shortcut=shortcuts[0],
+                                                                                    action=action.objectName()))
+            shortcuts.remove(shortcuts[0])
+        action.setShortcuts([QtGui.QKeySequence(shortcut) for shortcut in shortcuts])
+
+    def remove_action(self, action, category=None):
+        """
+        This removes an action from its category. Empty categories are automatically removed.
+
+        :param action:  The ``QAction`` object to be removed.
+        :param category: The name (unicode string) of the category, which contains the action. Defaults to None.
+        """
+        if category not in self.categories:
+            return
+        self.categories[category].actions.remove(action)
+        # Remove empty categories.
+        if not self.categories[category].actions:
+            self.categories.remove(category)
+        shortcuts = list(map(QtGui.QKeySequence.toString, action.shortcuts()))
+        for shortcut in shortcuts:
+            # Remove action from the list of actions which are using this shortcut.
+            ActionList.shortcut_map[shortcut].remove(action)
+            # Remove empty entries.
+            if not ActionList.shortcut_map[shortcut]:
+                del ActionList.shortcut_map[shortcut]
+
+    def add_category(self, name, weight):
+        """
+        Add an empty category to the list of categories. This is only convenient for categories with a given weight.
+
+        :param name: The category's name.
+        :param weight: The category's weight (int).
+        """
+        if name in self.categories:
+            # Only change the weight and resort the categories again.
+            for category in self.categories:
+                if category.name == name:
+                    category.weight = weight
+            self.categories.categories.sort(key=lambda cat: cat.weight)
+            return
+        self.categories.add(name, weight)
+
+    def update_shortcut_map(self, action, old_shortcuts):
+        """
+        Remove the action for the given ``old_shortcuts`` from the ``shortcut_map`` to ensure its up-to-dateness.
+        **Note**: The new action's shortcuts **must** be assigned to the given ``action`` **before** calling this
+        method.
+
+        :param action: The action whose shortcuts are supposed to be updated in the ``shortcut_map``.
+        :param old_shortcuts: A list of unicode key sequences.
+        """
+        for old_shortcut in old_shortcuts:
+            # Remove action from the list of actions which are using this shortcut.
+            ActionList.shortcut_map[old_shortcut].remove(action)
+            # Remove empty entries.
+            if not ActionList.shortcut_map[old_shortcut]:
+                del ActionList.shortcut_map[old_shortcut]
+        new_shortcuts = list(map(QtGui.QKeySequence.toString, action.shortcuts()))
+        # Add the new shortcuts to the map.
+        for new_shortcut in new_shortcuts:
+            existing_actions = ActionList.shortcut_map.get(new_shortcut, [])
+            existing_actions.append(action)
+            ActionList.shortcut_map[new_shortcut] = existing_actions
+
+    def _is_shortcut_available(self, existing_actions, action):
+        """
+        Checks if the given ``action`` may use its assigned shortcut(s) or not. Returns ``True`` or ``False.
+
+        :param existing_actions: A list of actions which already use a particular shortcut.
+        :param action: The action which wants to use a particular shortcut.
+        """
+        global_context = action.shortcutContext() in [QtCore.Qt.WindowShortcut, QtCore.Qt.ApplicationShortcut]
+        affected_actions = []
+        if global_context:
+            affected_actions = [a for a in self.get_all_child_objects(action.parent()) if isinstance(a,
+                                                                                                     QtWidgets.QAction)]
+        for existing_action in existing_actions:
+            if action is existing_action:
+                continue
+            if existing_action in affected_actions:
+                return False
+            if existing_action.shortcutContext() in [QtCore.Qt.WindowShortcut, QtCore.Qt.ApplicationShortcut]:
+                return False
+            elif action in self.get_all_child_objects(existing_action.parent()):
+                return False
+        return True
+
+    def get_all_child_objects(self, qobject):
+        """
+        Goes recursively through the children of ``qobject`` and returns a list of all child objects.
+        """
+        children = qobject.children()
+        # Append the children's children.
+        children.extend(list(map(self.get_all_child_objects, children)))
+        return children
+
+
+class CategoryOrder(object):
+    """
+    An enumeration class for category weights.
+    """
+    standard_menu = -20
+    standard_toolbar = -10
 
=== added file 'openlp/core/common/db.py'
--- openlp/core/common/db.py	1970-01-01 00:00:00 +0000
+++ openlp/core/common/db.py	2017-01-08 22:05:36 +0000
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+The :mod:`db` module provides helper functions for database related methods.
+"""
+import logging
+from copy import deepcopy
+
+import sqlalchemy
+
+
+log = logging.getLogger(__name__)
+
+
+def drop_column(op, tablename, columnname):
+    drop_columns(op, tablename, [columnname])
+
+
+def drop_columns(op, tablename, columns):
+    """
+    Column dropping functionality for SQLite, as there is no DROP COLUMN support in SQLite
+
+    From https://github.com/klugjohannes/alembic-sqlite
+    """
+
+    # get the db engine and reflect database tables
+    engine = op.get_bind()
+    meta = sqlalchemy.MetaData(bind=engine)
+    meta.reflect()
+
+    # create a select statement from the old table
+    old_table = meta.tables[tablename]
+    select = sqlalchemy.sql.select([c for c in old_table.c if c.name not in columns])
+
+    # get remaining columns without table attribute attached
+    remaining_columns = [deepcopy(c) for c in old_table.columns if c.name not in columns]
+    for column in remaining_columns:
+        column.table = None
+
+    # create a temporary new table
+    new_tablename = '{0}_new'.format(tablename)
+    op.create_table(new_tablename, *remaining_columns)
+    meta.reflect()
+    new_table = meta.tables[new_tablename]
+
+    # copy data from old table
+    insert = sqlalchemy.sql.insert(new_table).from_select([c.name for c in remaining_columns], select)
+    engine.execute(insert)
+
+    # drop the old table and rename the new table to take the old tables
+    # position
+    op.drop_table(tablename)
+    op.rename_table(new_tablename, tablename)
 
=== renamed file 'openlp/core/common/historycombobox.py' => 'openlp/core/common/historycombobox.py.THIS'
=== added file 'openlp/core/common/httputils.py'
--- openlp/core/common/httputils.py	1970-01-01 00:00:00 +0000
+++ openlp/core/common/httputils.py	2017-01-08 22:05:36 +0000
@@ -0,0 +1,255 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+The :mod:`openlp.core.utils` module provides the utility libraries for OpenLP.
+"""
+import hashlib
+import logging
+import os
+import socket
+import sys
+import time
+import urllib.error
+import urllib.parse
+import urllib.request
+from http.client import HTTPException
+from random import randint
+
+from openlp.core.common import Registry, trace_error_handler
+
+log = logging.getLogger(__name__ + '.__init__')
+
+USER_AGENTS = {
+    'win32': [
+        'Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36',
+        'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36',
+        'Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.71 Safari/537.36'
+    ],
+    'darwin': [
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) '
+        'Chrome/26.0.1410.43 Safari/537.31',
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/536.11 (KHTML, like Gecko) '
+        'Chrome/20.0.1132.57 Safari/536.11',
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/536.11 (KHTML, like Gecko) '
+        'Chrome/20.0.1132.47 Safari/536.11',
+    ],
+    'linux2': [
+        'Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.22 (KHTML, like Gecko) Ubuntu Chromium/25.0.1364.160 '
+        'Chrome/25.0.1364.160 Safari/537.22',
+        'Mozilla/5.0 (X11; CrOS armv7l 2913.260.0) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.99 '
+        'Safari/537.11',
+        'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.27 (KHTML, like Gecko) Chrome/26.0.1389.0 Safari/537.27'
+    ],
+    'default': [
+        'Mozilla/5.0 (X11; NetBSD amd64; rv:18.0) Gecko/20130120 Firefox/18.0'
+    ]
+}
+CONNECTION_TIMEOUT = 30
+CONNECTION_RETRIES = 2
+
+
+class HTTPRedirectHandlerFixed(urllib.request.HTTPRedirectHandler):
+    """
+    Special HTTPRedirectHandler used to work around http://bugs.python.org/issue22248
+    (Redirecting to urls with special chars)
+    """
+    def redirect_request(self, req, fp, code, msg, headers, new_url):
+        #
+        """
+        Test if the new_url can be decoded to ascii
+
+        :param req:
+        :param fp:
+        :param code:
+        :param msg:
+        :param headers:
+        :param new_url:
+        :return:
+        """
+        try:
+            new_url.encode('latin1').decode('ascii')
+            fixed_url = new_url
+        except Exception:
+            # The url could not be decoded to ascii, so we do some url encoding
+            fixed_url = urllib.parse.quote(new_url.encode('latin1').decode('utf-8', 'replace'), safe='/:')
+        return super(HTTPRedirectHandlerFixed, self).redirect_request(req, fp, code, msg, headers, fixed_url)
+
+
+def get_user_agent():
+    """
+    Return a user agent customised for the platform the user is on.
+    """
+    browser_list = USER_AGENTS.get(sys.platform, None)
+    if not browser_list:
+        browser_list = USER_AGENTS['default']
+    random_index = randint(0, len(browser_list) - 1)
+    return browser_list[random_index]
+
+
+def get_web_page(url, header=None, update_openlp=False):
+    """
+    Attempts to download the webpage at url and returns that page or None.
+
+    :param url: The URL to be downloaded.
+    :param header:  An optional HTTP header to pass in the request to the web server.
+    :param update_openlp: Tells OpenLP to update itself if the page is successfully downloaded.
+        Defaults to False.
+    """
+    # TODO: Add proxy usage. Get proxy info from OpenLP settings, add to a
+    # proxy_handler, build into an opener and install the opener into urllib2.
+    # http://docs.python.org/library/urllib2.html
+    if not url:
+        return None
+    # This is needed to work around http://bugs.python.org/issue22248 and https://bugs.launchpad.net/openlp/+bug/1251437
+    opener = urllib.request.build_opener(HTTPRedirectHandlerFixed())
+    urllib.request.install_opener(opener)
+    req = urllib.request.Request(url)
+    if not header or header[0].lower() != 'user-agent':
+        user_agent = get_user_agent()
+        req.add_header('User-Agent', user_agent)
+    if header:
+        req.add_header(header[0], header[1])
+    log.debug('Downloading URL = %s' % url)
+    retries = 0
+    while retries <= CONNECTION_RETRIES:
+        retries += 1
+        time.sleep(0.1)
+        try:
+            page = urllib.request.urlopen(req, timeout=CONNECTION_TIMEOUT)
+            log.debug('Downloaded page {text}'.format(text=page.geturl()))
+            break
+        except urllib.error.URLError as err:
+            log.exception('URLError on {text}'.format(text=url))
+            log.exception('URLError: {text}'.format(text=err.reason))
+            page = None
+            if retries > CONNECTION_RETRIES:
+                raise
+        except socket.timeout:
+            log.exception('Socket timeout: {text}'.format(text=url))
+            page = None
+            if retries > CONNECTION_RETRIES:
+                raise
+        except socket.gaierror:
+            log.exception('Socket gaierror: {text}'.format(text=url))
+            page = None
+            if retries > CONNECTION_RETRIES:
+                raise
+        except ConnectionRefusedError:
+            log.exception('ConnectionRefused: {text}'.format(text=url))
+            page = None
+            if retries > CONNECTION_RETRIES:
+                raise
+            break
+        except ConnectionError:
+            log.exception('Connection error: {text}'.format(text=url))
+            page = None
+            if retries > CONNECTION_RETRIES:
+                raise
+        except HTTPException:
+            log.exception('HTTPException error: {text}'.format(text=url))
+            page = None
+            if retries > CONNECTION_RETRIES:
+                raise
+        except:
+            # Don't know what's happening, so reraise the original
+            raise
+    if update_openlp:
+        Registry().get('application').process_events()
+    if not page:
+        log.exception('{text} could not be downloaded'.format(text=url))
+        return None
+    log.debug(page)
+    return page
+
+
+def get_url_file_size(url):
+    """
+    Get the size of a file.
+
+    :param url: The URL of the file we want to download.
+    """
+    retries = 0
+    while True:
+        try:
+            site = urllib.request.urlopen(url, timeout=CONNECTION_TIMEOUT)
+            meta = site.info()
+            return int(meta.get("Content-Length"))
+        except urllib.error.URLError:
+            if retries > CONNECTION_RETRIES:
+                raise
+            else:
+                retries += 1
+                time.sleep(0.1)
+                continue
+
+
+def url_get_file(callback, url, f_path, sha256=None):
+    """"
+    Download a file given a URL.  The file is retrieved in chunks, giving the ability to cancel the download at any
+    point. Returns False on download error.
+
+    :param callback: the class which needs to be updated
+    :param url: URL to download
+    :param f_path: Destination file
+    :param sha256: The check sum value to be checked against the download value
+    """
+    block_count = 0
+    block_size = 4096
+    retries = 0
+    while True:
+        try:
+            filename = open(f_path, "wb")
+            url_file = urllib.request.urlopen(url, timeout=CONNECTION_TIMEOUT)
+            if sha256:
+                hasher = hashlib.sha256()
+            # Download until finished or canceled.
+            while not callback.was_cancelled:
+                data = url_file.read(block_size)
+                if not data:
+                    break
+                filename.write(data)
+                if sha256:
+                    hasher.update(data)
+                block_count += 1
+                callback._download_progress(block_count, block_size)
+            filename.close()
+            if sha256 and hasher.hexdigest() != sha256:
+                log.error('sha256 sums did not match for file: {file}'.format(file=f_path))
+                os.remove(f_path)
+                return False
+        except (urllib.error.URLError, socket.timeout) as err:
+            trace_error_handler(log)
+            filename.close()
+            os.remove(f_path)
+            if retries > CONNECTION_RETRIES:
+                return False
+            else:
+                retries += 1
+                time.sleep(0.1)
+                continue
+        break
+    # Delete file if cancelled, it may be a partial file.
+    if callback.was_cancelled:
+        os.remove(f_path)
+    return True
+
+__all__ = ['get_web_page']
 
=== added file 'openlp/core/common/languagemanager.py'
--- openlp/core/common/languagemanager.py	1970-01-01 00:00:00 +0000
+++ openlp/core/common/languagemanager.py	2017-01-08 22:05:36 +0000
@@ -0,0 +1,207 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+The :mod:`languagemanager` module provides all the translation settings and language file loading for OpenLP.
+"""
+import locale
+import logging
+import re
+
+from PyQt5 import QtCore, QtWidgets
+
+
+from openlp.core.common import AppLocation, Settings, translate, is_win, is_macosx
+
+log = logging.getLogger(__name__)
+
+ICU_COLLATOR = None
+DIGITS_OR_NONDIGITS = re.compile(r'\d+|\D+', re.UNICODE)
+
+
+class LanguageManager(object):
+    """
+    Helper for Language selection
+    """
+    __qm_list__ = {}
+    auto_language = False
+
+    @staticmethod
+    def get_translator(language):
+        """
+        Set up a translator to use in this instance of OpenLP
+
+        :param language: The language to load into the translator
+        """
+        if LanguageManager.auto_language:
+            language = QtCore.QLocale.system().name()
+        lang_path = AppLocation.get_directory(AppLocation.LanguageDir)
+        app_translator = QtCore.QTranslator()
+        app_translator.load(language, lang_path)
+        # A translator for buttons and other default strings provided by Qt.
+        if not is_win() and not is_macosx():
+            lang_path = QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath)
+        default_translator = QtCore.QTranslator()
+        default_translator.load('qt_%s' % language, lang_path)
+        return app_translator, default_translator
+
+    @staticmethod
+    def find_qm_files():
+        """
+        Find all available language files in this OpenLP install
+        """
+        log.debug('Translation files: {files}'.format(files=AppLocation.get_directory(AppLocation.LanguageDir)))
+        trans_dir = QtCore.QDir(AppLocation.get_directory(AppLocation.LanguageDir))
+        file_names = trans_dir.entryList(['*.qm'], QtCore.QDir.Files, QtCore.QDir.Name)
+        # Remove qm files from the list which start with "qt_".
+        file_names = [file_ for file_ in file_names if not file_.startswith('qt_')]
+        return list(map(trans_dir.filePath, file_names))
+
+    @staticmethod
+    def language_name(qm_file):
+        """
+        Load the language name from a language file
+
+        :param qm_file: The file to obtain the name from
+        """
+        translator = QtCore.QTranslator()
+        translator.load(qm_file)
+        return translator.translate('OpenLP.MainWindow', 'English', 'Please add the name of your language here')
+
+    @staticmethod
+    def get_language():
+        """
+        Retrieve a saved language to use from settings
+        """
+        language = Settings().value('core/language')
+        language = str(language)
+        log.info("Language file: '{language}' Loaded from conf file".format(language=language))
+        if re.match(r'[[].*[]]', language):
+            LanguageManager.auto_language = True
+            language = re.sub(r'[\[\]]', '', language)
+        return language
+
+    @staticmethod
+    def set_language(action, message=True):
+        """
+        Set the language to translate OpenLP into
+
+        :param action:  The language menu option
+        :param message:  Display the message option
+        """
+        language = 'en'
+        if action:
+            action_name = str(action.objectName())
+            if action_name == 'autoLanguageItem':
+                LanguageManager.auto_language = True
+            else:
+                LanguageManager.auto_language = False
+                qm_list = LanguageManager.get_qm_list()
+                language = str(qm_list[action_name])
+        if LanguageManager.auto_language:
+            language = '[{language}]'.format(language=language)
+        Settings().setValue('core/language', language)
+        log.info("Language file: '{language}' written to conf file".format(language=language))
+        if message:
+            QtWidgets.QMessageBox.information(None,
+                                              translate('OpenLP.LanguageManager', 'Language'),
+                                              translate('OpenLP.LanguageManager',
+                                                        'Please restart OpenLP to use your new language setting.'))
+
+    @staticmethod
+    def init_qm_list():
+        """
+        Initialise the list of available translations
+        """
+        LanguageManager.__qm_list__ = {}
+        qm_files = LanguageManager.find_qm_files()
+        for counter, qmf in enumerate(qm_files):
+            reg_ex = QtCore.QRegExp("^.*i18n/(.*).qm")
+            if reg_ex.exactMatch(qmf):
+                name = '{regex}'.format(regex=reg_ex.cap(1))
+                # TODO: Test before converting to python3 string format
+                LanguageManager.__qm_list__['%#2i %s' % (counter + 1, LanguageManager.language_name(qmf))] = name
+
+    @staticmethod
+    def get_qm_list():
+        """
+        Return the list of available translations
+        """
+        if not LanguageManager.__qm_list__:
+            LanguageManager.init_qm_list()
+        return LanguageManager.__qm_list__
+
+
+def format_time(text, local_time):
+    """
+    Workaround for Python built-in time formatting function time.strftime().
+
+    time.strftime() accepts only ascii characters. This function accepts
+    unicode string and passes individual % placeholders to time.strftime().
+    This ensures only ascii characters are passed to time.strftime().
+
+    :param text:  The text to be processed.
+    :param local_time: The time to be used to add to the string.  This is a time object
+    """
+
+    def match_formatting(match):
+        """
+        Format the match
+        """
+        return local_time.strftime(match.group())
+
+    return re.sub(r'\%[a-zA-Z]', match_formatting, text)
+
+
+def get_locale_key(string):
+    """
+    Creates a key for case insensitive, locale aware string sorting.
+
+    :param string: The corresponding string.
+    """
+    string = string.lower()
+    # ICU is the prefered way to handle locale sort key, we fallback to locale.strxfrm which will work in most cases.
+    global ICU_COLLATOR
+    try:
+        if ICU_COLLATOR is None:
+            import icu
+            language = LanguageManager.get_language()
+            icu_locale = icu.Locale(language)
+            ICU_COLLATOR = icu.Collator.createInstance(icu_locale)
+        return ICU_COLLATOR.getSortKey(string)
+    except:
+        return locale.strxfrm(string).encode()
+
+
+def get_natural_key(string):
+    """
+    Generate a key for locale aware natural string sorting.
+
+    :param string: string to be sorted by
+    Returns a list of string compare keys and integers.
+    """
+    key = DIGITS_OR_NONDIGITS.findall(string)
+    key = [int(part) if part.isdigit() else get_locale_key(part) for part in key]
+    # Python 3 does not support comparison of different types anymore. So make sure, that we do not compare str
+    # and int.
+    if string and string[0].isdigit():
+        return [b''] + key
+    return key
 
=== added file 'openlp/core/common/languages.py'
--- openlp/core/common/languages.py	1970-01-01 00:00:00 +0000
+++ openlp/core/common/languages.py	2017-01-08 22:05:36 +0000
@@ -0,0 +1,201 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+The :mod:`languages` module provides a list of language names with utility functions.
+"""
+from collections import namedtuple
+
+from openlp.core.common import translate
+
+
+Language = namedtuple('Language', ['id', 'name', 'code'])
+languages = sorted([
+    Language(1, translate('common.languages', '(Afan) Oromo', 'Language code: om'), 'om'),
+    Language(2, translate('common.languages', 'Abkhazian', 'Language code: ab'), 'ab'),
+    Language(3, translate('common.languages', 'Afar', 'Language code: aa'), 'aa'),
+    Language(4, translate('common.languages', 'Afrikaans', 'Language code: af'), 'af'),
+    Language(5, translate('common.languages', 'Albanian', 'Language code: sq'), 'sq'),
+    Language(6, translate('common.languages', 'Amharic', 'Language code: am'), 'am'),
+    Language(140, translate('common.languages', 'Amuzgo', 'Language code: amu'), 'amu'),
+    Language(152, translate('common.languages', 'Ancient Greek', 'Language code: grc'), 'grc'),
+    Language(7, translate('common.languages', 'Arabic', 'Language code: ar'), 'ar'),
+    Language(8, translate('common.languages', 'Armenian', 'Language code: hy'), 'hy'),
+    Language(9, translate('common.languages', 'Assamese', 'Language code: as'), 'as'),
+    Language(10, translate('common.languages', 'Aymara', 'Language code: ay'), 'ay'),
+    Language(11, translate('common.languages', 'Azerbaijani', 'Language code: az'), 'az'),
+    Language(12, translate('common.languages', 'Bashkir', 'Language code: ba'), 'ba'),
+    Language(13, translate('common.languages', 'Basque', 'Language code: eu'), 'eu'),
+    Language(14, translate('common.languages', 'Bengali', 'Language code: bn'), 'bn'),
+    Language(15, translate('common.languages', 'Bhutani', 'Language code: dz'), 'dz'),
+    Language(16, translate('common.languages', 'Bihari', 'Language code: bh'), 'bh'),
+    Language(17, translate('common.languages', 'Bislama', 'Language code: bi'), 'bi'),
+    Language(18, translate('common.languages', 'Breton', 'Language code: br'), 'br'),
+    Language(19, translate('common.languages', 'Bulgarian', 'Language code: bg'), 'bg'),
+    Language(20, translate('common.languages', 'Burmese', 'Language code: my'), 'my'),
+    Language(21, translate('common.languages', 'Byelorussian', 'Language code: be'), 'be'),
+    Language(142, translate('common.languages', 'Cakchiquel', 'Language code: cak'), 'cak'),
+    Language(22, translate('common.languages', 'Cambodian', 'Language code: km'), 'km'),
+    Language(23, translate('common.languages', 'Catalan', 'Language code: ca'), 'ca'),
+    Language(24, translate('common.languages', 'Chinese', 'Language code: zh'), 'zh'),
+    Language(141, translate('common.languages', 'Comaltepec Chinantec', 'Language code: cco'), 'cco'),
+    Language(25, translate('common.languages', 'Corsican', 'Language code: co'), 'co'),
+    Language(26, translate('common.languages', 'Croatian', 'Language code: hr'), 'hr'),
+    Language(27, translate('common.languages', 'Czech', 'Language code: cs'), 'cs'),
+    Language(28, translate('common.languages', 'Danish', 'Language code: da'), 'da'),
+    Language(29, translate('common.languages', 'Dutch', 'Language code: nl'), 'nl'),
+    Language(30, translate('common.languages', 'English', 'Language code: en'), 'en'),
+    Language(31, translate('common.languages', 'Esperanto', 'Language code: eo'), 'eo'),
+    Language(32, translate('common.languages', 'Estonian', 'Language code: et'), 'et'),
+    Language(33, translate('common.languages', 'Faeroese', 'Language code: fo'), 'fo'),
+    Language(34, translate('common.languages', 'Fiji', 'Language code: fj'), 'fj'),
+    Language(35, translate('common.languages', 'Finnish', 'Language code: fi'), 'fi'),
+    Language(36, translate('common.languages', 'French', 'Language code: fr'), 'fr'),
+    Language(37, translate('common.languages', 'Frisian', 'Language code: fy'), 'fy'),
+    Language(38, translate('common.languages', 'Galician', 'Language code: gl'), 'gl'),
+    Language(39, translate('common.languages', 'Georgian', 'Language code: ka'), 'ka'),
+    Language(40, translate('common.languages', 'German', 'Language code: de'), 'de'),
+    Language(41, translate('common.languages', 'Greek', 'Language code: el'), 'el'),
+    Language(42, translate('common.languages', 'Greenlandic', 'Language code: kl'), 'kl'),
+    Language(43, translate('common.languages', 'Guarani', 'Language code: gn'), 'gn'),
+    Language(44, translate('common.languages', 'Gujarati', 'Language code: gu'), 'gu'),
+    Language(143, translate('common.languages', 'Haitian Creole', 'Language code: ht'), 'ht'),
+    Language(45, translate('common.languages', 'Hausa', 'Language code: ha'), 'ha'),
+    Language(46, translate('common.languages', 'Hebrew (former iw)', 'Language code: he'), 'he'),
+    Language(144, translate('common.languages', 'Hiligaynon', 'Language code: hil'), 'hil'),
+    Language(47, translate('common.languages', 'Hindi', 'Language code: hi'), 'hi'),
+    Language(48, translate('common.languages', 'Hungarian', 'Language code: hu'), 'hu'),
+    Language(49, translate('common.languages', 'Icelandic', 'Language code: is'), 'is'),
+    Language(50, translate('common.languages', 'Indonesian (former in)', 'Language code: id'), 'id'),
+    Language(51, translate('common.languages', 'Interlingua', 'Language code: ia'), 'ia'),
+    Language(52, translate('common.languages', 'Interlingue', 'Language code: ie'), 'ie'),
+    Language(54, translate('common.languages', 'Inuktitut (Eskimo)', 'Language code: iu'), 'iu'),
+    Language(53, translate('common.languages', 'Inupiak', 'Language code: ik'), 'ik'),
+    Language(55, translate('common.languages', 'Irish', 'Language code: ga'), 'ga'),
+    Language(56, translate('common.languages', 'Italian', 'Language code: it'), 'it'),
+    Language(145, translate('common.languages', 'Jakalteko', 'Language code: jac'), 'jac'),
+    Language(57, translate('common.languages', 'Japanese', 'Language code: ja'), 'ja'),
+    Language(58, translate('common.languages', 'Javanese', 'Language code: jw'), 'jw'),
+    Language(150, translate('common.languages', 'K\'iche\'', 'Language code: quc'), 'quc'),
+    Language(59, translate('common.languages', 'Kannada', 'Language code: kn'), 'kn'),
+    Language(60, translate('common.languages', 'Kashmiri', 'Language code: ks'), 'ks'),
+    Language(61, translate('common.languages', 'Kazakh', 'Language code: kk'), 'kk'),
+    Language(146, translate('common.languages', 'Kekchí ', 'Language code: kek'), 'kek'),
+    Language(62, translate('common.languages', 'Kinyarwanda', 'Language code: rw'), 'rw'),
+    Language(63, translate('common.languages', 'Kirghiz', 'Language code: ky'), 'ky'),
+    Language(64, translate('common.languages', 'Kirundi', 'Language code: rn'), 'rn'),
+    Language(65, translate('common.languages', 'Korean', 'Language code: ko'), 'ko'),
+    Language(66, translate('common.languages', 'Kurdish', 'Language code: ku'), 'ku'),
+    Language(67, translate('common.languages', 'Laothian', 'Language code: lo'), 'lo'),
+    Language(68, translate('common.languages', 'Latin', 'Language code: la'), 'la'),
+    Language(69, translate('common.languages', 'Latvian, Lettish', 'Language code: lv'), 'lv'),
+    Language(70, translate('common.languages', 'Lingala', 'Language code: ln'), 'ln'),
+    Language(71, translate('common.languages', 'Lithuanian', 'Language code: lt'), 'lt'),
+    Language(72, translate('common.languages', 'Macedonian', 'Language code: mk'), 'mk'),
+    Language(73, translate('common.languages', 'Malagasy', 'Language code: mg'), 'mg'),
+    Language(74, translate('common.languages', 'Malay', 'Language code: ms'), 'ms'),
+    Language(75, translate('common.languages', 'Malayalam', 'Language code: ml'), 'ml'),
+    Language(76, translate('common.languages', 'Maltese', 'Language code: mt'), 'mt'),
+    Language(148, translate('common.languages', 'Mam', 'Language code: mam'), 'mam'),
+    Language(77, translate('common.languages', 'Maori', 'Language code: mi'), 'mi'),
+    Language(147, translate('common.languages', 'Maori', 'Language code: mri'), 'mri'),
+    Language(78, translate('common.languages', 'Marathi', 'Language code: mr'), 'mr'),
+    Language(79, translate('common.languages', 'Moldavian', 'Language code: mo'), 'mo'),
+    Language(80, translate('common.languages', 'Mongolian', 'Language code: mn'), 'mn'),
+    Language(149, translate('common.languages', 'Nahuatl', 'Language code: nah'), 'nah'),
+    Language(81, translate('common.languages', 'Nauru', 'Language code: na'), 'na'),
+    Language(82, translate('common.languages', 'Nepali', 'Language code: ne'), 'ne'),
+    Language(83, translate('common.languages', 'Norwegian', 'Language code: no'), 'no'),
+    Language(84, translate('common.languages', 'Occitan', 'Language code: oc'), 'oc'),
+    Language(85, translate('common.languages', 'Oriya', 'Language code: or'), 'or'),
+    Language(86, translate('common.languages', 'Pashto, Pushto', 'Language code: ps'), 'ps'),
+    Language(87, translate('common.languages', 'Persian', 'Language code: fa'), 'fa'),
+    Language(151, translate('common.languages', 'Plautdietsch', 'Language code: pdt'), 'pdt'),
+    Language(88, translate('common.languages', 'Polish', 'Language code: pl'), 'pl'),
+    Language(89, translate('common.languages', 'Portuguese', 'Language code: pt'), 'pt'),
+    Language(90, translate('common.languages', 'Punjabi', 'Language code: pa'), 'pa'),
+    Language(91, translate('common.languages', 'Quechua', 'Language code: qu'), 'qu'),
+    Language(92, translate('common.languages', 'Rhaeto-Romance', 'Language code: rm'), 'rm'),
+    Language(93, translate('common.languages', 'Romanian', 'Language code: ro'), 'ro'),
+    Language(94, translate('common.languages', 'Russian', 'Language code: ru'), 'ru'),
+    Language(95, translate('common.languages', 'Samoan', 'Language code: sm'), 'sm'),
+    Language(96, translate('common.languages', 'Sangro', 'Language code: sg'), 'sg'),
+    Language(97, translate('common.languages', 'Sanskrit', 'Language code: sa'), 'sa'),
+    Language(98, translate('common.languages', 'Scots Gaelic', 'Language code: gd'), 'gd'),
+    Language(99, translate('common.languages', 'Serbian', 'Language code: sr'), 'sr'),
+    Language(100, translate('common.languages', 'Serbo-Croatian', 'Language code: sh'), 'sh'),
+    Language(101, translate('common.languages', 'Sesotho', 'Language code: st'), 'st'),
+    Language(102, translate('common.languages', 'Setswana', 'Language code: tn'), 'tn'),
+    Language(103, translate('common.languages', 'Shona', 'Language code: sn'), 'sn'),
+    Language(104, translate('common.languages', 'Sindhi', 'Language code: sd'), 'sd'),
+    Language(105, translate('common.languages', 'Singhalese', 'Language code: si'), 'si'),
+    Language(106, translate('common.languages', 'Siswati', 'Language code: ss'), 'ss'),
+    Language(107, translate('common.languages', 'Slovak', 'Language code: sk'), 'sk'),
+    Language(108, translate('common.languages', 'Slovenian', 'Language code: sl'), 'sl'),
+    Language(109, translate('common.languages', 'Somali', 'Language code: so'), 'so'),
+    Language(110, translate('common.languages', 'Spanish', 'Language code: es'), 'es'),
+    Language(111, translate('common.languages', 'Sudanese', 'Language code: su'), 'su'),
+    Language(112, translate('common.languages', 'Swahili', 'Language code: sw'), 'sw'),
+    Language(113, translate('common.languages', 'Swedish', 'Language code: sv'), 'sv'),
+    Language(114, translate('common.languages', 'Tagalog', 'Language code: tl'), 'tl'),
+    Language(115, translate('common.languages', 'Tajik', 'Language code: tg'), 'tg'),
+    Language(116, translate('common.languages', 'Tamil', 'Language code: ta'), 'ta'),
+    Language(117, translate('common.languages', 'Tatar', 'Language code: tt'), 'tt'),
+    Language(118, translate('common.languages', 'Tegulu', 'Language code: te'), 'te'),
+    Language(119, translate('common.languages', 'Thai', 'Language code: th'), 'th'),
+    Language(120, translate('common.languages', 'Tibetan', 'Language code: bo'), 'bo'),
+    Language(121, translate('common.languages', 'Tigrinya', 'Language code: ti'), 'ti'),
+    Language(122, translate('common.languages', 'Tonga', 'Language code: to'), 'to'),
+    Language(123, translate('common.languages', 'Tsonga', 'Language code: ts'), 'ts'),
+    Language(124, translate('common.languages', 'Turkish', 'Language code: tr'), 'tr'),
+    Language(125, translate('common.languages', 'Turkmen', 'Language code: tk'), 'tk'),
+    Language(126, translate('common.languages', 'Twi', 'Language code: tw'), 'tw'),
+    Language(127, translate('common.languages', 'Uigur', 'Language code: ug'), 'ug'),
+    Language(128, translate('common.languages', 'Ukrainian', 'Language code: uk'), 'uk'),
+    Language(129, translate('common.languages', 'Urdu', 'Language code: ur'), 'ur'),
+    Language(153, translate('common.languages', 'Uspanteco', 'Language code: usp'), 'usp'),
+    Language(130, translate('common.languages', 'Uzbek', 'Language code: uz'), 'uz'),
+    Language(131, translate('common.languages', 'Vietnamese', 'Language code: vi'), 'vi'),
+    Language(132, translate('common.languages', 'Volapuk', 'Language code: vo'), 'vo'),
+    Language(133, translate('common.languages', 'Welch', 'Language code: cy'), 'cy'),
+    Language(134, translate('common.languages', 'Wolof', 'Language code: wo'), 'wo'),
+    Language(135, translate('common.languages', 'Xhosa', 'Language code: xh'), 'xh'),
+    Language(136, translate('common.languages', 'Yiddish (former ji)', 'Language code: yi'), 'yi'),
+    Language(137, translate('common.languages', 'Yoruba', 'Language code: yo'), 'yo'),
+    Language(138, translate('common.languages', 'Zhuang', 'Language code: za'), 'za'),
+    Language(139, translate('common.languages', 'Zulu', 'Language code: zu'), 'zu')
+], key=lambda language: language.name)
+
+
+def get_language(name):
+    """
+    Find the language by its name or code.
+
+    :param name: The name or abbreviation of the language.
+    :return: The first match as a Language namedtuple or None
+    """
+    if name:
+        name_lower = name.lower()
+        name_title = name_lower[:1].upper() + name_lower[1:]
+        for language in languages:
+            if language.name == name_title or language.code == name_lower:
+                return language
+    return None
 
=== modified file 'openlp/core/common/openlpmixin.py'
--- openlp/core/common/openlpmixin.py	2016-12-31 11:05:48 +0000
+++ openlp/core/common/openlpmixin.py	2017-01-08 22:05:36 +0000
@@ -49,12 +49,13 @@
         Code to added debug wrapper to work on called functions within a decorated class.
         """
         def wrapped(*args, **kwargs):
-            parent.logger.debug("Entering %s" % func.__name__)
+            parent.logger.debug("Entering {function}".format(function=func.__name__))
             try:
                 return func(*args, **kwargs)
             except Exception as e:
                 if parent.logger.getEffectiveLevel() <= logging.ERROR:
-                    parent.logger.error('Exception in %s : %s' % (func.__name__, e))
+                    parent.logger.error('Exception in {function} : {error}'.format(function=func.__name__,
+                                                                                   error=e))
                 raise e
         return wrapped
 
@@ -70,6 +71,12 @@
         """
         self.logger.info(message)
 
+    def log_warning(self, message):
+        """
+        Common log warning handler
+        """
+        self.logger.warning(message)
+
     def log_error(self, message):
         """
         Common log error handler which prints the calling path
 
=== modified file 'openlp/core/common/registry.py'
--- openlp/core/common/registry.py	2016-12-31 11:05:48 +0000
+++ openlp/core/common/registry.py	2017-01-08 22:05:36 +0000
@@ -55,6 +55,7 @@
         registry = cls()
         registry.service_list = {}
         registry.functions_list = {}
+        registry.working_flags = {}
         # Allow the tests to remove Registry entries but not the live system
         registry.running_under_test = 'nose' in sys.argv[0]
         registry.initialising = True
@@ -71,8 +72,8 @@
         else:
             if not self.initialising:
                 trace_error_handler(log)
-                log.error('Service %s not found in list' % key)
-                raise KeyError('Service %s not found in list' % key)
+                log.error('Service {key} not found in list'.format(key=key))
+                raise KeyError('Service {key} not found in list'.format(key=key))
 
     def register(self, key, reference):
         """
@@ -83,15 +84,14 @@
         """
         if key in self.service_list:
             trace_error_handler(log)
-            log.error('Duplicate service exception %s' % key)
-            raise KeyError('Duplicate service exception %s' % key)
+            log.error('Duplicate service exception {key}'.format(key=key))
+            raise KeyError('Duplicate service exception {key}'.format(key=key))
         else:
             self.service_list[key] = reference
 
     def remove(self, key):
         """
-        Removes the registry value from the list based on the key passed in (Only valid and active for testing
-        framework).
+        Removes the registry value from the list based on the key passed in.
 
         :param key: The service to be deleted.
         """
@@ -140,8 +140,39 @@
                 except TypeError:
                     # Who has called me can help in debugging
                     trace_error_handler(log)
-                    log.exception('Exception for function %s', function)
+                    log.exception('Exception for function {function}'.format(function=function))
         else:
             trace_error_handler(log)
-            log.error("Event %s called but not registered" % event)
+            log.error("Event {event} called but not registered".format(event=event))
         return results
+
+    def get_flag(self, key):
+        """
+        Extracts the working_flag value from the list based on the key passed in
+
+        :param key: The flag to be retrieved.
+        """
+        if key in self.working_flags:
+            return self.working_flags[key]
+        else:
+            trace_error_handler(log)
+            log.error('Working Flag {key} not found in list'.format(key=key))
+            raise KeyError('Working Flag {key} not found in list'.format(key=key))
+
+    def set_flag(self, key, reference):
+        """
+        Sets a working_flag based on the key passed in.
+
+        :param key: The working_flag to be created this is usually a major class like "renderer" or "main_window" .
+        :param reference: The data to be saved.
+        """
+        self.working_flags[key] = reference
+
+    def remove_flag(self, key):
+        """
+        Removes the working flags value from the list based on the key passed.
+
+        :param key: The working_flag to be deleted.
+        """
+        if key in self.working_flags:
+            del self.working_flags[key]
 
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py	2016-12-31 11:05:48 +0000
+++ openlp/core/common/settings.py	2017-01-08 22:05:36 +0000
@@ -26,7 +26,7 @@
 import logging
 import os
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtCore, QtGui
 
 from openlp.core.common import ThemeLevel, SlideLimits, UiStrings, is_win, is_linux
 
@@ -107,10 +107,9 @@
     __default_settings__ = {
         'advanced/add page break': False,
         'advanced/alternate rows': not is_win(),
+        'advanced/autoscrolling': {'dist': 1, 'pos': 0},
         'advanced/current media plugin': -1,
         'advanced/data path': '',
-        'advanced/default color': '#ffffff',
-        'advanced/default image': ':/graphics/openlp-splash-screen.png',
         # 7 stands for now, 0 to 6 is Monday to Sunday.
         'advanced/default service day': 7,
         'advanced/default service enabled': True,
@@ -130,7 +129,9 @@
         'advanced/recent file count': 4,
         'advanced/save current plugin': False,
         'advanced/slide limits': SlideLimits.End,
+        'advanced/slide max height': -4,
         'advanced/single click preview': False,
+        'advanced/single click service preview': False,
         'advanced/x11 bypass wm': X11_BYPASS_DEFAULT,
         'advanced/search as type': True,
         'crashreport/last directory': '',
@@ -140,6 +141,7 @@
         'core/auto preview': False,
         'core/audio start paused': True,
         'core/auto unblank': False,
+        'core/click live slide to unblank': False,
         'core/blank warning': False,
         'core/ccli number': '',
         'core/has run wizard': False,
@@ -150,6 +152,9 @@
         'core/save prompt': False,
         'core/screen blank': False,
         'core/show splash': True,
+        'core/logo background color': '#ffffff',
+        'core/logo file': ':/graphics/openlp-splash-screen.png',
+        'core/logo hide on startup': False,
         'core/songselect password': '',
         'core/songselect username': '',
         'core/update check': True,
@@ -178,13 +183,15 @@
         'themes/wrap footer': False,
         'user interface/live panel': True,
         'user interface/live splitter geometry': QtCore.QByteArray(),
-        'user interface/lock panel': False,
+        'user interface/lock panel': True,
         'user interface/main window geometry': QtCore.QByteArray(),
         'user interface/main window position': QtCore.QPoint(0, 0),
         'user interface/main window splitter geometry': QtCore.QByteArray(),
         'user interface/main window state': QtCore.QByteArray(),
         'user interface/preview panel': True,
         'user interface/preview splitter geometry': QtCore.QByteArray(),
+        'user interface/is preset layout': False,
+        'projector/show after wizard': False,
         'projector/db type': 'sqlite',
         'projector/db username': '',
         'projector/db password': '',
@@ -205,7 +212,12 @@
         # ('general/recent files', 'core/recent files', [(recent_files_conv, None)]),
         ('songs/search as type', 'advanced/search as type', []),
         ('media/players', 'media/players_temp', [(media_players_conv, None)]),  # Convert phonon to system
-        ('media/players_temp', 'media/players', [])  # Move temp setting from above to correct setting
+        ('media/players_temp', 'media/players', []),  # Move temp setting from above to correct setting
+        ('advanced/default color', 'core/logo background color', []),  # Default image renamed + moved to general > 2.4.
+        ('advanced/default image', 'core/logo file', []),  # Default image renamed + moved to general after 2.4.
+        ('shortcuts/escapeItem', 'shortcuts/desktopScreenEnable', []),  # Escape item was removed in 2.6.
+        ('shortcuts/offlineHelpItem', 'shortcuts/userManualItem', []),  # Online and Offline help were combined in 2.6.
+        ('shortcuts/onlineHelpItem', 'shortcuts/userManualItem', [])  # Online and Offline help were combined in 2.6.
     ]
 
     @staticmethod
@@ -252,10 +264,10 @@
             'shortcuts/blankScreen': [QtGui.QKeySequence(QtCore.Qt.Key_Period)],
             'shortcuts/collapse': [QtGui.QKeySequence(QtCore.Qt.Key_Minus)],
             'shortcuts/desktopScreen': [QtGui.QKeySequence(QtCore.Qt.Key_D)],
+            'shortcuts/desktopScreenEnable': [QtGui.QKeySequence(QtCore.Qt.Key_Escape)],
             'shortcuts/delete': [QtGui.QKeySequence(QtGui.QKeySequence.Delete)],
             'shortcuts/down': [QtGui.QKeySequence(QtCore.Qt.Key_Down)],
             'shortcuts/editSong': [],
-            'shortcuts/escapeItem': [QtGui.QKeySequence(QtCore.Qt.Key_Escape)],
             'shortcuts/expand': [QtGui.QKeySequence(QtCore.Qt.Key_Plus)],
             'shortcuts/exportThemeItem': [],
             'shortcuts/fileNewItem': [QtGui.QKeySequence(QtGui.QKeySequence.New)],
@@ -264,6 +276,7 @@
             'shortcuts/fileSaveItem': [QtGui.QKeySequence(QtGui.QKeySequence.Save)],
             'shortcuts/fileOpenItem': [QtGui.QKeySequence(QtGui.QKeySequence.Open)],
             'shortcuts/goLive': [],
+            'shortcuts/userManualItem': [QtGui.QKeySequence(QtGui.QKeySequence.HelpContents)],
             'shortcuts/importThemeItem': [],
             'shortcuts/importBibleItem': [],
             'shortcuts/listViewBiblesDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete)],
@@ -324,8 +337,6 @@
                                            QtGui.QKeySequence(QtCore.Qt.Key_PageDown)],
             'shortcuts/nextService': [QtGui.QKeySequence(QtCore.Qt.Key_Right)],
             'shortcuts/newService': [],
-            'shortcuts/offlineHelpItem': [QtGui.QKeySequence(QtGui.QKeySequence.HelpContents)],
-            'shortcuts/onlineHelpItem': [QtGui.QKeySequence(QtGui.QKeySequence.HelpContents)],
             'shortcuts/openService': [],
             'shortcuts/saveService': [],
             'shortcuts/previousItem_live': [QtGui.QKeySequence(QtCore.Qt.Key_Up),
@@ -370,6 +381,7 @@
             'shortcuts/themeScreen': [QtGui.QKeySequence(QtCore.Qt.Key_T)],
             'shortcuts/toolsReindexItem': [],
             'shortcuts/toolsFindDuplicates': [],
+            'shortcuts/toolsSongListReport': [],
             'shortcuts/toolsAlertItem': [QtGui.QKeySequence(QtCore.Qt.Key_F7)],
             'shortcuts/toolsFirstTimeWizard': [],
             'shortcuts/toolsOpenDataFolder': [],
@@ -479,16 +491,16 @@
         # Do NOT do this anywhere else!
         settings = QtCore.QSettings(self.fileName(), Settings.IniFormat)
         settings.beginGroup(plugin.settings_section)
-        if settings.contains('%s count' % plugin.name):
+        if settings.contains('{name} count'.format(name=plugin.name)):
             # Get the count.
-            list_count = int(settings.value('%s count' % plugin.name, 0))
+            list_count = int(settings.value('{name} count'.format(name=plugin.name), 0))
             if list_count:
                 for counter in range(list_count):
                     # The keys were named e. g.: "image 0"
-                    item = settings.value('%s %d' % (plugin.name, counter), '')
+                    item = settings.value('{name} {counter:d}'.format(name=plugin.name, counter=counter), '')
                     if item:
                         files_list.append(item)
-                    settings.remove('%s %d' % (plugin.name, counter))
-            settings.remove('%s count' % plugin.name)
+                    settings.remove('{name} {counter:d}'.format(name=plugin.name, counter=counter))
+            settings.remove('{name} count'.format(name=plugin.name))
         settings.endGroup()
         return files_list
 
=== modified file 'openlp/core/common/uistrings.py'
--- openlp/core/common/uistrings.py	2016-12-31 11:05:48 +0000
+++ openlp/core/common/uistrings.py	2017-01-08 22:05:36 +0000
@@ -23,6 +23,7 @@
 The :mod:`uistrings` module provides standard strings for OpenLP.
 """
 import logging
+import itertools
 
 from openlp.core.common import translate
 
@@ -52,10 +53,12 @@
         self.About = translate('OpenLP.Ui', 'About')
         self.Add = translate('OpenLP.Ui', '&Add')
         self.AddGroup = translate('OpenLP.Ui', 'Add group')
+        self.AddGroupDot = translate('OpenLP.Ui', 'Add group.')
         self.Advanced = translate('OpenLP.Ui', 'Advanced')
         self.AllFiles = translate('OpenLP.Ui', 'All Files')
         self.Automatic = translate('OpenLP.Ui', 'Automatic')
         self.BackgroundColor = translate('OpenLP.Ui', 'Background Color')
+        self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:')
         self.Bottom = translate('OpenLP.Ui', 'Bottom')
         self.Browse = translate('OpenLP.Ui', 'Browse...')
         self.Cancel = translate('OpenLP.Ui', 'Cancel')
@@ -67,7 +70,7 @@
         self.Default = translate('OpenLP.Ui', 'Default')
         self.DefaultColor = translate('OpenLP.Ui', 'Default Color:')
         self.DefaultServiceName = translate('OpenLP.Ui', 'Service %Y-%m-%d %H-%M',
-                                            'This may not contain any of the following characters: /\\?*|<>\[\]":+\n'
+                                            'This may not contain any of the following characters: /\\?*|<>[]":+\n'
                                             'See http://docs.python.org/library/datetime'
                                             '.html#strftime-strptime-behavior for more information.')
         self.Delete = translate('OpenLP.Ui', '&Delete')
@@ -79,7 +82,8 @@
         self.Export = translate('OpenLP.Ui', 'Export')
         self.File = translate('OpenLP.Ui', 'File')
         self.FileNotFound = translate('OpenLP.Ui', 'File Not Found')
-        self.FileNotFoundMessage = translate('OpenLP.Ui', 'File %s not found.\nPlease try selecting it individually.')
+        self.FileNotFoundMessage = translate('OpenLP.Ui',
+                                             'File {name} not found.\nPlease try selecting it individually.')
         self.FontSizePtUnit = translate('OpenLP.Ui', 'pt', 'Abbreviated font pointsize unit')
         self.Help = translate('OpenLP.Ui', 'Help')
         self.Hours = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours')
@@ -108,9 +112,10 @@
         self.NFSp = translate('OpenLP.Ui', 'No Files Selected', 'Plural')
         self.NISs = translate('OpenLP.Ui', 'No Item Selected', 'Singular')
         self.NISp = translate('OpenLP.Ui', 'No Items Selected', 'Plural')
+        self.NoResults = translate('OpenLP.Ui', 'No Search Results')
         self.OLP = translate('OpenLP.Ui', 'OpenLP')
-        self.OLPV2 = "%s %s" % (self.OLP, "2")
-        self.OLPV2x = "%s %s" % (self.OLP, "2.4")
+        self.OLPV2 = "{name} {version}".format(name=self.OLP, version="2")
+        self.OLPV2x = "{name} {version}".format(name=self.OLP, version="2.4")
         self.OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. Do you wish to continue?')
         self.OpenService = translate('OpenLP.Ui', 'Open service.')
         self.PlaySlidesInLoop = translate('OpenLP.Ui', 'Play Slides in Loop')
@@ -135,10 +140,12 @@
         self.Settings = translate('OpenLP.Ui', 'Settings')
         self.SaveService = translate('OpenLP.Ui', 'Save Service')
         self.Service = translate('OpenLP.Ui', 'Service')
+        self.ShortResults = translate('OpenLP.Ui', 'Please type more text to use \'Search As You Type\'')
         self.Split = translate('OpenLP.Ui', 'Optional &Split')
         self.SplitToolTip = translate('OpenLP.Ui',
                                       'Split a slide into two only if it does not fit on the screen as one slide.')
-        self.StartTimeCode = translate('OpenLP.Ui', 'Start %s')
+        # TODO: WHERE is this used at? cannot find where it's used at in code.
+        self.StartTimeCode = translate('OpenLP.Ui', 'Start {code}')
         self.StopPlaySlidesInLoop = translate('OpenLP.Ui', 'Stop Play Slides in Loop')
         self.StopPlaySlidesToEnd = translate('OpenLP.Ui', 'Stop Play Slides to End')
         self.Theme = translate('OpenLP.Ui', 'Theme', 'Singular')
@@ -151,3 +158,31 @@
         self.Version = translate('OpenLP.Ui', 'Version')
         self.View = translate('OpenLP.Ui', 'View')
         self.ViewMode = translate('OpenLP.Ui', 'View Mode')
+        self.Video = translate('OpenLP.Ui', 'Video')
+        self.BibleShortSearchTitle = translate('OpenLP.Ui', 'Search is Empty or too Short')
+        self.BibleShortSearch = translate('OpenLP.Ui', '<strong>The search you have entered is empty or shorter '
+                                                       'than 3 characters long.</strong><br><br>Please try again with '
+                                                       'a longer search.')
+        self.BibleNoBiblesTitle = translate('OpenLP.Ui', 'No Bibles Available')
+        self.BibleNoBibles = translate('OpenLP.Ui', '<strong>There are no Bibles currently installed.</strong><br><br>'
+                                                    'Please use the Import Wizard to install one or more Bibles.')
+        book_chapter = translate('OpenLP.Ui', 'Book Chapter')
+        chapter = translate('OpenLP.Ui', 'Chapter')
+        verse = translate('OpenLP.Ui', 'Verse')
+        gap = ' | '
+        psalm = translate('OpenLP.Ui', 'Psalm')
+        may_shorten = translate('OpenLP.Ui', 'Book names may be shortened from full names, for an example Ps 23 = '
+                                             'Psalm 23')
+        bible_scripture_items = \
+            [book_chapter, gap, psalm, ' 23<br>',
+             book_chapter, '%(range)s', chapter, gap, psalm, ' 23%(range)s24<br>',
+             book_chapter, '%(verse)s', verse, '%(range)s', verse, gap, psalm, ' 23%(verse)s1%(range)s2<br>',
+             book_chapter, '%(verse)s', verse, '%(range)s', verse, '%(list)s', verse, '%(range)s', verse, gap, psalm,
+             ' 23%(verse)s1%(range)s2%(list)s5%(range)s6<br>',
+             book_chapter, '%(verse)s', verse, '%(range)s', verse, '%(list)s', chapter, '%(verse)s', verse, '%(range)s',
+             verse, gap, psalm, ' 23%(verse)s1%(range)s2%(list)s24%(verse)s1%(range)s3<br>',
+             book_chapter, '%(verse)s', verse, '%(range)s', chapter, '%(verse)s', verse, gap, psalm,
+             ' 23%(verse)s1%(range)s24%(verse)s1<br><br>', may_shorten]
+        itertools.chain.from_iterable(itertools.repeat(strings, 1) if isinstance(strings, str)
+                                      else strings for strings in bible_scripture_items)
+        self.BibleScriptureError = ''.join(str(joined) for joined in bible_scripture_items)
 
=== added file 'openlp/core/common/versionchecker.py'
--- openlp/core/common/versionchecker.py	1970-01-01 00:00:00 +0000
+++ openlp/core/common/versionchecker.py	2017-01-08 22:05:36 +0000
@@ -0,0 +1,173 @@
+import logging
+import os
+import platform
+import sys
+import time
+import urllib.error
+import urllib.parse
+import urllib.request
+from datetime import datetime
+from distutils.version import LooseVersion
+from subprocess import Popen, PIPE
+
+from PyQt5 import QtCore
+
+from openlp.core.common import AppLocation, Settings
+
+log = logging.getLogger(__name__)
+
+APPLICATION_VERSION = {}
+CONNECTION_TIMEOUT = 30
+CONNECTION_RETRIES = 2
+
+
+class VersionThread(QtCore.QThread):
+    """
+    A special Qt thread class to fetch the version of OpenLP from the website.
+    This is threaded so that it doesn't affect the loading time of OpenLP.
+    """
+    def __init__(self, main_window):
+        """
+        Constructor for the thread class.
+
+        :param main_window: The main window Object.
+        """
+        log.debug("VersionThread - Initialise")
+        super(VersionThread, self).__init__(None)
+        self.main_window = main_window
+
+    def run(self):
+        """
+        Run the thread.
+        """
+        self.sleep(1)
+        log.debug('Version thread - run')
+        app_version = get_application_version()
+        version = check_latest_version(app_version)
+        log.debug("Versions {version1} and {version2} ".format(version1=LooseVersion(str(version)),
+                                                               version2=LooseVersion(str(app_version['full']))))
+        if LooseVersion(str(version)) > LooseVersion(str(app_version['full'])):
+            self.main_window.openlp_version_check.emit('{version}'.format(version=version))
+
+
+def get_application_version():
+    """
+    Returns the application version of the running instance of OpenLP::
+
+        {'full': '1.9.4-bzr1249', 'version': '1.9.4', 'build': 'bzr1249'}
+    """
+    global APPLICATION_VERSION
+    if APPLICATION_VERSION:
+        return APPLICATION_VERSION
+    if '--dev-version' in sys.argv or '-d' in sys.argv:
+        # NOTE: The following code is a duplicate of the code in setup.py. Any fix applied here should also be applied
+        # there.
+
+        # Get the revision of this tree.
+        bzr = Popen(('bzr', 'revno'), stdout=PIPE)
+        tree_revision, error = bzr.communicate()
+        tree_revision = tree_revision.decode()
+        code = bzr.wait()
+        if code != 0:
+            raise Exception('Error running bzr log')
+
+        # Get all tags.
+        bzr = Popen(('bzr', 'tags'), stdout=PIPE)
+        output, error = bzr.communicate()
+        code = bzr.wait()
+        if code != 0:
+            raise Exception('Error running bzr tags')
+        tags = list(map(bytes.decode, output.splitlines()))
+        if not tags:
+            tag_version = '0.0.0'
+            tag_revision = '0'
+        else:
+            # Remove any tag that has "?" as revision number. A "?" as revision number indicates, that this tag is from
+            # another series.
+            tags = [tag for tag in tags if tag.split()[-1].strip() != '?']
+            # Get the last tag and split it in a revision and tag name.
+            tag_version, tag_revision = tags[-1].split()
+        # If they are equal, then this tree is tarball with the source for the release. We do not want the revision
+        # number in the full version.
+        if tree_revision == tag_revision:
+            full_version = tag_version.strip()
+        else:
+            full_version = '{tag}-bzr{tree}'.format(tag=tag_version.strip(), tree=tree_revision.strip())
+    else:
+        # We're not running the development version, let's use the file.
+        file_path = AppLocation.get_directory(AppLocation.VersionDir)
+        file_path = os.path.join(file_path, '.version')
+        version_file = None
+        try:
+            version_file = open(file_path, 'r')
+            full_version = str(version_file.read()).rstrip()
+        except IOError:
+            log.exception('Error in version file.')
+            full_version = '0.0.0-bzr000'
+        finally:
+            if version_file:
+                version_file.close()
+    bits = full_version.split('-')
+    APPLICATION_VERSION = {
+        'full': full_version,
+        'version': bits[0],
+        'build': bits[1] if len(bits) > 1 else None
+    }
+    if APPLICATION_VERSION['build']:
+        log.info('Openlp version {version} build {build}'.format(version=APPLICATION_VERSION['version'],
+                                                                 build=APPLICATION_VERSION['build']))
+    else:
+        log.info('Openlp version {version}'.format(version=APPLICATION_VERSION['version']))
+    return APPLICATION_VERSION
+
+
+def check_latest_version(current_version):
+    """
+    Check the latest version of OpenLP against the version file on the OpenLP
+    site.
+
+    **Rules around versions and version files:**
+
+    * If a version number has a build (i.e. -bzr1234), then it is a nightly.
+    * If a version number's minor version is an odd number, it is a development release.
+    * If a version number's minor version is an even number, it is a stable release.
+
+    :param current_version: The current version of OpenLP.
+    """
+    version_string = current_version['full']
+    # set to prod in the distribution config file.
+    settings = Settings()
+    settings.beginGroup('core')
+    last_test = settings.value('last version test')
+    this_test = str(datetime.now().date())
+    settings.setValue('last version test', this_test)
+    settings.endGroup()
+    if last_test != this_test:
+        if current_version['build']:
+            req = urllib.request.Request('http://www.openlp.org/files/nightly_version.txt')
+        else:
+            version_parts = current_version['version'].split('.')
+            if int(version_parts[1]) % 2 != 0:
+                req = urllib.request.Request('http://www.openlp.org/files/dev_version.txt')
+            else:
+                req = urllib.request.Request('http://www.openlp.org/files/version.txt')
+        req.add_header('User-Agent', 'OpenLP/{version} {system}/{release}; '.format(version=current_version['full'],
+                                                                                    system=platform.system(),
+                                                                                    release=platform.release()))
+        remote_version = None
+        retries = 0
+        while True:
+            try:
+                remote_version = str(urllib.request.urlopen(req, None,
+                                                            timeout=CONNECTION_TIMEOUT).read().decode()).strip()
+            except (urllib.error.URLError, ConnectionError):
+                if retries > CONNECTION_RETRIES:
+                    log.exception('Failed to download the latest OpenLP version file')
+                else:
+                    retries += 1
+                    time.sleep(0.1)
+                    continue
+            break
+        if remote_version:
+            version_string = remote_version
+    return version_string
 
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/__init__.py	2017-01-08 22:05:36 +0000
@@ -24,13 +24,12 @@
 OpenLP work.
 """
 
-from distutils.version import LooseVersion
 import logging
 import os
+from distutils.version import LooseVersion
 
 from PyQt5 import QtCore, QtGui, Qt, QtWidgets
 
-
 from openlp.core.common import translate
 
 log = logging.getLogger(__name__ + '.__init__')
@@ -55,9 +54,13 @@
 
     ``Theme``
         This says, that the image is used by a theme.
+
+    ``CommandPlugins``
+        This states that an image is being used by a command plugin.
     """
     ImagePlugin = 1
     Theme = 2
+    CommandPlugins = 3
 
 
 class MediaType(object):
@@ -92,12 +95,12 @@
     content = None
     try:
         file_handle = open(text_file, 'r', encoding='utf-8')
-        if not file_handle.read(3) == '\xEF\xBB\xBF':
+        if file_handle.read(3) != '\xEF\xBB\xBF':
             # no BOM was found
             file_handle.seek(0)
         content = file_handle.read()
     except (IOError, UnicodeError):
-        log.exception('Failed to open text file %s' % text_file)
+        log.exception('Failed to open text file {text}'.format(text=text_file))
     finally:
         if file_handle:
             file_handle.close()
@@ -126,16 +129,16 @@
         location like ``/path/to/file.png``. However, the **recommended** way is to specify a resource string.
     :return: The build icon.
     """
+    if isinstance(icon, QtGui.QIcon):
+        return icon
+    pix_map = None
     button_icon = QtGui.QIcon()
-    if isinstance(icon, QtGui.QIcon):
-        button_icon = icon
-    elif isinstance(icon, str):
-        if icon.startswith(':/'):
-            button_icon.addPixmap(QtGui.QPixmap(icon), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        else:
-            button_icon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(icon)), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+    if isinstance(icon, str):
+        pix_map = QtGui.QPixmap(icon)
     elif isinstance(icon, QtGui.QImage):
-        button_icon.addPixmap(QtGui.QPixmap.fromImage(icon), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        pix_map = QtGui.QPixmap.fromImage(icon)
+    if pix_map:
+        button_icon.addPixmap(pix_map, QtGui.QIcon.Normal, QtGui.QIcon.Off)
     return button_icon
 
 
@@ -174,10 +177,30 @@
     ext = os.path.splitext(thumb_path)[1].lower()
     reader = QtGui.QImageReader(image_path)
     if size is None:
-        ratio = reader.size().width() / reader.size().height()
+        # No size given; use default height of 88
+        if reader.size().isEmpty():
+            ratio = 1
+        else:
+            ratio = reader.size().width() / reader.size().height()
         reader.setScaledSize(QtCore.QSize(int(ratio * 88), 88))
-    else:
+    elif size.isValid():
+        # Complete size given
         reader.setScaledSize(size)
+    else:
+        # Invalid size given
+        if reader.size().isEmpty():
+            ratio = 1
+        else:
+            ratio = reader.size().width() / reader.size().height()
+        if size.width() >= 0:
+            # Valid width; scale height
+            reader.setScaledSize(QtCore.QSize(size.width(), int(size.width() / ratio)))
+        elif size.height() >= 0:
+            # Valid height; scale width
+            reader.setScaledSize(QtCore.QSize(int(ratio * size.height()), size.height()))
+        else:
+            # Invalid; use default height of 88
+            reader.setScaledSize(QtCore.QSize(int(ratio * 88), 88))
     thumb = reader.read()
     thumb.save(thumb_path, ext[1:])
     if not return_icon:
@@ -287,46 +310,34 @@
 
 def create_separated_list(string_list):
     """
-    Returns a string that represents a join of a list of strings with a localized separator. This function corresponds
-
-    to QLocale::createSeparatedList which was introduced in Qt 4.8 and implements the algorithm from
-    http://www.unicode.org/reports/tr35/#ListPatterns
-
-     :param string_list: List of unicode strings
+    Returns a string that represents a join of a list of strings with a localized separator.
+    Localized separation will be done via the translate() function by the translators.
+
+    :param string_list: List of unicode strings
+    :return: Formatted string
     """
-    if LooseVersion(Qt.PYQT_VERSION_STR) >= LooseVersion('4.9') and LooseVersion(Qt.qVersion()) >= LooseVersion('4.8'):
-        return QtCore.QLocale().createSeparatedList(string_list)
-    if not string_list:
-        return ''
-    elif len(string_list) == 1:
-        return string_list[0]
-    elif len(string_list) == 2:
-        return translate('OpenLP.core.lib', '%s and %s',
-                         'Locale list separator: 2 items') % (string_list[0], string_list[1])
+    list_length = len(string_list)
+    if list_length == 1:
+        list_to_string = string_list[0]
+    elif list_length == 2:
+        list_to_string = translate('OpenLP.core.lib', '{one} and {two}').format(one=string_list[0], two=string_list[1])
+    elif list_length > 2:
+        list_to_string = translate('OpenLP.core.lib', '{first} and {last}').format(first=', '.join(string_list[:-1]),
+                                                                                   last=string_list[-1])
     else:
-        merged = translate('OpenLP.core.lib', '%s, and %s',
-                           'Locale list separator: end') % (string_list[-2], string_list[-1])
-        for index in reversed(list(range(1, len(string_list) - 2))):
-            merged = translate('OpenLP.core.lib', '%s, %s',
-                               'Locale list separator: middle') % (string_list[index], merged)
-        return translate('OpenLP.core.lib', '%s, %s', 'Locale list separator: start') % (string_list[0], merged)
-
-
-from .colorbutton import ColorButton
+        list_to_string = ''
+    return list_to_string
+
+
 from .exceptions import ValidationError
 from .filedialog import FileDialog
 from .screen import ScreenList
-from .listwidgetwithdnd import ListWidgetWithDnD
-from .treewidgetwithdnd import TreeWidgetWithDnD
 from .formattingtags import FormattingTags
-from .spelltextedit import SpellTextEdit
 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
-from .toolbar import OpenLPToolbar
-from .dockwidget import OpenLPDockWidget
 from .imagemanager import ImageManager
 from .renderer import Renderer
 from .mediamanageritem import MediaManagerItem
 
=== renamed file 'openlp/core/lib/colorbutton.py' => 'openlp/core/lib/colorbutton.py.THIS'
=== modified file 'openlp/core/lib/db.py'
--- openlp/core/lib/db.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/db.py	2017-01-08 22:05:36 +0000
@@ -34,9 +34,8 @@
 from alembic.migration import MigrationContext
 from alembic.operations import Operations
 
-from openlp.core.common import AppLocation, Settings, translate
+from openlp.core.common import AppLocation, Settings, translate, delete_file
 from openlp.core.lib.ui import critical_error_message_box
-from openlp.core.utils import delete_file
 
 log = logging.getLogger(__name__)
 
@@ -69,9 +68,11 @@
     :return: The path to the database as type str
     """
     if db_file_name is None:
-        return 'sqlite:///%s/%s.sqlite' % (AppLocation.get_section_data_path(plugin_name), plugin_name)
+        return 'sqlite:///{path}/{plugin}.sqlite'.format(path=AppLocation.get_section_data_path(plugin_name),
+                                                         plugin=plugin_name)
     else:
-        return 'sqlite:///%s/%s' % (AppLocation.get_section_data_path(plugin_name), db_file_name)
+        return 'sqlite:///{path}/{name}'.format(path=AppLocation.get_section_data_path(plugin_name),
+                                                name=db_file_name)
 
 
 def handle_db_error(plugin_name, db_file_name):
@@ -83,10 +84,10 @@
     :return: None
     """
     db_path = get_db_path(plugin_name, db_file_name)
-    log.exception('Error loading database: %s', db_path)
+    log.exception('Error loading database: {db}'.format(db=db_path))
     critical_error_message_box(translate('OpenLP.Manager', 'Database Error'),
-                               translate('OpenLP.Manager', 'OpenLP cannot load your database.\n\nDatabase: %s')
-                               % db_path)
+                               translate('OpenLP.Manager',
+                                         'OpenLP cannot load your database.\n\nDatabase: {db}').format(db=db_path))
 
 
 def init_url(plugin_name, db_file_name=None):
@@ -102,10 +103,11 @@
     if db_type == 'sqlite':
         db_url = get_db_path(plugin_name, db_file_name)
     else:
-        db_url = '%s://%s:%s@%s/%s' % (db_type, urlquote(settings.value('db username')),
-                                       urlquote(settings.value('db password')),
-                                       urlquote(settings.value('db hostname')),
-                                       urlquote(settings.value('db database')))
+        db_url = '{type}://{user}:{password}@{host}/{db}'.format(type=db_type,
+                                                                 user=urlquote(settings.value('db username')),
+                                                                 password=urlquote(settings.value('db password')),
+                                                                 host=urlquote(settings.value('db hostname')),
+                                                                 db=urlquote(settings.value('db database')))
     settings.endGroup()
     return db_url
 
@@ -120,6 +122,21 @@
     return Operations(context)
 
 
+class BaseModel(object):
+    """
+    BaseModel provides a base object with a set of generic functions
+    """
+    @classmethod
+    def populate(cls, **kwargs):
+        """
+        Creates an instance of a class and populates it, returning the instance
+        """
+        instance = cls()
+        for key, value in kwargs.items():
+            instance.__setattr__(key, value)
+        return instance
+
+
 def upgrade_db(url, upgrade):
     """
     Upgrade a database.
@@ -158,10 +175,10 @@
         return version, upgrade.__version__
     version += 1
     try:
-        while hasattr(upgrade, 'upgrade_%d' % version):
-            log.debug('Running upgrade_%d', version)
+        while hasattr(upgrade, 'upgrade_{version:d}'.format(version=version)):
+            log.debug('Running upgrade_{version:d}'.format(version=version))
             try:
-                upgrade_func = getattr(upgrade, 'upgrade_%d' % version)
+                upgrade_func = getattr(upgrade, 'upgrade_{version:d}'.format(version=version))
                 upgrade_func(session, metadata)
                 session.commit()
                 # Update the version number AFTER a commit so that we are sure the previous transaction happened
@@ -169,16 +186,16 @@
                 session.commit()
                 version += 1
             except (SQLAlchemyError, DBAPIError):
-                log.exception('Could not run database upgrade script "upgrade_%s", upgrade process has been halted.',
-                              version)
+                log.exception('Could not run database upgrade script '
+                              '"upgrade_{version:d}", upgrade process has been halted.'.format(version=version))
                 break
     except (SQLAlchemyError, DBAPIError):
         version_meta = Metadata.populate(key='version', value=int(upgrade.__version__))
         session.commit()
     upgrade_version = upgrade.__version__
-    version_meta = int(version_meta.value)
+    version = int(version_meta.value)
     session.close()
-    return version_meta, upgrade_version
+    return version, upgrade_version
 
 
 def delete_database(plugin_name, db_file_name=None):
@@ -195,21 +212,6 @@
     return delete_file(db_file_path)
 
 
-class BaseModel(object):
-    """
-    BaseModel provides a base object with a set of generic functions
-    """
-    @classmethod
-    def populate(cls, **kwargs):
-        """
-        Creates an instance of a class and populates it, returning the instance
-        """
-        instance = cls()
-        for key, value in kwargs.items():
-            instance.__setattr__(key, value)
-        return instance
-
-
 class Manager(object):
     """
     Provide generic object persistence management
@@ -243,9 +245,10 @@
                 critical_error_message_box(
                     translate('OpenLP.Manager', 'Database Error'),
                     translate('OpenLP.Manager', 'The database being loaded was created in a more recent version of '
-                              'OpenLP. The database is version %d, while OpenLP expects version %d. The database will '
-                              'not be loaded.\n\nDatabase: %s') % (db_ver, up_ver, self.db_url)
-                )
+                              'OpenLP. The database is version {db_ver}, while OpenLP expects version {db_up}. '
+                              'The database will not be loaded.\n\nDatabase: {db_name}').format(db_ver=db_ver,
+                                                                                                db_up=up_ver,
+                                                                                                db_name=self.db_url))
                 return
         if not session:
             try:
@@ -461,7 +464,7 @@
                     raise
             except InvalidRequestError:
                 self.session.rollback()
-                log.exception('Failed to delete %s records', object_class.__name__)
+                log.exception('Failed to delete {name} records'.format(name=object_class.__name__))
                 return False
             except:
                 self.session.rollback()
 
=== renamed file 'openlp/core/lib/dockwidget.py' => 'openlp/core/lib/dockwidget.py.THIS'
=== modified file 'openlp/core/lib/exceptions.py'
--- openlp/core/lib/exceptions.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/exceptions.py	2017-01-08 22:05:36 +0000
@@ -24,9 +24,15 @@
 """
 
 
+# TODO: Test  __init__ & __str__
 class ValidationError(Exception):
     """
     The :class:`~openlp.core.lib.exceptions.ValidationError` exception provides a custom exception for validating
     import files.
     """
-    pass
+
+    def __init__(self, msg="Validation Error"):
+        self.msg = msg
+
+    def __str__(self):
+        return '{error_message}'.format(error_message=self.msg)
 
=== modified file 'openlp/core/lib/filedialog.py'
--- openlp/core/lib/filedialog.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/filedialog.py	2017-01-08 22:05:36 +0000
@@ -50,9 +50,9 @@
                 log.info('File not found. Attempting to unquote.')
                 file = parse.unquote(file)
                 if not os.path.exists(file):
-                    log.error('File %s not found.' % file)
+                    log.error('File {text} not found.'.format(text=file))
                     QtWidgets.QMessageBox.information(parent, UiStrings().FileNotFound,
-                                                      UiStrings().FileNotFoundMessage % file)
+                                                      UiStrings().FileNotFoundMessage.format(name=file))
                     continue
             file_list.append(file)
         return file_list
 
=== modified file 'openlp/core/lib/htmlbuilder.py'
--- openlp/core/lib/htmlbuilder.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/htmlbuilder.py	2017-01-08 22:05:36 +0000
@@ -389,6 +389,7 @@
 """
 import logging
 
+from string import Template
 from PyQt5 import QtWebKit
 
 from openlp.core.common import Settings
@@ -396,156 +397,200 @@
 
 log = logging.getLogger(__name__)
 
-HTMLSRC = """
-<!DOCTYPE html>
-<html>
-<head>
-<title>OpenLP Display</title>
-<style>
-*{
+HTML_SRC = Template("""
+    <!DOCTYPE html>
+    <html>
+    <head>
+    <title>OpenLP Display</title>
+    <style>
+    *{
+        margin: 0;
+        padding: 0;
+        border: 0;
+        overflow: hidden;
+        -webkit-user-select: none;
+    }
+    body {
+        ${bg_css};
+    }
+    .size {
+        position: absolute;
+        left: 0px;
+        top: 0px;
+        width: 100%;
+        height: 100%;
+    }
+    #black {
+        z-index: 8;
+        background-color: black;
+        display: none;
+    }
+    #bgimage {
+        z-index: 1;
+    }
+    #image {
+        z-index: 2;
+    }
+    ${css_additions}
+    #footer {
+        position: absolute;
+        z-index: 6;
+        ${footer_css}
+    }
+    /* lyric css */${lyrics_css}
+    sup {
+        font-size: 0.6em;
+        vertical-align: top;
+        position: relative;
+        top: -0.3em;
+    }
+    </style>
+    <script>
+        var timer = null;
+        var transition = ${transitions};
+        ${js_additions}
+
+        function show_image(src){
+            var img = document.getElementById('image');
+            img.src = src;
+            if(src == '')
+                img.style.display = 'none';
+            else
+                img.style.display = 'block';
+        }
+
+        function show_blank(state){
+            var black = 'none';
+            var lyrics = '';
+            switch(state){
+                case 'theme':
+                    lyrics = 'hidden';
+                    break;
+                case 'black':
+                    black = 'block';
+                    break;
+                case 'desktop':
+                    break;
+            }
+            document.getElementById('black').style.display = black;
+            document.getElementById('lyricsmain').style.visibility = lyrics;
+            document.getElementById('image').style.visibility = lyrics;
+            document.getElementById('footer').style.visibility = lyrics;
+        }
+
+        function show_footer(footertext){
+            document.getElementById('footer').innerHTML = footertext;
+        }
+
+        function show_text(new_text){
+            var match = /-webkit-text-fill-color:[^;\"]+/gi;
+            if(timer != null)
+                clearTimeout(timer);
+            /*
+            QtWebkit bug with outlines and justify causing outline alignment
+            problems. (Bug 859950) Surround each word with a <span> to workaround,
+            but only in this scenario.
+            */
+            var txt = document.getElementById('lyricsmain');
+            if(window.getComputedStyle(txt).textAlign == 'justify'){
+                if(window.getComputedStyle(txt).webkitTextStrokeWidth != '0px'){
+                    new_text = new_text.replace(/(\s|&nbsp;)+(?![^<]*>)/g,
+                        function(match) {
+                            return '</span>' + match + '<span>';
+                        });
+                    new_text = '<span>' + new_text + '</span>';
+                }
+            }
+            text_fade('lyricsmain', new_text);
+        }
+
+        function text_fade(id, new_text){
+            /*
+            Show the text.
+            */
+            var text = document.getElementById(id);
+            if(text == null) return;
+            if(!transition){
+                text.innerHTML = new_text;
+                return;
+            }
+            // Fade text out. 0.1 to minimize the time "nothing" is shown on the screen.
+            text.style.opacity = '0.1';
+            // Fade new text in after the old text has finished fading out.
+            timer = window.setTimeout(function(){_show_text(text, new_text)}, 400);
+        }
+
+        function _show_text(text, new_text) {
+            /*
+            Helper function to show the new_text delayed.
+            */
+            text.innerHTML = new_text;
+            text.style.opacity = '1';
+            // Wait until the text is completely visible. We want to save the timer id, to be able to call
+            // clearTimeout(timer) when the text has changed before finishing fading.
+            timer = window.setTimeout(function(){timer = null;}, 400);
+        }
+
+        function show_text_completed(){
+            return (timer == null);
+        }
+    </script>
+    </head>
+    <body>
+    <img id="bgimage" class="size" ${bg_image} />
+    <img id="image" class="size" ${image} />
+    ${html_additions}
+    <div class="lyricstable"><div id="lyricsmain" style="opacity:1" class="lyricscell lyricsmain"></div></div>
+    <div id="footer" class="footer"></div>
+    <div id="black" class="size"></div>
+    </body>
+    </html>
+    """)
+
+LYRICS_SRC = Template("""
+    .lyricstable {
+        z-index: 5;
+        position: absolute;
+        display: table;
+        ${stable}
+    }
+    .lyricscell {
+        display: table-cell;
+        word-wrap: break-word;
+        -webkit-transition: opacity 0.4s ease;
+        ${lyrics}
+    }
+    .lyricsmain {
+       ${main}
+    }
+    """)
+
+FOOTER_SRC = Template("""
+    left: ${left}px;
+    bottom: ${bottom}px;
+    width: ${width}px;
+    font-family: ${family};
+    font-size: ${size}pt;
+    color: ${color};
+    text-align: left;
+    white-space: ${space};
+    """)
+
+LYRICS_FORMAT_SRC = Template("""
+    ${justify}word-wrap: break-word;
+    text-align: ${align};
+    vertical-align: ${valign};
+    font-family: ${font};
+    font-size: ${size}pt;
+    color: ${color};
+    line-height: ${line}%;
     margin: 0;
     padding: 0;
-    border: 0;
-    overflow: hidden;
-    -webkit-user-select: none;
-}
-body {
-    %s;
-}
-.size {
-    position: absolute;
-    left: 0px;
-    top: 0px;
-    width: 100%%;
-    height: 100%%;
-}
-#black {
-    z-index: 8;
-    background-color: black;
-    display: none;
-}
-#bgimage {
-    z-index: 1;
-}
-#image {
-    z-index: 2;
-}
-%s
-#footer {
-    position: absolute;
-    z-index: 6;
-    %s
-}
-/* lyric css */
-%s
-sup {
-    font-size: 0.6em;
-    vertical-align: top;
-    position: relative;
-    top: -0.3em;
-}
-</style>
-<script>
-    var timer = null;
-    var transition = %s;
-    %s
-
-    function show_image(src){
-        var img = document.getElementById('image');
-        img.src = src;
-        if(src == '')
-            img.style.display = 'none';
-        else
-            img.style.display = 'block';
-    }
-
-    function show_blank(state){
-        var black = 'none';
-        var lyrics = '';
-        switch(state){
-            case 'theme':
-                lyrics = 'hidden';
-                break;
-            case 'black':
-                black = 'block';
-                break;
-            case 'desktop':
-                break;
-        }
-        document.getElementById('black').style.display = black;
-        document.getElementById('lyricsmain').style.visibility = lyrics;
-        document.getElementById('image').style.visibility = lyrics;
-        document.getElementById('footer').style.visibility = lyrics;
-    }
-
-    function show_footer(footertext){
-        document.getElementById('footer').innerHTML = footertext;
-    }
-
-    function show_text(new_text){
-        var match = /-webkit-text-fill-color:[^;\"]+/gi;
-        if(timer != null)
-            clearTimeout(timer);
-        /*
-        QtWebkit bug with outlines and justify causing outline alignment
-        problems. (Bug 859950) Surround each word with a <span> to workaround,
-        but only in this scenario.
-        */
-        var txt = document.getElementById('lyricsmain');
-        if(window.getComputedStyle(txt).textAlign == 'justify'){
-            if(window.getComputedStyle(txt).webkitTextStrokeWidth != '0px'){
-                new_text = new_text.replace(/(\s|&nbsp;)+(?![^<]*>)/g,
-                    function(match) {
-                        return '</span>' + match + '<span>';
-                    });
-                new_text = '<span>' + new_text + '</span>';
-            }
-        }
-        text_fade('lyricsmain', new_text);
-    }
-
-    function text_fade(id, new_text){
-        /*
-        Show the text.
-        */
-        var text = document.getElementById(id);
-        if(text == null) return;
-        if(!transition){
-            text.innerHTML = new_text;
-            return;
-        }
-        // Fade text out. 0.1 to minimize the time "nothing" is shown on the screen.
-        text.style.opacity = '0.1';
-        // Fade new text in after the old text has finished fading out.
-        timer = window.setTimeout(function(){_show_text(text, new_text)}, 400);
-    }
-
-    function _show_text(text, new_text) {
-        /*
-        Helper function to show the new_text delayed.
-        */
-        text.innerHTML = new_text;
-        text.style.opacity = '1';
-        // Wait until the text is completely visible. We want to save the timer id, to be able to call
-        // clearTimeout(timer) when the text has changed before finishing fading.
-        timer = window.setTimeout(function(){timer = null;}, 400);
-    }
-
-    function show_text_completed(){
-        return (timer == null);
-    }
-</script>
-</head>
-<body>
-<img id="bgimage" class="size" %s />
-<img id="image" class="size" %s />
-%s
-<div class="lyricstable"><div id="lyricsmain" style="opacity:1" class="lyricscell lyricsmain"></div></div>
-<div id="footer" class="footer"></div>
-<div id="black" class="size"></div>
-</body>
-</html>
-"""
+    padding-bottom: ${bottom};
+    padding-left: ${left}px;
+    width: ${width}px;
+    height: ${height}px;${font_style}${font_weight}
+    """)
 
 
 def build_html(item, screen, is_live, background, image=None, plugins=None):
@@ -564,13 +609,13 @@
     theme_data = item.theme_data
     # Image generated and poked in
     if background:
-        bgimage_src = 'src="data:image/png;base64,%s"' % background
+        bgimage_src = 'src="data:image/png;base64,{image}"'.format(image=background)
     elif item.bg_image_bytes:
-        bgimage_src = 'src="data:image/png;base64,%s"' % item.bg_image_bytes
+        bgimage_src = 'src="data:image/png;base64,{image}"'.format(image=item.bg_image_bytes)
     else:
         bgimage_src = 'style="display:none;"'
     if image:
-        image_src = 'src="data:image/png;base64,%s"' % image
+        image_src = 'src="data:image/png;base64,{image}"'.format(image=image)
     else:
         image_src = 'style="display:none;"'
     css_additions = ''
@@ -581,18 +626,17 @@
             css_additions += plugin.get_display_css()
             js_additions += plugin.get_display_javascript()
             html_additions += plugin.get_display_html()
-    html = HTMLSRC % (
-        build_background_css(item, width),
-        css_additions,
-        build_footer_css(item, height),
-        build_lyrics_css(item),
-        'true' if theme_data and theme_data.display_slide_transition and is_live else 'false',
-        js_additions,
-        bgimage_src,
-        image_src,
-        html_additions
-    )
-    return html
+    return HTML_SRC.substitute(bg_css=build_background_css(item, width),
+                               css_additions=css_additions,
+                               footer_css=build_footer_css(item, height),
+                               lyrics_css=build_lyrics_css(item),
+                               transitions='true' if (theme_data and
+                                                      theme_data.display_slide_transition and
+                                                      is_live) else 'false',
+                               js_additions=js_additions,
+                               bg_image=bgimage_src,
+                               image=image_src,
+                               html_additions=html_additions)
 
 
 def webkit_version():
@@ -601,9 +645,9 @@
     """
     try:
         webkit_ver = float(QtWebKit.qWebKitVersion())
-        log.debug('Webkit version = %s' % webkit_ver)
+        log.debug('Webkit version = {version}'.format(version=webkit_ver))
     except AttributeError:
-        webkit_ver = 0
+        webkit_ver = 0.0
     return webkit_ver
 
 
@@ -621,23 +665,25 @@
         if theme.background_type == BackgroundType.to_string(BackgroundType.Transparent):
             background = ''
         elif theme.background_type == BackgroundType.to_string(BackgroundType.Solid):
-            background = 'background-color: %s' % theme.background_color
+            background = 'background-color: {theme}'.format(theme=theme.background_color)
         else:
             if theme.background_direction == BackgroundGradientType.to_string(BackgroundGradientType.Horizontal):
-                background = 'background: -webkit-gradient(linear, left top, left bottom, from(%s), to(%s)) fixed' \
-                    % (theme.background_start_color, theme.background_end_color)
+                background = 'background: -webkit-gradient(linear, left top, left bottom, from({start}), to({end})) ' \
+                    'fixed'.format(start=theme.background_start_color, end=theme.background_end_color)
             elif theme.background_direction == BackgroundGradientType.to_string(BackgroundGradientType.LeftTop):
-                background = 'background: -webkit-gradient(linear, left top, right bottom, from(%s), to(%s)) fixed' \
-                    % (theme.background_start_color, theme.background_end_color)
+                background = 'background: -webkit-gradient(linear, left top, right bottom, from({start}), to({end})) ' \
+                    'fixed'.format(start=theme.background_start_color, end=theme.background_end_color)
             elif theme.background_direction == BackgroundGradientType.to_string(BackgroundGradientType.LeftBottom):
-                background = 'background: -webkit-gradient(linear, left bottom, right top, from(%s), to(%s)) fixed' \
-                    % (theme.background_start_color, theme.background_end_color)
+                background = 'background: -webkit-gradient(linear, left bottom, right top, from({start}), to({end})) ' \
+                    'fixed'.format(start=theme.background_start_color, end=theme.background_end_color)
             elif theme.background_direction == BackgroundGradientType.to_string(BackgroundGradientType.Vertical):
-                background = 'background: -webkit-gradient(linear, left top, right top, from(%s), to(%s)) fixed' % \
-                    (theme.background_start_color, theme.background_end_color)
+                background = 'background: -webkit-gradient(linear, left top, right top, from({start}), to({end})) ' \
+                    'fixed'.format(start=theme.background_start_color, end=theme.background_end_color)
             else:
-                background = 'background: -webkit-gradient(radial, %s 50%%, 100, %s 50%%, %s, from(%s), to(%s)) fixed'\
-                    % (width, width, width, theme.background_start_color, theme.background_end_color)
+                background = 'background: -webkit-gradient(radial, {width} 50%, 100, {width} 50%, {width}, ' \
+                    'from({start}), to({end})) fixed'.format(width=width,
+                                                             start=theme.background_start_color,
+                                                             end=theme.background_end_color)
     return background
 
 
@@ -647,36 +693,19 @@
 
     :param item: Service Item containing theme and location information
     """
-    style = """
-.lyricstable {
-    z-index: 5;
-    position: absolute;
-    display: table;
-    %s
-}
-.lyricscell {
-    display: table-cell;
-    word-wrap: break-word;
-    -webkit-transition: opacity 0.4s ease;
-    %s
-}
-.lyricsmain {
-    %s
-}
-"""
     theme_data = item.theme_data
     lyricstable = ''
     lyrics = ''
     lyricsmain = ''
     if theme_data and item.main:
-        lyricstable = 'left: %spx; top: %spx;' % (item.main.x(), item.main.y())
+        lyricstable = 'left: {left}px; top: {top}px;'.format(left=item.main.x(), top=item.main.y())
         lyrics = build_lyrics_format_css(theme_data, item.main.width(), item.main.height())
         lyricsmain += build_lyrics_outline_css(theme_data)
         if theme_data.font_main_shadow:
-            lyricsmain += ' text-shadow: %s %spx %spx;' % \
-                (theme_data.font_main_shadow_color, theme_data.font_main_shadow_size, theme_data.font_main_shadow_size)
-    lyrics_css = style % (lyricstable, lyrics, lyricsmain)
-    return lyrics_css
+            lyricsmain += ' text-shadow: {theme} {shadow}px ' \
+                '{shadow}px;'.format(theme=theme_data.font_main_shadow_color,
+                                     shadow=theme_data.font_main_shadow_size)
+    return LYRICS_SRC.substitute(stable=lyricstable, lyrics=lyrics, main=lyricsmain)
 
 
 def build_lyrics_outline_css(theme_data):
@@ -689,7 +718,9 @@
         size = float(theme_data.font_main_outline_size) / 16
         fill_color = theme_data.font_main_color
         outline_color = theme_data.font_main_outline_color
-        return ' -webkit-text-stroke: %sem %s; -webkit-text-fill-color: %s; ' % (size, outline_color, fill_color)
+        return ' -webkit-text-stroke: {size}em {color}; -webkit-text-fill-color: {fill}; '.format(size=size,
+                                                                                                  color=outline_color,
+                                                                                                  fill=fill_color)
     return ''
 
 
@@ -703,30 +734,23 @@
     """
     align = HorizontalType.Names[theme_data.display_horizontal_align]
     valign = VerticalType.Names[theme_data.display_vertical_align]
-    if theme_data.font_main_outline:
-        left_margin = int(theme_data.font_main_outline_size) * 2
-    else:
-        left_margin = 0
-    justify = 'white-space:pre-wrap;'
+    left_margin = (int(theme_data.font_main_outline_size) * 2) if theme_data.font_main_outline else 0
     # fix tag incompatibilities
-    if theme_data.display_horizontal_align == HorizontalType.Justify:
-        justify = ''
-    if theme_data.display_vertical_align == VerticalType.Bottom:
-        padding_bottom = '0.5em'
-    else:
-        padding_bottom = '0'
-    lyrics = '%s word-wrap: break-word; ' \
-             'text-align: %s; vertical-align: %s; font-family: %s; ' \
-             'font-size: %spt; color: %s; line-height: %d%%; margin: 0;' \
-             'padding: 0; padding-bottom: %s; padding-left: %spx; width: %spx; height: %spx; ' % \
-        (justify, align, valign, theme_data.font_main_name, theme_data.font_main_size,
-         theme_data.font_main_color, 100 + int(theme_data.font_main_line_adjustment), padding_bottom,
-         left_margin, width, height)
-    if theme_data.font_main_italics:
-        lyrics += 'font-style:italic; '
-    if theme_data.font_main_bold:
-        lyrics += 'font-weight:bold; '
-    return lyrics
+    justify = '' if (theme_data.display_horizontal_align == HorizontalType.Justify) else '    white-space: pre-wrap;\n'
+    padding_bottom = '0.5em' if (theme_data.display_vertical_align == VerticalType.Bottom) else '0'
+    return LYRICS_FORMAT_SRC.substitute(justify=justify,
+                                        align=align,
+                                        valign=valign,
+                                        font=theme_data.font_main_name,
+                                        size=theme_data.font_main_size,
+                                        color=theme_data.font_main_color,
+                                        line='{line:d}'.format(line=100 + int(theme_data.font_main_line_adjustment)),
+                                        bottom=padding_bottom,
+                                        left=left_margin,
+                                        width=width,
+                                        height=height,
+                                        font_style='\n    font-style: italic;' if theme_data.font_main_italics else '',
+                                        font_weight='\n    font-weight: bold;' if theme_data.font_main_bold else '')
 
 
 def build_footer_css(item, height):
@@ -736,21 +760,11 @@
     :param item: Service Item to be processed.
     :param height:
     """
-    style = """
-    left: %spx;
-    bottom: %spx;
-    width: %spx;
-    font-family: %s;
-    font-size: %spt;
-    color: %s;
-    text-align: left;
-    white-space: %s;
-    """
     theme = item.theme_data
     if not theme or not item.footer:
         return ''
     bottom = height - int(item.footer.y()) - int(item.footer.height())
     whitespace = 'normal' if Settings().value('themes/wrap footer') else 'nowrap'
-    lyrics_html = style % (item.footer.x(), bottom, item.footer.width(),
-                           theme.font_footer_name, theme.font_footer_size, theme.font_footer_color, whitespace)
-    return lyrics_html
+    return FOOTER_SRC.substitute(left=item.footer.x(), bottom=bottom, width=item.footer.width(),
+                                 family=theme.font_footer_name, size=theme.font_footer_size,
+                                 color=theme.font_footer_color, space=whitespace)
 
=== modified file 'openlp/core/lib/imagemanager.py'
--- openlp/core/lib/imagemanager.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/imagemanager.py	2017-01-08 22:05:36 +0000
@@ -236,7 +236,7 @@
         """
         Return the ``QImage`` from the cache. If not present wait for the background thread to process it.
         """
-        log.debug('getImage %s' % path)
+        log.debug('getImage {path}'.format(path=path))
         image = self._cache[(path, source, width, height)]
         if image.image is None:
             self._conversion_queue.modify_priority(image, Priority.High)
@@ -256,7 +256,7 @@
         """
         Returns the byte string for an image. If not present wait for the background thread to process it.
         """
-        log.debug('get_image_bytes %s' % path)
+        log.debug('get_image_bytes {path}'.format(path=path))
         image = self._cache[(path, source, width, height)]
         if image.image_bytes is None:
             self._conversion_queue.modify_priority(image, Priority.Urgent)
@@ -271,8 +271,8 @@
         """
         Add image to cache if it is not already there.
         """
-        log.debug('add_image %s' % path)
-        if not (path, source, width, height) in self._cache:
+        log.debug('add_image {path}'.format(path=path))
+        if (path, source, width, height) not in self._cache:
             image = Image(path, source, background, width, height)
             self._cache[(path, source, width, height)] = image
             self._conversion_queue.put((image.priority, image.secondary_priority, image))
 
=== renamed file 'openlp/core/lib/listwidgetwithdnd.py' => 'openlp/core/lib/listwidgetwithdnd.py.THIS'
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/mediamanageritem.py	2017-01-08 22:05:36 +0000
@@ -29,10 +29,11 @@
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common import Registry, RegistryProperties, Settings, UiStrings, translate
-from openlp.core.lib import FileDialog, OpenLPToolbar, ServiceItem, StringContent, ListWidgetWithDnD, \
-    ServiceItemContext
+from openlp.core.lib import FileDialog, ServiceItem, StringContent, ServiceItemContext
 from openlp.core.lib.searchedit import SearchEdit
 from openlp.core.lib.ui import create_widget_action, critical_error_message_box
+from openlp.core.ui.lib.listwidgetwithdnd import ListWidgetWithDnD
+from openlp.core.ui.lib.toolbar import OpenLPToolbar
 
 log = logging.getLogger(__name__)
 
@@ -185,7 +186,7 @@
         for action in toolbar_actions:
             if action[0] == StringContent.Preview:
                 self.toolbar.addSeparator()
-            self.toolbar.add_toolbar_action('%s%sAction' % (self.plugin.name, action[0]),
+            self.toolbar.add_toolbar_action('{name}{action}Action'.format(name=self.plugin.name, action=action[0]),
                                             text=self.plugin.get_string(action[1])['title'], icon=action[2],
                                             tooltip=self.plugin.get_string(action[1])['tooltip'],
                                             triggers=action[3])
@@ -199,7 +200,7 @@
         self.list_view.setSpacing(1)
         self.list_view.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
         self.list_view.setAlternatingRowColors(True)
-        self.list_view.setObjectName('%sListView' % self.plugin.name)
+        self.list_view.setObjectName('{name}ListView'.format(name=self.plugin.name))
         # Add to page_layout
         self.page_layout.addWidget(self.list_view)
         # define and add the context menu
@@ -211,19 +212,22 @@
                                  triggers=self.on_edit_click)
             create_widget_action(self.list_view, separator=True)
         create_widget_action(self.list_view,
-                             'listView%s%sItem' % (self.plugin.name.title(), StringContent.Preview.title()),
+                             'listView{plugin}{preview}Item'.format(plugin=self.plugin.name.title(),
+                                                                    preview=StringContent.Preview.title()),
                              text=self.plugin.get_string(StringContent.Preview)['title'],
                              icon=':/general/general_preview.png',
                              can_shortcuts=True,
                              triggers=self.on_preview_click)
         create_widget_action(self.list_view,
-                             'listView%s%sItem' % (self.plugin.name.title(), StringContent.Live.title()),
+                             'listView{plugin}{live}Item'.format(plugin=self.plugin.name.title(),
+                                                                 live=StringContent.Live.title()),
                              text=self.plugin.get_string(StringContent.Live)['title'],
                              icon=':/general/general_live.png',
                              can_shortcuts=True,
                              triggers=self.on_live_click)
         create_widget_action(self.list_view,
-                             'listView%s%sItem' % (self.plugin.name.title(), StringContent.Service.title()),
+                             'listView{plugin}{service}Item'.format(plugin=self.plugin.name.title(),
+                                                                    service=StringContent.Service.title()),
                              can_shortcuts=True,
                              text=self.plugin.get_string(StringContent.Service)['title'],
                              icon=':/general/general_add.png',
@@ -231,7 +235,8 @@
         if self.has_delete_icon:
             create_widget_action(self.list_view, separator=True)
             create_widget_action(self.list_view,
-                                 'listView%s%sItem' % (self.plugin.name.title(), StringContent.Delete.title()),
+                                 'listView{plugin}{delete}Item'.format(plugin=self.plugin.name.title(),
+                                                                       delete=StringContent.Delete.title()),
                                  text=self.plugin.get_string(StringContent.Delete)['title'],
                                  icon=':/general/general_delete.png',
                                  can_shortcuts=True, triggers=self.on_delete_click)
@@ -261,7 +266,7 @@
         self.search_text_layout.setObjectName('search_text_layout')
         self.search_text_label = QtWidgets.QLabel(self.search_widget)
         self.search_text_label.setObjectName('search_text_label')
-        self.search_text_edit = SearchEdit(self.search_widget)
+        self.search_text_edit = SearchEdit(self.search_widget, self.settings_section)
         self.search_text_edit.setObjectName('search_text_edit')
         self.search_text_label.setBuddy(self.search_text_edit)
         self.search_text_layout.addRow(self.search_text_label, self.search_text_edit)
@@ -312,7 +317,7 @@
         files = FileDialog.getOpenFileNames(self, self.on_new_prompt,
                                             Settings().value(self.settings_section + '/last directory'),
                                             self.on_new_file_masks)
-        log.info('New files(s) %s' % files)
+        log.info('New files(s) {files}'.format(files=files))
         if files:
             self.application.set_busy_cursor()
             self.validate_and_load(files)
@@ -332,7 +337,8 @@
                 if not error_shown:
                     critical_error_message_box(translate('OpenLP.MediaManagerItem', 'Invalid File Type'),
                                                translate('OpenLP.MediaManagerItem',
-                                                         'Invalid File %s.\nSuffix not supported') % file_name)
+                                                         'Invalid File {name}.\n'
+                                                         'Suffix not supported').format(name=file_name))
                     error_shown = True
             else:
                 new_files.append(file_name)
@@ -374,7 +380,8 @@
             self.load_list(full_list, target_group)
             last_dir = os.path.split(files[0])[0]
             Settings().setValue(self.settings_section + '/last directory', last_dir)
-            Settings().setValue('%s/%s files' % (self.settings_section, self.settings_section), self.get_file_list())
+            Settings().setValue('{section}/{section} files'.format(section=self.settings_section),
+                                self.get_file_list())
         if duplicates_found:
             critical_error_message_box(UiStrings().Duplicate,
                                        translate('OpenLP.MediaManagerItem',
@@ -390,8 +397,6 @@
         # Decide if we have to show the context menu or not.
         if item is None:
             return
-        if not item.flags() & QtCore.Qt.ItemIsSelectable:
-            return
         self.menu.exec(self.list_view.mapToGlobal(point))
 
     def get_file_list(self):
@@ -481,6 +486,7 @@
                                                         'You must select one or more items to preview.'))
         else:
             log.debug('%s Preview requested' % self.plugin.name)
+            Registry().set_flag('has doubleclick added item to service', False)
             service_item = self.build_service_item()
             if service_item:
                 service_item.from_plugin = True
@@ -549,7 +555,7 @@
             # Is it possible to process multiple list items to generate
             # multiple service items?
             if self.single_service_item:
-                log.debug('%s Add requested', self.plugin.name)
+                log.debug('{plugin} Add requested'.format(plugin=self.plugin.name))
                 self.add_to_service(replace=self.remote_triggered)
             else:
                 items = self.list_view.selectedIndexes()
@@ -590,7 +596,7 @@
                                               translate('OpenLP.MediaManagerItem',
                                                         'You must select one or more items.'))
         else:
-            log.debug('%s Add requested', self.plugin.name)
+            log.debug('{plugin} Add requested'.format(plugin=self.plugin.name))
             service_item = self.service_manager.get_service_item()
             if not service_item:
                 QtWidgets.QMessageBox.information(self, UiStrings().NISs,
@@ -603,7 +609,8 @@
                 # Turn off the remote edit update message indicator
                 QtWidgets.QMessageBox.information(self, translate('OpenLP.MediaManagerItem', 'Invalid Service Item'),
                                                   translate('OpenLP.MediaManagerItem',
-                                                            'You must select a %s service item.') % self.title)
+                                                            'You must select a {title} '
+                                                            'service item.').format(title=self.title))
 
     def build_service_item(self, item=None, xml_version=False, remote=False, context=ServiceItemContext.Live):
         """
@@ -629,20 +636,6 @@
         """
         return item
 
-    def check_search_result(self):
-        """
-        Checks if the list_view is empty and adds a "No Search Results" item.
-        """
-        if self.list_view.count():
-            return
-        message = translate('OpenLP.MediaManagerItem', 'No Search Results')
-        item = QtWidgets.QListWidgetItem(message)
-        item.setFlags(QtCore.Qt.NoItemFlags)
-        font = QtGui.QFont()
-        font.setItalic(True)
-        item.setFont(font)
-        self.list_view.addItem(item)
-
     def _get_id_of_item_to_generate(self, item, remote_item):
         """
         Utility method to check items being submitted for slide generation.
 
=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/plugin.py	2017-01-08 22:05:36 +0000
@@ -24,11 +24,10 @@
 """
 import logging
 
-
 from PyQt5 import QtCore
 
 from openlp.core.common import Registry, RegistryProperties, Settings, UiStrings
-from openlp.core.utils import get_application_version
+from openlp.core.common.versionchecker import get_application_version
 
 log = logging.getLogger(__name__)
 
@@ -131,7 +130,7 @@
         :param settings_tab_class: The class name of the plugin's settings tab.
         :param version: Defaults to *None*, which means that the same version number is used as OpenLP's version number.
         """
-        log.debug('Plugin %s initialised' % name)
+        log.debug('Plugin {plugin} initialised'.format(plugin=name))
         super(Plugin, self).__init__()
         self.name = name
         self.text_strings = {}
@@ -155,11 +154,11 @@
         # Append a setting for files in the mediamanager (note not all plugins
         # which have a mediamanager need this).
         if media_item_class is not None:
-            default_settings['%s/%s files' % (name, name)] = []
+            default_settings['{name}/{name} files'.format(name=name)] = []
         # Add settings to the dict of all settings.
         Settings.extend_default_settings(default_settings)
-        Registry().register_function('%s_add_service_item' % self.name, self.process_add_service_event)
-        Registry().register_function('%s_config_updated' % self.name, self.config_update)
+        Registry().register_function('{name}_add_service_item'.format(name=self.name), self.process_add_service_event)
+        Registry().register_function('{name}_config_updated'.format(name=self.name), self.config_update)
 
     def check_pre_conditions(self):
         """
@@ -257,7 +256,7 @@
         """
         Generic Drag and drop handler triggered from service_manager.
         """
-        log.debug('process_add_service_event event called for plugin %s' % self.name)
+        log.debug('process_add_service_event event called for plugin {name}'.format(name=self.name))
         if replace:
             self.media_item.on_add_edit_click()
         else:
 
=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/pluginmanager.py	2017-01-08 22:05:36 +0000
@@ -23,7 +23,6 @@
 Provide plugin management
 """
 import os
-import sys
 import imp
 
 from openlp.core.lib import Plugin, PluginStatus
@@ -43,7 +42,7 @@
         super(PluginManager, self).__init__(parent)
         self.log_info('Plugin manager Initialising')
         self.base_path = os.path.abspath(AppLocation.get_directory(AppLocation.PluginsDir))
-        self.log_debug('Base path %s ' % self.base_path)
+        self.log_debug('Base path {path}'.format(path=self.base_path))
         self.plugins = []
         self.log_info('Plugin manager Initialised')
 
@@ -73,7 +72,7 @@
         """
         start_depth = len(os.path.abspath(self.base_path).split(os.sep))
         present_plugin_dir = os.path.join(self.base_path, 'presentations')
-        self.log_debug('finding plugins in %s at depth %d' % (self.base_path, start_depth))
+        self.log_debug('finding plugins in {path} at depth {depth:d}'.format(path=self.base_path, depth=start_depth))
         for root, dirs, files in os.walk(self.base_path):
             for name in files:
                 if name.endswith('.py') and not name.startswith('__'):
@@ -84,7 +83,9 @@
                         break
                     module_name = name[:-3]
                     # import the modules
-                    self.log_debug('Importing %s from %s. Depth %d' % (module_name, root, this_depth))
+                    self.log_debug('Importing {name} from {root}. Depth {depth:d}'.format(name=module_name,
+                                                                                          root=root,
+                                                                                          depth=this_depth))
                     try:
                         # Use the "imp" library to try to get around a problem with the PyUNO library which
                         # monkey-patches the __import__ function to do some magic. This causes issues with our tests.
@@ -93,21 +94,21 @@
                         # Then load the module (do the actual import) using the details from find_module()
                         imp.load_module(module_name, fp, path_name, description)
                     except ImportError as e:
-                        self.log_exception('Failed to import module %s on path %s: %s'
-                                           % (module_name, path, e.args[0]))
+                        self.log_exception('Failed to import module {name} on path {path}: '
+                                           '{args}'.format(name=module_name, path=path, args=e.args[0]))
         plugin_classes = Plugin.__subclasses__()
         plugin_objects = []
         for p in plugin_classes:
             try:
                 plugin = p()
-                self.log_debug('Loaded plugin %s' % str(p))
+                self.log_debug('Loaded plugin {plugin}'.format(plugin=str(p)))
                 plugin_objects.append(plugin)
             except TypeError:
-                self.log_exception('Failed to load plugin %s' % str(p))
+                self.log_exception('Failed to load plugin {plugin}'.format(plugin=str(p)))
         plugins_list = sorted(plugin_objects, key=lambda plugin: plugin.weight)
         for plugin in plugins_list:
             if plugin.check_pre_conditions():
-                self.log_debug('Plugin %s active' % str(plugin.name))
+                self.log_debug('Plugin {plugin} active'.format(plugin=str(plugin.name)))
                 plugin.set_status()
             else:
                 plugin.status = PluginStatus.Disabled
@@ -175,10 +176,11 @@
         Loop through all the plugins and give them an opportunity to initialise themselves.
         """
         for plugin in self.plugins:
-            self.log_info('initialising plugins %s in a %s state' % (plugin.name, plugin.is_active()))
+            self.log_info('initialising plugins {plugin} in a {state} state'.format(plugin=plugin.name,
+                                                                                    state=plugin.is_active()))
             if plugin.is_active():
                 plugin.initialise()
-                self.log_info('Initialisation Complete for %s ' % plugin.name)
+                self.log_info('Initialisation Complete for {plugin}'.format(plugin=plugin.name))
 
     def finalise_plugins(self):
         """
@@ -187,7 +189,7 @@
         for plugin in self.plugins:
             if plugin.is_active():
                 plugin.finalise()
-                self.log_info('Finalisation Complete for %s ' % plugin.name)
+                self.log_info('Finalisation Complete for {plugin}'.format(plugin=plugin.name))
 
     def get_plugin_by_name(self, name):
         """
 
=== modified file 'openlp/core/lib/projector/constants.py'
--- openlp/core/lib/projector/constants.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/projector/constants.py	2017-01-08 22:05:36 +0000
@@ -131,169 +131,181 @@
 S_NETWORK_SENDING = 400
 S_NETWORK_RECEIVED = 401
 
-CONNECTION_ERRORS = {E_NOT_CONNECTED, E_NO_AUTHENTICATION, E_AUTHENTICATION, E_CLASS,
-                     E_PREFIX, E_CONNECTION_REFUSED, E_REMOTE_HOST_CLOSED_CONNECTION,
-                     E_HOST_NOT_FOUND, E_SOCKET_ACCESS, E_SOCKET_RESOURCE, E_SOCKET_TIMEOUT,
-                     E_DATAGRAM_TOO_LARGE, E_NETWORK, E_ADDRESS_IN_USE, E_SOCKET_ADDRESS_NOT_AVAILABLE,
-                     E_UNSUPPORTED_SOCKET_OPERATION, E_PROXY_AUTHENTICATION_REQUIRED,
-                     E_SLS_HANDSHAKE_FAILED, E_UNFINISHED_SOCKET_OPERATION, E_PROXY_CONNECTION_REFUSED,
-                     E_PROXY_CONNECTION_CLOSED, E_PROXY_CONNECTION_TIMEOUT, E_PROXY_NOT_FOUND,
-                     E_PROXY_PROTOCOL, E_UNKNOWN_SOCKET_ERROR
-                     }
+CONNECTION_ERRORS = {
+    E_NOT_CONNECTED, E_NO_AUTHENTICATION, E_AUTHENTICATION, E_CLASS,
+    E_PREFIX, E_CONNECTION_REFUSED, E_REMOTE_HOST_CLOSED_CONNECTION,
+    E_HOST_NOT_FOUND, E_SOCKET_ACCESS, E_SOCKET_RESOURCE, E_SOCKET_TIMEOUT,
+    E_DATAGRAM_TOO_LARGE, E_NETWORK, E_ADDRESS_IN_USE, E_SOCKET_ADDRESS_NOT_AVAILABLE,
+    E_UNSUPPORTED_SOCKET_OPERATION, E_PROXY_AUTHENTICATION_REQUIRED,
+    E_SLS_HANDSHAKE_FAILED, E_UNFINISHED_SOCKET_OPERATION, E_PROXY_CONNECTION_REFUSED,
+    E_PROXY_CONNECTION_CLOSED, E_PROXY_CONNECTION_TIMEOUT, E_PROXY_NOT_FOUND,
+    E_PROXY_PROTOCOL, E_UNKNOWN_SOCKET_ERROR
+}
 
-PJLINK_ERRORS = {'ERRA': E_AUTHENTICATION,   # Authentication error
-                 'ERR1': E_UNDEFINED,        # Undefined command error
-                 'ERR2': E_PARAMETER,        # Invalid parameter error
-                 'ERR3': E_UNAVAILABLE,      # Projector busy
-                 'ERR4': E_PROJECTOR,        # Projector or display failure
-                 E_AUTHENTICATION: 'ERRA',
-                 E_UNDEFINED: 'ERR1',
-                 E_PARAMETER: 'ERR2',
-                 E_UNAVAILABLE: 'ERR3',
-                 E_PROJECTOR: 'ERR4'}
+PJLINK_ERRORS = {
+    'ERRA': E_AUTHENTICATION,   # Authentication error
+    'ERR1': E_UNDEFINED,        # Undefined command error
+    'ERR2': E_PARAMETER,        # Invalid parameter error
+    'ERR3': E_UNAVAILABLE,      # Projector busy
+    'ERR4': E_PROJECTOR,        # Projector or display failure
+    E_AUTHENTICATION: 'ERRA',
+    E_UNDEFINED: 'ERR1',
+    E_PARAMETER: 'ERR2',
+    E_UNAVAILABLE: 'ERR3',
+    E_PROJECTOR: 'ERR4'
+}
 
 # Map error/status codes to string
-ERROR_STRING = {0: 'S_OK',
-                E_GENERAL: 'E_GENERAL',
-                E_NOT_CONNECTED: 'E_NOT_CONNECTED',
-                E_FAN: 'E_FAN',
-                E_LAMP: 'E_LAMP',
-                E_TEMP: 'E_TEMP',
-                E_COVER: 'E_COVER',
-                E_FILTER: 'E_FILTER',
-                E_AUTHENTICATION: 'E_AUTHENTICATION',
-                E_NO_AUTHENTICATION: 'E_NO_AUTHENTICATION',
-                E_UNDEFINED: 'E_UNDEFINED',
-                E_PARAMETER: 'E_PARAMETER',
-                E_UNAVAILABLE: 'E_UNAVAILABLE',
-                E_PROJECTOR: 'E_PROJECTOR',
-                E_INVALID_DATA: 'E_INVALID_DATA',
-                E_WARN: 'E_WARN',
-                E_ERROR: 'E_ERROR',
-                E_CLASS: 'E_CLASS',
-                E_PREFIX: 'E_PREFIX',  # Last projector error
-                E_CONNECTION_REFUSED: 'E_CONNECTION_REFUSED',  # First QtSocket error
-                E_REMOTE_HOST_CLOSED_CONNECTION: 'E_REMOTE_HOST_CLOSED_CONNECTION',
-                E_HOST_NOT_FOUND: 'E_HOST_NOT_FOUND',
-                E_SOCKET_ACCESS: 'E_SOCKET_ACCESS',
-                E_SOCKET_RESOURCE: 'E_SOCKET_RESOURCE',
-                E_SOCKET_TIMEOUT: 'E_SOCKET_TIMEOUT',
-                E_DATAGRAM_TOO_LARGE: 'E_DATAGRAM_TOO_LARGE',
-                E_NETWORK: 'E_NETWORK',
-                E_ADDRESS_IN_USE: 'E_ADDRESS_IN_USE',
-                E_SOCKET_ADDRESS_NOT_AVAILABLE: 'E_SOCKET_ADDRESS_NOT_AVAILABLE',
-                E_UNSUPPORTED_SOCKET_OPERATION: 'E_UNSUPPORTED_SOCKET_OPERATION',
-                E_PROXY_AUTHENTICATION_REQUIRED: 'E_PROXY_AUTHENTICATION_REQUIRED',
-                E_SLS_HANDSHAKE_FAILED: 'E_SLS_HANDSHAKE_FAILED',
-                E_UNFINISHED_SOCKET_OPERATION: 'E_UNFINISHED_SOCKET_OPERATION',
-                E_PROXY_CONNECTION_REFUSED: 'E_PROXY_CONNECTION_REFUSED',
-                E_PROXY_CONNECTION_CLOSED: 'E_PROXY_CONNECTION_CLOSED',
-                E_PROXY_CONNECTION_TIMEOUT: 'E_PROXY_CONNECTION_TIMEOUT',
-                E_PROXY_NOT_FOUND: 'E_PROXY_NOT_FOUND',
-                E_PROXY_PROTOCOL: 'E_PROXY_PROTOCOL',
-                E_UNKNOWN_SOCKET_ERROR: 'E_UNKNOWN_SOCKET_ERROR'}
+ERROR_STRING = {
+    0: 'S_OK',
+    E_GENERAL: 'E_GENERAL',
+    E_NOT_CONNECTED: 'E_NOT_CONNECTED',
+    E_FAN: 'E_FAN',
+    E_LAMP: 'E_LAMP',
+    E_TEMP: 'E_TEMP',
+    E_COVER: 'E_COVER',
+    E_FILTER: 'E_FILTER',
+    E_AUTHENTICATION: 'E_AUTHENTICATION',
+    E_NO_AUTHENTICATION: 'E_NO_AUTHENTICATION',
+    E_UNDEFINED: 'E_UNDEFINED',
+    E_PARAMETER: 'E_PARAMETER',
+    E_UNAVAILABLE: 'E_UNAVAILABLE',
+    E_PROJECTOR: 'E_PROJECTOR',
+    E_INVALID_DATA: 'E_INVALID_DATA',
+    E_WARN: 'E_WARN',
+    E_ERROR: 'E_ERROR',
+    E_CLASS: 'E_CLASS',
+    E_PREFIX: 'E_PREFIX',  # Last projector error
+    E_CONNECTION_REFUSED: 'E_CONNECTION_REFUSED',  # First QtSocket error
+    E_REMOTE_HOST_CLOSED_CONNECTION: 'E_REMOTE_HOST_CLOSED_CONNECTION',
+    E_HOST_NOT_FOUND: 'E_HOST_NOT_FOUND',
+    E_SOCKET_ACCESS: 'E_SOCKET_ACCESS',
+    E_SOCKET_RESOURCE: 'E_SOCKET_RESOURCE',
+    E_SOCKET_TIMEOUT: 'E_SOCKET_TIMEOUT',
+    E_DATAGRAM_TOO_LARGE: 'E_DATAGRAM_TOO_LARGE',
+    E_NETWORK: 'E_NETWORK',
+    E_ADDRESS_IN_USE: 'E_ADDRESS_IN_USE',
+    E_SOCKET_ADDRESS_NOT_AVAILABLE: 'E_SOCKET_ADDRESS_NOT_AVAILABLE',
+    E_UNSUPPORTED_SOCKET_OPERATION: 'E_UNSUPPORTED_SOCKET_OPERATION',
+    E_PROXY_AUTHENTICATION_REQUIRED: 'E_PROXY_AUTHENTICATION_REQUIRED',
+    E_SLS_HANDSHAKE_FAILED: 'E_SLS_HANDSHAKE_FAILED',
+    E_UNFINISHED_SOCKET_OPERATION: 'E_UNFINISHED_SOCKET_OPERATION',
+    E_PROXY_CONNECTION_REFUSED: 'E_PROXY_CONNECTION_REFUSED',
+    E_PROXY_CONNECTION_CLOSED: 'E_PROXY_CONNECTION_CLOSED',
+    E_PROXY_CONNECTION_TIMEOUT: 'E_PROXY_CONNECTION_TIMEOUT',
+    E_PROXY_NOT_FOUND: 'E_PROXY_NOT_FOUND',
+    E_PROXY_PROTOCOL: 'E_PROXY_PROTOCOL',
+    E_UNKNOWN_SOCKET_ERROR: 'E_UNKNOWN_SOCKET_ERROR'
+}
 
-STATUS_STRING = {S_NOT_CONNECTED: 'S_NOT_CONNECTED',
-                 S_CONNECTING: 'S_CONNECTING',
-                 S_CONNECTED: 'S_CONNECTED',
-                 S_STATUS: 'S_STATUS',
-                 S_OFF: 'S_OFF',
-                 S_INITIALIZE: 'S_INITIALIZE',
-                 S_STANDBY: 'S_STANDBY',
-                 S_WARMUP: 'S_WARMUP',
-                 S_ON: 'S_ON',
-                 S_COOLDOWN: 'S_COOLDOWN',
-                 S_INFO: 'S_INFO',
-                 S_NETWORK_SENDING: 'S_NETWORK_SENDING',
-                 S_NETWORK_RECEIVED: 'S_NETWORK_RECEIVED'}
+STATUS_STRING = {
+    S_NOT_CONNECTED: 'S_NOT_CONNECTED',
+    S_CONNECTING: 'S_CONNECTING',
+    S_CONNECTED: 'S_CONNECTED',
+    S_STATUS: 'S_STATUS',
+    S_OFF: 'S_OFF',
+    S_INITIALIZE: 'S_INITIALIZE',
+    S_STANDBY: 'S_STANDBY',
+    S_WARMUP: 'S_WARMUP',
+    S_ON: 'S_ON',
+    S_COOLDOWN: 'S_COOLDOWN',
+    S_INFO: 'S_INFO',
+    S_NETWORK_SENDING: 'S_NETWORK_SENDING',
+    S_NETWORK_RECEIVED: 'S_NETWORK_RECEIVED'
+}
 
 # Map error/status codes to message strings
-ERROR_MSG = {E_OK: translate('OpenLP.ProjectorConstants', 'OK'),  # E_OK | S_OK
-             E_GENERAL: translate('OpenLP.ProjectorConstants', 'General projector error'),
-             E_NOT_CONNECTED: translate('OpenLP.ProjectorConstants', 'Not connected error'),
-             E_LAMP: translate('OpenLP.ProjectorConstants', 'Lamp error'),
-             E_FAN: translate('OpenLP.ProjectorConstants', 'Fan error'),
-             E_TEMP: translate('OpenLP.ProjectorConstants', 'High temperature detected'),
-             E_COVER: translate('OpenLP.ProjectorConstants', 'Cover open detected'),
-             E_FILTER: translate('OpenLP.ProjectorConstants', 'Check filter'),
-             E_AUTHENTICATION: translate('OpenLP.ProjectorConstants', 'Authentication Error'),
-             E_UNDEFINED: translate('OpenLP.ProjectorConstants', 'Undefined Command'),
-             E_PARAMETER: translate('OpenLP.ProjectorConstants', 'Invalid Parameter'),
-             E_UNAVAILABLE: translate('OpenLP.ProjectorConstants', 'Projector Busy'),
-             E_PROJECTOR: translate('OpenLP.ProjectorConstants', 'Projector/Display Error'),
-             E_INVALID_DATA: translate('OpenLP.ProjectorConstants', 'Invalid packet received'),
-             E_WARN: translate('OpenLP.ProjectorConstants', 'Warning condition detected'),
-             E_ERROR: translate('OpenLP.ProjectorConstants', 'Error condition detected'),
-             E_CLASS: translate('OpenLP.ProjectorConstants', 'PJLink class not supported'),
-             E_PREFIX: translate('OpenLP.ProjectorConstants', 'Invalid prefix character'),
-             E_CONNECTION_REFUSED: translate('OpenLP.ProjectorConstants',
-                                             'The connection was refused by the peer (or timed out)'),
-             E_REMOTE_HOST_CLOSED_CONNECTION: translate('OpenLP.ProjectorConstants',
-                                                        'The remote host closed the connection'),
-             E_HOST_NOT_FOUND: translate('OpenLP.ProjectorConstants', 'The host address was not found'),
-             E_SOCKET_ACCESS: translate('OpenLP.ProjectorConstants',
-                                        'The socket operation failed because the application '
-                                        'lacked the required privileges'),
-             E_SOCKET_RESOURCE: translate('OpenLP.ProjectorConstants',
-                                          'The local system ran out of resources (e.g., too many sockets)'),
-             E_SOCKET_TIMEOUT: translate('OpenLP.ProjectorConstants',
-                                         'The socket operation timed out'),
-             E_DATAGRAM_TOO_LARGE: translate('OpenLP.ProjectorConstants',
-                                             'The datagram was larger than the operating system\'s limit'),
-             E_NETWORK: translate('OpenLP.ProjectorConstants',
-                                  'An error occurred with the network (Possibly someone pulled the plug?)'),
-             E_ADDRESS_IN_USE: translate('OpenLP.ProjectorConstants',
-                                         'The address specified with socket.bind() '
-                                         'is already in use and was set to be exclusive'),
-             E_SOCKET_ADDRESS_NOT_AVAILABLE: translate('OpenLP.ProjectorConstants',
-                                                       'The address specified to socket.bind() '
-                                                       'does not belong to the host'),
-             E_UNSUPPORTED_SOCKET_OPERATION: translate('OpenLP.ProjectorConstants',
-                                                       'The requested socket operation is not supported by the local '
-                                                       'operating system (e.g., lack of IPv6 support)'),
-             E_PROXY_AUTHENTICATION_REQUIRED: translate('OpenLP.ProjectorConstants',
-                                                        'The socket is using a proxy, '
-                                                        'and the proxy requires authentication'),
-             E_SLS_HANDSHAKE_FAILED: translate('OpenLP.ProjectorConstants',
-                                               'The SSL/TLS handshake failed'),
-             E_UNFINISHED_SOCKET_OPERATION: translate('OpenLP.ProjectorConstants',
-                                                      'The last operation attempted has not finished yet '
-                                                      '(still in progress in the background)'),
-             E_PROXY_CONNECTION_REFUSED: translate('OpenLP.ProjectorConstants',
-                                                   'Could not contact the proxy server because the connection '
-                                                   'to that server was denied'),
-             E_PROXY_CONNECTION_CLOSED: translate('OpenLP.ProjectorConstants',
-                                                  'The connection to the proxy server was closed unexpectedly '
-                                                  '(before the connection to the final peer was established)'),
-             E_PROXY_CONNECTION_TIMEOUT: translate('OpenLP.ProjectorConstants',
-                                                   'The connection to the proxy server timed out or the proxy '
-                                                   'server stopped responding in the authentication phase.'),
-             E_PROXY_NOT_FOUND: translate('OpenLP.ProjectorConstants',
-                                          'The proxy address set with setProxy() was not found'),
-             E_PROXY_PROTOCOL: translate('OpenLP.ProjectorConstants',
-                                         'The connection negotiation with the proxy server failed because the '
-                                         'response from the proxy server could not be understood'),
-             E_UNKNOWN_SOCKET_ERROR: translate('OpenLP.ProjectorConstants', 'An unidentified error occurred'),
-             S_NOT_CONNECTED: translate('OpenLP.ProjectorConstants', 'Not connected'),
-             S_CONNECTING: translate('OpenLP.ProjectorConstants', 'Connecting'),
-             S_CONNECTED: translate('OpenLP.ProjectorConstants', 'Connected'),
-             S_STATUS: translate('OpenLP.ProjectorConstants', 'Getting status'),
-             S_OFF: translate('OpenLP.ProjectorConstants', 'Off'),
-             S_INITIALIZE: translate('OpenLP.ProjectorConstants', 'Initialize in progress'),
-             S_STANDBY: translate('OpenLP.ProjectorConstants', 'Power in standby'),
-             S_WARMUP: translate('OpenLP.ProjectorConstants', 'Warmup in progress'),
-             S_ON: translate('OpenLP.ProjectorConstants', 'Power is on'),
-             S_COOLDOWN: translate('OpenLP.ProjectorConstants', 'Cooldown in progress'),
-             S_INFO: translate('OpenLP.ProjectorConstants', 'Projector Information available'),
-             S_NETWORK_SENDING: translate('OpenLP.ProjectorConstants', 'Sending data'),
-             S_NETWORK_RECEIVED: translate('OpenLP.ProjectorConstants', 'Received data')}
+ERROR_MSG = {
+    E_OK: translate('OpenLP.ProjectorConstants', 'OK'),  # E_OK | S_OK
+    E_GENERAL: translate('OpenLP.ProjectorConstants', 'General projector error'),
+    E_NOT_CONNECTED: translate('OpenLP.ProjectorConstants', 'Not connected error'),
+    E_LAMP: translate('OpenLP.ProjectorConstants', 'Lamp error'),
+    E_FAN: translate('OpenLP.ProjectorConstants', 'Fan error'),
+    E_TEMP: translate('OpenLP.ProjectorConstants', 'High temperature detected'),
+    E_COVER: translate('OpenLP.ProjectorConstants', 'Cover open detected'),
+    E_FILTER: translate('OpenLP.ProjectorConstants', 'Check filter'),
+    E_AUTHENTICATION: translate('OpenLP.ProjectorConstants', 'Authentication Error'),
+    E_UNDEFINED: translate('OpenLP.ProjectorConstants', 'Undefined Command'),
+    E_PARAMETER: translate('OpenLP.ProjectorConstants', 'Invalid Parameter'),
+    E_UNAVAILABLE: translate('OpenLP.ProjectorConstants', 'Projector Busy'),
+    E_PROJECTOR: translate('OpenLP.ProjectorConstants', 'Projector/Display Error'),
+    E_INVALID_DATA: translate('OpenLP.ProjectorConstants', 'Invalid packet received'),
+    E_WARN: translate('OpenLP.ProjectorConstants', 'Warning condition detected'),
+    E_ERROR: translate('OpenLP.ProjectorConstants', 'Error condition detected'),
+    E_CLASS: translate('OpenLP.ProjectorConstants', 'PJLink class not supported'),
+    E_PREFIX: translate('OpenLP.ProjectorConstants', 'Invalid prefix character'),
+    E_CONNECTION_REFUSED: translate('OpenLP.ProjectorConstants',
+                                    'The connection was refused by the peer (or timed out)'),
+    E_REMOTE_HOST_CLOSED_CONNECTION: translate('OpenLP.ProjectorConstants',
+                                               'The remote host closed the connection'),
+    E_HOST_NOT_FOUND: translate('OpenLP.ProjectorConstants', 'The host address was not found'),
+    E_SOCKET_ACCESS: translate('OpenLP.ProjectorConstants',
+                               'The socket operation failed because the application '
+                               'lacked the required privileges'),
+    E_SOCKET_RESOURCE: translate('OpenLP.ProjectorConstants',
+                                 'The local system ran out of resources (e.g., too many sockets)'),
+    E_SOCKET_TIMEOUT: translate('OpenLP.ProjectorConstants',
+                                'The socket operation timed out'),
+    E_DATAGRAM_TOO_LARGE: translate('OpenLP.ProjectorConstants',
+                                    'The datagram was larger than the operating system\'s limit'),
+    E_NETWORK: translate('OpenLP.ProjectorConstants',
+                         'An error occurred with the network (Possibly someone pulled the plug?)'),
+    E_ADDRESS_IN_USE: translate('OpenLP.ProjectorConstants',
+                                'The address specified with socket.bind() '
+                                'is already in use and was set to be exclusive'),
+    E_SOCKET_ADDRESS_NOT_AVAILABLE: translate('OpenLP.ProjectorConstants',
+                                              'The address specified to socket.bind() '
+                                              'does not belong to the host'),
+    E_UNSUPPORTED_SOCKET_OPERATION: translate('OpenLP.ProjectorConstants',
+                                              'The requested socket operation is not supported by the local '
+                                              'operating system (e.g., lack of IPv6 support)'),
+    E_PROXY_AUTHENTICATION_REQUIRED: translate('OpenLP.ProjectorConstants',
+                                               'The socket is using a proxy, '
+                                               'and the proxy requires authentication'),
+    E_SLS_HANDSHAKE_FAILED: translate('OpenLP.ProjectorConstants',
+                                      'The SSL/TLS handshake failed'),
+    E_UNFINISHED_SOCKET_OPERATION: translate('OpenLP.ProjectorConstants',
+                                             'The last operation attempted has not finished yet '
+                                             '(still in progress in the background)'),
+    E_PROXY_CONNECTION_REFUSED: translate('OpenLP.ProjectorConstants',
+                                          'Could not contact the proxy server because the connection '
+                                          'to that server was denied'),
+    E_PROXY_CONNECTION_CLOSED: translate('OpenLP.ProjectorConstants',
+                                         'The connection to the proxy server was closed unexpectedly '
+                                         '(before the connection to the final peer was established)'),
+    E_PROXY_CONNECTION_TIMEOUT: translate('OpenLP.ProjectorConstants',
+                                          'The connection to the proxy server timed out or the proxy '
+                                          'server stopped responding in the authentication phase.'),
+    E_PROXY_NOT_FOUND: translate('OpenLP.ProjectorConstants',
+                                 'The proxy address set with setProxy() was not found'),
+    E_PROXY_PROTOCOL: translate('OpenLP.ProjectorConstants',
+                                'The connection negotiation with the proxy server failed because the '
+                                'response from the proxy server could not be understood'),
+    E_UNKNOWN_SOCKET_ERROR: translate('OpenLP.ProjectorConstants', 'An unidentified error occurred'),
+    S_NOT_CONNECTED: translate('OpenLP.ProjectorConstants', 'Not connected'),
+    S_CONNECTING: translate('OpenLP.ProjectorConstants', 'Connecting'),
+    S_CONNECTED: translate('OpenLP.ProjectorConstants', 'Connected'),
+    S_STATUS: translate('OpenLP.ProjectorConstants', 'Getting status'),
+    S_OFF: translate('OpenLP.ProjectorConstants', 'Off'),
+    S_INITIALIZE: translate('OpenLP.ProjectorConstants', 'Initialize in progress'),
+    S_STANDBY: translate('OpenLP.ProjectorConstants', 'Power in standby'),
+    S_WARMUP: translate('OpenLP.ProjectorConstants', 'Warmup in progress'),
+    S_ON: translate('OpenLP.ProjectorConstants', 'Power is on'),
+    S_COOLDOWN: translate('OpenLP.ProjectorConstants', 'Cooldown in progress'),
+    S_INFO: translate('OpenLP.ProjectorConstants', 'Projector Information available'),
+    S_NETWORK_SENDING: translate('OpenLP.ProjectorConstants', 'Sending data'),
+    S_NETWORK_RECEIVED: translate('OpenLP.ProjectorConstants', 'Received data')
+}
 
 # Map for ERST return codes to string
-PJLINK_ERST_STATUS = {'0': ERROR_STRING[E_OK],
-                      '1': ERROR_STRING[E_WARN],
-                      '2': ERROR_STRING[E_ERROR]}
+PJLINK_ERST_STATUS = {
+    '0': ERROR_STRING[E_OK],
+    '1': ERROR_STRING[E_WARN],
+    '2': ERROR_STRING[E_ERROR]
+}
 
 # Map for POWR return codes to status code
+<<<<<<< TREE
 PJLINK_POWR_STATUS = {'0': S_STANDBY,
                       '1': S_ON,
                       '2': S_COOLDOWN,
@@ -355,3 +367,71 @@
                         '58': translate('OpenLP.DB', 'Network 8'),
                         '59': translate('OpenLP.DB', 'Network 9')
                         }
+=======
+PJLINK_POWR_STATUS = {
+    '0': S_STANDBY,
+    '1': S_ON,
+    '2': S_COOLDOWN,
+    '3': S_WARMUP,
+    S_STANDBY: '0',
+    S_ON: '1',
+    S_COOLDOWN: '2',
+    S_WARMUP: '3'
+}
+
+PJLINK_DEFAULT_SOURCES = {
+    '1': translate('OpenLP.DB', 'RGB'),
+    '2': translate('OpenLP.DB', 'Video'),
+    '3': translate('OpenLP.DB', 'Digital'),
+    '4': translate('OpenLP.DB', 'Storage'),
+    '5': translate('OpenLP.DB', 'Network')
+}
+
+PJLINK_DEFAULT_CODES = {
+    '11': translate('OpenLP.DB', 'RGB 1'),
+    '12': translate('OpenLP.DB', 'RGB 2'),
+    '13': translate('OpenLP.DB', 'RGB 3'),
+    '14': translate('OpenLP.DB', 'RGB 4'),
+    '15': translate('OpenLP.DB', 'RGB 5'),
+    '16': translate('OpenLP.DB', 'RGB 6'),
+    '17': translate('OpenLP.DB', 'RGB 7'),
+    '18': translate('OpenLP.DB', 'RGB 8'),
+    '19': translate('OpenLP.DB', 'RGB 9'),
+    '21': translate('OpenLP.DB', 'Video 1'),
+    '22': translate('OpenLP.DB', 'Video 2'),
+    '23': translate('OpenLP.DB', 'Video 3'),
+    '24': translate('OpenLP.DB', 'Video 4'),
+    '25': translate('OpenLP.DB', 'Video 5'),
+    '26': translate('OpenLP.DB', 'Video 6'),
+    '27': translate('OpenLP.DB', 'Video 7'),
+    '28': translate('OpenLP.DB', 'Video 8'),
+    '29': translate('OpenLP.DB', 'Video 9'),
+    '31': translate('OpenLP.DB', 'Digital 1'),
+    '32': translate('OpenLP.DB', 'Digital 2'),
+    '33': translate('OpenLP.DB', 'Digital 3'),
+    '34': translate('OpenLP.DB', 'Digital 4'),
+    '35': translate('OpenLP.DB', 'Digital 5'),
+    '36': translate('OpenLP.DB', 'Digital 6'),
+    '37': translate('OpenLP.DB', 'Digital 7'),
+    '38': translate('OpenLP.DB', 'Digital 8'),
+    '39': translate('OpenLP.DB', 'Digital 9'),
+    '41': translate('OpenLP.DB', 'Storage 1'),
+    '42': translate('OpenLP.DB', 'Storage 2'),
+    '43': translate('OpenLP.DB', 'Storage 3'),
+    '44': translate('OpenLP.DB', 'Storage 4'),
+    '45': translate('OpenLP.DB', 'Storage 5'),
+    '46': translate('OpenLP.DB', 'Storage 6'),
+    '47': translate('OpenLP.DB', 'Storage 7'),
+    '48': translate('OpenLP.DB', 'Storage 8'),
+    '49': translate('OpenLP.DB', 'Storage 9'),
+    '51': translate('OpenLP.DB', 'Network 1'),
+    '52': translate('OpenLP.DB', 'Network 2'),
+    '53': translate('OpenLP.DB', 'Network 3'),
+    '54': translate('OpenLP.DB', 'Network 4'),
+    '55': translate('OpenLP.DB', 'Network 5'),
+    '56': translate('OpenLP.DB', 'Network 6'),
+    '57': translate('OpenLP.DB', 'Network 7'),
+    '58': translate('OpenLP.DB', 'Network 8'),
+    '59': translate('OpenLP.DB', 'Network 9')
+}
+>>>>>>> MERGE-SOURCE
 
=== modified file 'openlp/core/lib/projector/db.py'
--- openlp/core/lib/projector/db.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/projector/db.py	2017-01-08 22:05:36 +0000
@@ -40,13 +40,12 @@
 
 from sqlalchemy import Column, ForeignKey, Integer, MetaData, String, and_
 from sqlalchemy.ext.declarative import declarative_base, declared_attr
-from sqlalchemy.orm import backref, relationship
+from sqlalchemy.orm import relationship
 
 from openlp.core.lib.db import Manager, init_db, init_url
 from openlp.core.lib.projector.constants import PJLINK_DEFAULT_CODES
 
-metadata = MetaData()
-Base = declarative_base(metadata)
+Base = declarative_base(MetaData())
 
 
 class CommonBase(object):
@@ -54,8 +53,8 @@
     Base class to automate table name and ID column.
     """
     @declared_attr
-    def __tablename__(cls):
-        return cls.__name__.lower()
+    def __tablename__(self):
+        return self.__name__.lower()
 
     id = Column(Integer, primary_key=True)
 
@@ -74,7 +73,7 @@
         """
         Returns a basic representation of a Manufacturer table entry.
         """
-        return '<Manufacturer(name="%s")>' % self.name
+        return '<Manufacturer(name="{name}")>'.format(name=self.name)
 
     name = Column(String(30))
     models = relationship('Model',
@@ -101,7 +100,7 @@
         """
         Returns a basic representation of a Model table entry.
         """
-        return '<Model(name=%s)>' % self.name
+        return '<Model(name={name})>'.format(name=self.name)
 
     manufacturer_id = Column(Integer, ForeignKey('manufacturer.id'))
     name = Column(String(20))
@@ -131,8 +130,9 @@
         """
         Return basic representation of Source table entry.
         """
-        return '<Source(pjlink_name="%s", pjlink_code="%s", text="%s")>' % \
-            (self.pjlink_name, self.pjlink_code, self.text)
+        return '<Source(pjlink_name="{name}", pjlink_code="{code}", text="{text}")>'.format(name=self.pjlink_name,
+                                                                                            code=self.pjlink_code,
+                                                                                            text=self.text)
     model_id = Column(Integer, ForeignKey('model.id'))
     pjlink_name = Column(String(15))
     pjlink_code = Column(String(2))
@@ -162,11 +162,22 @@
         """
         Return basic representation of Source table entry.
         """
-        return '< Projector(id="%s", ip="%s", port="%s", pin="%s", name="%s", location="%s",' \
-            'notes="%s", pjlink_name="%s", manufacturer="%s", model="%s", other="%s",' \
-            'sources="%s", source_list="%s") >' % (self.id, self.ip, self.port, self.pin, self.name, self.location,
-                                                   self.notes, self.pjlink_name, self.manufacturer, self.model,
-                                                   self.other, self.sources, self.source_list)
+        return '< Projector(id="{data}", ip="{ip}", port="{port}", pin="{pin}", name="{name}", ' \
+            'location="{location}", notes="{notes}", pjlink_name="{pjlink_name}", ' \
+            'manufacturer="{manufacturer}", model="{model}", other="{other}", ' \
+            'sources="{sources}", source_list="{source_list}") >'.format(data=self.id,
+                                                                         ip=self.ip,
+                                                                         port=self.port,
+                                                                         pin=self.pin,
+                                                                         name=self.name,
+                                                                         location=self.location,
+                                                                         notes=self.notes,
+                                                                         pjlink_name=self.pjlink_name,
+                                                                         manufacturer=self.manufacturer,
+                                                                         model=self.model,
+                                                                         other=self.other,
+                                                                         sources=self.sources,
+                                                                         source_list=self.source_list)
     ip = Column(String(100))
     port = Column(String(8))
     pin = Column(String(20))
@@ -203,10 +214,11 @@
         """
         Return basic representation of Source table entry.
         """
-        return '<ProjectorSource(id="%s", code="%s", text="%s", projector_id="%s")>' % (self.id,
-                                                                                        self.code,
-                                                                                        self.text,
-                                                                                        self.projector_id)
+        return '<ProjectorSource(id="{data}", code="{code}", text="{text}", ' \
+            'projector_id="{projector_id}")>'.format(data=self.id,
+                                                     code=self.code,
+                                                     text=self.text,
+                                                     projector_id=self.projector_id)
     code = Column(String(3))
     text = Column(String(20))
     projector_id = Column(Integer, ForeignKey('projector.id'))
@@ -217,10 +229,10 @@
     Class to access the projector database.
     """
     def __init__(self, *args, **kwargs):
-        log.debug('ProjectorDB().__init__(args="%s", kwargs="%s")' % (args, kwargs))
+        log.debug('ProjectorDB().__init__(args="{arg}", kwargs="{kwarg}")'.format(arg=args, kwarg=kwargs))
         super().__init__(plugin_name='projector', init_schema=self.init_schema)
-        log.debug('ProjectorDB() Initialized using db url %s' % self.db_url)
-        log.debug('Session: %s', self.session)
+        log.debug('ProjectorDB() Initialized using db url {db}'.format(db=self.db_url))
+        log.debug('Session: {session}'.format(session=self.session))
 
     def init_schema(self, *args, **kwargs):
         """
@@ -240,13 +252,14 @@
         :param dbid: DB record id
         :returns: Projector() instance
         """
-        log.debug('get_projector_by_id(id="%s")' % dbid)
+        log.debug('get_projector_by_id(id="{data}")'.format(data=dbid))
         projector = self.get_object_filtered(Projector, Projector.id == dbid)
         if projector is None:
             # Not found
-            log.warn('get_projector_by_id() did not find %s' % id)
+            log.warning('get_projector_by_id() did not find {data}'.format(data=id))
             return None
-        log.debug('get_projectorby_id() returning 1 entry for "%s" id="%s"' % (dbid, projector.id))
+        log.debug('get_projectorby_id() returning 1 entry for "{entry}" id="{data}"'.format(entry=dbid,
+                                                                                            data=projector.id))
         return projector
 
     def get_projector_all(self):
@@ -262,7 +275,7 @@
             return return_list
         for new_projector in new_list:
             return_list.append(new_projector)
-        log.debug('get_all() returning %s item(s)' % len(return_list))
+        log.debug('get_all() returning {items} item(s)'.format(items=len(return_list)))
         return return_list
 
     def get_projector_by_ip(self, ip):
@@ -276,9 +289,10 @@
         projector = self.get_object_filtered(Projector, Projector.ip == ip)
         if projector is None:
             # Not found
-            log.warn('get_projector_by_ip() did not find %s' % ip)
+            log.warning('get_projector_by_ip() did not find {ip}'.format(ip=ip))
             return None
-        log.debug('get_projectorby_ip() returning 1 entry for "%s" id="%s"' % (ip, projector.id))
+        log.debug('get_projectorby_ip() returning 1 entry for "{ip}" id="{data}"'.format(ip=ip,
+                                                                                         data=projector.id))
         return projector
 
     def get_projector_by_name(self, name):
@@ -288,13 +302,14 @@
         :param name: Name of projector
         :returns: Projector() instance
         """
-        log.debug('get_projector_by_name(name="%s")' % name)
+        log.debug('get_projector_by_name(name="{name}")'.format(name=name))
         projector = self.get_object_filtered(Projector, Projector.name == name)
         if projector is None:
             # Not found
-            log.warn('get_projector_by_name() did not find "%s"' % name)
+            log.warning('get_projector_by_name() did not find "{name}"'.format(name=name))
             return None
-        log.debug('get_projector_by_name() returning one entry for "%s" id="%s"' % (name, projector.id))
+        log.debug('get_projector_by_name() returning one entry for "{name}" id="{data}"'.format(name=name,
+                                                                                                data=projector.id))
         return projector
 
     def add_projector(self, projector):
@@ -308,13 +323,13 @@
         """
         old_projector = self.get_object_filtered(Projector, Projector.ip == projector.ip)
         if old_projector is not None:
-            log.warn('add_new() skipping entry ip="%s" (Already saved)' % old_projector.ip)
+            log.warning('add_new() skipping entry ip="{ip}" (Already saved)'.format(ip=old_projector.ip))
             return False
         log.debug('add_new() saving new entry')
-        log.debug('ip="%s", name="%s", location="%s"' % (projector.ip,
-                                                         projector.name,
-                                                         projector.location))
-        log.debug('notes="%s"' % projector.notes)
+        log.debug('ip="{ip}", name="{name}", location="{location}"'.format(ip=projector.ip,
+                                                                           name=projector.name,
+                                                                           location=projector.location))
+        log.debug('notes="{notes}"'.format(notes=projector.notes))
         return self.save_object(projector)
 
     def update_projector(self, projector=None):
@@ -333,7 +348,7 @@
         if old_projector is None:
             log.error('Edit called on projector instance not in database - cancelled')
             return False
-        log.debug('(%s) Updating projector with dbid=%s' % (projector.ip, projector.id))
+        log.debug('({ip}) Updating projector with dbid={dbid}'.format(ip=projector.ip, dbid=projector.id))
         old_projector.ip = projector.ip
         old_projector.name = projector.name
         old_projector.location = projector.location
@@ -357,9 +372,9 @@
         """
         deleted = self.delete_object(Projector, projector.id)
         if deleted:
-            log.debug('delete_by_id() Removed entry id="%s"' % projector.id)
+            log.debug('delete_by_id() Removed entry id="{data}"'.format(data=projector.id))
         else:
-            log.error('delete_by_id() Entry id="%s" not deleted for some reason' % projector.id)
+            log.error('delete_by_id() Entry id="{data}" not deleted for some reason'.format(data=projector.id))
         return deleted
 
     def get_source_list(self, projector):
@@ -392,12 +407,12 @@
         :param source: ProjectorSource id
         :returns: ProjetorSource instance or None
         """
-        source_entry = self.get_object_filtered(ProjetorSource, ProjectorSource.id == source)
+        source_entry = self.get_object_filtered(ProjectorSource, ProjectorSource.id == source)
         if source_entry is None:
             # Not found
-            log.warn('get_source_by_id() did not find "%s"' % source)
+            log.warning('get_source_by_id() did not find "{source}"'.format(source=source))
             return None
-        log.debug('get_source_by_id() returning one entry for "%s""' % (source))
+        log.debug('get_source_by_id() returning one entry for "{source}""'.format(source=source))
         return source_entry
 
     def get_source_by_code(self, code, projector_id):
@@ -411,11 +426,14 @@
         source_entry = self.get_object_filtered(ProjectorSource,
                                                 and_(ProjectorSource.code == code,
                                                      ProjectorSource.projector_id == projector_id))
+
         if source_entry is None:
             # Not found
-            log.warn('get_source_by_id() did not find code="%s" projector_id="%s"' % (code, projector_id))
+            log.warning('get_source_by_id() not found')
+            log.warning('code="{code}" projector_id="{data}"'.format(code=code, data=projector_id))
             return None
-        log.debug('get_source_by_id() returning one entry for code="%s" projector_id="%s"' % (code, projector_id))
+        log.debug('get_source_by_id() returning one entry')
+        log.debug('code="{code}" projector_id="{data}"'.format(code=code, data=projector_id))
         return source_entry
 
     def add_source(self, source):
@@ -424,6 +442,6 @@
 
         :param source: ProjectorSource() instance to add
         """
-        log.debug('Saving ProjectorSource(projector_id="%s" code="%s" text="%s")' % (source.projector_id,
-                                                                                     source.code, source.text))
+        log.debug('Saving ProjectorSource(projector_id="{data}" '
+                  'code="{code}" text="{text}")'.format(data=source.projector_id, code=source.code, text=source.text))
         return self.save_object(source)
 
=== modified file 'openlp/core/lib/projector/pjlink1.py'
--- openlp/core/lib/projector/pjlink1.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/projector/pjlink1.py	2017-01-08 22:05:36 +0000
@@ -46,15 +46,24 @@
 
 from codecs import decode
 
-from PyQt5.QtCore import pyqtSignal, pyqtSlot
-from PyQt5.QtNetwork import QAbstractSocket, QTcpSocket
+from PyQt5 import QtCore, QtNetwork
 
+<<<<<<< TREE
 from openlp.core.common import translate, md5_hash
 from openlp.core.lib.projector.constants import *
+=======
+from openlp.core.common import translate, qmd5_hash
+from openlp.core.lib.projector.constants import CONNECTION_ERRORS, CR, ERROR_MSG, ERROR_STRING, \
+    E_AUTHENTICATION, E_CONNECTION_REFUSED, E_GENERAL, E_INVALID_DATA, E_NETWORK, E_NOT_CONNECTED, \
+    E_PARAMETER, E_PROJECTOR, E_SOCKET_TIMEOUT, E_UNAVAILABLE, E_UNDEFINED, PJLINK_ERRORS, \
+    PJLINK_ERST_STATUS, PJLINK_MAX_PACKET, PJLINK_PORT, PJLINK_POWR_STATUS, PJLINK_VALID_CMD, \
+    STATUS_STRING, S_CONNECTED, S_CONNECTING, S_NETWORK_RECEIVED, S_NETWORK_SENDING, S_NOT_CONNECTED, \
+    S_OFF, S_OK, S_ON, S_STATUS
+>>>>>>> MERGE-SOURCE
 
 # Shortcuts
-SocketError = QAbstractSocket.SocketError
-SocketSTate = QAbstractSocket.SocketState
+SocketError = QtNetwork.QAbstractSocket.SocketError
+SocketSTate = QtNetwork.QAbstractSocket.SocketState
 
 PJLINK_PREFIX = '%'
 PJLINK_CLASS = '1'
@@ -62,11 +71,12 @@
 PJLINK_SUFFIX = CR
 
 
-class PJLink1(QTcpSocket):
+class PJLink1(QtNetwork.QTcpSocket):
     """
     Socket service for connecting to a PJLink-capable projector.
     """
     # Signals sent by this module
+<<<<<<< TREE
     changeStatus = pyqtSignal(str, int, str)
     projectorNetwork = pyqtSignal(str, int)  # Projector network activity
     projectorStatus = pyqtSignal(int)  # Status update
@@ -74,6 +84,15 @@
     projectorNoAuthentication = pyqtSignal(str)  # PIN set and no authentication needed
     projectorReceivedData = pyqtSignal()  # Notify when received data finished processing
     projectorUpdateIcons = pyqtSignal()  # Update the status icons on toolbar
+=======
+    changeStatus = QtCore.pyqtSignal(str, int, str)
+    projectorNetwork = QtCore.pyqtSignal(int)  # Projector network activity
+    projectorStatus = QtCore.pyqtSignal(int)  # Status update
+    projectorAuthentication = QtCore.pyqtSignal(str)  # Authentication error
+    projectorNoAuthentication = QtCore.pyqtSignal(str)  # PIN set and no authentication needed
+    projectorReceivedData = QtCore.pyqtSignal()  # Notify when received data finished processing
+    projectorUpdateIcons = QtCore.pyqtSignal()  # Update the status icons on toolbar
+>>>>>>> MERGE-SOURCE
 
     def __init__(self, name=None, ip=None, port=PJLINK_PORT, pin=None, *args, **kwargs):
         """
@@ -116,8 +135,8 @@
         self.error_status = S_OK
         # Socket information
         # Add enough space to input buffer for extraneous \n \r
-        self.maxSize = PJLINK_MAX_PACKET + 2
-        self.setReadBufferSize(self.maxSize)
+        self.max_size = PJLINK_MAX_PACKET + 2
+        self.setReadBufferSize(self.max_size)
         # PJLink information
         self.pjlink_class = '1'  # Default class
         self.reset_information()
@@ -129,19 +148,20 @@
         # Socket timer for some possible brain-dead projectors or network cable pulled
         self.socket_timer = None
         # Map command to function
-        self.PJLINK1_FUNC = {'AVMT': self.process_avmt,
-                             'CLSS': self.process_clss,
-                             'ERST': self.process_erst,
-                             'INFO': self.process_info,
-                             'INF1': self.process_inf1,
-                             'INF2': self.process_inf2,
-                             'INPT': self.process_inpt,
-                             'INST': self.process_inst,
-                             'LAMP': self.process_lamp,
-                             'NAME': self.process_name,
-                             'PJLINK': self.check_login,
-                             'POWR': self.process_powr
-                             }
+        self.pjlink1_functions = {
+            'AVMT': self.process_avmt,
+            'CLSS': self.process_clss,
+            'ERST': self.process_erst,
+            'INFO': self.process_info,
+            'INF1': self.process_inf1,
+            'INF2': self.process_inf2,
+            'INPT': self.process_inpt,
+            'INST': self.process_inst,
+            'LAMP': self.process_lamp,
+            'NAME': self.process_name,
+            'PJLINK': self.check_login,
+            'POWR': self.process_powr
+        }
 
     def reset_information(self):
         """
@@ -291,7 +311,7 @@
                                                                     message=status_message if msg is None else msg))
         self.changeStatus.emit(self.ip, status, message)
 
-    @pyqtSlot()
+    @QtCore.pyqtSlot()
     def check_login(self, data=None):
         """
         Processes the initial connection and authentication (if needed).
@@ -309,8 +329,8 @@
                 log.error('({ip}) Socket timeout waiting for login'.format(ip=self.ip))
                 self.change_status(E_SOCKET_TIMEOUT)
                 return
-            read = self.readLine(self.maxSize)
-            dontcare = self.readLine(self.maxSize)  # Clean out the trailing \r\n
+            read = self.readLine(self.max_size)
+            dontcare = self.readLine(self.max_size)  # Clean out the trailing \r\n
             if read is None:
                 log.warning('({ip}) read is None - socket error?'.format(ip=self.ip))
                 return
@@ -320,8 +340,13 @@
             data = decode(read, 'ascii')
             # Possibility of extraneous data on input when reading.
             # Clean out extraneous characters in buffer.
+<<<<<<< TREE
             dontcare = self.readLine(self.maxSize)
             log.debug('({ip}) check_login() read "{data}"'.format(ip=self.ip, data=data.strip()))
+=======
+            dontcare = self.readLine(self.max_size)
+            log.debug('({ip}) check_login() read "{data}"'.format(ip=self.ip, data=data.strip()))
+>>>>>>> MERGE-SOURCE
         # At this point, we should only have the initial login prompt with
         # possible authentication
         # PJLink initial login will be:
@@ -354,6 +379,7 @@
             return
         elif data_check[1] == '1':
             # Authenticated login with salt
+<<<<<<< TREE
             if self.pin is None:
                 log.warning('({ip}) Authenticated connection but no pin set'.format(ip=self.name))
                 self.disconnect_from_host()
@@ -365,20 +391,34 @@
                 log.debug('({ip}) Setting hash with salt="{data}"'.format(ip=self.ip, data=data_check[2]))
                 log.debug('({ip}) pin="{data}"'.format(ip=self.ip, data=self.pin))
                 salt = md5_hash(salt=data_check[2].encode('ascii'), data=self.pin.encode('ascii'))
+=======
+            if self.pin is None:
+                log.warning('({ip}) Authenticated connection but no pin set'.format(ip=self.name))
+                self.disconnect_from_host()
+                self.change_status(E_AUTHENTICATION)
+                log.debug('({ip}) Emitting projectorAuthentication() signal'.format(ip=self.name))
+                self.projectorAuthentication.emit(self.name)
+                return
+            else:
+                log.debug('({ip}) Setting hash with salt="{data}"'.format(ip=self.ip, data=data_check[2]))
+                log.debug('({ip}) pin="{data}"'.format(ip=self.ip, data=self.pin))
+                data_hash = str(qmd5_hash(salt=data_check[2].encode('utf-8'), data=self.pin.encode('utf-8')),
+                                encoding='ascii')
+>>>>>>> MERGE-SOURCE
         else:
-            salt = None
-        # We're connected at this point, so go ahead and do regular I/O
+            data_hash = None
+        # We're connected at this point, so go ahead and setup regular I/O
         self.readyRead.connect(self.get_data)
         self.projectorReceivedData.connect(self._send_command)
         # Initial data we should know about
-        self.send_command(cmd='CLSS', salt=salt)
+        self.send_command(cmd='CLSS', salt=data_hash)
         self.waitForReadyRead()
         if (not self.no_poll) and (self.state() == self.ConnectedState):
             log.debug('({ip}) Starting timer'.format(ip=self.ip))
             self.timer.setInterval(2000)  # Set 2 seconds for initial information
             self.timer.start()
 
-    @pyqtSlot()
+    @QtCore.pyqtSlot()
     def get_data(self):
         """
         Socket interface to retrieve data.
@@ -388,7 +428,7 @@
             log.debug('({ip}) get_data(): Not connected - returning'.format(ip=self.ip))
             self.send_busy = False
             return
-        read = self.readLine(self.maxSize)
+        read = self.readLine(self.max_size)
         if read == -1:
             # No data available
             log.debug('({ip}) get_data(): No data available (-1)'.format(ip=self.ip))
@@ -435,7 +475,11 @@
             return
         return self.process_command(cmd, data)
 
+<<<<<<< TREE
     @pyqtSlot(QAbstractSocket.SocketError)
+=======
+    @QtCore.pyqtSlot(QtNetwork.QAbstractSocket.SocketError)
+>>>>>>> MERGE-SOURCE
     def get_error(self, err):
         """
         Process error from SocketError signal.
@@ -475,6 +519,7 @@
             log.warning('({ip}) send_command(): Not connected - returning'.format(ip=self.ip))
             self.send_queue = []
             return
+<<<<<<< TREE
         self.projectorNetwork.emit(self.ip, S_NETWORK_SENDING)
         log.debug('(%s) send_command(): Building cmd="%s" opts="%s" %s' % (self.ip,
                                                                            cmd,
@@ -484,6 +529,19 @@
             out = '%s%s %s%s' % (PJLINK_HEADER, cmd, opts, CR)
         else:
             out = '%s%s%s %s%s' % (salt, PJLINK_HEADER, cmd, opts, CR)
+=======
+        self.projectorNetwork.emit(S_NETWORK_SENDING)
+        log.debug('({ip}) send_command(): Building cmd="{command}" opts="{data}"{salt}'.format(ip=self.ip,
+                                                                                               command=cmd,
+                                                                                               data=opts,
+                                                                                               salt='' if salt is None
+                                                                                               else ' with hash'))
+        out = '{salt}{header}{command} {options}{suffix}'.format(salt="" if salt is None else salt,
+                                                                 header=PJLINK_HEADER,
+                                                                 command=cmd,
+                                                                 options=opts,
+                                                                 suffix=CR)
+>>>>>>> MERGE-SOURCE
         if out in self.send_queue:
             # Already there, so don't add
             log.debug('({ip}) send_command(out="{data}") Already in queue - skipping'.format(ip=self.ip,
@@ -501,7 +559,7 @@
             log.debug('({ip}) send_command() calling _send_string()'.format(ip=self.ip))
             self._send_command()
 
-    @pyqtSlot()
+    @QtCore.pyqtSlot()
     def _send_command(self, data=None):
         """
         Socket interface to send data. If data=None, then check queue.
@@ -533,6 +591,7 @@
         log.debug('({ip}) _send_string(): Sending "{data}"'.format(ip=self.ip, data=out.strip()))
         log.debug('({ip}) _send_string(): Queue = {data}'.format(ip=self.ip, data=self.send_queue))
         self.socket_timer.start()
+<<<<<<< TREE
         try:
             self.projectorNetwork.emit(self.ip, S_NETWORK_SENDING)
             sent = self.write(out.encode('ascii'))
@@ -546,6 +605,15 @@
             self.changeStatus(E_NETWORK,
                               translate('OpenLP.PJLink1', '{code} : {string}').format(code=e.error(),
                                                                                       string=e.errorString()))
+=======
+        self.projectorNetwork.emit(S_NETWORK_SENDING)
+        sent = self.write(out.encode('ascii'))
+        self.waitForBytesWritten(2000)  # 2 seconds should be enough
+        if sent == -1:
+            # Network error?
+            self.change_status(E_NETWORK,
+                               translate('OpenLP.PJLink1', 'Error while sending data to projector'))
+>>>>>>> MERGE-SOURCE
 
     def process_command(self, cmd, data):
         """
@@ -589,8 +657,8 @@
             self.projectorReceivedData.emit()
             return
 
-        if cmd in self.PJLINK1_FUNC:
-            self.PJLINK1_FUNC[cmd](data)
+        if cmd in self.pjlink1_functions:
+            self.pjlink1_functions[cmd](data)
         else:
             log.warning('({ip}) Invalid command {data}'.format(ip=self.ip, data=cmd))
         self.send_busy = False
@@ -815,9 +883,9 @@
             log.warning('({ip}) connect_to_host(): Already connected - returning'.format(ip=self.ip))
             return
         self.change_status(S_CONNECTING)
-        self.connectToHost(self.ip, self.port if type(self.port) is int else int(self.port))
+        self.connectToHost(self.ip, self.port if isinstance(self.port, int) else int(self.port))
 
-    @pyqtSlot()
+    @QtCore.pyqtSlot()
     def disconnect_from_host(self, abort=False):
         """
         Close socket and cleanup.
 
=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/renderer.py	2017-01-08 22:05:36 +0000
@@ -22,6 +22,7 @@
 
 import re
 
+from string import Template
 from PyQt5 import QtGui, QtCore, QtWebKitWidgets
 
 from openlp.core.common import Registry, RegistryProperties, OpenLPMixin, RegistryMixin, Settings
@@ -107,7 +108,7 @@
 
         :param theme_name: The theme name
         """
-        self.log_debug("_set_theme with theme %s" % theme_name)
+        self.log_debug("_set_theme with theme {theme}".format(theme=theme_name))
         if theme_name not in self._theme_dimensions:
             theme_data = self.theme_manager.get_theme_data(theme_name)
             main_rect = self.get_main_rectangle(theme_data)
@@ -183,7 +184,7 @@
 
         :param item_theme_name: The item theme's name.
         """
-        self.log_debug("set_item_theme with theme %s" % item_theme_name)
+        self.log_debug("set_item_theme with theme {theme}".format(theme=item_theme_name))
         self._set_theme(item_theme_name)
         self.item_theme_name = item_theme_name
 
@@ -317,7 +318,7 @@
         self.width = screen_size.width()
         self.height = screen_size.height()
         self.screen_ratio = self.height / self.width
-        self.log_debug('_calculate default %s, %f' % (screen_size, self.screen_ratio))
+        self.log_debug('_calculate default {size}, {ratio:f}'.format(size=screen_size, ratio=self.screen_ratio))
         # 90% is start of footer
         self.footer_start = int(self.height * 0.90)
 
@@ -354,7 +355,7 @@
         :param rect_main: The main text block.
         :param rect_footer: The footer text block.
         """
-        self.log_debug('_set_text_rectangle %s , %s' % (rect_main, rect_footer))
+        self.log_debug('_set_text_rectangle {main} , {footer}'.format(main=rect_main, footer=rect_footer))
         self._rect = rect_main
         self._rect_footer = rect_footer
         self.page_width = self._rect.width()
@@ -370,7 +371,7 @@
         self.web.resize(self.page_width, self.page_height)
         self.web_frame = self.web.page().mainFrame()
         # Adjust width and height to account for shadow. outline done in css.
-        html = """<!DOCTYPE html><html><head><script>
+        html = Template("""<!DOCTYPE html><html><head><script>
             function show_text(newtext) {
                 var main = document.getElementById('main');
                 main.innerHTML = newtext;
@@ -379,12 +380,16 @@
                 // returned value).
                 return main.offsetHeight;
             }
-            </script><style>*{margin: 0; padding: 0; border: 0;}
-            #main {position: absolute; top: 0px; %s %s}</style></head><body>
-            <div id="main"></div></body></html>""" % \
-            (build_lyrics_format_css(theme_data, self.page_width, self.page_height),
-             build_lyrics_outline_css(theme_data))
-        self.web.setHtml(html)
+            </script>
+            <style>
+                *{margin: 0; padding: 0; border: 0;}
+                #main {position: absolute; top: 0px; ${format_css} ${outline_css}}
+            </style></head>
+            <body><div id="main"></div></body></html>""")
+        self.web.setHtml(html.substitute(format_css=build_lyrics_format_css(theme_data,
+                                                                            self.page_width,
+                                                                            self.page_height),
+                                         outline_css=build_lyrics_outline_css(theme_data)))
         self.empty_height = self.web_frame.contentsSize().height()
 
     def _paginate_slide(self, lines, line_end):
@@ -518,7 +523,8 @@
 
         :param text:  The text to check. It may contain HTML tags.
         """
-        self.web_frame.evaluateJavaScript('show_text("%s")' % text.replace('\\', '\\\\').replace('\"', '\\\"'))
+        self.web_frame.evaluateJavaScript('show_text'
+                                          '("{text}")'.format(text=text.replace('\\', '\\\\').replace('\"', '\\\"')))
         return self.web_frame.contentsSize().height() <= self.empty_height
 
 
@@ -529,7 +535,7 @@
     :param line: Line to be split
     """
     # this parse we are to be wordy
-    return re.split('\s+', line)
+    return re.split(r'\s+', line)
 
 
 def get_start_tags(raw_text):
 
=== modified file 'openlp/core/lib/screen.py'
--- openlp/core/lib/screen.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/screen.py	2017-01-08 22:05:36 +0000
@@ -78,7 +78,7 @@
         ``number``
             The number of the screen, which size has changed.
         """
-        log.info('screen_resolution_changed %d' % number)
+        log.info('screen_resolution_changed {number:d}'.format(number=number))
         for screen in self.screen_list:
             if number == screen['number']:
                 new_screen = {
@@ -105,7 +105,7 @@
         """
         # Do not log at start up.
         if changed_screen != -1:
-            log.info('screen_count_changed %d' % self.desktop.screenCount())
+            log.info('screen_count_changed {count:d}'.format(count=self.desktop.screenCount()))
         # Remove unplugged screens.
         for screen in copy.deepcopy(self.screen_list):
             if screen['number'] == self.desktop.screenCount():
@@ -132,9 +132,11 @@
         """
         screen_list = []
         for screen in self.screen_list:
-            screen_name = '%s %d' % (translate('OpenLP.ScreenList', 'Screen'), screen['number'] + 1)
+            screen_name = '{name} {number:d}'.format(name=translate('OpenLP.ScreenList', 'Screen'),
+                                                     number=screen['number'] + 1)
             if screen['primary']:
-                screen_name = '%s (%s)' % (screen_name, translate('OpenLP.ScreenList', 'primary'))
+                screen_name = '{name} ({primary})'.format(name=screen_name,
+                                                          primary=translate('OpenLP.ScreenList', 'primary'))
             screen_list.append(screen_name)
         return screen_list
 
@@ -152,7 +154,7 @@
                     'size': PyQt5.QtCore.QRect(0, 0, 1024, 768)
                 }
         """
-        log.info('Screen %d found with resolution %s' % (screen['number'], screen['size']))
+        log.info('Screen {number:d} found with resolution {size}'.format(number=screen['number'], size=screen['size']))
         if screen['primary']:
             self.current = screen
             self.override = copy.deepcopy(self.current)
@@ -165,7 +167,7 @@
 
         :param number: The screen number (int).
         """
-        log.info('remove_screen %d' % number)
+        log.info('remove_screen {number:d}'.format(number=number))
         for screen in self.screen_list:
             if screen['number'] == number:
                 self.screen_list.remove(screen)
@@ -189,7 +191,7 @@
 
         :param number: The screen number (int).
         """
-        log.debug('set_current_display %s' % number)
+        log.debug('set_current_display {number}'.format(number=number))
         if number + 1 > self.display_count:
             self.current = self.screen_list[0]
         else:
 
=== modified file 'openlp/core/lib/searchedit.py'
--- openlp/core/lib/searchedit.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/searchedit.py	2017-01-08 22:05:36 +0000
@@ -26,6 +26,7 @@
 
 from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_widget_action
+from openlp.core.common import Settings
 
 log = logging.getLogger(__name__)
 
@@ -37,11 +38,12 @@
     searchTypeChanged = QtCore.pyqtSignal(QtCore.QVariant)
     cleared = QtCore.pyqtSignal()
 
-    def __init__(self, parent):
+    def __init__(self, parent, settings_section):
         """
         Constructor.
         """
-        super(SearchEdit, self).__init__(parent)
+        super().__init__(parent)
+        self.settings_section = settings_section
         self._current_search_type = -1
         self.clear_button = QtWidgets.QToolButton(self)
         self.clear_button.setIcon(build_icon(':/system/clear_shortcut.png'))
@@ -62,9 +64,10 @@
         right_padding = self.clear_button.width() + frame_width
         if hasattr(self, 'menu_button'):
             left_padding = self.menu_button.width()
-            stylesheet = 'QLineEdit { padding-left: %spx; padding-right: %spx; } ' % (left_padding, right_padding)
+            stylesheet = 'QLineEdit {{ padding-left:{left}px; padding-right: {right}px; }} '.format(left=left_padding,
+                                                                                                    right=right_padding)
         else:
-            stylesheet = 'QLineEdit { padding-right: %spx; } ' % right_padding
+            stylesheet = 'QLineEdit {{ padding-right: {right}px; }} '.format(right=right_padding)
         self.setStyleSheet(stylesheet)
         msz = self.minimumSizeHint()
         self.setMinimumSize(max(msz.width(), self.clear_button.width() + (frame_width * 2) + 2),
@@ -99,14 +102,10 @@
         menu = self.menu_button.menu()
         for action in menu.actions():
             if identifier == action.data():
-                # setPlaceholderText has been implemented in Qt 4.7 and in at least PyQt 4.9 (I am not sure, if it was
-                # implemented in PyQt 4.8).
-                try:
-                    self.setPlaceholderText(action.placeholder_text)
-                except AttributeError:
-                    pass
+                self.setPlaceholderText(action.placeholder_text)
                 self.menu_button.setDefaultAction(action)
                 self._current_search_type = identifier
+                Settings().setValue('{section}/last search type'.format(section=self.settings_section), identifier)
                 self.searchTypeChanged.emit(identifier)
                 return True
 
@@ -129,14 +128,10 @@
                     (2, ":/songs/authors.png", "Authors", "Search Authors...")
         """
         menu = QtWidgets.QMenu(self)
-        first = None
         for identifier, icon, title, placeholder in items:
             action = create_widget_action(
                 menu, text=title, icon=icon, data=identifier, triggers=self._on_menu_action_triggered)
             action.placeholder_text = placeholder
-            if first is None:
-                first = action
-                self._current_search_type = identifier
         if not hasattr(self, 'menu_button'):
             self.menu_button = QtWidgets.QToolButton(self)
             self.menu_button.setIcon(build_icon(':/system/clear_shortcut.png'))
@@ -145,7 +140,8 @@
             self.menu_button.setStyleSheet('QToolButton { border: none; padding: 0px 10px 0px 0px; }')
             self.menu_button.resize(QtCore.QSize(28, 18))
         self.menu_button.setMenu(menu)
-        self.menu_button.setDefaultAction(first)
+        self.set_current_search_type(
+            Settings().value('{section}/last search type'.format(section=self.settings_section)))
         self.menu_button.show()
         self._update_style_sheet()
 
 
=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/serviceitem.py	2017-01-08 22:05:36 +0000
@@ -34,7 +34,7 @@
 from PyQt5 import QtGui
 
 from openlp.core.common import RegistryProperties, Settings, translate, AppLocation, md5_hash
-from openlp.core.lib import ImageSource, build_icon, clean_tags, expand_tags, create_thumb
+from openlp.core.lib import ImageSource, build_icon, clean_tags, expand_tags
 
 log = logging.getLogger(__name__)
 
@@ -247,7 +247,7 @@
             self.renderer.set_item_theme(self.theme)
             self.theme_data, self.main, self.footer = self.renderer.pre_render()
         if self.service_item_type == ServiceItemType.Text:
-            log.debug('Formatting slides: %s' % self.title)
+            log.debug('Formatting slides: {title}'.format(title=self.title))
             # Save rendered pages to this dict. In the case that a slide is used twice we can use the pages saved to
             # the dict instead of rendering them again.
             previous_pages = {}
@@ -270,7 +270,7 @@
         elif self.service_item_type == ServiceItemType.Image or self.service_item_type == ServiceItemType.Command:
             pass
         else:
-            log.error('Invalid value renderer: %s' % self.service_item_type)
+            log.error('Invalid value renderer: {item}'.format(item=self.service_item_type))
         self.title = clean_tags(self.title)
         # The footer should never be None, but to be compatible with a few
         # nightly builds between 1.9.4 and 1.9.5, we have to correct this to
@@ -325,7 +325,8 @@
         self.service_item_type = ServiceItemType.Command
         # If the item should have a display title but this frame doesn't have one, we make one up
         if self.is_capable(ItemCapabilities.HasDisplayTitle) and not display_title:
-            display_title = translate('OpenLP.ServiceItem', '[slide %d]') % (len(self._raw_frames) + 1)
+            display_title = translate('OpenLP.ServiceItem',
+                                      '[slide {frame:d}]').format(frame=len(self._raw_frames) + 1)
         # Update image path to match servicemanager location if file was loaded from service
         if image and not self.has_original_files and self.name == 'presentations':
             file_location = os.path.join(path, file_name)
@@ -334,6 +335,8 @@
                                  file_location_hash, ntpath.basename(image))
         self._raw_frames.append({'title': file_name, 'image': image, 'path': path,
                                  'display_title': display_title, 'notes': notes})
+        if self.is_capable(ItemCapabilities.HasThumbnails):
+            self.image_manager.add_image(image, ImageSource.CommandPlugins, '#000000')
         self._new_item()
 
     def get_service_repr(self, lite_save):
@@ -390,7 +393,7 @@
         :param path: Defaults to *None*. This is the service manager path for things which have their files saved
             with them or None when the saved service is lite and the original file paths need to be preserved.
         """
-        log.debug('set_from_service called with path %s' % path)
+        log.debug('set_from_service called with path {path}'.format(path=path))
         header = service_item['serviceitem']['header']
         self.title = header['title']
         self.name = header['name']
@@ -606,11 +609,13 @@
         start = None
         end = None
         if self.start_time != 0:
-            start = translate('OpenLP.ServiceItem', '<strong>Start</strong>: %s') % \
-                str(datetime.timedelta(seconds=self.start_time))
+            time = str(datetime.timedelta(seconds=self.start_time))
+            start = translate('OpenLP.ServiceItem',
+                              '<strong>Start</strong>: {start}').format(start=time)
         if self.media_length != 0:
-            end = translate('OpenLP.ServiceItem', '<strong>Length</strong>: %s') % \
-                str(datetime.timedelta(seconds=self.media_length))
+            length = str(datetime.timedelta(seconds=self.media_length // 1000))
+            end = translate('OpenLP.ServiceItem', '<strong>Length</strong>: {length}').format(length=length)
+
         if not start and not end:
             return ''
         elif start and not end:
@@ -618,7 +623,7 @@
         elif not start and end:
             return end
         else:
-            return '%s <br>%s' % (start, end)
+            return '{start} <br>{end}'.format(start=start, end=end)
 
     def update_theme(self, theme):
         """
 
=== modified file 'openlp/core/lib/settingstab.py'
--- openlp/core/lib/settingstab.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/settingstab.py	2017-01-08 22:05:36 +0000
@@ -135,4 +135,4 @@
         """
         Tab has just been made visible to the user
         """
-        self.tab_visited = True
+        pass
 
=== renamed file 'openlp/core/lib/spelltextedit.py' => 'openlp/core/lib/spelltextedit.py.THIS'
=== modified file 'openlp/core/lib/theme.py'
--- openlp/core/lib/theme.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/theme.py	2017-01-08 22:05:36 +0000
@@ -23,7 +23,6 @@
 Provide the theme XML and handling functions for OpenLP v2 themes.
 """
 import os
-import re
 import logging
 import json
 
@@ -44,6 +43,7 @@
     Gradient = 1
     Image = 2
     Transparent = 3
+    Video = 4
 
     @staticmethod
     def to_string(background_type):
@@ -58,6 +58,8 @@
             return 'image'
         elif background_type == BackgroundType.Transparent:
             return 'transparent'
+        elif background_type == BackgroundType.Video:
+            return 'video'
 
     @staticmethod
     def from_string(type_string):
@@ -72,6 +74,8 @@
             return BackgroundType.Image
         elif type_string == 'transparent':
             return BackgroundType.Transparent
+        elif type_string == 'video':
+            return BackgroundType.Video
 
 
 class BackgroundGradientType(object):
@@ -160,6 +164,7 @@
         jsn = get_text_file_string(json_file)
         jsn = json.loads(jsn)
         self.expand_json(jsn)
+        self.background_filename = None
 
     def expand_json(self, var, prev=None):
         """
@@ -184,7 +189,7 @@
 
         :param path: The path name to be added.
         """
-        if self.background_type == 'image':
+        if self.background_type == 'image' or self.background_type == 'video':
             if self.background_filename and path:
                 self.theme_name = self.theme_name.strip()
                 self.background_filename = self.background_filename.strip()
@@ -255,6 +260,21 @@
         # Create endColor element
         self.child_element(background, 'borderColor', str(border_color))
 
+    def add_background_video(self, filename, border_color):
+        """
+        Add a video background.
+
+        :param filename: The file name of the video.
+        :param border_color:
+        """
+        background = self.theme_xml.createElement('background')
+        background.setAttribute('type', 'video')
+        self.theme.appendChild(background)
+        # Create Filename element
+        self.child_element(background, 'filename', filename)
+        # Create endColor element
+        self.child_element(background, 'borderColor', str(border_color))
+
     def add_font(self, name, color, size, override, fonttype='main', bold='False', italics='False',
                  line_adjustment=0, xpos=0, ypos=0, width=0, height=0, outline='False', outline_color='#ffffff',
                  outline_pixel=2, shadow='False', shadow_color='#ffffff', shadow_pixel=5):
@@ -407,7 +427,7 @@
         try:
             theme_xml = objectify.fromstring(xml)
         except etree.XMLSyntaxError:
-            log.exception('Invalid xml %s', xml)
+            log.exception('Invalid xml {text}'.format(text=xml))
             return
         xml_iter = theme_xml.getiterator()
         for element in xml_iter:
@@ -454,15 +474,16 @@
             if element.startswith('shadow') or element.startswith('outline'):
                 master = 'font_main'
         # fix bold font
+        ret_value = None
         if element == 'weight':
             element = 'bold'
             if value == 'Normal':
-                value = False
+                ret_value = False
             else:
-                value = True
+                ret_value = True
         if element == 'proportion':
             element = 'size'
-        return False, master, element, value
+        return False, master, element, ret_value if ret_value is not None else value
 
     def _create_attr(self, master, element, value):
         """
@@ -493,7 +514,8 @@
         theme_strings = []
         for key in dir(self):
             if key[0:1] != '_':
-                theme_strings.append('%30s: %s' % (key, getattr(self, key)))
+                # TODO: Due to bound methods returned, I don't know how to write a proper test
+                theme_strings.append('{key:>30}: {value}'.format(key=key, value=getattr(self, key)))
         return '\n'.join(theme_strings)
 
     def _build_xml_from_attrs(self):
@@ -512,6 +534,9 @@
         elif self.background_type == BackgroundType.to_string(BackgroundType.Image):
             filename = os.path.split(self.background_filename)[1]
             self.add_background_image(filename, self.background_border_color)
+        elif self.background_type == BackgroundType.to_string(BackgroundType.Video):
+            filename = os.path.split(self.background_filename)[1]
+            self.add_background_video(filename, self.background_border_color)
         elif self.background_type == BackgroundType.to_string(BackgroundType.Transparent):
             self.add_background_transparent()
         self.add_font(
 
=== renamed file 'openlp/core/lib/toolbar.py' => 'openlp/core/lib/toolbar.py.THIS'
=== renamed file 'openlp/core/lib/treewidgetwithdnd.py' => 'openlp/core/lib/treewidgetwithdnd.py.THIS'
=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py	2016-12-31 11:05:48 +0000
+++ openlp/core/lib/ui.py	2017-01-08 22:05:36 +0000
@@ -27,8 +27,8 @@
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common import Registry, UiStrings, translate, is_macosx
+from openlp.core.common.actions import ActionList
 from openlp.core.lib import build_icon
-from openlp.core.utils.actions import ActionList
 
 
 log = logging.getLogger(__name__)
@@ -165,7 +165,7 @@
             kwargs.setdefault('icon', ':/services/service_down.png')
             kwargs.setdefault('tooltip', translate('OpenLP.Ui', 'Move selection down one position.'))
         else:
-            log.warning('The role "%s" is not defined in create_push_button().', role)
+            log.warning('The role "{role}" is not defined in create_push_button().'.format(role=role))
     if kwargs.pop('btn_class', '') == 'toolbutton':
         button = QtWidgets.QToolButton(parent)
     else:
@@ -183,7 +183,7 @@
         button.clicked.connect(kwargs.pop('click'))
     for key in list(kwargs.keys()):
         if key not in ['text', 'icon', 'tooltip', 'click']:
-            log.warning('Parameter %s was not consumed in create_button().', key)
+            log.warning('Parameter {key} was not consumed in create_button().'.format(key=key))
     return button
 
 
@@ -270,7 +270,7 @@
         action.triggered.connect(kwargs.pop('triggers'))
     for key in list(kwargs.keys()):
         if key not in ['text', 'icon', 'tooltip', 'statustip', 'checked', 'can_shortcuts', 'category', 'triggers']:
-            log.warning('Parameter %s was not consumed in create_action().' % key)
+            log.warning('Parameter {key} was not consumed in create_action().'.format(key=key))