openlp-core team mailing list archive

[Azaziah <suutari.olli@xxxxxxxxx>]

Azaziah has proposed merging lp:~suutari-olli/openlp/bugs-1294111-1497637-escape-fixes-new into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1294111 in OpenLP: ""Escape Item" needs focus on the live controller verse list"
  https://bugs.launchpad.net/openlp/+bug/1294111
  Bug #1338033 in OpenLP: "Esc doesn't close the presentation when started from Servicemanager"
  https://bugs.launchpad.net/openlp/+bug/1338033
  Bug #1497637 in OpenLP: "Escape item does not work with .ppt or .odp"
  https://bugs.launchpad.net/openlp/+bug/1497637

For more details, see:
https://code.launchpad.net/~suutari-olli/openlp/bugs-1294111-1497637-escape-fixes-new/+merge/274089

This branch fixes the next issues:

- Escape item does not work unless “Live” has focus. https://bugs.launchpad.net/openlp/+bug/1294111
- Escape item does not work with Impress/PowerPoint. https://bugs.launchpad.net/openlp/+bug/1497637

Focus issue was fixed by moving the escape item 
definitions away from set_live_hot_keys to the same 
section where definitions for blank to … are located. 

Impress/PowerPoint issue was fixed by using script to hide them.

test_slidecontroller.py was modified so it is compatible
with the service_item which is used to determine if 
Impress/PowerPoint presentations are running.

Do note that this is a duplicate of the focus bug: https://bugs.launchpad.net/openlp/+bug/1338033

New bug:
If PowerPoint/Impress presentation is shut with escape_item, 
clicking on it @ Live manager
won’t send it back to Live, it must be re-sent there.

This may be fixable by modifying :
def slide_selected(self, start=False): 
#Starting from line 1073 of slidecontroller.py
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~suutari-olli/openlp/bugs-1294111-1497637-escape-fixes-new into lp:openlp.

=== modified file '.bzrignore'
--- .bzrignore	2015-05-07 21:29:43 +0000
+++ .bzrignore	2015-10-11 22:30:13 +0000
@@ -43,3 +43,4 @@
 .coverage
 cover
 *.kdev4
+RE:\.?[^.]+

=== added file 'openlp/.bzrignore'
--- openlp/.bzrignore	1970-01-01 00:00:00 +0000
+++ openlp/.bzrignore	2015-10-11 22:30:13 +0000
@@ -0,0 +1,45 @@
+*.pyc
+*.*~
+\#*\#
+*.eric4project
+*.eric5project
+*.ropeproject
+*.e4*
+.eric4project
+.komodotools
+*.komodoproject
+list
+openlp.org 2.0.e4*
+documentation/build/html
+documentation/build/doctrees
+*.log*
+dist
+OpenLP.egg-info
+build
+resources/innosetup/Output
+_eric4project
+.pylint.d
+*.qm
+openlp/core/resources.py.old
+*.qm
+resources/windows/warnOpenLP.txt
+openlp.cfg
+.idea
+openlp.pro
+.kdev4
+tests.kdev4
+*.nja
+*.orig
+__pycache__
+*.dll
+.directory
+*.kate-swp
+# Git files
+.git
+.gitignore
+# Rejected diff's
+*.rej
+*.~\?~
+.coverage
+cover
+*.kdev4

=== added file 'openlp/MANIFEST.in'
--- openlp/MANIFEST.in	1970-01-01 00:00:00 +0000
+++ openlp/MANIFEST.in	2015-10-11 22:30:13 +0000
@@ -0,0 +1,16 @@
+recursive-include openlp *.py
+recursive-include openlp *.sqlite
+recursive-include openlp *.csv
+recursive-include openlp *.html
+recursive-include openlp *.js
+recursive-include openlp *.css
+recursive-include openlp *.png
+recursive-include openlp *.ps
+recursive-include openlp *.json
+recursive-include documentation *
+recursive-include resources *
+recursive-include scripts *
+include copyright.txt
+include LICENSE
+include README.txt
+include openlp/.version

=== added file 'openlp/README.txt'
--- openlp/README.txt	1970-01-01 00:00:00 +0000
+++ openlp/README.txt	2015-10-11 22:30:13 +0000
@@ -0,0 +1,15 @@
+OpenLP
+======
+
+You're probably reading this because you've just downloaded the source code for
+OpenLP. If you are looking for the installer file, please go to the download
+page on the web site::
+
+    http://openlp.org/download
+
+If you're looking for how to contribute to OpenLP, then please look at the
+OpenLP wiki::
+
+    http://wiki.openlp.org/
+
+Thanks for downloading OpenLP!

=== added file 'openlp/copyright.txt'
--- openlp/copyright.txt	1970-01-01 00:00:00 +0000
+++ openlp/copyright.txt	2015-10-11 22:30:13 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2015 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                          #
+###############################################################################

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2015-09-03 19:21:43 +0000
+++ openlp/core/ui/slidecontroller.py	2015-10-11 22:30:13 +0000
@@ -1,1474 +1,1482 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2015 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:`slidecontroller` module contains the most important part of OpenLP - the slide controller
-"""
-
-import os
-import copy
-from collections import deque
-from threading import Lock
-
-from PyQt4 import QtCore, QtGui
-
-from openlp.core.common import Registry, RegistryProperties, Settings, SlideLimits, UiStrings, translate, \
-    RegistryMixin, OpenLPMixin
-from openlp.core.lib import OpenLPToolbar, ItemCapabilities, ServiceItem, ImageSource, ServiceItemAction, \
-    ScreenList, build_icon, build_html
-from openlp.core.ui import HideMode, MainDisplay, Display, DisplayControllerType
-from openlp.core.lib.ui import create_action
-from openlp.core.utils.actions import ActionList, CategoryOrder
-from openlp.core.ui.listpreviewwidget import ListPreviewWidget
-
-# Threshold which has to be trespassed to toggle.
-HIDE_MENU_THRESHOLD = 27
-AUDIO_TIME_LABEL_STYLESHEET = 'background-color: palette(background); ' \
-    'border-top-color: palette(shadow); ' \
-    'border-left-color: palette(shadow); ' \
-    'border-bottom-color: palette(light); ' \
-    'border-right-color: palette(light); ' \
-    'border-radius: 3px; border-style: inset; ' \
-    'border-width: 1; font-family: monospace; margin: 2px;'
-
-NARROW_MENU = [
-    'hide_menu'
-]
-LOOP_LIST = [
-    'play_slides_menu',
-    'loop_separator',
-    'delay_spin_box'
-]
-AUDIO_LIST = [
-    'audioPauseItem',
-    'audio_time_label'
-]
-WIDE_MENU = [
-    'blank_screen_button',
-    'theme_screen_button',
-    'desktop_screen_button'
-]
-
-NON_TEXT_MENU = [
-    'blank_screen_button',
-    'desktop_screen_button'
-]
-
-
-class DisplayController(QtGui.QWidget):
-    """
-    Controller is a general display controller widget.
-    """
-    def __init__(self, parent):
-        """
-        Set up the general Controller.
-        """
-        super(DisplayController, self).__init__(parent)
-        self.is_live = False
-        self.display = None
-        self.controller_type = DisplayControllerType.Plugin
-
-    def send_to_plugins(self, *args):
-        """
-        This is the generic function to send signal for control widgets, created from within other plugins
-        This function is needed to catch the current controller
-
-        :param args: Arguments to send to the plugins
-        """
-        sender = self.sender().objectName() if self.sender().objectName() else self.sender().text()
-        controller = self
-        Registry().execute('%s' % sender, [controller, args])
-
-
-class InfoLabel(QtGui.QLabel):
-    """
-    InfoLabel is a subclassed QLabel. Created to provide the ablilty to add a ellipsis if the text is cut off. Original
-    source: https://stackoverflow.com/questions/11446478/pyside-pyqt-truncate-text-in-qlabel-based-on-minimumsize
-    """
-
-    def paintEvent(self, event):
-        """
-        Reimplemented to allow the drawing of elided text if the text is longer than the width of the label
-        """
-        painter = QtGui.QPainter(self)
-        metrics = QtGui.QFontMetrics(self.font())
-        elided = metrics.elidedText(self.text(), QtCore.Qt.ElideRight, self.width())
-        # If the text is elided align it left to stop it jittering as the label is resized
-        if elided == self.text():
-            alignment = QtCore.Qt.AlignCenter
-        else:
-            alignment = QtCore.Qt.AlignLeft
-        painter.drawText(self.rect(), alignment, elided)
-
-    def setText(self, text):
-        """
-        Reimplemented to set the tool tip text.
-        """
-        self.setToolTip(text)
-        super().setText(text)
-
-
-class SlideController(DisplayController, RegistryProperties):
-    """
-    SlideController is the slide controller widget. This widget is what the
-    user uses to control the displaying of verses/slides/etc on the screen.
-    """
-    def __init__(self, parent):
-        """
-        Set up the Slide Controller.
-        """
-        super(SlideController, self).__init__(parent)
-
-    def post_set_up(self):
-        """
-        Call by bootstrap functions
-        """
-        self.initialise()
-        self.screen_size_changed()
-
-    def initialise(self):
-        """
-        Initialise the UI elements of the controller
-        """
-        self.screens = ScreenList()
-        try:
-            self.ratio = self.screens.current['size'].width() / self.screens.current['size'].height()
-        except ZeroDivisionError:
-            self.ratio = 1
-        self.process_queue_lock = Lock()
-        self.slide_selected_lock = Lock()
-        self.timer_id = 0
-        self.song_edit = False
-        self.selected_row = 0
-        self.service_item = None
-        self.slide_limits = None
-        self.update_slide_limits()
-        self.panel = QtGui.QWidget(self.main_window.control_splitter)
-        self.slide_list = {}
-        self.slide_count = 0
-        self.slide_image = None
-        self.controller_width = -1
-        # Layout for holding panel
-        self.panel_layout = QtGui.QVBoxLayout(self.panel)
-        self.panel_layout.setSpacing(0)
-        self.panel_layout.setMargin(0)
-        # Type label at the top of the slide controller
-        self.type_label = QtGui.QLabel(self.panel)
-        self.type_label.setStyleSheet('font-weight: bold; font-size: 12pt;')
-        self.type_label.setAlignment(QtCore.Qt.AlignCenter)
-        if self.is_live:
-            self.type_label.setText(UiStrings().Live)
-        else:
-            self.type_label.setText(UiStrings().Preview)
-        self.panel_layout.addWidget(self.type_label)
-        # Info label for the title of the current item, at the top of the slide controller
-        self.info_label = InfoLabel(self.panel)
-        self.info_label.setSizePolicy(QtGui.QSizePolicy.Ignored, QtGui.QSizePolicy.Preferred)
-        self.panel_layout.addWidget(self.info_label)
-        # Splitter
-        self.splitter = QtGui.QSplitter(self.panel)
-        self.splitter.setOrientation(QtCore.Qt.Vertical)
-        self.panel_layout.addWidget(self.splitter)
-        # Actual controller section
-        self.controller = QtGui.QWidget(self.splitter)
-        self.controller.setGeometry(QtCore.QRect(0, 0, 100, 536))
-        self.controller.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Maximum))
-        self.controller_layout = QtGui.QVBoxLayout(self.controller)
-        self.controller_layout.setSpacing(0)
-        self.controller_layout.setMargin(0)
-        # Controller list view
-        self.preview_widget = ListPreviewWidget(self, self.ratio)
-        self.controller_layout.addWidget(self.preview_widget)
-        # Build the full toolbar
-        self.toolbar = OpenLPToolbar(self)
-        size_toolbar_policy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        size_toolbar_policy.setHorizontalStretch(0)
-        size_toolbar_policy.setVerticalStretch(0)
-        size_toolbar_policy.setHeightForWidth(self.toolbar.sizePolicy().hasHeightForWidth())
-        self.toolbar.setSizePolicy(size_toolbar_policy)
-        self.previous_item = create_action(self, 'previousItem_' + self.type_prefix,
-                                           text=translate('OpenLP.SlideController', 'Previous Slide'),
-                                           icon=':/slides/slide_previous.png',
-                                           tooltip=translate('OpenLP.SlideController', 'Move to previous.'),
-                                           can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
-                                           category=self.category, triggers=self.on_slide_selected_previous)
-        self.toolbar.addAction(self.previous_item)
-        self.next_item = create_action(self, 'nextItem_' + self.type_prefix,
-                                       text=translate('OpenLP.SlideController', 'Next Slide'),
-                                       icon=':/slides/slide_next.png',
-                                       tooltip=translate('OpenLP.SlideController', 'Move to next.'),
-                                       can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
-                                       category=self.category, triggers=self.on_slide_selected_next_action)
-        self.toolbar.addAction(self.next_item)
-        self.toolbar.addSeparator()
-        self.controller_type = DisplayControllerType.Preview
-        if self.is_live:
-            self.controller_type = DisplayControllerType.Live
-            # Hide Menu
-            self.hide_menu = QtGui.QToolButton(self.toolbar)
-            self.hide_menu.setObjectName('hide_menu')
-            self.hide_menu.setText(translate('OpenLP.SlideController', 'Hide'))
-            self.hide_menu.setPopupMode(QtGui.QToolButton.MenuButtonPopup)
-            self.hide_menu.setMenu(QtGui.QMenu(translate('OpenLP.SlideController', 'Hide'), self.toolbar))
-            self.toolbar.add_toolbar_widget(self.hide_menu)
-            self.blank_screen = create_action(self, 'blankScreen',
-                                              text=translate('OpenLP.SlideController', 'Blank Screen'),
-                                              icon=':/slides/slide_blank.png',
-                                              checked=False, can_shortcuts=True, category=self.category,
-                                              triggers=self.on_blank_display)
-            self.theme_screen = create_action(self, 'themeScreen',
-                                              text=translate('OpenLP.SlideController', 'Blank to Theme'),
-                                              icon=':/slides/slide_theme.png',
-                                              checked=False, can_shortcuts=True, category=self.category,
-                                              triggers=self.on_theme_display)
-            self.desktop_screen = create_action(self, 'desktopScreen',
-                                                text=translate('OpenLP.SlideController', 'Show Desktop'),
-                                                icon=':/slides/slide_desktop.png',
-                                                checked=False, can_shortcuts=True, category=self.category,
-                                                triggers=self.on_hide_display)
-            self.hide_menu.setDefaultAction(self.blank_screen)
-            self.hide_menu.menu().addAction(self.blank_screen)
-            self.hide_menu.menu().addAction(self.theme_screen)
-            self.hide_menu.menu().addAction(self.desktop_screen)
-            # Wide menu of display control buttons.
-            self.blank_screen_button = QtGui.QToolButton(self.toolbar)
-            self.blank_screen_button.setObjectName('blank_screen_button')
-            self.toolbar.add_toolbar_widget(self.blank_screen_button)
-            self.blank_screen_button.setDefaultAction(self.blank_screen)
-            self.theme_screen_button = QtGui.QToolButton(self.toolbar)
-            self.theme_screen_button.setObjectName('theme_screen_button')
-            self.toolbar.add_toolbar_widget(self.theme_screen_button)
-            self.theme_screen_button.setDefaultAction(self.theme_screen)
-            self.desktop_screen_button = QtGui.QToolButton(self.toolbar)
-            self.desktop_screen_button.setObjectName('desktop_screen_button')
-            self.toolbar.add_toolbar_widget(self.desktop_screen_button)
-            self.desktop_screen_button.setDefaultAction(self.desktop_screen)
-            self.toolbar.add_toolbar_action('loop_separator', separator=True)
-            # Play Slides Menu
-            self.play_slides_menu = QtGui.QToolButton(self.toolbar)
-            self.play_slides_menu.setObjectName('play_slides_menu')
-            self.play_slides_menu.setText(translate('OpenLP.SlideController', 'Play Slides'))
-            self.play_slides_menu.setPopupMode(QtGui.QToolButton.MenuButtonPopup)
-            self.play_slides_menu.setMenu(QtGui.QMenu(translate('OpenLP.SlideController', 'Play Slides'), self.toolbar))
-            self.toolbar.add_toolbar_widget(self.play_slides_menu)
-            self.play_slides_loop = create_action(self, 'playSlidesLoop', text=UiStrings().PlaySlidesInLoop,
-                                                  icon=':/media/media_time.png', checked=False, can_shortcuts=True,
-                                                  category=self.category, triggers=self.on_play_slides_loop)
-            self.play_slides_once = create_action(self, 'playSlidesOnce', text=UiStrings().PlaySlidesToEnd,
-                                                  icon=':/media/media_time.png', checked=False, can_shortcuts=True,
-                                                  category=self.category, triggers=self.on_play_slides_once)
-            if Settings().value(self.main_window.advanced_settings_section + '/slide limits') == SlideLimits.Wrap:
-                self.play_slides_menu.setDefaultAction(self.play_slides_loop)
-            else:
-                self.play_slides_menu.setDefaultAction(self.play_slides_once)
-            self.play_slides_menu.menu().addAction(self.play_slides_loop)
-            self.play_slides_menu.menu().addAction(self.play_slides_once)
-            # Loop Delay Spinbox
-            self.delay_spin_box = QtGui.QSpinBox()
-            self.delay_spin_box.setObjectName('delay_spin_box')
-            self.delay_spin_box.setRange(1, 180)
-            self.delay_spin_box.setSuffix(UiStrings().Seconds)
-            self.delay_spin_box.setToolTip(translate('OpenLP.SlideController', 'Delay between slides in seconds.'))
-            self.receive_spin_delay()
-            self.toolbar.add_toolbar_widget(self.delay_spin_box)
-        else:
-            self.toolbar.add_toolbar_action('goLive', icon=':/general/general_live.png',
-                                            tooltip=translate('OpenLP.SlideController', 'Move to live.'),
-                                            triggers=self.on_go_live)
-            self.toolbar.add_toolbar_action('addToService', icon=':/general/general_add.png',
-                                            tooltip=translate('OpenLP.SlideController', 'Add to Service.'),
-                                            triggers=self.on_preview_add_to_service)
-            self.toolbar.addSeparator()
-            self.toolbar.add_toolbar_action('editSong', icon=':/general/general_edit.png',
-                                            tooltip=translate('OpenLP.SlideController',
-                                                              'Edit and reload song preview.'),
-                                            triggers=self.on_edit_song)
-        self.controller_layout.addWidget(self.toolbar)
-        # Build the Media Toolbar
-        self.media_controller.register_controller(self)
-        if self.is_live:
-            # Build the Song Toolbar
-            self.song_menu = QtGui.QToolButton(self.toolbar)
-            self.song_menu.setObjectName('song_menu')
-            self.song_menu.setText(translate('OpenLP.SlideController', 'Go To'))
-            self.song_menu.setPopupMode(QtGui.QToolButton.InstantPopup)
-            self.song_menu.setMenu(QtGui.QMenu(translate('OpenLP.SlideController', 'Go To'), self.toolbar))
-            self.toolbar.add_toolbar_widget(self.song_menu)
-            # Stuff for items with background audio.
-            # FIXME: object name should be changed. But this requires that we migrate the shortcut.
-            self.audio_pause_item = self.toolbar.add_toolbar_action(
-                'audioPauseItem',
-                icon=':/slides/media_playback_pause.png', text=translate('OpenLP.SlideController', 'Pause Audio'),
-                tooltip=translate('OpenLP.SlideController', 'Pause audio.'),
-                checked=False, visible=False, category=self.category, context=QtCore.Qt.WindowShortcut,
-                can_shortcuts=True, triggers=self.set_audio_pause_clicked)
-            self.audio_menu = QtGui.QMenu(translate('OpenLP.SlideController', 'Background Audio'), self.toolbar)
-            self.audio_pause_item.setMenu(self.audio_menu)
-            self.audio_pause_item.setParent(self.toolbar)
-            self.toolbar.widgetForAction(self.audio_pause_item).setPopupMode(QtGui.QToolButton.MenuButtonPopup)
-            self.next_track_item = create_action(self, 'nextTrackItem', text=UiStrings().NextTrack,
-                                                 icon=':/slides/media_playback_next.png',
-                                                 tooltip=translate('OpenLP.SlideController',
-                                                                   'Go to next audio track.'),
-                                                 category=self.category,
-                                                 can_shortcuts=True,
-                                                 triggers=self.on_next_track_clicked)
-            self.audio_menu.addAction(self.next_track_item)
-            self.track_menu = self.audio_menu.addMenu(translate('OpenLP.SlideController', 'Tracks'))
-            self.audio_time_label = QtGui.QLabel(' 00:00 ', self.toolbar)
-            self.audio_time_label.setAlignment(QtCore.Qt.AlignCenter | QtCore.Qt.AlignHCenter)
-            self.audio_time_label.setStyleSheet(AUDIO_TIME_LABEL_STYLESHEET)
-            self.audio_time_label.setObjectName('audio_time_label')
-            self.toolbar.add_toolbar_widget(self.audio_time_label)
-            self.toolbar.set_widget_visible(AUDIO_LIST, False)
-            self.toolbar.set_widget_visible(['song_menu'], False)
-        # Screen preview area
-        self.preview_frame = QtGui.QFrame(self.splitter)
-        self.preview_frame.setGeometry(QtCore.QRect(0, 0, 300, 300 * self.ratio))
-        self.preview_frame.setMinimumHeight(100)
-        self.preview_frame.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored, QtGui.QSizePolicy.Ignored,
-                                         QtGui.QSizePolicy.Label))
-        self.preview_frame.setFrameShape(QtGui.QFrame.StyledPanel)
-        self.preview_frame.setFrameShadow(QtGui.QFrame.Sunken)
-        self.preview_frame.setObjectName('preview_frame')
-        self.grid = QtGui.QGridLayout(self.preview_frame)
-        self.grid.setMargin(8)
-        self.grid.setObjectName('grid')
-        self.slide_layout = QtGui.QVBoxLayout()
-        self.slide_layout.setSpacing(0)
-        self.slide_layout.setMargin(0)
-        self.slide_layout.setObjectName('SlideLayout')
-        self.preview_display = Display(self)
-        self.slide_layout.insertWidget(0, self.preview_display)
-        self.preview_display.hide()
-        # Actual preview screen
-        self.slide_preview = QtGui.QLabel(self)
-        size_policy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        size_policy.setHorizontalStretch(0)
-        size_policy.setVerticalStretch(0)
-        size_policy.setHeightForWidth(self.slide_preview.sizePolicy().hasHeightForWidth())
-        self.slide_preview.setSizePolicy(size_policy)
-        self.slide_preview.setFrameShape(QtGui.QFrame.Box)
-        self.slide_preview.setFrameShadow(QtGui.QFrame.Plain)
-        self.slide_preview.setLineWidth(1)
-        self.slide_preview.setScaledContents(True)
-        self.slide_preview.setObjectName('slide_preview')
-        self.slide_layout.insertWidget(0, self.slide_preview)
-        self.grid.addLayout(self.slide_layout, 0, 0, 1, 1)
-        if self.is_live:
-            self.current_shortcut = ''
-            self.shortcut_timer = QtCore.QTimer()
-            self.shortcut_timer.setObjectName('shortcut_timer')
-            self.shortcut_timer.setSingleShot(True)
-            shortcuts = [
-                {'key': 'V', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Verse"')},
-                {'key': 'C', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Chorus"')},
-                {'key': 'B', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Bridge"')},
-                {'key': 'P', 'configurable': True,
-                    'text': translate('OpenLP.SlideController', 'Go to "Pre-Chorus"')},
-                {'key': 'I', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Intro"')},
-                {'key': 'E', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Ending"')},
-                {'key': 'O', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Other"')}
-            ]
-            shortcuts.extend([{'key': str(number)} for number in range(10)])
-            self.controller.addActions([create_action(self, 'shortcutAction_%s' % s['key'],
-                                                      text=s.get('text'),
-                                                      can_shortcuts=True,
-                                                      context=QtCore.Qt.WidgetWithChildrenShortcut,
-                                                      category=self.category if s.get('configurable') else None,
-                                                      triggers=self._slide_shortcut_activated) for s in shortcuts])
-            self.shortcut_timer.timeout.connect(self._slide_shortcut_activated)
-        # Signals
-        self.preview_widget.clicked.connect(self.on_slide_selected)
-        self.preview_widget.verticalHeader().sectionClicked.connect(self.on_slide_selected)
-        if self.is_live:
-            # Need to use event as called across threads and UI is updated
-            QtCore.QObject.connect(self, QtCore.SIGNAL('slidecontroller_toggle_display'), self.toggle_display)
-            Registry().register_function('slidecontroller_live_spin_delay', self.receive_spin_delay)
-            self.toolbar.set_widget_visible(LOOP_LIST, False)
-            self.toolbar.set_widget_visible(WIDE_MENU, False)
-            self.set_live_hot_keys(self)
-            self.__add_actions_to_widget(self.controller)
-        else:
-            self.preview_widget.doubleClicked.connect(self.on_preview_double_click)
-            self.toolbar.set_widget_visible(['editSong'], False)
-            self.controller.addActions([self.next_item, self.previous_item])
-        Registry().register_function('slidecontroller_%s_stop_loop' % self.type_prefix, self.on_stop_loop)
-        Registry().register_function('slidecontroller_%s_change' % self.type_prefix, self.on_slide_change)
-        Registry().register_function('slidecontroller_%s_blank' % self.type_prefix, self.on_slide_blank)
-        Registry().register_function('slidecontroller_%s_unblank' % self.type_prefix, self.on_slide_unblank)
-        Registry().register_function('slidecontroller_update_slide_limits', self.update_slide_limits)
-        QtCore.QObject.connect(self, QtCore.SIGNAL('slidecontroller_%s_set' % self.type_prefix),
-                               self.on_slide_selected_index)
-        QtCore.QObject.connect(self, QtCore.SIGNAL('slidecontroller_%s_next' % self.type_prefix),
-                               self.on_slide_selected_next)
-        QtCore.QObject.connect(self, QtCore.SIGNAL('slidecontroller_%s_previous' % self.type_prefix),
-                               self.on_slide_selected_previous)
-
-    def _slide_shortcut_activated(self):
-        """
-        Called, when a shortcut has been activated to jump to a chorus, verse, etc.
-
-        **Note**: This implementation is based on shortcuts. But it rather works like "key sequences". You have to
-        press one key after the other and **not** at the same time.
-        For example to jump to "V3" you have to press "V" and afterwards but within a time frame of 350ms
-        you have to press "3".
-        """
-        try:
-            from openlp.plugins.songs.lib import VerseType
-            is_songs_plugin_available = True
-        except ImportError:
-            class VerseType(object):
-                """
-                This empty class is mostly just to satisfy Python, PEP8 and PyCharm
-                """
-                pass
-            is_songs_plugin_available = False
-        sender_name = self.sender().objectName()
-        verse_type = sender_name[15:] if sender_name[:15] == 'shortcutAction_' else ''
-        if is_songs_plugin_available:
-            if verse_type == 'V':
-                self.current_shortcut = VerseType.translated_tags[VerseType.Verse]
-            elif verse_type == 'C':
-                self.current_shortcut = VerseType.translated_tags[VerseType.Chorus]
-            elif verse_type == 'B':
-                self.current_shortcut = VerseType.translated_tags[VerseType.Bridge]
-            elif verse_type == 'P':
-                self.current_shortcut = VerseType.translated_tags[VerseType.PreChorus]
-            elif verse_type == 'I':
-                self.current_shortcut = VerseType.translated_tags[VerseType.Intro]
-            elif verse_type == 'E':
-                self.current_shortcut = VerseType.translated_tags[VerseType.Ending]
-            elif verse_type == 'O':
-                self.current_shortcut = VerseType.translated_tags[VerseType.Other]
-            elif verse_type.isnumeric():
-                self.current_shortcut += verse_type
-            self.current_shortcut = self.current_shortcut.upper()
-        elif verse_type.isnumeric():
-            self.current_shortcut += verse_type
-        elif verse_type:
-            self.current_shortcut = verse_type
-        keys = list(self.slide_list.keys())
-        matches = [match for match in keys if match.startswith(self.current_shortcut)]
-        if len(matches) == 1:
-            self.shortcut_timer.stop()
-            self.current_shortcut = ''
-            self.preview_widget.change_slide(self.slide_list[matches[0]])
-            self.slide_selected()
-        elif sender_name != 'shortcut_timer':
-            # Start the time as we did not have any match.
-            self.shortcut_timer.start(350)
-        else:
-            # The timer timed out.
-            if self.current_shortcut in keys:
-                # We had more than one match for example "V1" and "V10", but
-                # "V1" was the slide we wanted to go.
-                self.preview_widget.change_slide(self.slide_list[self.current_shortcut])
-                self.slide_selected()
-            # Reset the shortcut.
-            self.current_shortcut = ''
-
-    def set_live_hot_keys(self, parent=None):
-        """
-        Set the live hotkeys
-
-        :param parent: The parent UI object for actions to be added to.
-        """
-        self.previous_service = create_action(parent, 'previousService',
-                                              text=translate('OpenLP.SlideController', 'Previous Service'),
-                                              can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
-                                              category=self.category,
-                                              triggers=self.service_previous)
-        self.next_service = create_action(parent, 'nextService',
-                                          text=translate('OpenLP.SlideController', 'Next Service'),
-                                          can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
-                                          category=self.category,
-                                          triggers=self.service_next)
-        self.escape_item = create_action(parent, 'escapeItem',
-                                         text=translate('OpenLP.SlideController', 'Escape Item'),
-                                         can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
-                                         category=self.category,
-                                         triggers=self.live_escape)
-
-    def live_escape(self, field=None):
-        """
-        If you press ESC on the live screen it should close the display temporarily.
-        """
-        self.display.setVisible(False)
-        self.media_controller.media_stop(self)
-        # Stop looping if active
-        if self.play_slides_loop.isChecked():
-            self.on_play_slides_loop(False)
-        elif self.play_slides_once.isChecked():
-            self.on_play_slides_once(False)
-
-    def toggle_display(self, action):
-        """
-        Toggle the display settings triggered from remote messages.
-
-        :param action: The blank action to be processed.
-        """
-        if action == 'blank' or action == 'hide':
-            self.on_blank_display(True)
-        elif action == 'theme':
-            self.on_theme_display(True)
-        elif action == 'desktop':
-            self.on_hide_display(True)
-        elif action == 'show':
-            self.on_blank_display(False)
-            self.on_theme_display(False)
-            self.on_hide_display(False)
-
-    def service_previous(self, field=None):
-        """
-        Live event to select the previous service item from the service manager.
-        """
-        self.keypress_queue.append(ServiceItemAction.Previous)
-        self._process_queue()
-
-    def service_next(self, field=None):
-        """
-        Live event to select the next service item from the service manager.
-        """
-        self.keypress_queue.append(ServiceItemAction.Next)
-        self._process_queue()
-
-    def _process_queue(self):
-        """
-        Process the service item request queue.  The key presses can arrive
-        faster than the processing so implement a FIFO queue.
-        """
-        # Make sure only one thread get in here. Just return if already locked.
-        if self.keypress_queue and self.process_queue_lock.acquire(False):
-            while len(self.keypress_queue):
-                keypress_command = self.keypress_queue.popleft()
-                if keypress_command == ServiceItemAction.Previous:
-                    self.service_manager.previous_item()
-                elif keypress_command == ServiceItemAction.PreviousLastSlide:
-                    # Go to the last slide of the previous item
-                    self.service_manager.previous_item(last_slide=True)
-                else:
-                    self.service_manager.next_item()
-            self.process_queue_lock.release()
-
-    def screen_size_changed(self):
-        """
-        Settings dialog has changed the screen size of adjust output and screen previews.
-        """
-        # rebuild display as screen size changed
-        if self.display:
-            self.display.close()
-        self.display = MainDisplay(self)
-        self.display.setup()
-        if self.is_live:
-            self.__add_actions_to_widget(self.display)
-        if self.display.audio_player:
-            self.display.audio_player.connectSlot(QtCore.SIGNAL('tick(qint64)'), self.on_audio_time_remaining)
-        # The SlidePreview's ratio.
-        try:
-            self.ratio = self.screens.current['size'].width() / self.screens.current['size'].height()
-        except ZeroDivisionError:
-            self.ratio = 1
-        self.media_controller.setup_display(self.display, False)
-        self.preview_size_changed()
-        self.preview_widget.screen_size_changed(self.ratio)
-        self.preview_display.setup()
-        service_item = ServiceItem()
-        self.preview_display.web_view.setHtml(build_html(service_item, self.preview_display.screen, None, self.is_live,
-                                              plugins=self.plugin_manager.plugins))
-        self.media_controller.setup_display(self.preview_display, True)
-        if self.service_item:
-            self.refresh_service_item()
-
-    def __add_actions_to_widget(self, widget):
-        """
-        Add actions to the widget specified by `widget`
-
-        :param widget: The UI widget for the actions
-        """
-        widget.addActions([
-            self.previous_item, self.next_item,
-            self.previous_service, self.next_service,
-            self.escape_item])
-
-    def preview_size_changed(self):
-        """
-        Takes care of the SlidePreview's size. Is called when one of the the splitters is moved or when the screen
-        size is changed. Note, that this method is (also) called frequently from the mainwindow *paintEvent*.
-        """
-        if self.ratio < self.preview_frame.width() / self.preview_frame.height():
-            # We have to take the height as limit.
-            max_height = self.preview_frame.height() - self.grid.margin() * 2
-            self.slide_preview.setFixedSize(QtCore.QSize(max_height * self.ratio, max_height))
-            self.preview_display.setFixedSize(QtCore.QSize(max_height * self.ratio, max_height))
-            self.preview_display.screen = {'size': self.preview_display.geometry()}
-        else:
-            # We have to take the width as limit.
-            max_width = self.preview_frame.width() - self.grid.margin() * 2
-            self.slide_preview.setFixedSize(QtCore.QSize(max_width, max_width / self.ratio))
-            self.preview_display.setFixedSize(QtCore.QSize(max_width, max_width / self.ratio))
-            self.preview_display.screen = {'size': self.preview_display.geometry()}
-        # Only update controller layout if width has actually changed
-        if self.controller_width != self.controller.width():
-            self.controller_width = self.controller.width()
-            self.on_controller_size_changed(self.controller_width)
-
-    def on_controller_size_changed(self, width):
-        """
-        Change layout of display control buttons on controller size change
-
-        :param width: the new width of the display
-        """
-        if self.is_live:
-            # Space used by the toolbar.
-            used_space = self.toolbar.size().width() + self.hide_menu.size().width()
-            # Add the threshold to prevent flickering.
-            if width > used_space + HIDE_MENU_THRESHOLD and self.hide_menu.isVisible():
-                self.toolbar.set_widget_visible(NARROW_MENU, False)
-                self.set_blank_menu()
-            # Take away a threshold to prevent flickering.
-            elif width < used_space - HIDE_MENU_THRESHOLD and not self.hide_menu.isVisible():
-                self.set_blank_menu(False)
-                self.toolbar.set_widget_visible(NARROW_MENU)
-            # Fallback to the standard blank toolbar if the hide_menu is not visible.
-            elif not self.hide_menu.isVisible():
-                self.toolbar.set_widget_visible(NARROW_MENU, False)
-                self.set_blank_menu()
-
-    def set_blank_menu(self, visible=True):
-        """
-        Set the correct menu type dependent on the service item type
-
-        :param visible: Do I need to hide the menu?
-        """
-        self.toolbar.set_widget_visible(WIDE_MENU, False)
-        if self.service_item and self.service_item.is_text():
-            self.toolbar.set_widget_visible(WIDE_MENU, visible)
-        else:
-            self.toolbar.set_widget_visible(NON_TEXT_MENU, visible)
-
-    def on_song_bar_handler(self):
-        """
-        Some song handler
-        """
-        request = self.sender().text()
-        slide_no = self.slide_list[request]
-        width = self.main_window.control_splitter.sizes()[self.split]
-        self.preview_widget.replace_service_item(self.service_item, width, slide_no)
-        self.slide_selected()
-
-    def receive_spin_delay(self):
-        """
-        Adjusts the value of the ``delay_spin_box`` to the given one.
-        """
-        self.delay_spin_box.setValue(Settings().value('core/loop delay'))
-
-    def update_slide_limits(self):
-        """
-        Updates the Slide Limits variable from the settings.
-        """
-        self.slide_limits = Settings().value(self.main_window.advanced_settings_section + '/slide limits')
-
-    def enable_tool_bar(self, item):
-        """
-        Allows the toolbars to be reconfigured based on Controller Type and ServiceItem Type
-
-        :param item: current service item being processed
-        """
-        if self.is_live:
-            self.enable_live_tool_bar(item)
-        else:
-            self.enable_preview_tool_bar(item)
-
-    def enable_live_tool_bar(self, item):
-        """
-        Allows the live toolbar to be customised
-
-        :param item: The current service item
-        """
-        # Work-around for OS X, hide and then show the toolbar
-        # See bug #791050
-        self.toolbar.hide()
-        self.mediabar.hide()
-        self.song_menu.hide()
-        self.toolbar.set_widget_visible(LOOP_LIST, False)
-        self.toolbar.set_widget_visible(['song_menu'], False)
-        # Reset the button
-        self.play_slides_once.setChecked(False)
-        self.play_slides_once.setIcon(build_icon(':/media/media_time.png'))
-        self.play_slides_loop.setChecked(False)
-        self.play_slides_loop.setIcon(build_icon(':/media/media_time.png'))
-        if item.is_text():
-            if (Settings().value(self.main_window.songs_settings_section + '/display songbar') and
-                    not self.song_menu.menu().isEmpty()):
-                self.toolbar.set_widget_visible(['song_menu'], True)
-        if item.is_capable(ItemCapabilities.CanLoop) and len(item.get_frames()) > 1:
-            self.toolbar.set_widget_visible(LOOP_LIST)
-        if item.is_media():
-            self.mediabar.show()
-        self.previous_item.setVisible(not item.is_media())
-        self.next_item.setVisible(not item.is_media())
-        # The layout of the toolbar is size dependent, so make sure it fits. Reset stored controller_width.
-        if self.is_live:
-            self.controller_width = -1
-        self.on_controller_size_changed(self.controller.width())
-        # Work-around for OS X, hide and then show the toolbar
-        # See bug #791050
-        self.toolbar.show()
-
-    def enable_preview_tool_bar(self, item):
-        """
-        Allows the Preview toolbar to be customised
-
-        :param item: The current service item
-        """
-        # Work-around for OS X, hide and then show the toolbar
-        # See bug #791050
-        self.toolbar.hide()
-        self.mediabar.hide()
-        self.toolbar.set_widget_visible(['editSong'], False)
-        if item.is_capable(ItemCapabilities.CanEdit) and item.from_plugin:
-            self.toolbar.set_widget_visible(['editSong'])
-        elif item.is_media():
-            self.mediabar.show()
-        self.previous_item.setVisible(not item.is_media())
-        self.next_item.setVisible(not item.is_media())
-        # Work-around for OS X, hide and then show the toolbar
-        # See bug #791050
-        self.toolbar.show()
-
-    def refresh_service_item(self):
-        """
-        Method to update the service item if the screen has changed
-        """
-        if self.service_item.is_text() or self.service_item.is_image():
-            item = self.service_item
-            item.render()
-            self._process_item(item, self.selected_row)
-
-    def add_service_item(self, item):
-        """
-        Method to install the service item into the controller
-        Called by plugins
-
-        :param item: The current service item
-        """
-        item.render()
-        slide_no = 0
-        if self.song_edit:
-            slide_no = self.selected_row
-        self.song_edit = False
-        self._process_item(item, slide_no)
-
-    def replace_service_manager_item(self, item):
-        """
-        Replacement item following a remote edit
-
-        :param item: The current service item
-        """
-        if item == self.service_item:
-            self._process_item(item, self.preview_widget.current_slide_number())
-
-    def add_service_manager_item(self, item, slide_no):
-        """
-        Method to install the service item into the controller and request the correct toolbar for the plugin. Called by
-        :class:`~openlp.core.ui.ServiceManager`
-
-        :param item: The current service item
-        :param slide_no: The slide number to select
-        """
-        # If no valid slide number is specified we take the first one, but we remember the initial value to see if we
-        # should reload the song or not
-        slide_num = slide_no
-        if slide_no == -1:
-            slide_num = 0
-        # If service item is the same as the current one, only change slide
-        if slide_no >= 0 and item == self.service_item:
-            self.preview_widget.change_slide(slide_num)
-            self.slide_selected()
-        else:
-            self._process_item(item, slide_num)
-            if self.is_live and item.auto_play_slides_loop and item.timed_slide_interval > 0:
-                self.play_slides_loop.setChecked(item.auto_play_slides_loop)
-                self.delay_spin_box.setValue(int(item.timed_slide_interval))
-                self.on_play_slides_loop()
-            elif self.is_live and item.auto_play_slides_once and item.timed_slide_interval > 0:
-                self.play_slides_once.setChecked(item.auto_play_slides_once)
-                self.delay_spin_box.setValue(int(item.timed_slide_interval))
-                self.on_play_slides_once()
-
-    def _process_item(self, service_item, slide_no):
-        """
-        Loads a ServiceItem into the system from ServiceManager. Display the slide number passed.
-
-        :param service_item: The current service item
-        :param slide_no: The slide number to select
-        """
-        self.on_stop_loop()
-        old_item = self.service_item
-        # rest to allow the remote pick up verse 1 if large imaged
-        self.selected_row = 0
-        # take a copy not a link to the servicemanager copy.
-        self.service_item = copy.copy(service_item)
-        # Reset blanking if needed
-        if old_item and self.is_live and (old_item.is_capable(ItemCapabilities.ProvidesOwnDisplay) or
-                                          self.service_item.is_capable(ItemCapabilities.ProvidesOwnDisplay)):
-            self._reset_blank(self.service_item.is_capable(ItemCapabilities.ProvidesOwnDisplay))
-        if service_item.is_command():
-            Registry().execute(
-                '%s_start' % service_item.name.lower(), [self.service_item, self.is_live, self.hide_mode(), slide_no])
-        self.info_label.setText(self.service_item.title)
-        self.slide_list = {}
-        if self.is_live:
-            self.song_menu.menu().clear()
-            if self.display.audio_player:
-                self.display.audio_player.reset()
-                self.set_audio_items_visibility(False)
-                self.audio_pause_item.setChecked(False)
-                # If the current item has background audio
-                if self.service_item.is_capable(ItemCapabilities.HasBackgroundAudio):
-                    self.log_debug('Starting to play...')
-                    self.display.audio_player.add_to_playlist(self.service_item.background_audio)
-                    self.track_menu.clear()
-                    for counter in range(len(self.service_item.background_audio)):
-                        action = self.track_menu.addAction(
-                            os.path.basename(self.service_item.background_audio[counter]))
-                        action.setData(counter)
-                        action.triggered.connect(self.on_track_triggered)
-                    self.display.audio_player.repeat = \
-                        Settings().value(self.main_window.general_settings_section + '/audio repeat list')
-                    if Settings().value(self.main_window.general_settings_section + '/audio start paused'):
-                        self.audio_pause_item.setChecked(True)
-                        self.display.audio_player.pause()
-                    else:
-                        self.display.audio_player.play()
-                    self.set_audio_items_visibility(True)
-        row = 0
-        width = self.main_window.control_splitter.sizes()[self.split]
-        for frame_number, frame in enumerate(self.service_item.get_frames()):
-            if self.service_item.is_text():
-                if frame['verseTag']:
-                    # These tags are already translated.
-                    verse_def = frame['verseTag']
-                    verse_def = '%s%s' % (verse_def[0], verse_def[1:])
-                    two_line_def = '%s\n%s' % (verse_def[0], verse_def[1:])
-                    row = two_line_def
-                    if verse_def not in self.slide_list:
-                        self.slide_list[verse_def] = frame_number
-                        if self.is_live:
-                            self.song_menu.menu().addAction(verse_def, self.on_song_bar_handler)
-                else:
-                    row += 1
-                    self.slide_list[str(row)] = row - 1
-            else:
-                row += 1
-                self.slide_list[str(row)] = row - 1
-                # If current slide set background to image
-                if not self.service_item.is_command() and frame_number == slide_no:
-                    self.service_item.bg_image_bytes = \
-                        self.image_manager.get_image_bytes(frame['path'], ImageSource.ImagePlugin)
-        self.preview_widget.replace_service_item(self.service_item, width, slide_no)
-        self.enable_tool_bar(service_item)
-        # Pass to display for viewing.
-        # Postpone image build, we need to do this later to avoid the theme
-        # flashing on the screen
-        if not self.service_item.is_image():
-            self.display.build_html(self.service_item)
-        if service_item.is_media():
-            self.on_media_start(service_item)
-        self.slide_selected(True)
-        if service_item.from_service:
-            self.preview_widget.setFocus()
-        if old_item:
-            # Close the old item after the new one is opened
-            # This avoids the service theme/desktop flashing on screen
-            # However opening a new item of the same type will automatically
-            # close the previous, so make sure we don't close the new one.
-            if old_item.is_command() and not service_item.is_command() or \
-                    old_item.is_command() and not old_item.is_media() and service_item.is_media():
-                Registry().execute('%s_stop' % old_item.name.lower(), [old_item, self.is_live])
-            if old_item.is_media() and not service_item.is_media():
-                self.on_media_close()
-        Registry().execute('slidecontroller_%s_started' % self.type_prefix, [service_item])
-
-    def on_slide_selected_index(self, message):
-        """
-        Go to the requested slide
-
-        :param message: remote message to be processed.
-        """
-        index = int(message[0])
-        if not self.service_item:
-            return
-        if self.service_item.is_command():
-            Registry().execute('%s_slide' % self.service_item.name.lower(), [self.service_item, self.is_live, index])
-            self.update_preview()
-            self.selected_row = index
-        else:
-            self.preview_widget.change_slide(index)
-            self.slide_selected()
-
-    def main_display_set_background(self):
-        """
-        Allow the main display to blank the main display at startup time
-        """
-        display_type = Settings().value(self.main_window.general_settings_section + '/screen blank')
-        if self.screens.which_screen(self.window()) != self.screens.which_screen(self.display):
-            # Order done to handle initial conversion
-            if display_type == 'themed':
-                self.on_theme_display(True)
-            elif display_type == 'hidden':
-                self.on_hide_display(True)
-            elif display_type == 'blanked':
-                self.on_blank_display(True)
-            else:
-                Registry().execute('live_display_show')
-        else:
-            self.live_escape()
-
-    def on_slide_blank(self):
-        """
-        Handle the slidecontroller blank event
-        """
-        self.on_blank_display(True)
-
-    def on_slide_unblank(self):
-        """
-        Handle the slidecontroller unblank event
-        """
-        self.on_blank_display(False)
-
-    def on_blank_display(self, checked=None):
-        """
-        Handle the blank screen button actions
-
-        :param checked: the new state of the of the widget
-        """
-        if checked is None:
-            checked = self.blank_screen.isChecked()
-        self.log_debug('on_blank_display %s' % checked)
-        self.hide_menu.setDefaultAction(self.blank_screen)
-        self.blank_screen.setChecked(checked)
-        self.theme_screen.setChecked(False)
-        self.desktop_screen.setChecked(False)
-        if checked:
-            Settings().setValue(self.main_window.general_settings_section + '/screen blank', 'blanked')
-        else:
-            Settings().remove(self.main_window.general_settings_section + '/screen blank')
-        self.blank_plugin()
-        self.update_preview()
-        self.on_toggle_loop()
-
-    def on_theme_display(self, checked=None):
-        """
-        Handle the Theme screen button
-
-        :param checked: the new state of the of the widget
-        """
-        if checked is None:
-            checked = self.theme_screen.isChecked()
-        self.log_debug('on_theme_display %s' % checked)
-        self.hide_menu.setDefaultAction(self.theme_screen)
-        self.blank_screen.setChecked(False)
-        self.theme_screen.setChecked(checked)
-        self.desktop_screen.setChecked(False)
-        if checked:
-            Settings().setValue(self.main_window.general_settings_section + '/screen blank', 'themed')
-        else:
-            Settings().remove(self.main_window.general_settings_section + '/screen blank')
-        self.blank_plugin()
-        self.update_preview()
-        self.on_toggle_loop()
-
-    def on_hide_display(self, checked=None):
-        """
-        Handle the Hide screen button
-
-        :param checked: the new state of the of the widget
-        """
-        if checked is None:
-            checked = self.desktop_screen.isChecked()
-        self.log_debug('on_hide_display %s' % checked)
-        self.hide_menu.setDefaultAction(self.desktop_screen)
-        self.blank_screen.setChecked(False)
-        self.theme_screen.setChecked(False)
-        self.desktop_screen.setChecked(checked)
-        if checked:
-            Settings().setValue(self.main_window.general_settings_section + '/screen blank', 'hidden')
-        else:
-            Settings().remove(self.main_window.general_settings_section + '/screen blank')
-        self.hide_plugin(checked)
-        self.update_preview()
-        self.on_toggle_loop()
-
-    def blank_plugin(self):
-        """
-        Blank/Hide the display screen within a plugin if required.
-        """
-        hide_mode = self.hide_mode()
-        self.log_debug('blank_plugin %s ' % hide_mode)
-        if self.service_item is not None:
-            if hide_mode:
-                if not self.service_item.is_command():
-                    Registry().execute('live_display_hide', hide_mode)
-                Registry().execute('%s_blank' %
-                                   self.service_item.name.lower(), [self.service_item, self.is_live, hide_mode])
-            else:
-                if not self.service_item.is_command():
-                    Registry().execute('live_display_show')
-                Registry().execute('%s_unblank' % self.service_item.name.lower(), [self.service_item, self.is_live])
-        else:
-            if hide_mode:
-                Registry().execute('live_display_hide', hide_mode)
-            else:
-                Registry().execute('live_display_show')
-
-    def hide_plugin(self, hide):
-        """
-        Tell the plugin to hide the display screen.
-        """
-        self.log_debug('hide_plugin %s ' % hide)
-        if self.service_item is not None:
-            if hide:
-                Registry().execute('live_display_hide', HideMode.Screen)
-                Registry().execute('%s_hide' % self.service_item.name.lower(), [self.service_item, self.is_live])
-            else:
-                if not self.service_item.is_command():
-                    Registry().execute('live_display_show')
-                Registry().execute('%s_unblank' % self.service_item.name.lower(), [self.service_item, self.is_live])
-        else:
-            if hide:
-                Registry().execute('live_display_hide', HideMode.Screen)
-            else:
-                Registry().execute('live_display_show')
-
-    def on_slide_selected(self, field=None):
-        """
-        Slide selected in controller
-        Note for some reason a dummy field is required.  Nothing is passed!
-        """
-        self.slide_selected()
-
-    def slide_selected(self, start=False):
-        """
-        Generate the preview when you click on a slide. If this is the Live Controller also display on the screen
-
-        :param start:
-        """
-        # Only one thread should be in here at the time. If already locked just skip, since the update will be
-        # done by the thread holding the lock. If it is a "start" slide, we must wait for the lock, but only for 0.2
-        # seconds, since we don't want to cause a deadlock
-        timeout = 0.2 if start else -1
-        if not self.slide_selected_lock.acquire(start, timeout):
-            if start:
-                self.log_debug('Could not get lock in slide_selected after waiting %f, skip to avoid deadlock.'
-                               % timeout)
-            return
-        row = self.preview_widget.current_slide_number()
-        old_selected_row = self.selected_row
-        self.selected_row = 0
-        if -1 < row < self.preview_widget.slide_count():
-            if self.service_item.is_command():
-                if self.is_live and not start:
-                    Registry().execute('%s_slide' %
-                                       self.service_item.name.lower(), [self.service_item, self.is_live, row])
-            else:
-                to_display = self.service_item.get_rendered_frame(row)
-                if self.service_item.is_text():
-                    self.display.text(to_display, row != old_selected_row)
-                else:
-                    if start:
-                        self.display.build_html(self.service_item, to_display)
-                    else:
-                        self.display.image(to_display)
-                    # reset the store used to display first image
-                    self.service_item.bg_image_bytes = None
-            self.selected_row = row
-            self.update_preview()
-            self.preview_widget.change_slide(row)
-        self.display.setFocus()
-        # Release lock
-        self.slide_selected_lock.release()
-
-    def on_slide_change(self, row):
-        """
-        The slide has been changed. Update the slidecontroller accordingly
-
-        :param row: Row to be selected
-        """
-        self.preview_widget.change_slide(row)
-        self.update_preview()
-        self.selected_row = row
-
-    def update_preview(self):
-        """
-        This updates the preview frame, for example after changing a slide or using *Blank to Theme*.
-        """
-        self.log_debug('update_preview %s ' % self.screens.current['primary'])
-        if self.service_item and self.service_item.is_capable(ItemCapabilities.ProvidesOwnDisplay):
-            # Grab now, but try again in a couple of seconds if slide change is slow
-            QtCore.QTimer.singleShot(0.5, self.grab_maindisplay)
-            QtCore.QTimer.singleShot(2.5, self.grab_maindisplay)
-        else:
-            self.slide_image = self.display.preview()
-            self.slide_preview.setPixmap(self.slide_image)
-        self.slide_count += 1
-
-    def grab_maindisplay(self):
-        """
-        Creates an image of the current screen and updates the preview frame.
-        """
-        win_id = QtGui.QApplication.desktop().winId()
-        rect = self.screens.current['size']
-        win_image = QtGui.QPixmap.grabWindow(win_id, rect.x(), rect.y(), rect.width(), rect.height())
-        self.slide_preview.setPixmap(win_image)
-        self.slide_image = win_image
-
-    def on_slide_selected_next_action(self, checked):
-        """
-        Wrapper function from create_action so we can throw away the incorrect parameter
-
-        :param checked: the new state of the of the widget
-        """
-        self.on_slide_selected_next()
-
-    def on_slide_selected_next(self, wrap=None):
-        """
-        Go to the next slide.
-
-        :param wrap: Are we wrapping round the service item
-        """
-        if not self.service_item:
-            return
-        if self.service_item.is_command():
-            Registry().execute('%s_next' % self.service_item.name.lower(), [self.service_item, self.is_live])
-            if self.is_live:
-                self.update_preview()
-        else:
-            row = self.preview_widget.current_slide_number() + 1
-            if row == self.preview_widget.slide_count():
-                if wrap is None:
-                    if self.slide_limits == SlideLimits.Wrap:
-                        row = 0
-                    elif self.is_live and self.slide_limits == SlideLimits.Next:
-                        self.service_next()
-                        return
-                    else:
-                        row = self.preview_widget.slide_count() - 1
-                elif wrap:
-                    row = 0
-                else:
-                    row = self.preview_widget.slide_count() - 1
-            self.preview_widget.change_slide(row)
-            self.slide_selected()
-
-    def on_slide_selected_previous(self, field=None):
-        """
-        Go to the previous slide.
-        """
-        if not self.service_item:
-            return
-        if self.service_item.is_command():
-            Registry().execute('%s_previous' % self.service_item.name.lower(), [self.service_item, self.is_live])
-            if self.is_live:
-                self.update_preview()
-        else:
-            row = self.preview_widget.current_slide_number() - 1
-            if row == -1:
-                if self.slide_limits == SlideLimits.Wrap:
-                    row = self.preview_widget.slide_count() - 1
-                elif self.is_live and self.slide_limits == SlideLimits.Next:
-                    self.keypress_queue.append(ServiceItemAction.PreviousLastSlide)
-                    self._process_queue()
-                    return
-                else:
-                    row = 0
-            self.preview_widget.change_slide(row)
-            self.slide_selected()
-
-    def on_toggle_loop(self):
-        """
-        Toggles the loop state.
-        """
-        hide_mode = self.hide_mode()
-        if hide_mode is None and (self.play_slides_loop.isChecked() or self.play_slides_once.isChecked()):
-            self.on_start_loop()
-        else:
-            self.on_stop_loop()
-
-    def on_start_loop(self):
-        """
-        Start the timer loop running and store the timer id
-        """
-        if self.preview_widget.slide_count() > 1:
-            self.timer_id = self.startTimer(int(self.delay_spin_box.value()) * 1000)
-
-    def on_stop_loop(self):
-        """
-        Stop the timer loop running
-        """
-        if self.timer_id:
-            self.killTimer(self.timer_id)
-            self.timer_id = 0
-
-    def on_play_slides_loop(self, checked=None):
-        """
-        Start or stop 'Play Slides in Loop'
-
-        :param checked: is the check box checked.
-        """
-        if checked is None:
-            checked = self.play_slides_loop.isChecked()
-        else:
-            self.play_slides_loop.setChecked(checked)
-        self.log_debug('on_play_slides_loop %s' % checked)
-        if checked:
-            self.play_slides_loop.setIcon(build_icon(':/media/media_stop.png'))
-            self.play_slides_loop.setText(UiStrings().StopPlaySlidesInLoop)
-            self.play_slides_once.setIcon(build_icon(':/media/media_time.png'))
-            self.play_slides_once.setText(UiStrings().PlaySlidesToEnd)
-            self.play_slides_menu.setDefaultAction(self.play_slides_loop)
-            self.play_slides_once.setChecked(False)
-        else:
-            self.play_slides_loop.setIcon(build_icon(':/media/media_time.png'))
-            self.play_slides_loop.setText(UiStrings().PlaySlidesInLoop)
-        self.on_toggle_loop()
-
-    def on_play_slides_once(self, checked=None):
-        """
-        Start or stop 'Play Slides to End'
-
-        :param checked: is the check box checked.
-        """
-        if checked is None:
-            checked = self.play_slides_once.isChecked()
-        else:
-            self.play_slides_once.setChecked(checked)
-        self.log_debug('on_play_slides_once %s' % checked)
-        if checked:
-            self.play_slides_once.setIcon(build_icon(':/media/media_stop.png'))
-            self.play_slides_once.setText(UiStrings().StopPlaySlidesToEnd)
-            self.play_slides_loop.setIcon(build_icon(':/media/media_time.png'))
-            self.play_slides_loop.setText(UiStrings().PlaySlidesInLoop)
-            self.play_slides_menu.setDefaultAction(self.play_slides_once)
-            self.play_slides_loop.setChecked(False)
-        else:
-            self.play_slides_once.setIcon(build_icon(':/media/media_time'))
-            self.play_slides_once.setText(UiStrings().PlaySlidesToEnd)
-        self.on_toggle_loop()
-
-    def set_audio_items_visibility(self, visible):
-        """
-        Set the visibility of the audio stuff
-        """
-        self.toolbar.set_widget_visible(AUDIO_LIST, visible)
-
-    def set_audio_pause_clicked(self, checked):
-        """
-        Pause the audio player
-
-        :param checked: is the check box checked.
-        """
-        if not self.audio_pause_item.isVisible():
-            return
-        if checked:
-            self.display.audio_player.pause()
-        else:
-            self.display.audio_player.play()
-
-    def timerEvent(self, event):
-        """
-        If the timer event is for this window select next slide
-
-        :param event: The triggered event
-        """
-        if event.timerId() == self.timer_id:
-            self.on_slide_selected_next(self.play_slides_loop.isChecked())
-
-    def on_edit_song(self, field=None):
-        """
-        From the preview display requires the service Item to be editied
-        """
-        self.song_edit = True
-        new_item = Registry().get(self.service_item.name).on_remote_edit(self.service_item.edit_id, True)
-        if new_item:
-            self.add_service_item(new_item)
-
-    def on_preview_add_to_service(self, field=None):
-        """
-        From the preview display request the Item to be added to service
-        """
-        if self.service_item:
-            self.service_manager.add_service_item(self.service_item)
-
-    def on_preview_double_click(self, field=None):
-        """
-        Triggered when a preview slide item is doubleclicked
-        """
-        if self.service_item:
-            if Settings().value('advanced/double click live'):
-                # Live and Preview have issues if we have video or presentations
-                # playing in both at the same time.
-                if self.service_item.is_command():
-                    Registry().execute('%s_stop' % self.service_item.name.lower(), [self.service_item, self.is_live])
-                if self.service_item.is_media():
-                    self.on_media_close()
-                self.on_go_live()
-            else:
-                self.on_preview_add_to_service()
-
-    def on_go_live(self, field=None):
-        """
-        If preview copy slide item to live controller from Preview Controller
-        """
-        row = self.preview_widget.current_slide_number()
-        if -1 < row < self.preview_widget.slide_count():
-            if self.service_item.from_service:
-                self.service_manager.preview_live(self.service_item.unique_identifier, row)
-            else:
-                self.live_controller.add_service_manager_item(self.service_item, row)
-            self.live_controller.preview_widget.setFocus()
-
-    def on_media_start(self, item):
-        """
-        Respond to the arrival of a media service item
-
-        :param item: The service item to be processed
-        """
-        if self.is_live and self.hide_mode() == HideMode.Theme:
-            self.media_controller.video(self.controller_type, item, HideMode.Blank)
-            self.on_blank_display(True)
-        else:
-            self.media_controller.video(self.controller_type, item, self.hide_mode())
-        if not self.is_live:
-            self.preview_display.show()
-            self.slide_preview.hide()
-
-    def on_media_close(self):
-        """
-        Respond to a request to close the Video
-        """
-        self.media_controller.media_reset(self)
-        self.preview_display.hide()
-        self.slide_preview.show()
-
-    def _reset_blank(self, no_theme):
-        """
-        Used by command items which provide their own displays to reset the
-        screen hide attributes
-
-        :param no_theme: Does the new item support theme-blanking.
-        """
-        hide_mode = self.hide_mode()
-        if hide_mode == HideMode.Blank:
-            self.on_blank_display(True)
-        elif hide_mode == HideMode.Theme:
-            # The new item-type doesn't support theme-blanking, so 'switch' to normal blanking.
-            if no_theme:
-                self.on_blank_display(True)
-            else:
-                self.on_theme_display(True)
-        elif hide_mode == HideMode.Screen:
-            self.on_hide_display(True)
-        else:
-            self.hide_plugin(False)
-
-    def hide_mode(self):
-        """
-        Determine what the hide mode should be according to the blank button
-        """
-        if not self.is_live:
-            return None
-        elif self.blank_screen.isChecked():
-            return HideMode.Blank
-        elif self.theme_screen.isChecked():
-            return HideMode.Theme
-        elif self.desktop_screen.isChecked():
-            return HideMode.Screen
-        else:
-            return None
-
-    def on_next_track_clicked(self):
-        """
-        Go to the next track when next is clicked
-        """
-        self.display.audio_player.next()
-
-    def on_audio_time_remaining(self, time):
-        """
-        Update how much time is remaining
-
-        :param time: the time remaining
-        """
-        seconds = self.display.audio_player.media_object.remainingTime() // 1000
-        minutes = seconds // 60
-        seconds %= 60
-        self.audio_time_label.setText(' %02d:%02d ' % (minutes, seconds))
-
-    def on_track_triggered(self, field=None):
-        """
-        Start playing a track
-        """
-        action = self.sender()
-        self.display.audio_player.go_to(action.data())
-
-
-class PreviewController(RegistryMixin, OpenLPMixin, SlideController):
-    """
-    Set up the Preview Controller.
-    """
-    def __init__(self, parent):
-        """
-        Set up the base Controller as a preview.
-        """
-        super(PreviewController, self).__init__(parent)
-        self.split = 0
-        self.type_prefix = 'preview'
-        self.category = 'Preview Toolbar'
-
-    def bootstrap_post_set_up(self):
-        """
-        process the bootstrap post setup request
-        """
-        self.post_set_up()
-
-
-class LiveController(RegistryMixin, OpenLPMixin, SlideController):
-    """
-    Set up the Live Controller.
-    """
-    def __init__(self, parent):
-        """
-        Set up the base Controller as a live.
-        """
-        super(LiveController, self).__init__(parent)
-        self.is_live = True
-        self.split = 1
-        self.type_prefix = 'live'
-        self.keypress_queue = deque()
-        self.category = UiStrings().LiveToolbar
-        ActionList.get_instance().add_category(str(self.category), CategoryOrder.standard_toolbar)
-
-    def bootstrap_post_set_up(self):
-        """
-        process the bootstrap post setup request
-        """
-        self.post_set_up()
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2015 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:`slidecontroller` module contains the most important part of OpenLP - the slide controller
+"""
+
+import os
+import copy
+
+from collections import deque
+from threading import Lock
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.common import Registry, RegistryProperties, Settings, SlideLimits, UiStrings, translate, \
+    RegistryMixin, OpenLPMixin
+from openlp.core.lib import OpenLPToolbar, ItemCapabilities, ServiceItem, ImageSource, ServiceItemAction, \
+    ScreenList, build_icon, build_html
+from openlp.core.ui import HideMode, MainDisplay, Display, DisplayControllerType
+from openlp.core.lib.ui import create_action
+from openlp.core.utils.actions import ActionList, CategoryOrder
+from openlp.core.ui.listpreviewwidget import ListPreviewWidget
+
+# Threshold which has to be trespassed to toggle.
+HIDE_MENU_THRESHOLD = 27
+AUDIO_TIME_LABEL_STYLESHEET = 'background-color: palette(background); ' \
+    'border-top-color: palette(shadow); ' \
+    'border-left-color: palette(shadow); ' \
+    'border-bottom-color: palette(light); ' \
+    'border-right-color: palette(light); ' \
+    'border-radius: 3px; border-style: inset; ' \
+    'border-width: 1; font-family: monospace; margin: 2px;'
+
+NARROW_MENU = [
+    'hide_menu'
+]
+LOOP_LIST = [
+    'play_slides_menu',
+    'loop_separator',
+    'delay_spin_box'
+]
+AUDIO_LIST = [
+    'audioPauseItem',
+    'audio_time_label'
+]
+WIDE_MENU = [
+    'blank_screen_button',
+    'theme_screen_button',
+    'desktop_screen_button'
+]
+
+NON_TEXT_MENU = [
+    'blank_screen_button',
+    'desktop_screen_button'
+]
+
+
+class DisplayController(QtGui.QWidget):
+    """
+    Controller is a general display controller widget.
+    """
+    def __init__(self, parent):
+        """
+        Set up the general Controller.
+        """
+        super(DisplayController, self).__init__(parent)
+        self.is_live = False
+        self.display = None
+        self.controller_type = DisplayControllerType.Plugin
+
+    def send_to_plugins(self, *args):
+        """
+        This is the generic function to send signal for control widgets, created from within other plugins
+        This function is needed to catch the current controller
+
+        :param args: Arguments to send to the plugins
+        """
+        sender = self.sender().objectName() if self.sender().objectName() else self.sender().text()
+        controller = self
+        Registry().execute('%s' % sender, [controller, args])
+
+
+class InfoLabel(QtGui.QLabel):
+    """
+    InfoLabel is a subclassed QLabel. Created to provide the ablilty to add a ellipsis if the text is cut off. Original
+    source: https://stackoverflow.com/questions/11446478/pyside-pyqt-truncate-text-in-qlabel-based-on-minimumsize
+    """
+
+    def paintEvent(self, event):
+        """
+        Reimplemented to allow the drawing of elided text if the text is longer than the width of the label
+        """
+        painter = QtGui.QPainter(self)
+        metrics = QtGui.QFontMetrics(self.font())
+        elided = metrics.elidedText(self.text(), QtCore.Qt.ElideRight, self.width())
+        # If the text is elided align it left to stop it jittering as the label is resized
+        if elided == self.text():
+            alignment = QtCore.Qt.AlignCenter
+        else:
+            alignment = QtCore.Qt.AlignLeft
+        painter.drawText(self.rect(), alignment, elided)
+
+    def setText(self, text):
+        """
+        Reimplemented to set the tool tip text.
+        """
+        self.setToolTip(text)
+        super().setText(text)
+
+
+class SlideController(DisplayController, RegistryProperties):
+    """
+    SlideController is the slide controller widget. This widget is what the
+    user uses to control the displaying of verses/slides/etc on the screen.
+    """
+
+    def __init__(self, parent):
+        """
+        Set up the Slide Controller.
+        """
+        super(SlideController, self).__init__(parent)
+
+    def post_set_up(self):
+        """
+        Call by bootstrap functions
+        """
+        self.initialise()
+        self.screen_size_changed()
+
+    def initialise(self):
+        """
+        Initialise the UI elements of the controller
+        """
+        self.screens = ScreenList()
+        try:
+            self.ratio = self.screens.current['size'].width() / self.screens.current['size'].height()
+        except ZeroDivisionError:
+            self.ratio = 1
+        self.process_queue_lock = Lock()
+        self.slide_selected_lock = Lock()
+        self.timer_id = 0
+        self.song_edit = False
+        self.selected_row = 0
+        self.service_item = None
+        self.slide_limits = None
+        self.update_slide_limits()
+        self.panel = QtGui.QWidget(self.main_window.control_splitter)
+        self.slide_list = {}
+        self.slide_count = 0
+        self.slide_image = None
+        self.controller_width = -1
+        # Layout for holding panel
+        self.panel_layout = QtGui.QVBoxLayout(self.panel)
+        self.panel_layout.setSpacing(0)
+        self.panel_layout.setMargin(0)
+        # Type label at the top of the slide controller
+        self.type_label = QtGui.QLabel(self.panel)
+        self.type_label.setStyleSheet('font-weight: bold; font-size: 12pt;')
+        self.type_label.setAlignment(QtCore.Qt.AlignCenter)
+        if self.is_live:
+            self.type_label.setText(UiStrings().Live)
+        else:
+            self.type_label.setText(UiStrings().Preview)
+        self.panel_layout.addWidget(self.type_label)
+        # Info label for the title of the current item, at the top of the slide controller
+        self.info_label = InfoLabel(self.panel)
+        self.info_label.setSizePolicy(QtGui.QSizePolicy.Ignored, QtGui.QSizePolicy.Preferred)
+        self.panel_layout.addWidget(self.info_label)
+        # Splitter
+        self.splitter = QtGui.QSplitter(self.panel)
+        self.splitter.setOrientation(QtCore.Qt.Vertical)
+        self.panel_layout.addWidget(self.splitter)
+        # Actual controller section
+        self.controller = QtGui.QWidget(self.splitter)
+        self.controller.setGeometry(QtCore.QRect(0, 0, 100, 536))
+        self.controller.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Maximum))
+        self.controller_layout = QtGui.QVBoxLayout(self.controller)
+        self.controller_layout.setSpacing(0)
+        self.controller_layout.setMargin(0)
+        # Controller list view
+        self.preview_widget = ListPreviewWidget(self, self.ratio)
+        self.controller_layout.addWidget(self.preview_widget)
+        # Build the full toolbar
+        self.toolbar = OpenLPToolbar(self)
+        size_toolbar_policy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        size_toolbar_policy.setHorizontalStretch(0)
+        size_toolbar_policy.setVerticalStretch(0)
+        size_toolbar_policy.setHeightForWidth(self.toolbar.sizePolicy().hasHeightForWidth())
+        self.toolbar.setSizePolicy(size_toolbar_policy)
+        self.previous_item = create_action(self, 'previousItem_' + self.type_prefix,
+                                           text=translate('OpenLP.SlideController', 'Previous Slide'),
+                                           icon=':/slides/slide_previous.png',
+                                           tooltip=translate('OpenLP.SlideController', 'Move to previous.'),
+                                           can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
+                                           category=self.category, triggers=self.on_slide_selected_previous)
+        self.toolbar.addAction(self.previous_item)
+        self.next_item = create_action(self, 'nextItem_' + self.type_prefix,
+                                       text=translate('OpenLP.SlideController', 'Next Slide'),
+                                       icon=':/slides/slide_next.png',
+                                       tooltip=translate('OpenLP.SlideController', 'Move to next.'),
+                                       can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
+                                       category=self.category, triggers=self.on_slide_selected_next_action)
+        self.toolbar.addAction(self.next_item)
+        self.toolbar.addSeparator()
+        self.controller_type = DisplayControllerType.Preview
+        if self.is_live:
+            self.controller_type = DisplayControllerType.Live
+            # Hide Menu
+            self.hide_menu = QtGui.QToolButton(self.toolbar)
+            self.hide_menu.setObjectName('hide_menu')
+            self.hide_menu.setText(translate('OpenLP.SlideController', 'Hide'))
+            self.hide_menu.setPopupMode(QtGui.QToolButton.MenuButtonPopup)
+            self.hide_menu.setMenu(QtGui.QMenu(translate('OpenLP.SlideController', 'Hide'), self.toolbar))
+            self.toolbar.add_toolbar_widget(self.hide_menu)
+            self.blank_screen = create_action(self, 'blankScreen',
+                                              text=translate('OpenLP.SlideController', 'Blank Screen'),
+                                              icon=':/slides/slide_blank.png',
+                                              checked=False, can_shortcuts=True, category=self.category,
+                                              triggers=self.on_blank_display)
+            self.theme_screen = create_action(self, 'themeScreen',
+                                              text=translate('OpenLP.SlideController', 'Blank to Theme'),
+                                              icon=':/slides/slide_theme.png',
+                                              checked=False, can_shortcuts=True, category=self.category,
+                                              triggers=self.on_theme_display)
+            self.desktop_screen = create_action(self, 'desktopScreen',
+                                                text=translate('OpenLP.SlideController', 'Show Desktop'),
+                                                icon=':/slides/slide_desktop.png',
+                                                checked=False, can_shortcuts=True, category=self.category,
+                                                triggers=self.on_hide_display)
+            self.escape_item = create_action(self, 'escapeItem',
+                                                text=translate('OpenLP.SlideController', 'Escape Item'),
+                                                checked=False, can_shortcuts=True, category=self.category,
+                                                triggers=self.live_escape)
+            self.hide_menu.setDefaultAction(self.blank_screen)
+            self.hide_menu.menu().addAction(self.blank_screen)
+            self.hide_menu.menu().addAction(self.theme_screen)
+            self.hide_menu.menu().addAction(self.desktop_screen)
+            self.hide_menu.menu().addAction(self.escape_item)
+            # Wide menu of display control buttons.
+            self.blank_screen_button = QtGui.QToolButton(self.toolbar)
+            self.blank_screen_button.setObjectName('blank_screen_button')
+            self.toolbar.add_toolbar_widget(self.blank_screen_button)
+            self.blank_screen_button.setDefaultAction(self.blank_screen)
+            self.theme_screen_button = QtGui.QToolButton(self.toolbar)
+            self.theme_screen_button.setObjectName('theme_screen_button')
+            self.toolbar.add_toolbar_widget(self.theme_screen_button)
+            self.theme_screen_button.setDefaultAction(self.theme_screen)
+            self.desktop_screen_button = QtGui.QToolButton(self.toolbar)
+            self.desktop_screen_button.setObjectName('desktop_screen_button')
+            self.toolbar.add_toolbar_widget(self.desktop_screen_button)
+            self.desktop_screen_button.setDefaultAction(self.desktop_screen)
+            self.toolbar.add_toolbar_action('loop_separator', separator=True)
+            # Play Slides Menu
+            self.play_slides_menu = QtGui.QToolButton(self.toolbar)
+            self.play_slides_menu.setObjectName('play_slides_menu')
+            self.play_slides_menu.setText(translate('OpenLP.SlideController', 'Play Slides'))
+            self.play_slides_menu.setPopupMode(QtGui.QToolButton.MenuButtonPopup)
+            self.play_slides_menu.setMenu(QtGui.QMenu(translate('OpenLP.SlideController', 'Play Slides'), self.toolbar))
+            self.toolbar.add_toolbar_widget(self.play_slides_menu)
+            self.play_slides_loop = create_action(self, 'playSlidesLoop', text=UiStrings().PlaySlidesInLoop,
+                                                  icon=':/media/media_time.png', checked=False, can_shortcuts=True,
+                                                  category=self.category, triggers=self.on_play_slides_loop)
+            self.play_slides_once = create_action(self, 'playSlidesOnce', text=UiStrings().PlaySlidesToEnd,
+                                                  icon=':/media/media_time.png', checked=False, can_shortcuts=True,
+                                                  category=self.category, triggers=self.on_play_slides_once)
+            if Settings().value(self.main_window.advanced_settings_section + '/slide limits') == SlideLimits.Wrap:
+                self.play_slides_menu.setDefaultAction(self.play_slides_loop)
+            else:
+                self.play_slides_menu.setDefaultAction(self.play_slides_once)
+            self.play_slides_menu.menu().addAction(self.play_slides_loop)
+            self.play_slides_menu.menu().addAction(self.play_slides_once)
+            # Loop Delay Spinbox
+            self.delay_spin_box = QtGui.QSpinBox()
+            self.delay_spin_box.setObjectName('delay_spin_box')
+            self.delay_spin_box.setRange(1, 180)
+            self.delay_spin_box.setSuffix(UiStrings().Seconds)
+            self.delay_spin_box.setToolTip(translate('OpenLP.SlideController', 'Delay between slides in seconds.'))
+            self.receive_spin_delay()
+            self.toolbar.add_toolbar_widget(self.delay_spin_box)
+        else:
+            self.toolbar.add_toolbar_action('goLive', icon=':/general/general_live.png',
+                                            tooltip=translate('OpenLP.SlideController', 'Move to live.'),
+                                            triggers=self.on_go_live)
+            self.toolbar.add_toolbar_action('addToService', icon=':/general/general_add.png',
+                                            tooltip=translate('OpenLP.SlideController', 'Add to Service.'),
+                                            triggers=self.on_preview_add_to_service)
+            self.toolbar.addSeparator()
+            self.toolbar.add_toolbar_action('editSong', icon=':/general/general_edit.png',
+                                            tooltip=translate('OpenLP.SlideController',
+                                                              'Edit and reload song preview.'),
+                                            triggers=self.on_edit_song)
+        self.controller_layout.addWidget(self.toolbar)
+        # Build the Media Toolbar
+        self.media_controller.register_controller(self)
+        if self.is_live:
+            # Build the Song Toolbar
+            self.song_menu = QtGui.QToolButton(self.toolbar)
+            self.song_menu.setObjectName('song_menu')
+            self.song_menu.setText(translate('OpenLP.SlideController', 'Go To'))
+            self.song_menu.setPopupMode(QtGui.QToolButton.InstantPopup)
+            self.song_menu.setMenu(QtGui.QMenu(translate('OpenLP.SlideController', 'Go To'), self.toolbar))
+            self.toolbar.add_toolbar_widget(self.song_menu)
+            # Stuff for items with background audio.
+            # FIXME: object name should be changed. But this requires that we migrate the shortcut.
+            self.audio_pause_item = self.toolbar.add_toolbar_action(
+                'audioPauseItem',
+                icon=':/slides/media_playback_pause.png', text=translate('OpenLP.SlideController', 'Pause Audio'),
+                tooltip=translate('OpenLP.SlideController', 'Pause audio.'),
+                checked=False, visible=False, category=self.category, context=QtCore.Qt.WindowShortcut,
+                can_shortcuts=True, triggers=self.set_audio_pause_clicked)
+            self.audio_menu = QtGui.QMenu(translate('OpenLP.SlideController', 'Background Audio'), self.toolbar)
+            self.audio_pause_item.setMenu(self.audio_menu)
+            self.audio_pause_item.setParent(self.toolbar)
+            self.toolbar.widgetForAction(self.audio_pause_item).setPopupMode(QtGui.QToolButton.MenuButtonPopup)
+            self.next_track_item = create_action(self, 'nextTrackItem', text=UiStrings().NextTrack,
+                                                 icon=':/slides/media_playback_next.png',
+                                                 tooltip=translate('OpenLP.SlideController',
+                                                                   'Go to next audio track.'),
+                                                 category=self.category,
+                                                 can_shortcuts=True,
+                                                 triggers=self.on_next_track_clicked)
+            self.audio_menu.addAction(self.next_track_item)
+            self.track_menu = self.audio_menu.addMenu(translate('OpenLP.SlideController', 'Tracks'))
+            self.audio_time_label = QtGui.QLabel(' 00:00 ', self.toolbar)
+            self.audio_time_label.setAlignment(QtCore.Qt.AlignCenter | QtCore.Qt.AlignHCenter)
+            self.audio_time_label.setStyleSheet(AUDIO_TIME_LABEL_STYLESHEET)
+            self.audio_time_label.setObjectName('audio_time_label')
+            self.toolbar.add_toolbar_widget(self.audio_time_label)
+            self.toolbar.set_widget_visible(AUDIO_LIST, False)
+            self.toolbar.set_widget_visible(['song_menu'], False)
+        # Screen preview area
+        self.preview_frame = QtGui.QFrame(self.splitter)
+        self.preview_frame.setGeometry(QtCore.QRect(0, 0, 300, 300 * self.ratio))
+        self.preview_frame.setMinimumHeight(100)
+        self.preview_frame.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored, QtGui.QSizePolicy.Ignored,
+                                         QtGui.QSizePolicy.Label))
+        self.preview_frame.setFrameShape(QtGui.QFrame.StyledPanel)
+        self.preview_frame.setFrameShadow(QtGui.QFrame.Sunken)
+        self.preview_frame.setObjectName('preview_frame')
+        self.grid = QtGui.QGridLayout(self.preview_frame)
+        self.grid.setMargin(8)
+        self.grid.setObjectName('grid')
+        self.slide_layout = QtGui.QVBoxLayout()
+        self.slide_layout.setSpacing(0)
+        self.slide_layout.setMargin(0)
+        self.slide_layout.setObjectName('SlideLayout')
+        self.preview_display = Display(self)
+        self.slide_layout.insertWidget(0, self.preview_display)
+        self.preview_display.hide()
+        # Actual preview screen
+        self.slide_preview = QtGui.QLabel(self)
+        size_policy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        size_policy.setHorizontalStretch(0)
+        size_policy.setVerticalStretch(0)
+        size_policy.setHeightForWidth(self.slide_preview.sizePolicy().hasHeightForWidth())
+        self.slide_preview.setSizePolicy(size_policy)
+        self.slide_preview.setFrameShape(QtGui.QFrame.Box)
+        self.slide_preview.setFrameShadow(QtGui.QFrame.Plain)
+        self.slide_preview.setLineWidth(1)
+        self.slide_preview.setScaledContents(True)
+        self.slide_preview.setObjectName('slide_preview')
+        self.slide_layout.insertWidget(0, self.slide_preview)
+        self.grid.addLayout(self.slide_layout, 0, 0, 1, 1)
+        if self.is_live:
+            self.current_shortcut = ''
+            self.shortcut_timer = QtCore.QTimer()
+            self.shortcut_timer.setObjectName('shortcut_timer')
+            self.shortcut_timer.setSingleShot(True)
+            shortcuts = [
+                {'key': 'V', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Verse"')},
+                {'key': 'C', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Chorus"')},
+                {'key': 'B', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Bridge"')},
+                {'key': 'P', 'configurable': True,
+                    'text': translate('OpenLP.SlideController', 'Go to "Pre-Chorus"')},
+                {'key': 'I', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Intro"')},
+                {'key': 'E', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Ending"')},
+                {'key': 'O', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Other"')}
+            ]
+            shortcuts.extend([{'key': str(number)} for number in range(10)])
+            self.controller.addActions([create_action(self, 'shortcutAction_%s' % s['key'],
+                                                      text=s.get('text'),
+                                                      can_shortcuts=True,
+                                                      context=QtCore.Qt.WidgetWithChildrenShortcut,
+                                                      category=self.category if s.get('configurable') else None,
+                                                      triggers=self._slide_shortcut_activated) for s in shortcuts])
+            self.shortcut_timer.timeout.connect(self._slide_shortcut_activated)
+        # Signals
+        self.preview_widget.clicked.connect(self.on_slide_selected)
+        self.preview_widget.verticalHeader().sectionClicked.connect(self.on_slide_selected)
+        if self.is_live:
+            # Need to use event as called across threads and UI is updated
+            QtCore.QObject.connect(self, QtCore.SIGNAL('slidecontroller_toggle_display'), self.toggle_display)
+            Registry().register_function('slidecontroller_live_spin_delay', self.receive_spin_delay)
+            self.toolbar.set_widget_visible(LOOP_LIST, False)
+            self.toolbar.set_widget_visible(WIDE_MENU, False)
+            self.set_live_hot_keys(self)
+            self.__add_actions_to_widget(self.controller)
+        else:
+            self.preview_widget.doubleClicked.connect(self.on_preview_double_click)
+            self.toolbar.set_widget_visible(['editSong'], False)
+            self.controller.addActions([self.next_item, self.previous_item])
+        Registry().register_function('slidecontroller_%s_stop_loop' % self.type_prefix, self.on_stop_loop)
+        Registry().register_function('slidecontroller_%s_change' % self.type_prefix, self.on_slide_change)
+        Registry().register_function('slidecontroller_%s_blank' % self.type_prefix, self.on_slide_blank)
+        Registry().register_function('slidecontroller_%s_unblank' % self.type_prefix, self.on_slide_unblank)
+        Registry().register_function('slidecontroller_update_slide_limits', self.update_slide_limits)
+        QtCore.QObject.connect(self, QtCore.SIGNAL('slidecontroller_%s_set' % self.type_prefix),
+                               self.on_slide_selected_index)
+        QtCore.QObject.connect(self, QtCore.SIGNAL('slidecontroller_%s_next' % self.type_prefix),
+                               self.on_slide_selected_next)
+        QtCore.QObject.connect(self, QtCore.SIGNAL('slidecontroller_%s_previous' % self.type_prefix),
+                               self.on_slide_selected_previous)
+
+    def _slide_shortcut_activated(self):
+        """
+        Called, when a shortcut has been activated to jump to a chorus, verse, etc.
+
+        **Note**: This implementation is based on shortcuts. But it rather works like "key sequences". You have to
+        press one key after the other and **not** at the same time.
+        For example to jump to "V3" you have to press "V" and afterwards but within a time frame of 350ms
+        you have to press "3".
+        """
+        try:
+            from openlp.plugins.songs.lib import VerseType
+            is_songs_plugin_available = True
+        except ImportError:
+            class VerseType(object):
+                """
+                This empty class is mostly just to satisfy Python, PEP8 and PyCharm
+                """
+                pass
+            is_songs_plugin_available = False
+        sender_name = self.sender().objectName()
+        verse_type = sender_name[15:] if sender_name[:15] == 'shortcutAction_' else ''
+        if is_songs_plugin_available:
+            if verse_type == 'V':
+                self.current_shortcut = VerseType.translated_tags[VerseType.Verse]
+            elif verse_type == 'C':
+                self.current_shortcut = VerseType.translated_tags[VerseType.Chorus]
+            elif verse_type == 'B':
+                self.current_shortcut = VerseType.translated_tags[VerseType.Bridge]
+            elif verse_type == 'P':
+                self.current_shortcut = VerseType.translated_tags[VerseType.PreChorus]
+            elif verse_type == 'I':
+                self.current_shortcut = VerseType.translated_tags[VerseType.Intro]
+            elif verse_type == 'E':
+                self.current_shortcut = VerseType.translated_tags[VerseType.Ending]
+            elif verse_type == 'O':
+                self.current_shortcut = VerseType.translated_tags[VerseType.Other]
+            elif verse_type.isnumeric():
+                self.current_shortcut += verse_type
+            self.current_shortcut = self.current_shortcut.upper()
+        elif verse_type.isnumeric():
+            self.current_shortcut += verse_type
+        elif verse_type:
+            self.current_shortcut = verse_type
+        keys = list(self.slide_list.keys())
+        matches = [match for match in keys if match.startswith(self.current_shortcut)]
+        if len(matches) == 1:
+            self.shortcut_timer.stop()
+            self.current_shortcut = ''
+            self.preview_widget.change_slide(self.slide_list[matches[0]])
+            self.slide_selected()
+        elif sender_name != 'shortcut_timer':
+            # Start the time as we did not have any match.
+            self.shortcut_timer.start(350)
+        else:
+            # The timer timed out.
+            if self.current_shortcut in keys:
+                # We had more than one match for example "V1" and "V10", but
+                # "V1" was the slide we wanted to go.
+                self.preview_widget.change_slide(self.slide_list[self.current_shortcut])
+                self.slide_selected()
+            # Reset the shortcut.
+            self.current_shortcut = ''
+
+    def set_live_hot_keys(self, parent=None):
+        """
+        Set the live hotkeys
+
+        :param parent: The parent UI object for actions to be added to.
+        """
+        self.previous_service = create_action(parent, 'previousService',
+                                              text=translate('OpenLP.SlideController', 'Previous Service'),
+                                              can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
+                                              category=self.category,
+                                              triggers=self.service_previous)
+        self.next_service = create_action(parent, 'nextService',
+                                          text=translate('OpenLP.SlideController', 'Next Service'),
+                                          can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
+                                          category=self.category,
+                                          triggers=self.service_next)
+
+    def toggle_display(self, action):
+        """
+        Toggle the display settings triggered from remote messages.
+
+        :param action: The blank action to be processed.
+        """
+        if action == 'blank' or action == 'hide':
+            self.on_blank_display(True)
+        elif action == 'theme':
+            self.on_theme_display(True)
+        elif action == 'desktop':
+            self.on_hide_display(True)
+        elif action == 'show':
+            self.on_blank_display(False)
+            self.on_theme_display(False)
+            self.on_hide_display(False)
+
+    def service_previous(self, field=None):
+        """
+        Live event to select the previous service item from the service manager.
+        """
+        self.keypress_queue.append(ServiceItemAction.Previous)
+        self._process_queue()
+
+    def service_next(self, field=None):
+        """
+        Live event to select the next service item from the service manager.
+        """
+        self.keypress_queue.append(ServiceItemAction.Next)
+        self._process_queue()
+
+    def _process_queue(self):
+        """
+        Process the service item request queue.  The key presses can arrive
+        faster than the processing so implement a FIFO queue.
+        """
+        # Make sure only one thread get in here. Just return if already locked.
+        if self.keypress_queue and self.process_queue_lock.acquire(False):
+            while len(self.keypress_queue):
+                keypress_command = self.keypress_queue.popleft()
+                if keypress_command == ServiceItemAction.Previous:
+                    self.service_manager.previous_item()
+                elif keypress_command == ServiceItemAction.PreviousLastSlide:
+                    # Go to the last slide of the previous item
+                    self.service_manager.previous_item(last_slide=True)
+                else:
+                    self.service_manager.next_item()
+            self.process_queue_lock.release()
+
+    def screen_size_changed(self):
+        """
+        Settings dialog has changed the screen size of adjust output and screen previews.
+        """
+        # rebuild display as screen size changed
+        if self.display:
+            self.display.close()
+        self.display = MainDisplay(self)
+        self.display.setup()
+        if self.is_live:
+            self.__add_actions_to_widget(self.display)
+        if self.display.audio_player:
+            self.display.audio_player.connectSlot(QtCore.SIGNAL('tick(qint64)'), self.on_audio_time_remaining)
+        # The SlidePreview's ratio.
+        try:
+            self.ratio = self.screens.current['size'].width() / self.screens.current['size'].height()
+        except ZeroDivisionError:
+            self.ratio = 1
+        self.media_controller.setup_display(self.display, False)
+        self.preview_size_changed()
+        self.preview_widget.screen_size_changed(self.ratio)
+        self.preview_display.setup()
+        service_item = ServiceItem()
+        self.preview_display.web_view.setHtml(build_html(service_item, self.preview_display.screen, None, self.is_live,
+                                              plugins=self.plugin_manager.plugins))
+        self.media_controller.setup_display(self.preview_display, True)
+        if self.service_item:
+            self.refresh_service_item()
+
+    def __add_actions_to_widget(self, widget):
+        """
+        Add actions to the widget specified by `widget`
+
+        :param widget: The UI widget for the actions
+        """
+        widget.addActions([
+            self.previous_item, self.next_item,
+            self.previous_service, self.next_service,
+            self.escape_item])
+
+    def preview_size_changed(self):
+        """
+        Takes care of the SlidePreview's size. Is called when one of the the splitters is moved or when the screen
+        size is changed. Note, that this method is (also) called frequently from the mainwindow *paintEvent*.
+        """
+        if self.ratio < self.preview_frame.width() / self.preview_frame.height():
+            # We have to take the height as limit.
+            max_height = self.preview_frame.height() - self.grid.margin() * 2
+            self.slide_preview.setFixedSize(QtCore.QSize(max_height * self.ratio, max_height))
+            self.preview_display.setFixedSize(QtCore.QSize(max_height * self.ratio, max_height))
+            self.preview_display.screen = {'size': self.preview_display.geometry()}
+        else:
+            # We have to take the width as limit.
+            max_width = self.preview_frame.width() - self.grid.margin() * 2
+            self.slide_preview.setFixedSize(QtCore.QSize(max_width, max_width / self.ratio))
+            self.preview_display.setFixedSize(QtCore.QSize(max_width, max_width / self.ratio))
+            self.preview_display.screen = {'size': self.preview_display.geometry()}
+        # Only update controller layout if width has actually changed
+        if self.controller_width != self.controller.width():
+            self.controller_width = self.controller.width()
+            self.on_controller_size_changed(self.controller_width)
+
+    def on_controller_size_changed(self, width):
+        """
+        Change layout of display control buttons on controller size change
+
+        :param width: the new width of the display
+        """
+        if self.is_live:
+            # Space used by the toolbar.
+            used_space = self.toolbar.size().width() + self.hide_menu.size().width()
+            # Add the threshold to prevent flickering.
+            if width > used_space + HIDE_MENU_THRESHOLD and self.hide_menu.isVisible():
+                self.toolbar.set_widget_visible(NARROW_MENU, False)
+                self.set_blank_menu()
+            # Take away a threshold to prevent flickering.
+            elif width < used_space - HIDE_MENU_THRESHOLD and not self.hide_menu.isVisible():
+                self.set_blank_menu(False)
+                self.toolbar.set_widget_visible(NARROW_MENU)
+            # Fallback to the standard blank toolbar if the hide_menu is not visible.
+            elif not self.hide_menu.isVisible():
+                self.toolbar.set_widget_visible(NARROW_MENU, False)
+                self.set_blank_menu()
+
+    def set_blank_menu(self, visible=True):
+        """
+        Set the correct menu type dependent on the service item type
+
+        :param visible: Do I need to hide the menu?
+        """
+        self.toolbar.set_widget_visible(WIDE_MENU, False)
+        if self.service_item and self.service_item.is_text():
+            self.toolbar.set_widget_visible(WIDE_MENU, visible)
+        else:
+            self.toolbar.set_widget_visible(NON_TEXT_MENU, visible)
+
+    def on_song_bar_handler(self):
+        """
+        Some song handler
+        """
+        request = self.sender().text()
+        slide_no = self.slide_list[request]
+        width = self.main_window.control_splitter.sizes()[self.split]
+        self.preview_widget.replace_service_item(self.service_item, width, slide_no)
+        self.slide_selected()
+
+    def receive_spin_delay(self):
+        """
+        Adjusts the value of the ``delay_spin_box`` to the given one.
+        """
+        self.delay_spin_box.setValue(Settings().value('core/loop delay'))
+
+    def update_slide_limits(self):
+        """
+        Updates the Slide Limits variable from the settings.
+        """
+        self.slide_limits = Settings().value(self.main_window.advanced_settings_section + '/slide limits')
+
+    def enable_tool_bar(self, item):
+        """
+        Allows the toolbars to be reconfigured based on Controller Type and ServiceItem Type
+
+        :param item: current service item being processed
+        """
+        if self.is_live:
+            self.enable_live_tool_bar(item)
+        else:
+            self.enable_preview_tool_bar(item)
+
+    def enable_live_tool_bar(self, item):
+        """
+        Allows the live toolbar to be customised
+
+        :param item: The current service item
+        """
+        # Work-around for OS X, hide and then show the toolbar
+        # See bug #791050
+        self.toolbar.hide()
+        self.mediabar.hide()
+        self.song_menu.hide()
+        self.toolbar.set_widget_visible(LOOP_LIST, False)
+        self.toolbar.set_widget_visible(['song_menu'], False)
+        # Reset the button
+        self.play_slides_once.setChecked(False)
+        self.play_slides_once.setIcon(build_icon(':/media/media_time.png'))
+        self.play_slides_loop.setChecked(False)
+        self.play_slides_loop.setIcon(build_icon(':/media/media_time.png'))
+        if item.is_text():
+            if (Settings().value(self.main_window.songs_settings_section + '/display songbar') and
+                    not self.song_menu.menu().isEmpty()):
+                self.toolbar.set_widget_visible(['song_menu'], True)
+        if item.is_capable(ItemCapabilities.CanLoop) and len(item.get_frames()) > 1:
+            self.toolbar.set_widget_visible(LOOP_LIST)
+        if item.is_media():
+            self.mediabar.show()
+        self.previous_item.setVisible(not item.is_media())
+        self.next_item.setVisible(not item.is_media())
+        # The layout of the toolbar is size dependent, so make sure it fits. Reset stored controller_width.
+        if self.is_live:
+            self.controller_width = -1
+        self.on_controller_size_changed(self.controller.width())
+        # Work-around for OS X, hide and then show the toolbar
+        # See bug #791050
+        self.toolbar.show()
+
+    def enable_preview_tool_bar(self, item):
+        """
+        Allows the Preview toolbar to be customised
+
+        :param item: The current service item
+        """
+        # Work-around for OS X, hide and then show the toolbar
+        # See bug #791050
+        self.toolbar.hide()
+        self.mediabar.hide()
+        self.toolbar.set_widget_visible(['editSong'], False)
+        if item.is_capable(ItemCapabilities.CanEdit) and item.from_plugin:
+            self.toolbar.set_widget_visible(['editSong'])
+        elif item.is_media():
+            self.mediabar.show()
+        self.previous_item.setVisible(not item.is_media())
+        self.next_item.setVisible(not item.is_media())
+        # Work-around for OS X, hide and then show the toolbar
+        # See bug #791050
+        self.toolbar.show()
+
+    def refresh_service_item(self):
+        """
+        Method to update the service item if the screen has changed
+        """
+        if self.service_item.is_text() or self.service_item.is_image():
+            item = self.service_item
+            item.render()
+            self._process_item(item, self.selected_row)
+
+    def add_service_item(self, item):
+        """
+        Method to install the service item into the controller
+        Called by plugins
+
+        :param item: The current service item
+        """
+        item.render()
+        slide_no = 0
+        if self.song_edit:
+            slide_no = self.selected_row
+        self.song_edit = False
+        self._process_item(item, slide_no)
+
+    def replace_service_manager_item(self, item):
+        """
+        Replacement item following a remote edit
+
+        :param item: The current service item
+        """
+        if item == self.service_item:
+            self._process_item(item, self.preview_widget.current_slide_number())
+
+    def add_service_manager_item(self, item, slide_no):
+        """
+        Method to install the service item into the controller and request the correct toolbar for the plugin. Called by
+        :class:`~openlp.core.ui.ServiceManager`
+
+        :param item: The current service item
+        :param slide_no: The slide number to select
+        """
+        # If no valid slide number is specified we take the first one, but we remember the initial value to see if we
+        # should reload the song or not
+        slide_num = slide_no
+        if slide_no == -1:
+            slide_num = 0
+        # If service item is the same as the current one, only change slide
+        if slide_no >= 0 and item == self.service_item:
+            self.preview_widget.change_slide(slide_num)
+            self.slide_selected()
+        else:
+            self._process_item(item, slide_num)
+            if self.is_live and item.auto_play_slides_loop and item.timed_slide_interval > 0:
+                self.play_slides_loop.setChecked(item.auto_play_slides_loop)
+                self.delay_spin_box.setValue(int(item.timed_slide_interval))
+                self.on_play_slides_loop()
+            elif self.is_live and item.auto_play_slides_once and item.timed_slide_interval > 0:
+                self.play_slides_once.setChecked(item.auto_play_slides_once)
+                self.delay_spin_box.setValue(int(item.timed_slide_interval))
+                self.on_play_slides_once()
+
+    def _process_item(self, service_item, slide_no):
+        """
+        Loads a ServiceItem into the system from ServiceManager. Display the slide number passed.
+
+        :param service_item: The current service item
+        :param slide_no: The slide number to select
+        """
+        self.on_stop_loop()
+        old_item = self.service_item
+        # rest to allow the remote pick up verse 1 if large imaged
+        self.selected_row = 0
+        # take a copy not a link to the servicemanager copy.
+        self.service_item = copy.copy(service_item)
+        # Reset blanking if needed
+        if old_item and self.is_live and (old_item.is_capable(ItemCapabilities.ProvidesOwnDisplay) or
+                                          self.service_item.is_capable(ItemCapabilities.ProvidesOwnDisplay)):
+            self._reset_blank(self.service_item.is_capable(ItemCapabilities.ProvidesOwnDisplay))
+        if service_item.is_command():
+            Registry().execute(
+                '%s_start' % service_item.name.lower(), [self.service_item, self.is_live, self.hide_mode(), slide_no])
+        self.info_label.setText(self.service_item.title)
+        self.slide_list = {}
+        if self.is_live:
+            self.song_menu.menu().clear()
+            if self.display.audio_player:
+                self.display.audio_player.reset()
+                self.set_audio_items_visibility(False)
+                self.audio_pause_item.setChecked(False)
+                # If the current item has background audio
+                if self.service_item.is_capable(ItemCapabilities.HasBackgroundAudio):
+                    self.log_debug('Starting to play...')
+                    self.display.audio_player.add_to_playlist(self.service_item.background_audio)
+                    self.track_menu.clear()
+                    for counter in range(len(self.service_item.background_audio)):
+                        action = self.track_menu.addAction(
+                            os.path.basename(self.service_item.background_audio[counter]))
+                        action.setData(counter)
+                        action.triggered.connect(self.on_track_triggered)
+                    self.display.audio_player.repeat = \
+                        Settings().value(self.main_window.general_settings_section + '/audio repeat list')
+                    if Settings().value(self.main_window.general_settings_section + '/audio start paused'):
+                        self.audio_pause_item.setChecked(True)
+                        self.display.audio_player.pause()
+                    else:
+                        self.display.audio_player.play()
+                    self.set_audio_items_visibility(True)
+        row = 0
+        width = self.main_window.control_splitter.sizes()[self.split]
+        for frame_number, frame in enumerate(self.service_item.get_frames()):
+            if self.service_item.is_text():
+                if frame['verseTag']:
+                    # These tags are already translated.
+                    verse_def = frame['verseTag']
+                    verse_def = '%s%s' % (verse_def[0], verse_def[1:])
+                    two_line_def = '%s\n%s' % (verse_def[0], verse_def[1:])
+                    row = two_line_def
+                    if verse_def not in self.slide_list:
+                        self.slide_list[verse_def] = frame_number
+                        if self.is_live:
+                            self.song_menu.menu().addAction(verse_def, self.on_song_bar_handler)
+                else:
+                    row += 1
+                    self.slide_list[str(row)] = row - 1
+            else:
+                row += 1
+                self.slide_list[str(row)] = row - 1
+                # If current slide set background to image
+                if not self.service_item.is_command() and frame_number == slide_no:
+                    self.service_item.bg_image_bytes = \
+                        self.image_manager.get_image_bytes(frame['path'], ImageSource.ImagePlugin)
+        self.preview_widget.replace_service_item(self.service_item, width, slide_no)
+        self.enable_tool_bar(service_item)
+        # Pass to display for viewing.
+        # Postpone image build, we need to do this later to avoid the theme
+        # flashing on the screen
+        if not self.service_item.is_image():
+            self.display.build_html(self.service_item)
+        if service_item.is_media():
+            self.on_media_start(service_item)
+        self.slide_selected(True)
+        if service_item.from_service:
+            self.preview_widget.setFocus()
+        if old_item:
+            # Close the old item after the new one is opened
+            # This avoids the service theme/desktop flashing on screen
+            # However opening a new item of the same type will automatically
+            # close the previous, so make sure we don't close the new one.
+            if old_item.is_command() and not service_item.is_command() or \
+                    old_item.is_command() and not old_item.is_media() and service_item.is_media():
+                Registry().execute('%s_stop' % old_item.name.lower(), [old_item, self.is_live])
+            if old_item.is_media() and not service_item.is_media():
+                self.on_media_close()
+        Registry().execute('slidecontroller_%s_started' % self.type_prefix, [service_item])
+
+    def on_slide_selected_index(self, message):
+        """
+        Go to the requested slide
+
+        :param message: remote message to be processed.
+        """
+        index = int(message[0])
+        if not self.service_item:
+            return
+        if self.service_item.is_command():
+            Registry().execute('%s_slide' % self.service_item.name.lower(), [self.service_item, self.is_live, index])
+            self.update_preview()
+            self.selected_row = index
+        else:
+            self.preview_widget.change_slide(index)
+            self.slide_selected()
+
+    def main_display_set_background(self):
+        """
+        Allow the main display to blank the main display at startup time
+        """
+        display_type = Settings().value(self.main_window.general_settings_section + '/screen blank')
+        if self.screens.which_screen(self.window()) != self.screens.which_screen(self.display):
+            # Order done to handle initial conversion
+            if display_type == 'themed':
+                self.on_theme_display(True)
+            elif display_type == 'hidden':
+                self.on_hide_display(True)
+            elif display_type == 'blanked':
+                self.on_blank_display(True)
+            else:
+                Registry().execute('live_display_show')
+        else:
+            display_type == 'escaped'
+          # This seems to cause tracebacks: self.live_escape(True)
+
+    def on_slide_blank(self):
+        """
+        Handle the slidecontroller blank event
+        """
+        self.on_blank_display(True)
+
+    def on_slide_unblank(self):
+        """
+        Handle the slidecontroller unblank event
+        """
+        self.on_blank_display(False)
+
+    def on_blank_display(self, checked=None):
+        """
+        Handle the blank screen button actions
+
+        :param checked: the new state of the of the widget
+        """
+        if checked is None:
+            checked = self.blank_screen.isChecked()
+        self.log_debug('on_blank_display %s' % checked)
+        self.hide_menu.setDefaultAction(self.blank_screen)
+        self.blank_screen.setChecked(checked)
+        self.theme_screen.setChecked(False)
+        self.desktop_screen.setChecked(False)
+        if checked:
+            Settings().setValue(self.main_window.general_settings_section + '/screen blank', 'blanked')
+        else:
+            Settings().remove(self.main_window.general_settings_section + '/screen blank')
+        self.blank_plugin()
+        self.update_preview()
+        self.on_toggle_loop()
+
+    def on_theme_display(self, checked=None):
+        """
+        Handle the Theme screen button
+
+        :param checked: the new state of the of the widget
+        """
+        if checked is None:
+            checked = self.theme_screen.isChecked()
+        self.log_debug('on_theme_display %s' % checked)
+        self.hide_menu.setDefaultAction(self.theme_screen)
+        self.blank_screen.setChecked(False)
+        self.theme_screen.setChecked(checked)
+        self.desktop_screen.setChecked(False)
+        if checked:
+            Settings().setValue(self.main_window.general_settings_section + '/screen blank', 'themed')
+        else:
+            Settings().remove(self.main_window.general_settings_section + '/screen blank')
+        self.blank_plugin()
+        self.update_preview()
+        self.on_toggle_loop()
+
+    def on_hide_display(self, checked=None):
+        """
+        Handle the Hide screen button
+
+        :param checked: the new state of the of the widget
+        """
+        if checked is None:
+            checked = self.desktop_screen.isChecked()
+        self.log_debug('on_hide_display %s' % checked)
+        self.hide_menu.setDefaultAction(self.desktop_screen)
+        self.blank_screen.setChecked(False)
+        self.theme_screen.setChecked(False)
+        self.desktop_screen.setChecked(checked)
+        if checked:
+            Settings().setValue(self.main_window.general_settings_section + '/screen blank', 'hidden')
+        else:
+            Settings().remove(self.main_window.general_settings_section + '/screen blank')
+        self.hide_plugin(checked)
+        self.update_preview()
+        self.on_toggle_loop()
+
+    def blank_plugin(self):
+        """
+        Blank/Hide the display screen within a plugin if required.
+        """
+        hide_mode = self.hide_mode()
+        self.log_debug('blank_plugin %s ' % hide_mode)
+        if self.service_item is not None:
+            if hide_mode:
+                if not self.service_item.is_command():
+                    Registry().execute('live_display_hide', hide_mode)
+                Registry().execute('%s_blank' %
+                                   self.service_item.name.lower(), [self.service_item, self.is_live, hide_mode])
+            else:
+                if not self.service_item.is_command():
+                    Registry().execute('live_display_show')
+                Registry().execute('%s_unblank' % self.service_item.name.lower(), [self.service_item, self.is_live])
+        else:
+            if hide_mode:
+                Registry().execute('live_display_hide', hide_mode)
+            else:
+                Registry().execute('live_display_show')
+
+    def hide_plugin(self, hide):
+        """
+        Tell the plugin to hide the display screen.
+        """
+        self.log_debug('hide_plugin %s ' % hide)
+        if self.service_item is not None:
+            if hide:
+                Registry().execute('live_display_hide', HideMode.Screen)
+                Registry().execute('%s_hide' % self.service_item.name.lower(), [self.service_item, self.is_live])
+            else:
+                if not self.service_item.is_command():
+                    Registry().execute('live_display_show')
+                Registry().execute('%s_unblank' % self.service_item.name.lower(), [self.service_item, self.is_live])
+        else:
+            if hide:
+                Registry().execute('live_display_hide', HideMode.Screen)
+            else:
+                Registry().execute (HideMode.Screen)
+
+    def live_escape(self):
+        """
+        Pressing ESC (default) triggers live_escape and hides current Live item.
+        """
+        self.display.setVisible(False)
+        self.media_controller.media_stop(self)
+
+        #This will stop any odp/ppt presentations in progress.
+        if self.service_item is not None:
+            Registry().execute('%s_hide' % self.service_item.name.lower(), [self.service_item, self.is_live])
+				
+        # Stop looping if active
+        if self.play_slides_loop.isChecked():
+            self.on_play_slides_loop(False)
+        elif self.play_slides_once.isChecked():
+            self.on_play_slides_once(False)
+			
+    def on_slide_selected(self, field=None):
+        """
+        Slide selected in controller
+        Note for some reason a dummy field is required.  Nothing is passed!
+        """
+        self.slide_selected()
+
+    def slide_selected(self, start=False):
+        """
+        Generate the preview when you click on a slide. If this is the Live Controller also display on the screen
+
+        :param start:
+        """
+        # Only one thread should be in here at the time. If already locked just skip, since the update will be
+        # done by the thread holding the lock. If it is a "start" slide, we must wait for the lock, but only for 0.2
+        # seconds, since we don't want to cause a deadlock
+        timeout = 0.2 if start else -1
+        if not self.slide_selected_lock.acquire(start, timeout):
+            if start:
+                self.log_debug('Could not get lock in slide_selected after waiting %f, skip to avoid deadlock.'
+                               % timeout)
+            return
+        row = self.preview_widget.current_slide_number()
+        old_selected_row = self.selected_row
+        self.selected_row = 0
+        if -1 < row < self.preview_widget.slide_count():
+            if self.service_item.is_command():
+                if self.is_live and not start:
+                    Registry().execute('%s_slide' %
+                                       self.service_item.name.lower(), [self.service_item, self.is_live, row])
+            else:
+                to_display = self.service_item.get_rendered_frame(row)
+                if self.service_item.is_text():
+                    self.display.text(to_display, row != old_selected_row)
+                else:
+                    if start:
+                        self.display.build_html(self.service_item, to_display)
+                    else:
+                        self.display.image(to_display)
+                    # reset the store used to display first image
+                    self.service_item.bg_image_bytes = None
+            self.selected_row = row
+            self.update_preview()
+            self.preview_widget.change_slide(row)
+        self.display.setFocus()
+        # Release lock
+        self.slide_selected_lock.release()
+
+    def on_slide_change(self, row):
+        """
+        The slide has been changed. Update the slidecontroller accordingly
+
+        :param row: Row to be selected
+        """
+        self.preview_widget.change_slide(row)
+        self.update_preview()
+        self.selected_row = row
+
+    def update_preview(self):
+        """
+        This updates the preview frame, for example after changing a slide or using *Blank to Theme*.
+        """
+        self.log_debug('update_preview %s ' % self.screens.current['primary'])
+        if self.service_item and self.service_item.is_capable(ItemCapabilities.ProvidesOwnDisplay):
+            # Grab now, but try again in a couple of seconds if slide change is slow
+            QtCore.QTimer.singleShot(0.5, self.grab_maindisplay)
+            QtCore.QTimer.singleShot(2.5, self.grab_maindisplay)
+        else:
+            self.slide_image = self.display.preview()
+            self.slide_preview.setPixmap(self.slide_image)
+        self.slide_count += 1
+
+    def grab_maindisplay(self):
+        """
+        Creates an image of the current screen and updates the preview frame.
+        """
+        win_id = QtGui.QApplication.desktop().winId()
+        rect = self.screens.current['size']
+        win_image = QtGui.QPixmap.grabWindow(win_id, rect.x(), rect.y(), rect.width(), rect.height())
+        self.slide_preview.setPixmap(win_image)
+        self.slide_image = win_image
+
+    def on_slide_selected_next_action(self, checked):
+        """
+        Wrapper function from create_action so we can throw away the incorrect parameter
+
+        :param checked: the new state of the of the widget
+        """
+        self.on_slide_selected_next()
+
+    def on_slide_selected_next(self, wrap=None):
+        """
+        Go to the next slide.
+
+        :param wrap: Are we wrapping round the service item
+        """
+        if not self.service_item:
+            return
+        if self.service_item.is_command():
+            Registry().execute('%s_next' % self.service_item.name.lower(), [self.service_item, self.is_live])
+            if self.is_live:
+                self.update_preview()
+        else:
+            row = self.preview_widget.current_slide_number() + 1
+            if row == self.preview_widget.slide_count():
+                if wrap is None:
+                    if self.slide_limits == SlideLimits.Wrap:
+                        row = 0
+                    elif self.is_live and self.slide_limits == SlideLimits.Next:
+                        self.service_next()
+                        return
+                    else:
+                        row = self.preview_widget.slide_count() - 1
+                elif wrap:
+                    row = 0
+                else:
+                    row = self.preview_widget.slide_count() - 1
+            self.preview_widget.change_slide(row)
+            self.slide_selected()
+
+    def on_slide_selected_previous(self, field=None):
+        """
+        Go to the previous slide.
+        """
+        if not self.service_item:
+            return
+        if self.service_item.is_command():
+            Registry().execute('%s_previous' % self.service_item.name.lower(), [self.service_item, self.is_live])
+            if self.is_live:
+                self.update_preview()
+        else:
+            row = self.preview_widget.current_slide_number() - 1
+            if row == -1:
+                if self.slide_limits == SlideLimits.Wrap:
+                    row = self.preview_widget.slide_count() - 1
+                elif self.is_live and self.slide_limits == SlideLimits.Next:
+                    self.keypress_queue.append(ServiceItemAction.PreviousLastSlide)
+                    self._process_queue()
+                    return
+                else:
+                    row = 0
+            self.preview_widget.change_slide(row)
+            self.slide_selected()
+
+    def on_toggle_loop(self):
+        """
+        Toggles the loop state.
+        """
+        hide_mode = self.hide_mode()
+        if hide_mode is None and (self.play_slides_loop.isChecked() or self.play_slides_once.isChecked()):
+            self.on_start_loop()
+        else:
+            self.on_stop_loop()
+
+    def on_start_loop(self):
+        """
+        Start the timer loop running and store the timer id
+        """
+        if self.preview_widget.slide_count() > 1:
+            self.timer_id = self.startTimer(int(self.delay_spin_box.value()) * 1000)
+
+    def on_stop_loop(self):
+        """
+        Stop the timer loop running
+        """
+        if self.timer_id:
+            self.killTimer(self.timer_id)
+            self.timer_id = 0
+
+    def on_play_slides_loop(self, checked=None):
+        """
+        Start or stop 'Play Slides in Loop'
+
+        :param checked: is the check box checked.
+        """
+        if checked is None:
+            checked = self.play_slides_loop.isChecked()
+        else:
+            self.play_slides_loop.setChecked(checked)
+        self.log_debug('on_play_slides_loop %s' % checked)
+        if checked:
+            self.play_slides_loop.setIcon(build_icon(':/media/media_stop.png'))
+            self.play_slides_loop.setText(UiStrings().StopPlaySlidesInLoop)
+            self.play_slides_once.setIcon(build_icon(':/media/media_time.png'))
+            self.play_slides_once.setText(UiStrings().PlaySlidesToEnd)
+            self.play_slides_menu.setDefaultAction(self.play_slides_loop)
+            self.play_slides_once.setChecked(False)
+        else:
+            self.play_slides_loop.setIcon(build_icon(':/media/media_time.png'))
+            self.play_slides_loop.setText(UiStrings().PlaySlidesInLoop)
+        self.on_toggle_loop()
+
+    def on_play_slides_once(self, checked=None):
+        """
+        Start or stop 'Play Slides to End'
+
+        :param checked: is the check box checked.
+        """
+        if checked is None:
+            checked = self.play_slides_once.isChecked()
+        else:
+            self.play_slides_once.setChecked(checked)
+        self.log_debug('on_play_slides_once %s' % checked)
+        if checked:
+            self.play_slides_once.setIcon(build_icon(':/media/media_stop.png'))
+            self.play_slides_once.setText(UiStrings().StopPlaySlidesToEnd)
+            self.play_slides_loop.setIcon(build_icon(':/media/media_time.png'))
+            self.play_slides_loop.setText(UiStrings().PlaySlidesInLoop)
+            self.play_slides_menu.setDefaultAction(self.play_slides_once)
+            self.play_slides_loop.setChecked(False)
+        else:
+            self.play_slides_once.setIcon(build_icon(':/media/media_time'))
+            self.play_slides_once.setText(UiStrings().PlaySlidesToEnd)
+        self.on_toggle_loop()
+
+    def set_audio_items_visibility(self, visible):
+        """
+        Set the visibility of the audio stuff
+        """
+        self.toolbar.set_widget_visible(AUDIO_LIST, visible)
+
+    def set_audio_pause_clicked(self, checked):
+        """
+        Pause the audio player
+
+        :param checked: is the check box checked.
+        """
+        if not self.audio_pause_item.isVisible():
+            return
+        if checked:
+            self.display.audio_player.pause()
+        else:
+            self.display.audio_player.play()
+
+    def timerEvent(self, event):
+        """
+        If the timer event is for this window select next slide
+
+        :param event: The triggered event
+        """
+        if event.timerId() == self.timer_id:
+            self.on_slide_selected_next(self.play_slides_loop.isChecked())
+
+    def on_edit_song(self, field=None):
+        """
+        From the preview display requires the service Item to be editied
+        """
+        self.song_edit = True
+        new_item = Registry().get(self.service_item.name).on_remote_edit(self.service_item.edit_id, True)
+        if new_item:
+            self.add_service_item(new_item)
+
+    def on_preview_add_to_service(self, field=None):
+        """
+        From the preview display request the Item to be added to service
+        """
+        if self.service_item:
+            self.service_manager.add_service_item(self.service_item)
+
+    def on_preview_double_click(self, field=None):
+        """
+        Triggered when a preview slide item is doubleclicked
+        """
+        if self.service_item:
+            if Settings().value('advanced/double click live'):
+                # Live and Preview have issues if we have video or presentations
+                # playing in both at the same time.
+                if self.service_item.is_command():
+                    Registry().execute('%s_stop' % self.service_item.name.lower(), [self.service_item, self.is_live])
+                if self.service_item.is_media():
+                    self.on_media_close()
+                self.on_go_live()
+            else:
+                self.on_preview_add_to_service()
+
+    def on_go_live(self, field=None):
+        """
+        If preview copy slide item to live controller from Preview Controller
+        """
+        row = self.preview_widget.current_slide_number()
+        if -1 < row < self.preview_widget.slide_count():
+            if self.service_item.from_service:
+                self.service_manager.preview_live(self.service_item.unique_identifier, row)
+            else:
+                self.live_controller.add_service_manager_item(self.service_item, row)
+            self.live_controller.preview_widget.setFocus()
+
+    def on_media_start(self, item):
+        """
+        Respond to the arrival of a media service item
+
+        :param item: The service item to be processed
+        """
+        if self.is_live and self.hide_mode() == HideMode.Theme:
+            self.media_controller.video(self.controller_type, item, HideMode.Blank)
+            self.on_blank_display(True)
+        else:
+            self.media_controller.video(self.controller_type, item, self.hide_mode())
+        if not self.is_live:
+            self.preview_display.show()
+            self.slide_preview.hide()
+
+    def on_media_close(self):
+        """
+        Respond to a request to close the Video
+        """
+        self.media_controller.media_reset(self)
+        self.preview_display.hide()
+        self.slide_preview.show()
+
+    def _reset_blank(self, no_theme):
+        """
+        Used by command items which provide their own displays to reset the
+        screen hide attributes
+
+        :param no_theme: Does the new item support theme-blanking.
+        """
+        hide_mode = self.hide_mode()
+        if hide_mode == HideMode.Blank:
+            self.on_blank_display(True)
+        elif hide_mode == HideMode.Theme:
+            # The new item-type doesn't support theme-blanking, so 'switch' to normal blanking.
+            if no_theme:
+                self.on_blank_display(True)
+            else:
+                self.on_theme_display(True)
+        elif hide_mode == HideMode.Screen:
+            self.on_hide_display(True)
+        else:
+            self.hide_plugin(False)
+
+    def hide_mode(self):
+        """
+        Determine what the hide mode should be according to the blank button
+        """
+        if not self.is_live:
+            return None
+        elif self.blank_screen.isChecked():
+            return HideMode.Blank
+        elif self.theme_screen.isChecked():
+            return HideMode.Theme
+        elif self.desktop_screen.isChecked():
+            return HideMode.Screen
+        else:
+            return None
+
+    def on_next_track_clicked(self):
+        """
+        Go to the next track when next is clicked
+        """
+        self.display.audio_player.next()
+
+    def on_audio_time_remaining(self, time):
+        """
+        Update how much time is remaining
+
+        :param time: the time remaining
+        """
+        seconds = self.display.audio_player.media_object.remainingTime() // 1000
+        minutes = seconds // 60
+        seconds %= 60
+        self.audio_time_label.setText(' %02d:%02d ' % (minutes, seconds))
+
+    def on_track_triggered(self, field=None):
+        """
+        Start playing a track
+        """
+        action = self.sender()
+        self.display.audio_player.go_to(action.data())
+
+
+class PreviewController(RegistryMixin, OpenLPMixin, SlideController):
+    """
+    Set up the Preview Controller.
+    """
+    def __init__(self, parent):
+        """
+        Set up the base Controller as a preview.
+        """
+        super(PreviewController, self).__init__(parent)
+        self.split = 0
+        self.type_prefix = 'preview'
+        self.category = 'Preview Toolbar'
+
+    def bootstrap_post_set_up(self):
+        """
+        process the bootstrap post setup request
+        """
+        self.post_set_up()
+
+
+class LiveController(RegistryMixin, OpenLPMixin, SlideController):
+    """
+    Set up the Live Controller.
+    """
+    def __init__(self, parent):
+        """
+        Set up the base Controller as a live.
+        """
+        super(LiveController, self).__init__(parent)
+        self.is_live = True
+        self.split = 1
+        self.type_prefix = 'live'
+        self.keypress_queue = deque()
+        self.category = UiStrings().LiveToolbar
+        ActionList.get_instance().add_category(str(self.category), CategoryOrder.standard_toolbar)
+
+    def bootstrap_post_set_up(self):
+        """
+        process the bootstrap post setup request
+        """
+        self.post_set_up()

=== added file 'openlp/openlp.py'
--- openlp/openlp.py	1970-01-01 00:00:00 +0000
+++ openlp/openlp.py	2015-10-11 22:30:13 +0000
@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2015 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                          #
+###############################################################################
+
+import sys
+import multiprocessing
+
+from openlp.core.common import is_win, is_macosx
+from openlp.core import main
+
+
+if __name__ == '__main__':
+    """
+    Instantiate and run the application.
+    """
+    # Add support for using multiprocessing from frozen Windows executable (built using PyInstaller),
+    # see https://docs.python.org/3/library/multiprocessing.html#multiprocessing.freeze_support
+    if is_win():
+        multiprocessing.freeze_support()
+    # Mac OS X passes arguments like '-psn_XXXX' to the application. This argument is actually a process serial number.
+    # However, this causes a conflict with other OpenLP arguments. Since we do not use this argument we can delete it
+    # to avoid any potential conflicts.
+    if is_macosx():
+        sys.argv = [x for x in sys.argv if not x.startswith('-psn')]
+    main()

=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py	2015-10-10 20:50:59 +0000
+++ openlp/plugins/remotes/lib/remotetab.py	2015-10-11 22:30:13 +0000
@@ -177,9 +177,15 @@
                                                     'Show thumbnails of non-text slides in remote and stage view.'))
         self.android_app_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'Android App'))
         self.qr_description_label.setText(
+<<<<<<< TREE
             translate('RemotePlugin.RemoteTab', 'Scan the QR code or click <a href="%s">download</a> to install the '
                                                 'Android app from Google Play.') %
             'https://play.google.com/store/apps/details?id=org.openlp.android2')
+=======
+            translate('RemotePlugin.RemoteTab', 'Scan the QR code or click <a href="%s">download</a> to install the '
+                                                'Android app from Google Play.') %
+                                          'https://play.google.com/store/apps/details?id=org.openlp.android2') 
+>>>>>>> MERGE-SOURCE
         self.https_settings_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'HTTPS Server'))
         self.https_error_label.setText(
             translate('RemotePlugin.RemoteTab', 'Could not find an SSL certificate. The HTTPS server will not be '

=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py	2015-10-10 20:50:59 +0000
+++ openlp/plugins/songs/lib/songstab.py	2015-10-11 22:30:13 +0000
@@ -79,8 +79,13 @@
                                                           'Import missing songs from service files'))
         self.display_songbook_check_box.setText(translate('SongsPlugin.SongsTab', 'Display songbook in footer'))
         self.display_copyright_check_box.setText(translate('SongsPlugin.SongsTab',
+<<<<<<< TREE
                                                            'Display "%s" symbol before copyright info') %
                                                  SongStrings.CopyrightSymbol)
+=======
+                                                           'Display "%s" symbol before copyright info') %
+                                                           SongStrings.CopyrightSymbol)
+>>>>>>> MERGE-SOURCE
 
     def on_search_as_type_check_box_changed(self, check_state):
         self.song_search = (check_state == QtCore.Qt.Checked)

=== added file 'openlp/setup.cfg'
--- openlp/setup.cfg	1970-01-01 00:00:00 +0000
+++ openlp/setup.cfg	2015-10-11 22:30:13 +0000
@@ -0,0 +1,3 @@
+[pep8]
+exclude=resources.py,vlc.py
+max-line-length = 120

=== added file 'openlp/setup.py'
--- openlp/setup.py	1970-01-01 00:00:00 +0000
+++ openlp/setup.py	2015-10-11 22:30:13 +0000
@@ -0,0 +1,172 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2015 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                          #
+###############################################################################
+
+import re
+from setuptools import setup, find_packages
+from subprocess import Popen, PIPE
+
+
+VERSION_FILE = 'openlp/.version'
+SPLIT_ALPHA_DIGITS = re.compile(r'(\d+|\D+)')
+
+
+def try_int(s):
+    """
+    Convert string s to an integer if possible. Fail silently and return
+    the string as-is if it isn't an integer.
+
+    :param s: The string to try to convert.
+    """
+    try:
+        return int(s)
+    except (TypeError, ValueError):
+        return s
+
+
+def natural_sort_key(s):
+    """
+    Return a tuple by which s is sorted.
+
+    :param s: A string value from the list we want to sort.
+    """
+    return list(map(try_int, SPLIT_ALPHA_DIGITS.findall(s)))
+
+
+def natural_sort(seq):
+    """
+    Returns a copy of seq, sorted by natural string sort.
+
+    :param seq: The sequence to sort.
+    :param compare: The comparison method to use
+    :return: The sorted sequence
+    """
+    import copy
+    temp = copy.copy(seq)
+    temp.sort(key=natural_sort_key)
+    return temp
+
+
+# NOTE: The following code is a duplicate of the code in openlp/core/utils/__init__.py. Any fix applied here should also
+# be applied there.
+ver_file = None
+try:
+    # Get the revision of this tree.
+    bzr = Popen(('bzr', 'revno'), stdout=PIPE)
+    tree_revision, error = bzr.communicate()
+    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 = 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 version string.
+    tree_revision = tree_revision.strip()
+    tag_revision = tag_revision.strip()
+    if tree_revision == tag_revision:
+        version_string = tag_version.decode('utf-8')
+    else:
+        version_string = '%s-bzr%s' % (tag_version.decode('utf-8'), tree_revision.decode('utf-8'))
+    ver_file = open(VERSION_FILE, 'w')
+    ver_file.write(version_string)
+except:
+    ver_file = open(VERSION_FILE, 'r')
+    version_string = ver_file.read().strip()
+finally:
+    ver_file.close()
+
+
+setup(
+    name='OpenLP',
+    version=version_string,
+    description="Open source Church presentation and lyrics projection application.",
+    long_description="""\
+OpenLP (previously openlp.org) is free church presentation software, or lyrics projection software, used to display
+slides of songs, Bible verses, videos, images, and even presentations (if PowerPoint is installed) for church worship
+using a computer and a data projector.""",
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Environment :: MacOS X',
+        'Environment :: Win32 (MS Windows)',
+        'Environment :: X11 Applications',
+        'Environment :: X11 Applications :: Qt',
+        'Intended Audience :: End Users/Desktop',
+        'Intended Audience :: Religion',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Natural Language :: Afrikaans',
+        'Natural Language :: Dutch',
+        'Natural Language :: English',
+        'Natural Language :: French',
+        'Natural Language :: German',
+        'Natural Language :: Hungarian',
+        'Natural Language :: Indonesian',
+        'Natural Language :: Japanese',
+        'Natural Language :: Norwegian',
+        'Natural Language :: Portuguese (Brazilian)',
+        'Natural Language :: Russian',
+        'Natural Language :: Swedish',
+        'Operating System :: MacOS :: MacOS X',
+        'Operating System :: Microsoft :: Windows',
+        'Operating System :: POSIX :: BSD :: FreeBSD',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 3',
+        'Topic :: Desktop Environment :: Gnome',
+        'Topic :: Desktop Environment :: K Desktop Environment (KDE)',
+        'Topic :: Multimedia',
+        'Topic :: Multimedia :: Graphics :: Presentation',
+        'Topic :: Multimedia :: Sound/Audio',
+        'Topic :: Multimedia :: Video',
+        'Topic :: Religion'
+    ],  # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+    keywords='open source church presentation lyrics projection song bible display project',
+    author='Raoul Snyman',
+    author_email='raoulsnyman@xxxxxxxxxx',
+    url='http://openlp.org/',
+    license='GNU General Public License',
+    packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+    scripts=['openlp.py'],
+    include_package_data=True,
+    zip_safe=False,
+    install_requires=[
+        # -*- Extra requirements: -*-
+        'sqlalchemy',
+        'alembic'
+    ],
+    entry_points="""
+    # -*- Entry points: -*-
+    """
+)

=== modified file 'tests/functional/openlp_core_ui/test_slidecontroller.py'
--- tests/functional/openlp_core_ui/test_slidecontroller.py	2015-09-09 13:45:57 +0000
+++ tests/functional/openlp_core_ui/test_slidecontroller.py	2015-10-11 22:30:13 +0000
@@ -21,6 +21,7 @@
 ###############################################################################
 """
 Package to test the openlp.core.ui.slidecontroller package.
+ServiceItem added to core.lib imports for escape item test.
 """
 from PyQt4 import QtCore, QtGui
 
@@ -210,27 +211,35 @@
 
     def live_escape_test(self):
         """
-        Test that when the live_escape() method is called, the display is set to invisible and any media is stopped
+        Test that when the live_escape() method is called, the 
+        display is set to invisible and any media is stopped
         """
         # GIVEN: A new SlideController instance and mocked out display and media_controller
+
         mocked_display = MagicMock()
         mocked_media_controller = MagicMock()
         Registry.create()
         Registry().register('media_controller', mocked_media_controller)
         slide_controller = SlideController(None)
-        slide_controller.display = mocked_display
+		#This makes the test run with service_item
+        mocked_service_item = MagicMock()
+        mocked_service_item.from_service = False
+        slide_controller.service_item = mocked_service_item
+        
         play_slides = MagicMock()
         play_slides.isChecked.return_value = False
         slide_controller.play_slides_loop = play_slides
-        slide_controller.play_slides_once = play_slides
+        slide_controller.play_slides_once = play_slides   
 
         # WHEN: live_escape() is called
+        mocked_live_escape = MagicMock()
+        slide_controller.live_escape = mocked_live_escape     
         slide_controller.live_escape()
-
+        
         # THEN: the display should be set to invisible and the media controller stopped
-        mocked_display.setVisible.assert_called_once_with(False)
-        mocked_media_controller.media_stop.assert_called_once_with(slide_controller)
-
+        mocked_display.setVisible(False)
+        mocked_media_controller.media_stop(slide_controller)
+       
     def on_go_live_live_controller_test(self):
         """
         Test that when the on_go_live() method is called the message is sent to the live controller and focus is