r1475

documentation/manual/source/bibles.rst

@@ -22,19 +22,34 @@ You will see the Bible Importer window, click :guilabel:`Next`.
 .. image:: pics/bibleimport01.png
 
 After clicking :guilabel:`Next` you can select from the various types of
-software that OpenLP will convert Bibles from.
+software that OpenLP will convert Bibles from. Click on the file folder icon to
+choose the file(s) of the Bible database you want to import. See the sections
+below for more information on the different formats that OpenLP will import.
+Click :guilabel:`Next` to continue.
 
 .. image:: pics/bibleimport02.png
 
-Click on the file folder icon to choose the file of the Bible database you
+After selecting your file(s), you'll be asked to fill in the details of the
-want to import. See the following sections for information on the different 
+Bible you are importing. Remember to check what information you need to display
-formats that OpenLP will import.
+for your Bible's translation, as some of them have strict rules around the
+copyright notice. Click :guilabel:`Next` to continue.
 
-Importing from OpenLP Version 1
+.. image:: pics/bibleimportdetails1.png
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Converting from OpenLP Version 1 is a simple process. First you will need to 
+After filling in the copyright details, OpenLP will start to import your Bible.
-locate your Version 1 Bibles.
+It may take some time to import your Bible so please be patient.
+
+.. image:: pics/bibleimportfinished1.png
+
+When the import has finished click :guilabel:`Finish` and you should be 
+ready to use your Bible in OpenLP.
+
+Importing from openlp.org 1.x
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Importing Bibles from openlp.org 1.x is a simple process. First you will need to 
+locate your version 1.x Bibles. Version 1.x Bibles have the `.bible` file
+extension.
 
 Windows XP::
 
@@ -44,22 +59,15 @@ Windows Vista / Windows 7::
 
     C:\ProgramData\openlp.org\Data\Bibles\
 
-OpenLP Version 1 Bibles have the `.bible` file extension. After selecting
+After selecting all of the openlp.org 1.x Bibles you want to convert, click
-all of the OpenLP Version 1 Bibles you want to convert, click :guilabel:`Next` 
+:guilabel:`Next` to continue the import process.
-
-.. image:: pics/bibleimportdetails1.png
-
-Enter your Bible name and copyright details. Click :guilabel:`Next`. It may
-take some time to convert your Bibles so please be patient.
-
-.. image:: pics/bibleimportfinished1.png
-
-When the import has finished click :guilabel:`Finish` and you should be 
-ready to use your OpenLP Version 1 Bibles.
 
 Importing OSIS Bibles
 ^^^^^^^^^^^^^^^^^^^^^
 
+Importing OSIS files is very simple. Select OSIS as your import source, select
+your OSIS Bible file and continue the import process.
+
 **About OSIS Formatted Bibles**
 
 The OSIS XML standard was designed to provide a common format for distribution
@@ -69,24 +77,11 @@ of electronic Bibles. More information can be found out at the `Bible Technologi
 If you have any software installed that is part of the `Sword Project 
 <http://www.crosswire.org/sword/index.jsp>`_ it can be easily converted.
 
-Importing OSIS files is very simple. Select your OSIS Bible file and click
-:guilabel:`Next`
-
-.. image:: pics/bibleimportdetails1.png
-
-Enter you Bible name and copyright details. Click :guilabel:`Next`. It may take
-some time to convert your Bibles so please be patient.
-
-.. image:: pics/bibleimportfinished1.png
-
-Click :guilabel:`Finish` and you should be ready to use your OpenLP Version
-1 Bibles.
-
 You can use the commands below convert Bibles from that software to OSIS format. 
 
 The following commands are used in all platforms and the commands are case 
-sensitive across all platforms. To convert a Bible using Command Prompt in 
+sensitive across all platforms. To convert a Bible using the command prompt in 
-Windows or a Terminal in Linux or MAC you would type::
+Windows or a terminal in Linux or Mac OS X you would type::
 
     mod2osis biblename > biblename.osis
 
@@ -114,17 +109,9 @@ You may also import downloaded bibles from OpenSong. The process is the same,
 except you will need to extract the bible from a zip file. This is usually done
 by right clicking on the downloaded file and select `Extract` or `Extract Here`.
 
-After selecting the OpenSong Bibles you want to convert, click :guilabel:`Next` 
+After selecting the OpenSong Bibles you want to import, follow the rest of the
-
+import process. When the import has finished you should be ready to use your
-.. image:: pics/bibleimportdetails1.png
+OpenSong Bibles.
-
-Enter your Bible name and copyright details. Click :guilabel:`Next`. It may
-take some time to convert your Bibles so please be patient.
-
-.. image:: pics/bibleimportfinished1.png
-
-When the import has finished then click :guilabel:`Finish` and you should now be 
-ready to use your OpenSong Bibles.
 
 Importing Web Download Bibles
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -139,8 +126,6 @@ as another option and does require an internet connection.
 
 To use the web download feature select web download from the import wizard.
 
-.. image:: pics/bibleimport01.png
-
 You can select from several options of location to download from and also
 what Bible translation you need. You will probably want to choose the location 
 from where you get the best performance or has the translation you need.
@@ -154,30 +139,20 @@ not be needed.
 .. image:: pics/webbibleproxy1.png
 
 After selecting your download location and the Bible you wish to use, click
-:guilabel:`Next` When your import is completed click :guilabel:`Finish`
+:guilabel:`Next` to continue the import process. When your import is completed
-
+you should now be ready to use the web bible.
-.. image:: pics/biblewebcomplete.png
-
-You should now be ready to use the web bible.
 
 Importing CSV formatted Bibles
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If you have a Bible in .csv format OpenLP can import it. CSV Bibles will
-consist of two files a `books` file and a `verse` file.
+consist of two files a `books` file and a `verse` file. Select CSV from the list
-
+of Bible types to import.
-Select CSV from the list of Bible types to import.
-
-.. image:: pics/bibleimport02.png
 
 You are now ready to select your .csv files. You will need to select both your 
 books and verse file location.
 
 .. image:: pics/csvimport1.png
 
-After you have selected the file locations you can click :guilabel:`Next`
+After you have selected the file locations you can continue with the import
-
+process. Once it is complete you should be ready to use your imported CSV Bible.
-.. image:: pics/bibleimportfinished1.png
-
-Click :guilabel:`Finish` and you should now be ready to use your imported CSV
-Bible

documentation/manual/source/songs.rst

@@ -99,4 +99,134 @@ completed.
 Press :guilabel:`Finish` and OpenLP will be ready to use your songs imported
 from CCLI SongSelect.
 
+Creating or editing a song slide
+================================
 
+If you want to create a new song slide or, once you have a song imported, you 
+want to edit and rearrange the Title & Lyrics, Author, Topics & Song Book, 
+assign a Theme, or edit Copyright Info & Comments, you will do this through the 
+`Song Editor`. 
+
+**Edit:** To edit an existing song you can either click on a song in the 
+`Media Manager` and then click the button to :guilabel:`Edit the selected song` 
+or right click a song from either the `Media Manager` or additionally from the 
+`Service Manager` and click :guilabel:`Edit item`. If you are adding a new song 
+click :guilabel:`Add a new Song` in the `Media Manager`.
+
+.. image:: pics/song_edit_lyrics.png
+
+**Title:** This is where you would name your song or edit a song name.
+
+**Alternate title:**Alternate Title was for songs with two names 
+"Lord the Light" - "Shine Jesus Shine". You can also add a name in this box that 
+will bring up the song in Titles search. **Example:** You could use an alternate 
+title of "hymn" on all your hymn song titles for grouping. When you search "hymn" 
+it will show all the hymns that have "hymn" for the Alternate title. 
+
+**Lyrics:** The *Lyrics* window shows all lyrics imported or added. On the left 
+side of the lyrics you will see a capital letter followed by a number. A V1 
+would represent verse 1, C1 would be Chorus 1. You will use these letters and
+numbers for the order to display the lyrics.
+
+**Verse Order:** After you entered or edited your song, you will want OpenLP to 
+display the verses in the correct order you want them displayed. On the left side 
+of your lyrics you will see C1, V1, V2 etc. the way they were imported or added. 
+To put your lyrics in the correct order is as simple as typing in the 
+:guilabel:`Verse order box` at the bottom, the correct order you want them 
+displayed, with only a blank space in between each entry. The correct format will 
+look like this: V1 C1 V2 C1 V3 C1. If you forget to put a space in between the 
+order, or if you do not have the corresponding verse number, OpenLP will politely 
+tell you with a pop-up error message what is wrong so you can correct your 
+mistake and save it. Verse order is optional and if left blank the verses will 
+display in the order seen in *Lyrics*.
+
+.. image:: pics/song_edit_verse_error.png
+
+Adding or editing the lyrics
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Add:** To Add a new verse, click on :guilabel:`Add`. The main window is where
+you will type your lyrics. OpenLP is packaged with a spell checker for most 
+languages. If you misspell a word it will be underlined. Right click the 
+underlined word and left click *Spelling Suggestions* or you can ignore it and
+continue typing. You also have the ability to format the font using *Formatting
+Tags*. Highlight the word/words you want to format and right click the highlight. 
+Left click *Formatting Tags* and choose the format you want to apply to the font 
+and the format tags will be entered with your lyrics. These tags are not visible 
+when displayed. To remove the format, delete the tag on each end of the word or 
+sentence. 
+
+**Edit:** To edit an existing verse, click on the verse you wish to *Edit* then click on 
+:guilabel:`Edit`, make your changes and click :guilabel:`Save`. 
+
+**Edit All:** To edit the whole song at once, click on :guilabel:`Edit All`.
+ 
+**Delete:** To delete a verse, click on the verse you want to delete and it will
+highlight, click on the :guilabel:`Delete` button and it will be deleted.
+**Warning:**, once you click the :guilabel:`Delete` button, you will not be
+asked again, it will be deleted immediately.
+
+.. image:: pics/song_edit_verse_type.png
+
+**Verse type:** gives you 7 ways to classify your lyrics. Verse, Chorus, Bridge, 
+Pre-Chorus, Intro, Ending, Other. 
+
+If you have more than one verse, you would number them Verse 1, 2, 3 as needed. 
+If you find the verse has too many lines for your screen, you can edit and 
+shorten the verse and :guilabel:`Add` another slide. 
+
+Authors, Topics & Song Book
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Once your *Title & Lyrics* are added or edited the way you want them you must 
+add or enter the author or authors of the song. OpenLP requires all songs to 
+have an author entered. You can add a blank space for the author name.
+
+.. image:: pics/song_edit_authors.png
+
+**Authors:** Click the drop down arrow to view all authors or start typing a name
+in the box and a list will appear. If the authors name has not been added, type
+the authors name in the box and click :guilabel:`Add to Song`. The authors name
+will appear below and will also be added to your database. If you accidently add
+the wrong author you can click on the authors name and click :guilabel:`Remove`.
+
+:guilabel:`Manage Authors, Topics, Song Books`: Clicking this button will bring 
+up your complete list of authors.
+
+.. image:: pics/song_edit_maintenance.png
+
+**Add:** Clicking the :guilabel:`Add` button will bring up a box where you will
+add the Authors First name, Last name and Display name. Click :guilabel:`Save`
+when you are finished.
+
+.. image:: pics/song_edit_author_maintenance.png
+
+**Edit:** The :guilabel:`Edit` button will bring up window where you can edit
+the info that is already there.
+
+**Delete:** The :guilabel:`Delete` button will remove the author you have 
+highlighted. Note: You cannot delete an author that is assigned to a song. 
+Authors names are displayed in the footer.
+
+Theme, Copyright info & Comments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+On this tab you can assign a *Theme* to a song, enter the *Copyright information*
+and add the *CCLI number*. If you imported a song from SongSelect this 
+information will usually be entered.
+
+.. image:: pics/song_edit_theme_copyright.png
+
+**Theme:** Click the drop down arrow to display your list of themes or start 
+typing a theme name in the box and the list will appear. You can also create a 
+new theme by clicking the :guilabel:`New Theme` button. 
+
+**Copyright information:** Add or edit the copyright information in this box. If 
+you would like to use the © symbol click "guilabel:`©` button. This information
+is displayed in the footer.
+
+**CCLI number:** Enter the CCLI number in this box. Note: this is the CCLI number
+of the song, not your contract number. This number is not displayed in the footer
+
+**Comments:** You can add comments in this box. This information is not 
+dispayed in the footer.

openlp.pyw

@@ -116,7 +116,7 @@ class OpenLP(QtGui.QApplication):
         self.processEvents()
         # start the main app window
         self.mainWindow = MainWindow(screens, self.clipboard(),
-             self.arguments())
+            self.arguments())
         self.mainWindow.show()
         if show_splash:
             # now kill the splashscreen
@@ -140,7 +140,7 @@ class OpenLP(QtGui.QApplication):
         self.sharedMemory = QtCore.QSharedMemory('OpenLP')
         if self.sharedMemory.attach():
             status = QtGui.QMessageBox.critical(None,
-                UiStrings.Error, UiStrings.OpenLPStart,
+                UiStrings().Error, UiStrings().OpenLPStart,
                 QtGui.QMessageBox.StandardButtons(
                 QtGui.QMessageBox.Yes | QtGui.QMessageBox.No))
             if status == QtGui.QMessageBox.No:

openlp/core/lib/__init__.py

@@ -166,58 +166,6 @@ def build_icon(icon):
             QtGui.QIcon.Normal, QtGui.QIcon.Off)
     return button_icon
 
-def context_menu_action(base, icon, text, slot, shortcuts=None):
-    """
-    Utility method to help build context menus for plugins
-
-    ``base``
-        The parent menu to add this menu item to
-
-    ``icon``
-        An icon for this action
-
-    ``text``
-        The text to display for this action
-
-    ``slot``
-        The code to run when this action is triggered
-    """
-    action = QtGui.QAction(text, base)
-    if icon:
-        action.setIcon(build_icon(icon))
-    QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), slot)
-    if shortcuts:
-        action.setShortcuts(shortcuts)
-    return action
-
-def context_menu(base, icon, text):
-    """
-    Utility method to help build context menus for plugins
-
-    ``base``
-        The parent object to add this menu to
-
-    ``icon``
-        An icon for this menu
-
-    ``text``
-        The text to display for this menu
-    """
-    action = QtGui.QMenu(text, base)
-    action.setIcon(build_icon(icon))
-    return action
-
-def context_menu_separator(base):
-    """
-    Add a separator to a context menu
-
-    ``base``
-        The menu object to add the separator to
-    """
-    action = QtGui.QAction(u'', base)
-    action.setSeparator(True)
-    return action
-
 def image_to_byte(image):
     """
     Resize an image to fit on the current screen for the web and returns
@@ -326,8 +274,8 @@ def check_directory_exists(dir):
 
 from listwidgetwithdnd import ListWidgetWithDnD
 from displaytags import DisplayTags
-from spelltextedit import SpellTextEdit
 from eventreceiver import Receiver
+from spelltextedit import SpellTextEdit
 from imagemanager import ImageManager
 from settingsmanager import SettingsManager
 from plugin import PluginStatus, StringContent, Plugin
@@ -343,3 +291,4 @@ from dockwidget import OpenLPDockWidget
 from renderer import Renderer
 from rendermanager import RenderManager
 from mediamanageritem import MediaManagerItem
+from openlp.core.utils.actions import ActionList

openlp/core/lib/htmlbuilder.py

@@ -307,7 +307,7 @@ sup {
 </head>
 <body>
 <img id="bgimage" class="size" %s />
-<img id="image" class="size" style="display:none" />
+<img id="image" class="size" %s />
 <video id="video1" class="size" style="visibility:hidden" autobuffer preload>
 </video>
 <video id="video2" class="size" style="visibility:hidden" autobuffer preload>
@@ -320,7 +320,7 @@ sup {
 </html>
     """
 
-def build_html(item, screen, alert, islive, background):
+def build_html(item, screen, alert, islive, background, image=None):
     """
     Build the full web paged structure for display
 
@@ -332,6 +332,10 @@ def build_html(item, screen, alert, islive, background):
         Alert display display information
     `islive`
         Item is going live, rather than preview/theme building
+    `background`
+        Theme background image - bytes
+    `image`
+        Image media item - bytes
     """
     width = screen[u'size'].width()
     height = screen[u'size'].height()
@@ -339,11 +343,15 @@ def build_html(item, screen, alert, islive, background):
     webkitvers = webkit_version()
     # Image generated and poked in
     if background:
-        image = u'src="data:image/png;base64,%s"' % background
+        bgimage_src = u'src="data:image/png;base64,%s"' % background
     elif item.bg_image_bytes:
-        image = u'src="data:image/png;base64,%s"' % item.bg_image_bytes
+        bgimage_src = u'src="data:image/png;base64,%s"' % item.bg_image_bytes
     else:
-        image = u'style="display:none;"'
+        bgimage_src = u'style="display:none;"'
+    if image:
+        image_src = u'src="data:image/png;base64,%s"' % image
+    else:
+        image_src = u'style="display:none;"'
     html = HTMLSRC % (build_background_css(item, width, height),
         width, height,
         build_alert_css(alert, width),
@@ -351,7 +359,7 @@ def build_html(item, screen, alert, islive, background):
         build_lyrics_css(item, webkitvers),
         u'true' if theme and theme.display_slide_transition and islive \
             else u'false',
-        image,
+        bgimage_src, image_src,
         build_lyrics_html(item, webkitvers))
     return html
 
@@ -452,7 +460,7 @@ def build_lyrics_css(item, webkitvers):
 .lyricsshadow {
 %s
 }
-     """
+    """
     theme = item.themedata
     lyricstable = u''
     lyrics = u''
@@ -460,8 +468,7 @@ def build_lyrics_css(item, webkitvers):
     outline = u''
     shadow = u''
     if theme and item.main:
-        lyricstable = u'left: %spx; top: %spx;' % \
+        lyricstable = u'left: %spx; top: %spx;' % (item.main.x(), item.main.y())
-            (item.main.x(), item.main.y())
         lyrics = build_lyrics_format_css(theme, item.main.width(),
             item.main.height())
         # For performance reasons we want to show as few DIV's as possible,

openlp/core/lib/mediamanageritem.py

@@ -31,10 +31,10 @@ import os
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import context_menu_action, context_menu_separator, \
+from openlp.core.lib import SettingsManager, OpenLPToolbar, ServiceItem, \
-    SettingsManager, OpenLPToolbar, ServiceItem, StringContent, build_icon, \
+    StringContent, build_icon, translate, Receiver, ListWidgetWithDnD
-    translate, Receiver, ListWidgetWithDnD
+from openlp.core.lib.ui import UiStrings, context_menu_action, \
-from openlp.core.lib.ui import UiStrings
+    context_menu_separator
 
 log = logging.getLogger(__name__)
 
@@ -260,39 +260,42 @@ class MediaManagerItem(QtGui.QWidget):
                 context_menu_action(
                     self.listView, u':/general/general_edit.png',
                     self.plugin.getString(StringContent.Edit)[u'title'],
-                    self.onEditClick))
+                    self.onEditClick, context=QtCore.Qt.WidgetShortcut))
             self.listView.addAction(context_menu_separator(self.listView))
         if self.hasDeleteIcon:
             self.listView.addAction(
                 context_menu_action(
                     self.listView, u':/general/general_delete.png',
                     self.plugin.getString(StringContent.Delete)[u'title'],
-                    self.onDeleteClick, [QtCore.Qt.Key_Delete]))
+                    self.onDeleteClick, [QtCore.Qt.Key_Delete],
+                    context=QtCore.Qt.WidgetShortcut))
             self.listView.addAction(context_menu_separator(self.listView))
         self.listView.addAction(
             context_menu_action(
                 self.listView, u':/general/general_preview.png',
                 self.plugin.getString(StringContent.Preview)[u'title'],
-                self.onPreviewClick, [QtCore.Qt.Key_Enter]))
+                self.onPreviewClick, [QtCore.Qt.Key_Enter,
+                QtCore.Qt.Key_Return], context=QtCore.Qt.WidgetShortcut))
         self.listView.addAction(
             context_menu_action(
                 self.listView, u':/general/general_live.png',
                 self.plugin.getString(StringContent.Live)[u'title'],
                 self.onLiveClick, [QtCore.Qt.ShiftModifier + \
                 QtCore.Qt.Key_Enter, QtCore.Qt.ShiftModifier + \
-                QtCore.Qt.Key_Return]))
+                QtCore.Qt.Key_Return], context=QtCore.Qt.WidgetShortcut))
         self.listView.addAction(
             context_menu_action(
                 self.listView, u':/general/general_add.png',
                 self.plugin.getString(StringContent.Service)[u'title'],
-                self.onAddClick, [QtCore.Qt.Key_Plus, QtCore.Qt.Key_Equal]))
+                self.onAddClick, [QtCore.Qt.Key_Plus, QtCore.Qt.Key_Equal],
+                context=QtCore.Qt.WidgetShortcut))
         if self.addToServiceItem:
             self.listView.addAction(
                 context_menu_action(
                     self.listView, u':/general/general_add.png',
                     translate('OpenLP.MediaManagerItem',
                     '&Add to selected Service Item'),
-                    self.onAddEditClick))
+                    self.onAddEditClick, context=QtCore.Qt.WidgetShortcut))
         QtCore.QObject.connect(self.listView,
             QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
             self.onClickPressed)
@@ -432,7 +435,7 @@ class MediaManagerItem(QtGui.QWidget):
         item to the preview slide controller.
         """
         if not self.listView.selectedIndexes() and not self.remoteTriggered:
-            QtGui.QMessageBox.information(self, UiStrings.NISp,
+            QtGui.QMessageBox.information(self, UiStrings().NISp,
                 translate('OpenLP.MediaManagerItem',
                 'You must select one or more items to preview.'))
         else:
@@ -450,7 +453,7 @@ class MediaManagerItem(QtGui.QWidget):
         item to the live slide controller.
         """
         if not self.listView.selectedIndexes():
-            QtGui.QMessageBox.information(self, UiStrings.NISp,
+            QtGui.QMessageBox.information(self, UiStrings().NISp,
                 translate('OpenLP.MediaManagerItem',
                     'You must select one or more items to send live.'))
         else:
@@ -465,7 +468,7 @@ class MediaManagerItem(QtGui.QWidget):
         Add a selected item to the current service
         """
         if not self.listView.selectedIndexes() and not self.remoteTriggered:
-            QtGui.QMessageBox.information(self, UiStrings.NISp,
+            QtGui.QMessageBox.information(self, UiStrings().NISp,
                 translate('OpenLP.MediaManagerItem',
                     'You must select one or more items.'))
         else:
@@ -491,14 +494,14 @@ class MediaManagerItem(QtGui.QWidget):
         Add a selected item to an existing item in the current service.
         """
         if not self.listView.selectedIndexes() and not self.remoteTriggered:
-            QtGui.QMessageBox.information(self, UiStrings.NISp,
+            QtGui.QMessageBox.information(self, UiStrings().NISp,
                 translate('OpenLP.MediaManagerItem',
                     'You must select one or more items.'))
         else:
             log.debug(u'%s Add requested', self.plugin.name)
             serviceItem = self.parent.serviceManager.getServiceItem()
             if not serviceItem:
-                QtGui.QMessageBox.information(self, UiStrings.NISs,
+                QtGui.QMessageBox.information(self, UiStrings().NISs,
                     translate('OpenLP.MediaManagerItem',
                         'You must select an existing service item to add to.'))
             elif self.plugin.name.lower() == serviceItem.name.lower():

openlp/core/lib/plugin.py

@@ -115,8 +115,8 @@ class Plugin(QtCore.QObject):
     """
     log.info(u'loaded')
 
-    def __init__(self, name, pluginHelpers=None, mediaItemClass=None,
+    def __init__(self, name, plugin_helpers=None, media_item_class=None,
-        settingsTabClass=None, version=None):
+        settings_tab_class=None, version=None):
         """
         This is the constructor for the plugin object. This provides an easy
         way for descendent plugins to populate common data. This method *must*
@@ -132,15 +132,16 @@ class Plugin(QtCore.QObject):
         ``version``
             Defaults to *None*. The version of the plugin.
 
-        ``pluginHelpers``
+        ``plugin_helpers``
             Defaults to *None*. A list of helper objects.
 
-        ``mediaItemClass``
+        ``media_item_class``
             The class name of the plugin's media item.
 
-        ``settingsTabClass``
+        ``settings_tab_class``
             The class name of the plugin's settings tab.
         """
+        log.debug(u'Plugin %s initialised' % name)
         QtCore.QObject.__init__(self)
         self.name = name
         self.textStrings = {}
@@ -152,20 +153,20 @@ class Plugin(QtCore.QObject):
             self.version = get_application_version()[u'version']
         self.settingsSection = self.name.lower()
         self.icon = None
-        self.mediaItemClass = mediaItemClass
+        self.media_item_class = media_item_class
-        self.settingsTabClass = settingsTabClass
+        self.settings_tab_class = settings_tab_class
         self.weight = 0
         self.status = PluginStatus.Inactive
         # Set up logging
         self.log = logging.getLogger(self.name)
-        self.previewController = pluginHelpers[u'preview']
+        self.previewController = plugin_helpers[u'preview']
-        self.liveController = pluginHelpers[u'live']
+        self.liveController = plugin_helpers[u'live']
-        self.renderManager = pluginHelpers[u'render']
+        self.renderManager = plugin_helpers[u'render']
-        self.serviceManager = pluginHelpers[u'service']
+        self.serviceManager = plugin_helpers[u'service']
-        self.settingsForm = pluginHelpers[u'settings form']
+        self.settingsForm = plugin_helpers[u'settings form']
-        self.mediadock = pluginHelpers[u'toolbox']
+        self.mediadock = plugin_helpers[u'toolbox']
-        self.pluginManager = pluginHelpers[u'pluginmanager']
+        self.pluginManager = plugin_helpers[u'pluginmanager']
-        self.formparent = pluginHelpers[u'formparent']
+        self.formparent = plugin_helpers[u'formparent']
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'%s_add_service_item' % self.name),
             self.processAddServiceEvent)
@@ -212,8 +213,8 @@ class Plugin(QtCore.QObject):
         Construct a MediaManagerItem object with all the buttons and things
         you need, and return it for integration into openlp.org.
         """
-        if self.mediaItemClass:
+        if self.media_item_class:
-            return self.mediaItemClass(self, self, self.icon)
+            return self.media_item_class(self, self, self.icon)
         return None
 
     def addImportMenuItem(self, importMenu):
@@ -243,14 +244,15 @@ class Plugin(QtCore.QObject):
         """
         pass
 
-    def getSettingsTab(self):
+    def getSettingsTab(self, parent):
         """
         Create a tab for the settings window to display the configurable
         options for this plugin to the user.
         """
-        if self.settingsTabClass:
+        if self.settings_tab_class:
-            return self.settingsTabClass(self.name,
+            return self.settings_tab_class(parent, self.name,
-                self.getString(StringContent.VisibleName)[u'title'])
+                self.getString(StringContent.VisibleName)[u'title'],
+                self.icon_path)
         return None
 
     def addToMenu(self, menubar):
@@ -287,31 +289,14 @@ class Plugin(QtCore.QObject):
         """
         if self.mediaItem:
             self.mediaItem.initialise()
-        self.insertToolboxItem()
+            self.mediadock.insert_dock(self.mediaItem, self.icon, self.weight)
 
     def finalise(self):
         """
         Called by the plugin Manager to cleanup things.
         """
-        self.removeToolboxItem()
-
-    def removeToolboxItem(self):
-        """
-        Called by the plugin to remove toolbar
-        """
         if self.mediaItem:
             self.mediadock.remove_dock(self.mediaItem)
-        if self.settings_tab:
-            self.settingsForm.removeTab(self.settings_tab)
-
-    def insertToolboxItem(self):
-        """
-        Called by plugin to replace toolbar
-        """
-        if self.mediaItem:
-            self.mediadock.insert_dock(self.mediaItem, self.icon, self.weight)
-        if self.settings_tab:
-            self.settingsForm.insertTab(self.settings_tab, self.weight)
 
     def usesTheme(self, theme):
         """
@@ -345,28 +330,28 @@ class Plugin(QtCore.QObject):
         """
         ## Load Action ##
         self.__setNameTextString(StringContent.Load,
-            UiStrings.Load, tooltips[u'load'])
+            UiStrings().Load, tooltips[u'load'])
         ## Import Action ##
         self.__setNameTextString(StringContent.Import,
-            UiStrings.Import, tooltips[u'import'])
+            UiStrings().Import, tooltips[u'import'])
         ## New Action ##
         self.__setNameTextString(StringContent.New,
-            UiStrings.Add, tooltips[u'new'])
+            UiStrings().Add, tooltips[u'new'])
         ## Edit Action ##
         self.__setNameTextString(StringContent.Edit,
-            UiStrings.Edit, tooltips[u'edit'])
+            UiStrings().Edit, tooltips[u'edit'])
         ## Delete Action ##
         self.__setNameTextString(StringContent.Delete,
-            UiStrings.Delete, tooltips[u'delete'])
+            UiStrings().Delete, tooltips[u'delete'])
         ## Preview Action ##
         self.__setNameTextString(StringContent.Preview,
-            UiStrings.Preview, tooltips[u'preview'])
+            UiStrings().Preview, tooltips[u'preview'])
         ## Send Live Action ##
         self.__setNameTextString(StringContent.Live,
-            UiStrings.Live, tooltips[u'live'])
+            UiStrings().Live, tooltips[u'live'])
         ## Add to Service Action ##
         self.__setNameTextString(StringContent.Service,
-            UiStrings.Service, tooltips[u'service'])
+            UiStrings().Service, tooltips[u'service'])
 
     def __setNameTextString(self, name, title, tooltip):
         """

openlp/core/lib/pluginmanager.py

@@ -137,7 +137,7 @@ class PluginManager(object):
             if plugin.status is not PluginStatus.Disabled:
                 plugin.mediaItem = plugin.getMediaManagerItem()
 
-    def hook_settings_tabs(self, settingsform=None):
+    def hook_settings_tabs(self, settings_form=None):
         """
         Loop through all the plugins. If a plugin has a valid settings tab
         item, add it to the settings tab.
@@ -148,16 +148,8 @@ class PluginManager(object):
         """
         for plugin in self.plugins:
             if plugin.status is not PluginStatus.Disabled:
-                plugin.settings_tab = plugin.getSettingsTab()
+                plugin.settings_tab = plugin.getSettingsTab(settings_form)
-                visible_title = plugin.getString(StringContent.VisibleName)
+        settings_form.plugins = self.plugins
-                if plugin.settings_tab:
-                    log.debug(u'Inserting settings tab item from %s' %
-                        visible_title[u'title'])
-                    settingsform.addTab(visible_title[u'title'],
-                        plugin.settings_tab)
-                else:
-                    log.debug(
-                        u'No tab settings in %s' % visible_title[u'title'])
 
     def hook_import_menu(self, import_menu):
         """
@@ -207,8 +199,6 @@ class PluginManager(object):
             if plugin.isActive():
                 plugin.initialise()
                 log.info(u'Initialisation Complete for %s ' % plugin.name)
-            if not plugin.isActive():
-                plugin.removeToolboxItem()
         log.info(u'Initialise Plugins - Finished')
 
     def finalise_plugins(self):

openlp/core/lib/searchedit.py

@@ -29,6 +29,7 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon
+from openlp.core.lib.ui import icon_action
 
 log = logging.getLogger(__name__)
 
@@ -109,6 +110,21 @@ class SearchEdit(QtGui.QLineEdit):
         """
         return self._currentSearchType
 
+    def setCurrentSearchType(self, identifier):
+        """
+        Set a new current search type.
+
+        ``identifier``
+            The search type identifier (int). 
+        """
+        menu = self.menuButton.menu()
+        for action in menu.actions():
+            if identifier == action.data().toInt()[0]:
+                self.menuButton.setDefaultAction(action)
+                self._currentSearchType = identifier
+                self.emit(QtCore.SIGNAL(u'searchTypeChanged(int)'), identifier)
+                return True
+
     def setSearchTypes(self, items):
         """
         A list of tuples to be used in the search type menu. The first item in
@@ -132,7 +148,8 @@ class SearchEdit(QtGui.QLineEdit):
         menu = QtGui.QMenu(self)
         first = None
         for identifier, icon, title in items:
-            action = QtGui.QAction(build_icon(icon), title, menu)
+            action = icon_action(menu, u'', icon)
+            action.setText(title)
             action.setData(QtCore.QVariant(identifier))
             menu.addAction(action)
             QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered(bool)'),

openlp/core/lib/serviceitem.py

@@ -441,10 +441,10 @@ class ServiceItem(object):
         start = None
         end = None
         if self.start_time != 0:
-            start = UiStrings.StartTimeCode % \
+            start = UiStrings().StartTimeCode % \
                 unicode(datetime.timedelta(seconds=self.start_time))
         if self.media_length != 0:
-            end = UiStrings.LengthTime % \
+            end = UiStrings().LengthTime % \
                 unicode(datetime.timedelta(seconds=self.media_length))
         if not start and not end:
             return None

openlp/core/lib/settingstab.py

@@ -31,7 +31,7 @@ class SettingsTab(QtGui.QWidget):
     SettingsTab is a helper widget for plugins to define Tabs for the settings
     dialog.
     """
-    def __init__(self, title, visible_title=None):
+    def __init__(self, parent, title, visible_title=None, icon_path=None):
         """
         Constructor to create the Settings tab item.
 
@@ -41,10 +41,12 @@ class SettingsTab(QtGui.QWidget):
         ``visible_title``
             The title of the tab, which is usually displayed on the tab.
         """
-        QtGui.QWidget.__init__(self)
+        QtGui.QWidget.__init__(self, parent)
         self.tabTitle = title
         self.tabTitleVisible = visible_title
         self.settingsSection = self.tabTitle.lower()
+        if icon_path:
+            self.icon_path = icon_path
         self.setupUi()
         self.retranslateUi()
         self.initialise()

openlp/core/lib/spelltextedit.py

@@ -36,7 +36,9 @@ except ImportError:
 # http://john.nachtimwald.com/2009/08/22/qplaintextedit-with-in-line-spell-check
 
 from PyQt4 import QtCore, QtGui
+
 from openlp.core.lib import translate, DisplayTags
+from openlp.core.lib.ui import checkable_action
 
 log = logging.getLogger(__name__)
 
@@ -80,6 +82,19 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
         if not cursor.hasSelection():
             cursor.select(QtGui.QTextCursor.WordUnderCursor)
         self.setTextCursor(cursor)
+        # Add menu with available languages.
+        if ENCHANT_AVAILABLE:
+            lang_menu = QtGui.QMenu(
+                translate('OpenLP.SpellTextEdit', 'Language:'))
+            for lang in enchant.list_languages():
+                action = checkable_action(
+                    lang_menu, lang, lang == self.dictionary.tag)
+                action.setText(lang)
+                lang_menu.addAction(action)
+            popupMenu.insertSeparator(popupMenu.actions()[0])
+            popupMenu.insertMenu(popupMenu.actions()[0], lang_menu)
+            QtCore.QObject.connect(lang_menu,
+                QtCore.SIGNAL(u'triggered(QAction*)'), self.setLanguage)
         # Check if the selected word is misspelled and offer spelling
         # suggestions if it is.
         if ENCHANT_AVAILABLE and self.textCursor().hasSelection():
@@ -93,19 +108,30 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
                     spell_menu.addAction(action)
                 # Only add the spelling suggests to the menu if there are
                 # suggestions.
-                if len(spell_menu.actions()) != 0:
+                if len(spell_menu.actions()):
-                    popupMenu.insertSeparator(popupMenu.actions()[0])
                     popupMenu.insertMenu(popupMenu.actions()[0], spell_menu)
         tagMenu = QtGui.QMenu(translate('OpenLP.SpellTextEdit',
             'Formatting Tags'))
         for html in DisplayTags.get_html_tags():
-            action = SpellAction( html[u'desc'], tagMenu)
+            action = SpellAction(html[u'desc'], tagMenu)
             action.correct.connect(self.htmlTag)
             tagMenu.addAction(action)
         popupMenu.insertSeparator(popupMenu.actions()[0])
         popupMenu.insertMenu(popupMenu.actions()[0], tagMenu)
         popupMenu.exec_(event.globalPos())
 
+    def setLanguage(self, action):
+        """
+        Changes the language for this spelltextedit.
+
+        ``action``
+            The action.
+        """
+        self.dictionary = enchant.Dict(action.text())
+        self.highlighter.spellingDictionary = self.dictionary
+        self.highlighter.highlightBlock(self.toPlainText())
+        self.highlighter.rehighlight()
+
     def correctWord(self, word):
         """
         Replaces the selected text with word.

openlp/core/lib/theme.py

@@ -192,7 +192,7 @@ class VerticalType(object):
     Bottom = 2
 
     Names = [u'top', u'middle', u'bottom']
-    TranslatedNames = [UiStrings.Top, UiStrings.Middle, UiStrings.Bottom]
+    TranslatedNames = [UiStrings().Top, UiStrings().Middle, UiStrings().Bottom]
 
 
 BOOLEAN_LIST = [u'bold', u'italics', u'override', u'outline', u'shadow',

openlp/core/lib/toolbar.py

@@ -51,8 +51,7 @@ class OpenLPToolbar(QtGui.QToolBar):
         log.debug(u'Init done for %s' % parent.__class__.__name__)
 
     def addToolbarButton(self, title, icon, tooltip=None, slot=None,
-        checkable=False, shortcut=0, alternate=0,
+        checkable=False, shortcuts=None, context=QtCore.Qt.WidgetShortcut):
-        context=QtCore.Qt.WidgetShortcut):
         """
         A method to help developers easily add a button to the toolbar.
 
@@ -74,16 +73,12 @@ class OpenLPToolbar(QtGui.QToolBar):
             If *True* the button has two, *off* and *on*, states. Default is
             *False*, which means the buttons has only one state.
 
-        ``shortcut``
+        ``shortcuts``
-            The primary shortcut for this action
+            The list of shortcuts for this action
-
-        ``alternate``
-            The alternate shortcut for this action
 
         ``context``
             Specify the context in which this shortcut is valid
         """
-        newAction = None
         if icon:
             actionIcon = build_icon(icon)
             if slot and not checkable:
@@ -92,7 +87,7 @@ class OpenLPToolbar(QtGui.QToolBar):
                 newAction = self.addAction(actionIcon, title)
             self.icons[title] = actionIcon
         else:
-            newAction = QtGui.QAction(title, newAction)
+            newAction = QtGui.QAction(title, self)
             self.addAction(newAction)
             QtCore.QObject.connect(newAction,
                 QtCore.SIGNAL(u'triggered()'), slot)
@@ -103,8 +98,9 @@ class OpenLPToolbar(QtGui.QToolBar):
             QtCore.QObject.connect(newAction,
                 QtCore.SIGNAL(u'toggled(bool)'), slot)
         self.actions[title] = newAction
-        newAction.setShortcuts([shortcut, alternate])
+        if shortcuts is not None:
-        newAction.setShortcutContext(context)
+            newAction.setShortcuts(shortcuts)
+            newAction.setShortcutContext(context)
         return newAction
 
     def addToolbarSeparator(self, handle):

openlp/core/lib/ui.py

@@ -31,6 +31,7 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon, Receiver, translate
+from openlp.core.utils.actions import ActionList
 
 log = logging.getLogger(__name__)
 
@@ -38,70 +39,96 @@ class UiStrings(object):
     """
     Provide standard strings for objects to use.
     """
-    # These strings should need a good reason to be retranslated elsewhere.
+    __instance__ = None
-    # Should some/more/less of these have an & attached?
+
-    About = translate('OpenLP.Ui', 'About')
+    def __new__(cls):
-    Add = translate('OpenLP.Ui', '&Add')
+        """
-    Advanced = translate('OpenLP.Ui', 'Advanced')
+        Override the default object creation method to return a single instance.
-    AllFiles = translate('OpenLP.Ui', 'All Files')
+        """
-    Bottom = translate('OpenLP.Ui', 'Bottom')
+        if not cls.__instance__:
-    Browse = translate('OpenLP.Ui', 'Browse...')
+            cls.__instance__ = object.__new__(cls)
-    Cancel = translate('OpenLP.Ui', 'Cancel')
+        return cls.__instance__
-    CCLINumberLabel = translate('OpenLP.Ui', 'CCLI number:')
+
-    CreateService = translate('OpenLP.Ui', 'Create a new service.')
+    def __init__(self):
-    Continuous = translate('OpenLP.Ui', 'Continuous')
+        """
-    Default = unicode(translate('OpenLP.Ui', 'Default'))
+        These strings should need a good reason to be retranslated elsewhere.
-    Delete = translate('OpenLP.Ui', '&Delete')
+        Should some/more/less of these have an & attached?
-    DisplayStyle = translate('OpenLP.Ui', 'Display style:')
+        """
-    Edit = translate('OpenLP.Ui', '&Edit')
+        self.About = translate('OpenLP.Ui', 'About')
-    EmptyField = translate('OpenLP.Ui', 'Empty Field')
+        self.Add = translate('OpenLP.Ui', '&Add')
-    Error = translate('OpenLP.Ui', 'Error')
+        self.Advanced = translate('OpenLP.Ui', 'Advanced')
-    Export = translate('OpenLP.Ui', 'Export')
+        self.AllFiles = translate('OpenLP.Ui', 'All Files')
-    FontSizePtUnit = translate('OpenLP.Ui', 'pt',
+        self.Bottom = translate('OpenLP.Ui', 'Bottom')
-        'Abbreviated font pointsize unit')
+        self.Browse = translate('OpenLP.Ui', 'Browse...')
-    Hours = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours')
+        self.Cancel = translate('OpenLP.Ui', 'Cancel')
-    Image = translate('OpenLP.Ui', 'Image')
+        self.CCLINumberLabel = translate('OpenLP.Ui', 'CCLI number:')
-    Import = translate('OpenLP.Ui', 'Import')
+        self.CreateService = translate('OpenLP.Ui', 'Create a new service.')
-    LengthTime = unicode(translate('OpenLP.Ui', 'Length %s'))
+        self.Continuous = translate('OpenLP.Ui', 'Continuous')
-    Live = translate('OpenLP.Ui', 'Live')
+        self.Default = unicode(translate('OpenLP.Ui', 'Default'))
-    LiveBGError = translate('OpenLP.Ui', 'Live Background Error')
+        self.Delete = translate('OpenLP.Ui', '&Delete')
-    LivePanel = translate('OpenLP.Ui', 'Live Panel')
+        self.DisplayStyle = translate('OpenLP.Ui', 'Display style:')
-    Load = translate('OpenLP.Ui', 'Load')
+        self.Edit = translate('OpenLP.Ui', '&Edit')
-    Minutes = translate('OpenLP.Ui', 'm', 'The abbreviated unit for minutes')
+        self.EmptyField = translate('OpenLP.Ui', 'Empty Field')
-    Middle = translate('OpenLP.Ui', 'Middle')
+        self.Error = translate('OpenLP.Ui', 'Error')
-    New = translate('OpenLP.Ui', 'New')
+        self.Export = translate('OpenLP.Ui', 'Export')
-    NewService = translate('OpenLP.Ui', 'New Service')
+        self.File = translate('OpenLP.Ui', 'File')
-    NewTheme = translate('OpenLP.Ui', 'New Theme')
+        self.FontSizePtUnit = translate('OpenLP.Ui', 'pt',
-    NFSs = translate('OpenLP.Ui', 'No File Selected', 'Singular')
+            'Abbreviated font pointsize unit')
-    NFSp = translate('OpenLP.Ui', 'No Files Selected', 'Plural')
+        self.Help = translate('OpenLP.Ui', 'Help')
-    NISs = translate('OpenLP.Ui', 'No Item Selected', 'Singular')
+        self.Hours = translate('OpenLP.Ui', 'h',
-    NISp = translate('OpenLP.Ui', 'No Items Selected', 'Plural')
+            'The abbreviated unit for hours')
-    OLPV1 = translate('OpenLP.Ui', 'openlp.org 1.x')
+        self.Image = translate('OpenLP.Ui', 'Image')
-    OLPV2 = translate('OpenLP.Ui', 'OpenLP 2.0')
+        self.Import = translate('OpenLP.Ui', 'Import')
-    OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. Do you '
+        self.LayoutStyle = translate('OpenLP.Ui', 'Layout style:')
-        'wish to continue?')
+        self.LengthTime = unicode(translate('OpenLP.Ui', 'Length %s'))
-    OpenService = translate('OpenLP.Ui', 'Open Service')
+        self.Live = translate('OpenLP.Ui', 'Live')
-    Preview = translate('OpenLP.Ui', 'Preview')
+        self.LiveBGError = translate('OpenLP.Ui', 'Live Background Error')
-    PreviewPanel = translate('OpenLP.Ui', 'Preview Panel')
+        self.LivePanel = translate('OpenLP.Ui', 'Live Panel')
-    PrintServiceOrder = translate('OpenLP.Ui', 'Print Service Order')
+        self.LiveToolbar = translate('OpenLP.Ui', 'Live Toolbar')
-    ReplaceBG = translate('OpenLP.Ui', 'Replace Background')
+        self.Load = translate('OpenLP.Ui', 'Load')
-    ReplaceLiveBG = translate('OpenLP.Ui', 'Replace Live Background')
+        self.Minutes = translate('OpenLP.Ui', 'm',
-    ResetBG = translate('OpenLP.Ui', 'Reset Background')
+            'The abbreviated unit for minutes')
-    ResetLiveBG = translate('OpenLP.Ui', 'Reset Live Background')
+        self.Middle = translate('OpenLP.Ui', 'Middle')
-    Seconds = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds')
+        self.New = translate('OpenLP.Ui', 'New')
-    SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview')
+        self.NewService = translate('OpenLP.Ui', 'New Service')
-    Search = translate('OpenLP.Ui', 'Search')
+        self.NewTheme = translate('OpenLP.Ui', 'New Theme')
-    SelectDelete = translate('OpenLP.Ui', 'You must select an item to delete.')
+        self.NFSs = translate('OpenLP.Ui', 'No File Selected', 'Singular')
-    SelectEdit = translate('OpenLP.Ui', 'You must select an item to edit.')
+        self.NFSp = translate('OpenLP.Ui', 'No Files Selected', 'Plural')
-    SaveService = translate('OpenLP.Ui', 'Save Service')
+        self.NISs = translate('OpenLP.Ui', 'No Item Selected', 'Singular')
-    Service = translate('OpenLP.Ui', 'Service')
+        self.NISp = translate('OpenLP.Ui', 'No Items Selected', 'Plural')
-    StartTimeCode = unicode(translate('OpenLP.Ui', 'Start %s'))
+        self.OLPV1 = translate('OpenLP.Ui', 'openlp.org 1.x')
-    Theme = translate('OpenLP.Ui', 'Theme', 'Singular')
+        self.OLPV2 = translate('OpenLP.Ui', 'OpenLP 2.0')
-    Themes = translate('OpenLP.Ui', 'Themes', 'Plural')
+        self.OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. '
-    Top = translate('OpenLP.Ui', 'Top')
+            'Do you wish to continue?')
-    VersePerSlide = translate('OpenLP.Ui', 'Verse Per Slide')
+        self.OpenService = translate('OpenLP.Ui', 'Open Service')
-    VersePerLine = translate('OpenLP.Ui', 'Verse Per Line')
+        self.Preview = translate('OpenLP.Ui', 'Preview')
-    Version = translate('OpenLP.Ui', 'Version')
+        self.PreviewPanel = translate('OpenLP.Ui', 'Preview Panel')
+        self.PrintServiceOrder = translate('OpenLP.Ui', 'Print Service Order')
+        self.ReplaceBG = translate('OpenLP.Ui', 'Replace Background')
+        self.ReplaceLiveBG = translate('OpenLP.Ui', 'Replace Live Background')
+        self.ResetBG = translate('OpenLP.Ui', 'Reset Background')
+        self.ResetLiveBG = translate('OpenLP.Ui', 'Reset Live Background')
+        self.Seconds = translate('OpenLP.Ui', 's',
+            'The abbreviated unit for seconds')
+        self.SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview')
+        self.Search = translate('OpenLP.Ui', 'Search')
+        self.SelectDelete = translate('OpenLP.Ui', 'You must select an item '
+            'to delete.')
+        self.SelectEdit = translate('OpenLP.Ui', 'You must select an item to '
+            'edit.')
+        self.Settings = translate('OpenLP.Ui', 'Settings')
+        self.SaveService = translate('OpenLP.Ui', 'Save Service')
+        self.Service = translate('OpenLP.Ui', 'Service')
+        self.StartTimeCode = unicode(translate('OpenLP.Ui', 'Start %s'))
+        self.Theme = translate('OpenLP.Ui', 'Theme', 'Singular')
+        self.Themes = translate('OpenLP.Ui', 'Themes', 'Plural')
+        self.Tools = translate('OpenLP.Ui', 'Tools')
+        self.Top = translate('OpenLP.Ui', 'Top')
+        self.VersePerSlide = translate('OpenLP.Ui', 'Verse Per Slide')
+        self.VersePerLine = translate('OpenLP.Ui', 'Verse Per Line')
+        self.Version = translate('OpenLP.Ui', 'Version')
+        self.View = translate('OpenLP.Ui', 'View')
+        self.ViewMode = translate('OpenLP.Ui', 'View Model')
 
 def add_welcome_page(parent, image):
     """
@@ -148,7 +175,8 @@ def create_accept_reject_button_box(parent, okay=False):
     accept_button = QtGui.QDialogButtonBox.Save
     if okay:
         accept_button = QtGui.QDialogButtonBox.Ok
-    button_box.setStandardButtons(accept_button | QtGui.QDialogButtonBox.Cancel)
+    button_box.setStandardButtons(
+        accept_button | QtGui.QDialogButtonBox.Cancel)
     button_box.setObjectName(u'%sButtonBox' % parent)
     QtCore.QObject.connect(button_box, QtCore.SIGNAL(u'accepted()'),
         parent.accept)
@@ -175,11 +203,11 @@ def critical_error_message_box(title=None, message=None, parent=None,
         Should this message box question the user.
     """
     if question:
-        return QtGui.QMessageBox.critical(parent, UiStrings.Error, message,
+        return QtGui.QMessageBox.critical(parent, UiStrings().Error, message,
             QtGui.QMessageBox.StandardButtons(
             QtGui.QMessageBox.Yes | QtGui.QMessageBox.No))
     data = {u'message': message}
-    data[u'title'] = title if title else UiStrings.Error
+    data[u'title'] = title if title else UiStrings().Error
     return Receiver.send_message(u'openlp_error_message', data)
 
 def media_item_combo_box(parent, name):
@@ -209,7 +237,7 @@ def create_delete_push_button(parent, icon=None):
     delete_button.setObjectName(u'deleteButton')
     delete_icon = icon if icon else u':/general/general_delete.png'
     delete_button.setIcon(build_icon(delete_icon))
-    delete_button.setText(UiStrings.Delete)
+    delete_button.setText(UiStrings().Delete)
     delete_button.setToolTip(
         translate('OpenLP.Ui', 'Delete the selected item.'))
     QtCore.QObject.connect(delete_button,
@@ -242,43 +270,126 @@ def create_up_down_push_button_set(parent):
         QtCore.SIGNAL(u'clicked()'), parent.onDownButtonClicked)
     return up_button, down_button
 
-def base_action(parent, name):
+def base_action(parent, name, category=None):
     """
     Return the most basic action with the object name set.
+
+    ``category``
+        The category the action should be listed in the shortcut dialog. If you
+        not wish, that this action is added to the shortcut dialog, then do not
+        state any.
     """
     action = QtGui.QAction(parent)
     action.setObjectName(name)
+    if category is not None:
+        action_list = ActionList.get_instance()
+        action_list.add_action(action, category)
     return action
 
-def checkable_action(parent, name, checked=None):
+def checkable_action(parent, name, checked=None, category=None):
     """
     Return a standard action with the checkable attribute set.
     """
-    action = base_action(parent, name)
+    action = base_action(parent, name, category)
     action.setCheckable(True)
     if checked is not None:
         action.setChecked(checked)
     return action
 
-def icon_action(parent, name, icon, checked=None):
+def icon_action(parent, name, icon, checked=None, category=None):
     """
     Return a standard action with an icon.
     """
     if checked is not None:
-        action = checkable_action(parent, name, checked)
+        action = checkable_action(parent, name, checked, category)
     else:
-        action = base_action(parent, name)
+        action = base_action(parent, name, category)
     action.setIcon(build_icon(icon))
     return action
 
-def shortcut_action(parent, text, shortcuts, function):
+def shortcut_action(parent, name, shortcuts, function, icon=None, checked=None,
+    category=None, context=QtCore.Qt.WindowShortcut):
     """
     Return a shortcut enabled action.
     """
-    action = QtGui.QAction(text, parent)
+    action = QtGui.QAction(parent)
+    action.setObjectName(name)
+    if icon is not None:
+        action.setIcon(build_icon(icon))
+    if checked is not None:
+        action.setCheckable(True)
+        action.setChecked(checked)
     action.setShortcuts(shortcuts)
-    action.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
+    action.setShortcutContext(context)
-    QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), function)
+    action_list = ActionList.get_instance()
+    action_list.add_action(action, category)
+    QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered(bool)'), function)
+    return action
+
+def context_menu_action(base, icon, text, slot, shortcuts=None, category=None,
+    context=QtCore.Qt.WindowShortcut):
+    """
+    Utility method to help build context menus for plugins
+
+    ``base``
+        The parent menu to add this menu item to
+
+    ``icon``
+        An icon for this action
+
+    ``text``
+        The text to display for this action
+
+    ``slot``
+        The code to run when this action is triggered
+
+    ``shortcuts``
+        The action's shortcuts.
+
+    ``category``
+        The category the shortcut should be listed in the shortcut dialog. If
+        left to None, then the action will be hidden in the shortcut dialog.
+
+    ``context``
+        The context the shortcut is valid.
+    """
+    action = QtGui.QAction(text, base)
+    if icon:
+        action.setIcon(build_icon(icon))
+    QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered(bool)'), slot)
+    if shortcuts is not None:
+        action.setShortcuts(shortcuts)
+        action.setShortcutContext(context)
+        action_list = ActionList.get_instance()
+        action_list.add_action(action)
+    return action
+
+def context_menu(base, icon, text):
+    """
+    Utility method to help build context menus for plugins
+
+    ``base``
+        The parent object to add this menu to
+
+    ``icon``
+        An icon for this menu
+
+    ``text``
+        The text to display for this menu
+    """
+    action = QtGui.QMenu(text, base)
+    action.setIcon(build_icon(icon))
+    return action
+
+def context_menu_separator(base):
+    """
+    Add a separator to a context menu
+
+    ``base``
+        The menu object to add the separator to
+    """
+    action = QtGui.QAction(u'', base)
+    action.setSeparator(True)
     return action
 
 def add_widget_completer(cache, widget):
@@ -314,9 +425,9 @@ def create_valign_combo(form, parent, layout):
     verticalLabel.setText(translate('OpenLP.Ui', '&Vertical Align:'))
     form.verticalComboBox = QtGui.QComboBox(parent)
     form.verticalComboBox.setObjectName(u'VerticalComboBox')
-    form.verticalComboBox.addItem(UiStrings.Top)
+    form.verticalComboBox.addItem(UiStrings().Top)
-    form.verticalComboBox.addItem(UiStrings.Middle)
+    form.verticalComboBox.addItem(UiStrings().Middle)
-    form.verticalComboBox.addItem(UiStrings.Bottom)
+    form.verticalComboBox.addItem(UiStrings().Bottom)
     verticalLabel.setBuddy(form.verticalComboBox)
     layout.addRow(verticalLabel, form.verticalComboBox)
 

openlp/core/ui/aboutdialog.py

@@ -87,7 +87,7 @@ class Ui_AboutDialog(object):
         QtCore.QMetaObject.connectSlotsByName(aboutDialog)
 
     def retranslateUi(self, aboutDialog):
-        aboutDialog.setWindowTitle(u'%s OpenLP' % UiStrings.About)
+        aboutDialog.setWindowTitle(u'%s OpenLP' % UiStrings().About)
         self.aboutTextEdit.setPlainText(translate('OpenLP.AboutForm',
             'OpenLP <version><revision> - Open Source Lyrics '
             'Projection\n'
@@ -105,7 +105,7 @@ class Ui_AboutDialog(object):
             'consider contributing by using the button below.'
         ))
         self.aboutNotebook.setTabText(
-            self.aboutNotebook.indexOf(self.aboutTab), UiStrings.About)
+            self.aboutNotebook.indexOf(self.aboutTab), UiStrings().About)
         lead = u'Raoul "superfly" Snyman'
         developers = [u'Tim "TRB143" Bentley', u'Jonathan "gushie" Corwin',
             u'Michael "cocooncrash" Gorven',

openlp/core/ui/advancedtab.py

@@ -37,13 +37,15 @@ class AdvancedTab(SettingsTab):
     The :class:`AdvancedTab` manages the advanced settings tab including the UI
     and the loading and saving of the displayed settings.
     """
-    def __init__(self):
+    def __init__(self, parent):
         """
         Initialise the settings tab
         """
-        SettingsTab.__init__(self, u'Advanced')
+        generalTranslated = translate('AdvancedTab', 'Advanced')
+        SettingsTab.__init__(self, parent ,u'Advanced', generalTranslated)
         self.default_image = u':/graphics/openlp-splash-screen.png'
         self.default_color = u'#ffffff'
+        self.icon_path = u':/system/system_settings.png'
 
     def setupUi(self):
         """
@@ -125,7 +127,7 @@ class AdvancedTab(SettingsTab):
         """
         Setup the interface translation strings.
         """
-        self.tabTitleVisible = UiStrings.Advanced
+        self.tabTitleVisible = UiStrings().Advanced
         self.uiGroupBox.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings'))
         self.recentLabel.setText(
             translate('OpenLP.AdvancedTab',
@@ -224,7 +226,7 @@ class AdvancedTab(SettingsTab):
 
     def onDefaultBrowseButtonPressed(self):
         file_filters = u'%s;;%s (*.*) (*)' % (get_images_filter(),
-            UiStrings.AllFiles)
+            UiStrings().AllFiles)
         filename = QtGui.QFileDialog.getOpenFileName(self,
             translate('OpenLP.AdvancedTab', 'Open File'), '',
             file_filters)

openlp/core/ui/displaytagdialog.py

@@ -136,10 +136,10 @@ class Ui_DisplayTagDialog(object):
             translate('OpenLP.DisplayTagDialog', 'Start tag'))
         self.endTagLabel.setText(
             translate('OpenLP.DisplayTagDialog', 'End tag'))
-        self.deletePushButton.setText(UiStrings.Delete)
+        self.deletePushButton.setText(UiStrings().Delete)
         self.defaultPushButton.setText(
             translate('OpenLP.DisplayTagDialog', 'Default'))
-        self.newPushButton.setText(UiStrings.New)
+        self.newPushButton.setText(UiStrings().New)
         self.tagTableWidget.horizontalHeaderItem(0).setText(
             translate('OpenLP.DisplayTagDialog', 'Description'))
         self.tagTableWidget.horizontalHeaderItem(1).setText(

openlp/core/ui/exceptionform.py

@@ -178,7 +178,7 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
             self,translate('ImagePlugin.ExceptionDialog',
             'Select Attachment'),
             SettingsManager.get_last_dir(u'exceptions'),
-            u'%s (*.*) (*)' % UiStrings.AllFiles)
+            u'%s (*.*) (*)' % UiStrings().AllFiles)
         log.info(u'New files(s) %s', unicode(files))
         if files:
             self.fileAttachment = unicode(files)

openlp/core/ui/generaltab.py

@@ -36,7 +36,7 @@ class GeneralTab(SettingsTab):
     """
     GeneralTab is the general settings tab in the settings dialog.
     """
-    def __init__(self, screens):
+    def __init__(self, parent, screens):
         """
         Initialise the general settings tab
         """
@@ -44,7 +44,9 @@ class GeneralTab(SettingsTab):
         self.monitorNumber = 0
         # Set to True to allow PostSetup to work on application start up
         self.overrideChanged = True
-        SettingsTab.__init__(self, u'General')
+        self.icon_path = u':/icon/openlp-logo-16x16.png'
+        generalTranslated = translate('GeneralTab', 'General')
+        SettingsTab.__init__(self, parent, u'General', generalTranslated)
 
     def preLoad(self):
         """
@@ -236,7 +238,7 @@ class GeneralTab(SettingsTab):
         self.timeoutSpinBox.setSuffix(translate('OpenLP.GeneralTab', ' sec'))
         self.ccliGroupBox.setTitle(
             translate('OpenLP.GeneralTab', 'CCLI Details'))
-        self.numberLabel.setText(UiStrings.CCLINumberLabel)
+        self.numberLabel.setText(UiStrings().CCLINumberLabel)
         self.usernameLabel.setText(
             translate('OpenLP.GeneralTab', 'SongSelect username:'))
         self.passwordLabel.setText(

openlp/core/ui/maindisplay.py

@@ -453,7 +453,7 @@ class MainDisplay(DisplayWidget):
         painter.end()
         return preview
 
-    def buildHtml(self, serviceItem):
+    def buildHtml(self, serviceItem, image=None):
         """
         Store the serviceItem and build the new HTML from it. Add the
         HTML to the display
@@ -480,8 +480,12 @@ class MainDisplay(DisplayWidget):
         if self.serviceItem.themedata.background_filename:
             self.serviceItem.bg_image_bytes = self.imageManager. \
                 get_image_bytes(self.serviceItem.themedata.theme_name)
+        if image:
+            image_bytes = self.imageManager.get_image_bytes(image)
+        else:
+            image_bytes = None
         html = build_html(self.serviceItem, self.screen, self.alertTab,
-            self.isLive, background)
+            self.isLive, background, image_bytes)
         log.debug(u'buildHtml - pre setHtml')
         self.webView.setHtml(html)
         log.debug(u'buildHtml - post setHtml')

openlp/core/ui/mainwindow.py

@@ -33,12 +33,13 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import RenderManager, build_icon, OpenLPDockWidget, \
     SettingsManager, PluginManager, Receiver, translate
 from openlp.core.lib.ui import UiStrings, base_action, checkable_action, \
-    icon_action
+    icon_action, shortcut_action
 from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
     ThemeManager, SlideController, PluginForm, MediaDockManager, \
     ShortcutListForm, DisplayTagForm
 from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
-    ActionList, get_application_version
+    get_application_version
+from openlp.core.utils.actions import ActionList, CategoryOrder
 
 log = logging.getLogger(__name__)
 
@@ -161,74 +162,86 @@ class Ui_MainWindow(object):
         mainWindow.addDockWidget(QtCore.Qt.RightDockWidgetArea,
             self.themeManagerDock)
         # Create the menu items
-        self.FileNewItem = icon_action(mainWindow, u'FileNewItem',
+        action_list = ActionList.get_instance()
-            u':/general/general_new.png')
+        action_list.add_category(UiStrings().File, CategoryOrder.standardMenu)
-        mainWindow.actionList.add_action(self.FileNewItem, u'File')
+        self.FileNewItem = shortcut_action(mainWindow, u'FileNewItem',
-        self.FileOpenItem = icon_action(mainWindow, u'FileOpenItem',
+            [QtGui.QKeySequence(u'Ctrl+N')],
-            u':/general/general_open.png')
+            self.ServiceManagerContents.onNewServiceClicked,
-        mainWindow.actionList.add_action(self.FileOpenItem, u'File')
+            u':/general/general_new.png', category=UiStrings().File)
-        self.FileSaveItem = icon_action(mainWindow, u'FileSaveItem',
+        self.FileOpenItem = shortcut_action(mainWindow, u'FileOpenItem',
-            u':/general/general_save.png')
+            [QtGui.QKeySequence(u'Ctrl+O')],
-        mainWindow.actionList.add_action(self.FileSaveItem, u'File')
+            self.ServiceManagerContents.onLoadServiceClicked,
-        self.FileSaveAsItem = base_action(mainWindow, u'FileSaveAsItem')
+            u':/general/general_open.png', category=UiStrings().File)
-        mainWindow.actionList.add_action(self.FileSaveAsItem, u'File')
+        self.FileSaveItem = shortcut_action(mainWindow, u'FileSaveItem',
-        self.printServiceOrderItem = base_action(
+            [QtGui.QKeySequence(u'Ctrl+S')],
-            mainWindow, u'printServiceItem')
+            self.ServiceManagerContents.saveFile,
-        mainWindow.actionList.add_action(
+            u':/general/general_save.png', category=UiStrings().File)
-            self.printServiceOrderItem, u'Print Service Order')
+        self.FileSaveAsItem = shortcut_action(mainWindow, u'FileSaveAsItem',
-        self.FileExitItem = icon_action(mainWindow, u'FileExitItem',
+            [QtGui.QKeySequence(u'Ctrl+Shift+S')],
-            u':/system/system_exit.png')
+            self.ServiceManagerContents.saveFileAs, category=UiStrings().File)
-        mainWindow.actionList.add_action(self.FileExitItem, u'File')
+        self.printServiceOrderItem = shortcut_action(mainWindow,
-        self.ImportThemeItem = base_action(mainWindow, u'ImportThemeItem')
+            u'printServiceItem', [QtGui.QKeySequence(u'Ctrl+P')],
-        mainWindow.actionList.add_action(self.ImportThemeItem, u'Import')
+            self.ServiceManagerContents.printServiceOrder,
-        self.ImportLanguageItem = base_action(mainWindow, u'ImportLanguageItem')
+            category=UiStrings().File)
-        mainWindow.actionList.add_action(self.ImportLanguageItem, u'Import')
+        self.FileExitItem = shortcut_action(mainWindow, u'FileExitItem',
-        self.ExportThemeItem = base_action(mainWindow, u'ExportThemeItem')
+            [QtGui.QKeySequence(u'Alt+F4')], mainWindow.close,
-        mainWindow.actionList.add_action(self.ExportThemeItem, u'Export')
+            u':/system/system_exit.png', category=UiStrings().File)
-        self.ExportLanguageItem = base_action(mainWindow, u'ExportLanguageItem')
+        action_list.add_category(UiStrings().Import, CategoryOrder.standardMenu)
-        mainWindow.actionList.add_action(self.ExportLanguageItem, u'Export')
+        self.ImportThemeItem = base_action(
-        self.ViewMediaManagerItem = icon_action(mainWindow,
+            mainWindow, u'ImportThemeItem', UiStrings().Import)
-            u'ViewMediaManagerItem', u':/system/system_mediamanager.png',
+        self.ImportLanguageItem = base_action(
-            self.mediaManagerDock.isVisible())
+            mainWindow, u'ImportLanguageItem')#, UiStrings().Import)
-        self.ViewThemeManagerItem = icon_action(mainWindow,
+        action_list.add_category(UiStrings().Export, CategoryOrder.standardMenu)
-            u'ViewThemeManagerItem', u':/system/system_thememanager.png',
+        self.ExportThemeItem = base_action(
-            self.themeManagerDock.isVisible())
+            mainWindow, u'ExportThemeItem', UiStrings().Export)
-        mainWindow.actionList.add_action(self.ViewMediaManagerItem, u'View')
+        self.ExportLanguageItem = base_action(
-        self.ViewServiceManagerItem = icon_action(mainWindow,
+            mainWindow, u'ExportLanguageItem')#, UiStrings().Export)
-            u'ViewServiceManagerItem', u':/system/system_servicemanager.png',
+        action_list.add_category(UiStrings().View, CategoryOrder.standardMenu)
-            self.serviceManagerDock.isVisible())
+        self.ViewMediaManagerItem = shortcut_action(mainWindow,
-        mainWindow.actionList.add_action(self.ViewServiceManagerItem, u'View')
+            u'ViewMediaManagerItem', [QtGui.QKeySequence(u'F8')],
-        self.ViewPreviewPanel = checkable_action(mainWindow,
+            self.toggleMediaManager, u':/system/system_mediamanager.png',
-            u'ViewPreviewPanel', previewVisible)
+            self.mediaManagerDock.isVisible(), UiStrings().View)
-        mainWindow.actionList.add_action(self.ViewPreviewPanel, u'View')
+        self.ViewThemeManagerItem = shortcut_action(mainWindow,
-        self.ViewLivePanel = checkable_action(mainWindow, u'ViewLivePanel',
+            u'ViewThemeManagerItem', [QtGui.QKeySequence(u'F10')],
-            liveVisible)
+            self.toggleThemeManager,  u':/system/system_thememanager.png',
-        mainWindow.actionList.add_action(self.ViewLivePanel, u'View')
+            self.themeManagerDock.isVisible(), UiStrings().View)
-        self.ModeDefaultItem = checkable_action(mainWindow, u'ModeDefaultItem')
+        self.ViewServiceManagerItem = shortcut_action(mainWindow,
-        mainWindow.actionList.add_action(self.ModeDefaultItem, u'View Mode')
+            u'ViewServiceManagerItem', [QtGui.QKeySequence(u'F9')],
-        self.ModeSetupItem = checkable_action(mainWindow, u'ModeLiveItem')
+            self.toggleServiceManager, u':/system/system_servicemanager.png',
-        mainWindow.actionList.add_action(self.ModeSetupItem, u'View Mode')
+            self.serviceManagerDock.isVisible(), UiStrings().View)
-        self.ModeLiveItem = checkable_action(mainWindow, u'ModeLiveItem', True)
+        self.ViewPreviewPanel = shortcut_action(mainWindow,
-        mainWindow.actionList.add_action(self.ModeLiveItem, u'View Mode')
+            u'ViewPreviewPanel', [QtGui.QKeySequence(u'F11')],
+            self.setPreviewPanelVisibility, checked=previewVisible,
+            category=UiStrings().View)
+        self.ViewLivePanel = shortcut_action(mainWindow, u'ViewLivePanel',
+            [QtGui.QKeySequence(u'F12')], self.setLivePanelVisibility,
+            checked=liveVisible, category=UiStrings().View)
+        action_list.add_category(UiStrings().ViewMode, CategoryOrder.standardMenu)
+        self.ModeDefaultItem = checkable_action(
+            mainWindow, u'ModeDefaultItem', category=UiStrings().ViewMode)
+        self.ModeSetupItem = checkable_action(
+            mainWindow, u'ModeLiveItem', category=UiStrings().ViewMode)
+        self.ModeLiveItem = checkable_action(
+            mainWindow, u'ModeLiveItem', True, UiStrings().ViewMode)
         self.ModeGroup = QtGui.QActionGroup(mainWindow)
         self.ModeGroup.addAction(self.ModeDefaultItem)
         self.ModeGroup.addAction(self.ModeSetupItem)
         self.ModeGroup.addAction(self.ModeLiveItem)
         self.ModeDefaultItem.setChecked(True)
+        action_list.add_category(UiStrings().Tools, CategoryOrder.standardMenu)
         self.ToolsAddToolItem = icon_action(mainWindow, u'ToolsAddToolItem',
-            u':/tools/tools_add.png')
+            u':/tools/tools_add.png', category=UiStrings().Tools)
-        mainWindow.actionList.add_action(self.ToolsAddToolItem, u'Tools')
         self.ToolsOpenDataFolder = icon_action(mainWindow,
-            u'ToolsOpenDataFolder', u':/general/general_open.png')
+            u'ToolsOpenDataFolder', u':/general/general_open.png',
-        mainWindow.actionList.add_action(self.ToolsOpenDataFolder, u'Tools')
+            category=UiStrings().Tools)
-        self.settingsPluginListItem = icon_action(mainWindow,
+        action_list.add_category(UiStrings().Settings, CategoryOrder.standardMenu)
-            u'settingsPluginListItem', u':/system/settings_plugin_list.png')
+        self.settingsPluginListItem = shortcut_action(mainWindow,
-        mainWindow.actionList.add_action(self.settingsPluginListItem,
+            u'settingsPluginListItem', [QtGui.QKeySequence(u'Alt+F7')],
-            u'Settings')
+            self.onPluginItemClicked, u':/system/settings_plugin_list.png',
+            category=UiStrings().Settings)
         # i18n Language Items
         self.AutoLanguageItem = checkable_action(mainWindow,
             u'AutoLanguageItem', LanguageManager.auto_language)
-        mainWindow.actionList.add_action(self.AutoLanguageItem, u'Settings')
         self.LanguageGroup = QtGui.QActionGroup(mainWindow)
         self.LanguageGroup.setExclusive(True)
         self.LanguageGroup.setObjectName(u'LanguageGroup')
@@ -241,24 +254,26 @@ class Ui_MainWindow(object):
             add_actions(self.LanguageGroup, [languageItem])
         self.SettingsShortcutsItem = icon_action(mainWindow,
             u'SettingsShortcutsItem',
-            u':/system/system_configure_shortcuts.png')
+            u':/system/system_configure_shortcuts.png',
+            category=UiStrings().Settings)
         self.DisplayTagItem = icon_action(mainWindow,
-            u'DisplayTagItem', u':/system/tag_editor.png')
+            u'DisplayTagItem', u':/system/tag_editor.png',
+            category=UiStrings().Settings)
         self.SettingsConfigureItem = icon_action(mainWindow,
-            u'SettingsConfigureItem', u':/system/system_settings.png')
+            u'SettingsConfigureItem', u':/system/system_settings.png',
-        mainWindow.actionList.add_action(self.SettingsShortcutsItem,
+            category=UiStrings().Settings)
-            u'Settings')
+        action_list.add_category(UiStrings().Help, CategoryOrder.standardMenu)
         self.HelpDocumentationItem = icon_action(mainWindow,
-            u'HelpDocumentationItem', u':/system/system_help_contents.png')
+            u'HelpDocumentationItem', u':/system/system_help_contents.png',
+            category=None)#UiStrings().Help)
         self.HelpDocumentationItem.setEnabled(False)
-        mainWindow.actionList.add_action(self.HelpDocumentationItem, u'Help')
+        self.HelpAboutItem = shortcut_action(mainWindow, u'HelpAboutItem',
-        self.HelpAboutItem = icon_action(mainWindow, u'HelpAboutItem',
+            [QtGui.QKeySequence(u'Ctrl+F1')], self.onHelpAboutItemClicked,
-            u':/system/system_about.png')
+            u':/system/system_about.png', category=UiStrings().Help)
-        mainWindow.actionList.add_action(self.HelpAboutItem, u'Help')
+        self.HelpOnlineHelpItem = base_action(
-        self.HelpOnlineHelpItem = base_action(mainWindow, u'HelpOnlineHelpItem')
+            mainWindow, u'HelpOnlineHelpItem', category=UiStrings().Help)
-        mainWindow.actionList.add_action(self.HelpOnlineHelpItem, u'Help')
+        self.helpWebSiteItem = base_action(
-        self.helpWebSiteItem = base_action(mainWindow, u'helpWebSiteItem')
+            mainWindow, u'helpWebSiteItem', category=UiStrings().Help)
-        mainWindow.actionList.add_action(self.helpWebSiteItem, u'Help')
         add_actions(self.FileImportMenu,
             (self.ImportThemeItem, self.ImportLanguageItem))
         add_actions(self.FileExportMenu,
@@ -294,21 +309,18 @@ class Ui_MainWindow(object):
         # Connect up some signals and slots
         QtCore.QObject.connect(self.FileMenu,
             QtCore.SIGNAL(u'aboutToShow()'), self.updateFileMenu)
-        QtCore.QObject.connect(self.FileExitItem,
-            QtCore.SIGNAL(u'triggered()'), mainWindow.close)
         QtCore.QMetaObject.connectSlotsByName(mainWindow)
         # Hide the entry, as it does not have any functionality yet.
         self.ToolsAddToolItem.setVisible(False)
         self.ImportLanguageItem.setVisible(False)
         self.ExportLanguageItem.setVisible(False)
-        self.SettingsShortcutsItem.setVisible(False)
         self.HelpDocumentationItem.setVisible(False)
 
     def retranslateUi(self, mainWindow):
         """
         Set up the translation system
         """
-        mainWindow.mainTitle = UiStrings.OLPV2
+        mainWindow.mainTitle = UiStrings().OLPV2
         mainWindow.setWindowTitle(mainWindow.mainTitle)
         self.FileMenu.setTitle(translate('OpenLP.MainWindow', '&File'))
         self.FileImportMenu.setTitle(translate('OpenLP.MainWindow', '&Import'))
@@ -327,38 +339,29 @@ class Ui_MainWindow(object):
         self.themeManagerDock.setWindowTitle(
             translate('OpenLP.MainWindow', 'Theme Manager'))
         self.FileNewItem.setText(translate('OpenLP.MainWindow', '&New'))
-        self.FileNewItem.setToolTip(UiStrings.NewService)
+        self.FileNewItem.setToolTip(UiStrings().NewService)
-        self.FileNewItem.setStatusTip(UiStrings.CreateService)
+        self.FileNewItem.setStatusTip(UiStrings().CreateService)
-        self.FileNewItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+N'))
         self.FileOpenItem.setText(translate('OpenLP.MainWindow', '&Open'))
-        self.FileOpenItem.setToolTip(UiStrings.OpenService)
+        self.FileOpenItem.setToolTip(UiStrings().OpenService)
         self.FileOpenItem.setStatusTip(
             translate('OpenLP.MainWindow', 'Open an existing service.'))
-        self.FileOpenItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+O'))
         self.FileSaveItem.setText(translate('OpenLP.MainWindow', '&Save'))
-        self.FileSaveItem.setToolTip(UiStrings.SaveService)
+        self.FileSaveItem.setToolTip(UiStrings().SaveService)
         self.FileSaveItem.setStatusTip(
             translate('OpenLP.MainWindow', 'Save the current service to disk.'))
-        self.FileSaveItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+S'))
         self.FileSaveAsItem.setText(
             translate('OpenLP.MainWindow', 'Save &As...'))
         self.FileSaveAsItem.setToolTip(
             translate('OpenLP.MainWindow', 'Save Service As'))
         self.FileSaveAsItem.setStatusTip(translate('OpenLP.MainWindow',
             'Save the current service under a new name.'))
-        self.FileSaveAsItem.setShortcut(
+        self.printServiceOrderItem.setText(UiStrings().PrintServiceOrder)
-            translate('OpenLP.MainWindow', 'Ctrl+Shift+S'))
-        self.printServiceOrderItem.setText(UiStrings.PrintServiceOrder)
         self.printServiceOrderItem.setStatusTip(translate('OpenLP.MainWindow',
             'Print the current Service Order.'))
-        self.printServiceOrderItem.setShortcut(
-            translate('OpenLP.MainWindow', 'Ctrl+P'))
         self.FileExitItem.setText(
             translate('OpenLP.MainWindow', 'E&xit'))
         self.FileExitItem.setStatusTip(
             translate('OpenLP.MainWindow', 'Quit OpenLP'))
-        self.FileExitItem.setShortcut(
-            translate('OpenLP.MainWindow', 'Alt+F4'))
         self.ImportThemeItem.setText(
             translate('OpenLP.MainWindow', '&Theme'))
         self.ImportLanguageItem.setText(
@@ -379,53 +382,39 @@ class Ui_MainWindow(object):
             translate('OpenLP.MainWindow', 'Toggle Media Manager'))
         self.ViewMediaManagerItem.setStatusTip(translate('OpenLP.MainWindow',
             'Toggle the visibility of the media manager.'))
-        self.ViewMediaManagerItem.setShortcut(
-            translate('OpenLP.MainWindow', 'F8'))
         self.ViewThemeManagerItem.setText(
             translate('OpenLP.MainWindow', '&Theme Manager'))
         self.ViewThemeManagerItem.setToolTip(
             translate('OpenLP.MainWindow', 'Toggle Theme Manager'))
         self.ViewThemeManagerItem.setStatusTip(translate('OpenLP.MainWindow',
             'Toggle the visibility of the theme manager.'))
-        self.ViewThemeManagerItem.setShortcut(
-            translate('OpenLP.MainWindow', 'F10'))
         self.ViewServiceManagerItem.setText(
             translate('OpenLP.MainWindow', '&Service Manager'))
         self.ViewServiceManagerItem.setToolTip(
             translate('OpenLP.MainWindow', 'Toggle Service Manager'))
         self.ViewServiceManagerItem.setStatusTip(translate('OpenLP.MainWindow',
             'Toggle the visibility of the service manager.'))
-        self.ViewServiceManagerItem.setShortcut(
-            translate('OpenLP.MainWindow', 'F9'))
         self.ViewPreviewPanel.setText(
             translate('OpenLP.MainWindow', '&Preview Panel'))
         self.ViewPreviewPanel.setToolTip(
             translate('OpenLP.MainWindow', 'Toggle Preview Panel'))
         self.ViewPreviewPanel.setStatusTip(translate('OpenLP.MainWindow',
             'Toggle the visibility of the preview panel.'))
-        self.ViewPreviewPanel.setShortcut(
-            translate('OpenLP.MainWindow', 'F11'))
         self.ViewLivePanel.setText(
             translate('OpenLP.MainWindow', '&Live Panel'))
         self.ViewLivePanel.setToolTip(
             translate('OpenLP.MainWindow', 'Toggle Live Panel'))
         self.ViewLivePanel.setStatusTip(translate('OpenLP.MainWindow',
             'Toggle the visibility of the live panel.'))
-        self.ViewLivePanel.setShortcut(
-            translate('OpenLP.MainWindow', 'F12'))
         self.settingsPluginListItem.setText(translate('OpenLP.MainWindow',
             '&Plugin List'))
         self.settingsPluginListItem.setStatusTip(
             translate('OpenLP.MainWindow', 'List the Plugins'))
-        self.settingsPluginListItem.setShortcut(
-            translate('OpenLP.MainWindow', 'Alt+F7'))
         self.HelpDocumentationItem.setText(
             translate('OpenLP.MainWindow', '&User Guide'))
         self.HelpAboutItem.setText(translate('OpenLP.MainWindow', '&About'))
         self.HelpAboutItem.setStatusTip(
             translate('OpenLP.MainWindow', 'More information about OpenLP'))
-        self.HelpAboutItem.setShortcut(
-            translate('OpenLP.MainWindow', 'Ctrl+F1'))
         self.HelpOnlineHelpItem.setText(
             translate('OpenLP.MainWindow', '&Online Help'))
         # Uncomment after 1.9.5 beta string freeze
@@ -467,8 +456,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
     """
     log.info(u'MainWindow loaded')
 
-    actionList = ActionList()
-
     def __init__(self, screens, clipboard, arguments):
         """
         This constructor sets up the interface, the various managers, and the
@@ -485,7 +472,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.serviceSettingsSection = u'servicemanager'
         self.songsSettingsSection = u'songs'
         self.serviceNotSaved = False
-        self.actionList = ActionList()
         self.settingsmanager = SettingsManager(screens)
         self.aboutForm = AboutForm(self)
         self.settingsForm = SettingsForm(self.screens, self, self)
@@ -510,16 +496,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         QtCore.QObject.connect(self.ExportThemeItem,
             QtCore.SIGNAL(u'triggered()'),
             self.themeManagerContents.onExportTheme)
-        QtCore.QObject.connect(self.ViewMediaManagerItem,
-            QtCore.SIGNAL(u'triggered(bool)'), self.toggleMediaManager)
-        QtCore.QObject.connect(self.ViewServiceManagerItem,
-            QtCore.SIGNAL(u'triggered(bool)'), self.toggleServiceManager)
-        QtCore.QObject.connect(self.ViewThemeManagerItem,
-            QtCore.SIGNAL(u'triggered(bool)'), self.toggleThemeManager)
-        QtCore.QObject.connect(self.ViewPreviewPanel,
-            QtCore.SIGNAL(u'toggled(bool)'), self.setPreviewPanelVisibility)
-        QtCore.QObject.connect(self.ViewLivePanel,
-            QtCore.SIGNAL(u'toggled(bool)'), self.setLivePanelVisibility)
         QtCore.QObject.connect(self.mediaManagerDock,
             QtCore.SIGNAL(u'visibilityChanged(bool)'),
             self.ViewMediaManagerItem.setChecked)
@@ -533,32 +509,14 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             QtCore.SIGNAL(u'triggered()'), self.onHelpWebSiteClicked)
         QtCore.QObject.connect(self.HelpOnlineHelpItem,
             QtCore.SIGNAL(u'triggered()'), self.onHelpOnLineHelpClicked)
-        QtCore.QObject.connect(self.HelpAboutItem,
-            QtCore.SIGNAL(u'triggered()'), self.onHelpAboutItemClicked)
         QtCore.QObject.connect(self.ToolsOpenDataFolder,
             QtCore.SIGNAL(u'triggered()'), self.onToolsOpenDataFolderClicked)
-        QtCore.QObject.connect(self.settingsPluginListItem,
-            QtCore.SIGNAL(u'triggered()'), self.onPluginItemClicked)
         QtCore.QObject.connect(self.DisplayTagItem,
             QtCore.SIGNAL(u'triggered()'), self.onDisplayTagItemClicked)
         QtCore.QObject.connect(self.SettingsConfigureItem,
             QtCore.SIGNAL(u'triggered()'), self.onSettingsConfigureItemClicked)
         QtCore.QObject.connect(self.SettingsShortcutsItem,
             QtCore.SIGNAL(u'triggered()'), self.onSettingsShortcutsItemClicked)
-        QtCore.QObject.connect(self.FileNewItem, QtCore.SIGNAL(u'triggered()'),
-            self.ServiceManagerContents.onNewServiceClicked)
-        QtCore.QObject.connect(self.FileOpenItem,
-            QtCore.SIGNAL(u'triggered()'),
-            self.ServiceManagerContents.onLoadServiceClicked)
-        QtCore.QObject.connect(self.FileSaveItem,
-            QtCore.SIGNAL(u'triggered()'),
-            self.ServiceManagerContents.saveFile)
-        QtCore.QObject.connect(self.FileSaveAsItem,
-            QtCore.SIGNAL(u'triggered()'),
-            self.ServiceManagerContents.saveFileAs)
-        QtCore.QObject.connect(self.printServiceOrderItem,
-            QtCore.SIGNAL(u'triggered()'),
-            self.ServiceManagerContents.printServiceOrder)
         # i18n set signals for languages
         self.LanguageGroup.triggered.connect(LanguageManager.set_language)
         QtCore.QObject.connect(self.ModeDefaultItem,
@@ -781,7 +739,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         """
         Show the shortcuts dialog
         """
-        self.shortcutForm.exec_(self.actionList)
+        if self.shortcutForm.exec_():
+            self.shortcutForm.save()
 
     def onModeDefaultItemClicked(self):
         """
@@ -928,17 +887,14 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             unicode(translate('OpenLP.MainWindow', 'Default Theme: %s')) %
                 theme)
 
-    def toggleMediaManager(self, visible):
+    def toggleMediaManager(self):
-        if self.mediaManagerDock.isVisible() != visible:
+        self.mediaManagerDock.setVisible(not self.mediaManagerDock.isVisible())
-            self.mediaManagerDock.setVisible(visible)
 
-    def toggleServiceManager(self, visible):
+    def toggleServiceManager(self):
-        if self.serviceManagerDock.isVisible() != visible:
+        self.serviceManagerDock.setVisible(not self.serviceManagerDock.isVisible())
-            self.serviceManagerDock.setVisible(visible)
 
-    def toggleThemeManager(self, visible):
+    def toggleThemeManager(self):
-        if self.themeManagerDock.isVisible() != visible:
+        self.themeManagerDock.setVisible(not self.themeManagerDock.isVisible())
-            self.themeManagerDock.setVisible(visible)
 
     def setPreviewPanelVisibility(self, visible):
         """
@@ -1022,8 +978,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             self.FileMenu.addSeparator()
             for fileId, filename in enumerate(recentFilesToDisplay):
                 log.debug('Recent file name: %s', filename)
-                action = QtGui.QAction(u'&%d %s' % (fileId + 1,
+                action =  base_action(self, u'')
-                    QtCore.QFileInfo(filename).fileName()), self)
+                action.setText(u'&%d %s' % 
+                    (fileId + 1, QtCore.QFileInfo(filename).fileName()))
                 action.setData(QtCore.QVariant(filename))
                 self.connect(action, QtCore.SIGNAL(u'triggered()'),
                     self.ServiceManagerContents.onRecentServiceClicked)

openlp/core/ui/mediadockmanager.py

@@ -84,5 +84,5 @@ class MediaDockManager(object):
             if self.media_dock.widget(dock_index):
                 if self.media_dock.widget(dock_index).settingsSection == \
                     media_item.plugin.name.lower():
-                    self.media_dock.widget(dock_index).hide()
+                    self.media_dock.widget(dock_index).setVisible(False)
                     self.media_dock.removeItem(dock_index)

openlp/core/ui/plugindialog.py

@@ -78,8 +78,8 @@ class Ui_PluginViewDialog(object):
             translate('OpenLP.PluginForm', 'Plugin List'))
         self.pluginInfoGroupBox.setTitle(
             translate('OpenLP.PluginForm', 'Plugin Details'))
-        self.versionLabel.setText(u'%s:' % UiStrings.Version)
+        self.versionLabel.setText(u'%s:' % UiStrings().Version)
-        self.aboutLabel.setText(u'%s:' % UiStrings.About)
+        self.aboutLabel.setText(u'%s:' % UiStrings().About)
         self.statusLabel.setText(
             translate('OpenLP.PluginForm', 'Status:'))
         self.statusComboBox.setItemText(0,

openlp/core/ui/printservicedialog.py

@@ -132,6 +132,8 @@ class Ui_PrintServiceDialog(object):
         self.groupLayout = QtGui.QVBoxLayout()
         self.slideTextCheckBox = QtGui.QCheckBox()
         self.groupLayout.addWidget(self.slideTextCheckBox)
+        self.pageBreakAfterText = QtGui.QCheckBox()
+        self.groupLayout.addWidget(self.pageBreakAfterText)
         self.notesCheckBox = QtGui.QCheckBox()
         self.groupLayout.addWidget(self.notesCheckBox)
         self.metaDataCheckBox = QtGui.QCheckBox()
@@ -146,9 +148,11 @@ class Ui_PrintServiceDialog(object):
             QtCore.SIGNAL(u'toggled(bool)'), self.toggleOptions)
 
     def retranslateUi(self, printServiceDialog):
-        printServiceDialog.setWindowTitle(UiStrings.PrintServiceOrder)
+        printServiceDialog.setWindowTitle(UiStrings().PrintServiceOrder)
         self.slideTextCheckBox.setText(translate('OpenLP.PrintServiceForm',
             'Include slide text if available'))
+        self.pageBreakAfterText.setText(translate('OpenLP.PrintServiceForm',
+            'Add page break before each text item.'))
         self.notesCheckBox.setText(translate('OpenLP.PrintServiceForm',
             'Include service item notes'))
         self.metaDataCheckBox.setText(translate('OpenLP.PrintServiceForm',

openlp/core/ui/printserviceform.py

@@ -24,12 +24,65 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 import datetime
+import os
 
 from PyQt4 import QtCore, QtGui
+from lxml import html
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, get_text_file_string
 from openlp.core.lib.ui import UiStrings
 from openlp.core.ui.printservicedialog import Ui_PrintServiceDialog, ZoomSize
+from openlp.core.utils import AppLocation
+
+DEFAULT_CSS = """/*
+Edit this file to customize the service order print. Note, that not all CSS
+properties are supported. See:
+http://doc.trolltech.com/4.7/richtext-html-subset.html#css-properties
+*/
+
+.serviceTitle {
+   font-weight:600;
+   font-size:x-large;
+   color:black;
+}
+
+.itemTitle {
+   font-weight:600;
+   font-size:large;
+   color:black;
+}
+
+.itemText {
+   color:black;
+}
+
+.itemFooter {
+   font-size:8px;
+   color:black;
+}
+
+.itemNotesTitle {
+   font-weight:bold;
+   font-size:12px;
+   color:black;
+}
+
+.itemNotesText {
+   font-size:11px;
+   color:black;
+}
+
+.customNotesTitle {
+   font-weight:bold;
+   font-size:11px;
+   color:black;
+}
+
+.customNotesText {
+   font-size:11px;
+   color:black;
+}
+"""
 
 class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
 
@@ -50,6 +103,10 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
         settings.beginGroup(u'advanced')
         self.slideTextCheckBox.setChecked(settings.value(
             u'print slide text', QtCore.QVariant(False)).toBool())
+        self.pageBreakAfterText.setChecked(settings.value(
+            u'add page break', QtCore.QVariant(False)).toBool())
+        if not self.slideTextCheckBox.isChecked():
+            self.pageBreakAfterText.setDisabled(True)
         self.metaDataCheckBox.setChecked(settings.value(
             u'print file meta data', QtCore.QVariant(False)).toBool())
         self.notesCheckBox.setChecked(settings.value(
@@ -76,6 +133,9 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
             QtCore.SIGNAL(u'triggered()'), self.copyText)
         QtCore.QObject.connect(self.htmlCopy,
             QtCore.SIGNAL(u'triggered()'), self.copyHtmlText)
+        QtCore.QObject.connect(self.slideTextCheckBox,
+            QtCore.SIGNAL(u'stateChanged(int)'),
+            self.onSlideTextCheckBoxChanged)
         self.updatePreviewText()
 
     def toggleOptions(self, checked):
@@ -93,59 +153,125 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
         """
         Creates the html text and updates the html of *self.document*.
         """
-        text = u''
+        html_data = html.fromstring(
-        if self.titleLineEdit.text():
+            u'<title>%s</title>' % unicode(self.titleLineEdit.text()))
-            text += u'<h2>%s</h2>' % unicode(self.titleLineEdit.text())
+        css_path = os.path.join(
-        for item in self.serviceManager.serviceItems:
+            AppLocation.get_data_path(), u'servicePrint.css')
+        if not os.path.isfile(css_path):
+            # Create default css file.
+            css_file = open(css_path, u'w')
+            css_file.write(DEFAULT_CSS)
+            css_file.close()
+        custom_css = get_text_file_string(css_path)
+        self._addChildToParent(
+            u'style', custom_css, html_data.head, u'type', u'text/css')
+        self._addChildToParent(u'body', parent=html_data)
+        self._addChildToParent(u'span', unicode(self.titleLineEdit.text()),
+            html_data.body, u'class', u'serviceTitle')
+        for index, item in enumerate(self.serviceManager.serviceItems):
             item = item[u'service_item']
+            div = self._addChildToParent(u'div', parent=html_data.body)
             # Add the title of the service item.
-            text += u'<h3><img src="%s" /> %s</h3>' % (item.icon,
+            item_title = self._addChildToParent(
-                item.get_display_title())
+                u'h2', parent=div, attribute=u'class', value=u'itemTitle')
-            # Add slide text of the service item.
+            self._addChildToParent(
+                u'img', parent=item_title, attribute=u'src', value=item.icon)
+            self._fromstring(
+                u'<span> %s</span>' % item.get_display_title(), item_title)
             if self.slideTextCheckBox.isChecked():
+                # Add the text of the service item.
                 if item.is_text():
-                    # Add the text of the service item.
+                    verse_def = None
-                    verse = None
                     for slide in item.get_frames():
-                        if not verse:
+                        if not verse_def or verse_def != slide[u'verseTag']:
-                            text += u'<p>' + slide[u'html']
+                            p = self._addChildToParent(u'p', parent=div,
-                            verse = slide[u'verseTag']
+                                attribute=u'class', value=u'itemText')
-                        elif verse != slide[u'verseTag']:
-                            text += u'<\p><p>' + slide[u'html']
-                            verse = slide[u'verseTag']
                         else:
-                            text += u'<br/>' + slide[u'html']
+                            self._addChildToParent(u'br', parent=p)
-                    text += u'</p>'
+                        self._fromstring(u'<span>%s</span>' % slide[u'html'], p)
+                        verse_def = slide[u'verseTag']
+                    # Break the page before the div element.
+                    if index != 0 and self.pageBreakAfterText.isChecked():
+                        div.set(u'style', u'page-break-before:always')
+                # Add the image names of the service item.
                 elif item.is_image():
-                    # Add the image names of the service item.
+                    ol = self._addChildToParent(u'ol', parent=div)
-                    text += u'<ol>'
                     for slide in range(len(item.get_frames())):
-                        text += u'<li><p>%s</p></li>' % \
+                        self._addChildToParent(u'li', item.get_frame_title(slide), ol)
-                            item.get_frame_title(slide)
+                # add footer
-                    text += u'</ol>'
                 if item.foot_text:
-                    # add footer
+                    self._fromstring(
-                    text += u'<p>%s</p>' % item.foot_text
+                        item.foot_text, div, u'class', u'itemFooter')
             # Add service items' notes.
             if self.notesCheckBox.isChecked():
                 if item.notes:
-                    text += u'<p><strong>%s</strong></p>%s' % (translate(
+                    p = self._addChildToParent(u'p', parent=div)
-                        'OpenLP.ServiceManager', 'Notes:'),
+                    self._addChildToParent(u'span', unicode(
-                        item.notes.replace(u'\n', u'<br />'))
+                        translate('OpenLP.ServiceManager', 'Notes:')), p,
+                        u'class', u'itemNotesTitle')
+                    self._fromstring(u'<span> %s</span>' % item.notes.replace(
+                        u'\n', u'<br />'), p, u'class', u'itemNotesText')
             # Add play length of media files.
             if item.is_media() and self.metaDataCheckBox.isChecked():
                 tme = item.media_length
                 if item.end_time > 0:
                     tme = item.end_time - item.start_time
-                text += u'<p><strong>%s</strong> %s</p>' % (translate(
+                title = self._fromstring(u'<p><strong>%s</strong> </p>' %
-                    'OpenLP.ServiceManager', u'Playing time:'),
+                    translate('OpenLP.ServiceManager', 'Playing time:'), div)
-                    unicode(datetime.timedelta(seconds=tme)))
+                self._fromstring(u'<span>%s</span>' %
+                    unicode(datetime.timedelta(seconds=tme)), title)
+        # Add the custom service notes:
         if self.footerTextEdit.toPlainText():
-            text += u'<h4>%s</h4>%s' % (translate('OpenLP.ServiceManager',
+            div = self._addChildToParent(u'div', parent=html_data.body)
-                u'Custom Service Notes:'), self.footerTextEdit.toPlainText())
+            self._addChildToParent(u'span', translate('OpenLP.ServiceManager',
-        self.document.setHtml(text)
+                u'Custom Service Notes:'), div, u'class', u'customNotesTitle')
+            self._addChildToParent(
+                u'span', u' %s' % self.footerTextEdit.toPlainText(), div,
+                u'class', u'customNotesText')
+        self.document.setHtml(html.tostring(html_data))
         self.previewWidget.updatePreview()
 
+    def _addChildToParent(self, tag, text=None, parent=None, attribute=None,
+        value=None):
+        """
+        Creates a html element. If ``text`` is given, the element's text will
+        set and if a ``parent`` is given, the element is appended.
+
+        ``tag``
+            The html tag, e. g. ``u'span'``. Defaults to ``None``.
+
+        ``text``
+            The text for the tag. Defaults to ``None``.
+
+        ``parent``
+            The parent element. Defaults to ``None``.
+
+        ``attribute``
+            An optional attribute, for instance ``u'class``.
+
+        ``value``
+            The value for the given ``attribute``. It does not have a meaning,
+            if the attribute is left to its default.
+        """
+        element = html.Element(tag)
+        if text is not None:
+            element.text = unicode(text)
+        if parent is not None:
+            parent.append(element)
+        if attribute is not None:
+            element.set(attribute, value if value is not None else u'')
+        return element
+
+    def _fromstring(self, string, parent, attribute=None, value=None):
+        """
+        This is used to create a child html element from a string.
+        """
+        element = html.fromstring(string)
+        if attribute is not None:
+            element.set(attribute, value if value is not None else u'')
+        parent.append(element)
+        return element
+
     def paintRequested(self, printer):
         """
         Paint the preview of the *self.document*.
@@ -228,9 +354,16 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
         Called when html copy check box is selected.
         """
         if value == QtCore.Qt.Checked:
-            self.copyTextButton.setText(UiStrings.CopyToHtml)
+            self.copyTextButton.setText(UiStrings().CopyToHtml)
         else:
-            self.copyTextButton.setText(UiStrings.CopyToText)
+            self.copyTextButton.setText(UiStrings().CopyToText)
+
+    def onSlideTextCheckBoxChanged(self, state):
+        """
+        Disable or enable the ``pageBreakAfterText`` checkbox  as it should only
+        be enabled, when the ``slideTextCheckBox`` is enabled.
+        """
+        self.pageBreakAfterText.setDisabled(state == QtCore.Qt.Unchecked)
 
     def saveOptions(self):
         """
@@ -241,6 +374,8 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
         settings.beginGroup(u'advanced')
         settings.setValue(u'print slide text',
             QtCore.QVariant(self.slideTextCheckBox.isChecked()))
+        settings.setValue(u'add page break',
+            QtCore.QVariant(self.pageBreakAfterText.isChecked()))
         settings.setValue(u'print file meta data',
             QtCore.QVariant(self.metaDataCheckBox.isChecked()))
         settings.setValue(u'print notes',

openlp/core/ui/servicemanager.py

@@ -32,15 +32,16 @@ log = logging.getLogger(__name__)
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \
+from openlp.core.lib import OpenLPToolbar, ServiceItem, Receiver, build_icon, \
-    Receiver, build_icon, ItemCapabilities, SettingsManager, translate
+    ItemCapabilities, SettingsManager, translate
 from openlp.core.lib.theme import ThemeLevel
 from openlp.core.lib.ui import UiStrings, critical_error_message_box, \
-    find_and_set_in_combo_box
+    context_menu_action, find_and_set_in_combo_box
 from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm, StartTimeForm
 from openlp.core.ui.printserviceform import PrintServiceForm
 from openlp.core.utils import AppLocation, delete_file, file_is_unicode, \
     split_filename
+from openlp.core.utils.actions import ActionList, CategoryOrder
 
 class ServiceManagerList(QtGui.QTreeWidget):
     """
@@ -110,18 +111,18 @@ class ServiceManager(QtGui.QWidget):
         # Create the top toolbar
         self.toolbar = OpenLPToolbar(self)
         self.toolbar.addToolbarButton(
-            UiStrings.NewService, u':/general/general_new.png',
+            UiStrings().NewService, u':/general/general_new.png',
-            UiStrings.CreateService, self.onNewServiceClicked)
+            UiStrings().CreateService, self.onNewServiceClicked)
         self.toolbar.addToolbarButton(
-            UiStrings.OpenService, u':/general/general_open.png',
+            UiStrings().OpenService, u':/general/general_open.png',
             translate('OpenLP.ServiceManager', 'Load an existing service'),
             self.onLoadServiceClicked)
         self.toolbar.addToolbarButton(
-            UiStrings.SaveService, u':/general/general_save.png',
+            UiStrings().SaveService, u':/general/general_save.png',
             translate('OpenLP.ServiceManager', 'Save this service'),
             self.saveFile)
         self.toolbar.addSeparator()
-        self.themeLabel = QtGui.QLabel(u'%s:' % UiStrings.Theme, self)
+        self.themeLabel = QtGui.QLabel(u'%s:' % UiStrings().Theme, self)
         self.themeLabel.setMargin(3)
         self.themeLabel.setObjectName(u'themeLabel')
         self.toolbar.addToolbarWidget(u'ThemeLabel', self.themeLabel)
@@ -165,38 +166,57 @@ class ServiceManager(QtGui.QWidget):
             u':/services/service_top.png',
             translate('OpenLP.ServiceManager',
             'Move item to the top of the service.'),
-            self.onServiceTop, shortcut=QtCore.Qt.Key_Home)
+            self.onServiceTop, shortcuts=[QtCore.Qt.Key_Home])
+        self.serviceManagerList.moveTop.setObjectName(u'moveTop')
+        action_list = ActionList.get_instance()
+        action_list.add_category(
+            UiStrings().Service, CategoryOrder.standardToolbar)
+        action_list.add_action(
+            self.serviceManagerList.moveTop, UiStrings().Service)
         self.serviceManagerList.moveUp = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &up'),
             u':/services/service_up.png',
             translate('OpenLP.ServiceManager',
             'Move item up one position in the service.'),
-            self.onServiceUp, shortcut=QtCore.Qt.Key_PageUp)
+            self.onServiceUp, shortcuts=[QtCore.Qt.Key_PageUp])
+        self.serviceManagerList.moveUp.setObjectName(u'moveUp')
+        action_list.add_action(
+            self.serviceManagerList.moveUp, UiStrings().Service)
         self.serviceManagerList.moveDown = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &down'),
             u':/services/service_down.png',
             translate('OpenLP.ServiceManager',
             'Move item down one position in the service.'),
-            self.onServiceDown, shortcut=QtCore.Qt.Key_PageDown)
+            self.onServiceDown, shortcuts=[QtCore.Qt.Key_PageDown])
+        self.serviceManagerList.moveDown.setObjectName(u'moveDown')
+        action_list.add_action(
+            self.serviceManagerList.moveDown, UiStrings().Service)
         self.serviceManagerList.moveBottom = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move to &bottom'),
             u':/services/service_bottom.png',
             translate('OpenLP.ServiceManager',
             'Move item to the end of the service.'),
-            self.onServiceEnd, shortcut=QtCore.Qt.Key_End)
+            self.onServiceEnd, shortcuts=[QtCore.Qt.Key_End])
+        self.serviceManagerList.moveBottom.setObjectName(u'moveBottom')
+        action_list.add_action(
+            self.serviceManagerList.moveBottom, UiStrings().Service)
         self.serviceManagerList.down = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &down'),
             None,
             translate('OpenLP.ServiceManager',
             'Moves the selection down the window.'),
-            self.onMoveSelectionDown, shortcut=QtCore.Qt.Key_Down)
+            self.onMoveSelectionDown, shortcuts=[QtCore.Qt.Key_Down])
+        self.serviceManagerList.down.setObjectName(u'down')
+        action_list.add_action(self.serviceManagerList.down)
         self.serviceManagerList.down.setVisible(False)
         self.serviceManagerList.up = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move up'),
             None,
             translate('OpenLP.ServiceManager',
             'Moves the selection up the window.'),
-            self.onMoveSelectionUp, shortcut=QtCore.Qt.Key_Up)
+            self.onMoveSelectionUp, shortcuts=[QtCore.Qt.Key_Up])
+        self.serviceManagerList.up.setObjectName(u'up')
+        action_list.add_action(self.serviceManagerList.up)
         self.serviceManagerList.up.setVisible(False)
         self.orderToolbar.addSeparator()
         self.serviceManagerList.delete = self.orderToolbar.addToolbarButton(
@@ -211,22 +231,29 @@ class ServiceManager(QtGui.QWidget):
             u':/services/service_expand_all.png',
             translate('OpenLP.ServiceManager',
             'Expand all the service items.'),
-            self.onExpandAll, shortcut=QtCore.Qt.Key_Plus)
+            self.onExpandAll, shortcuts=[QtCore.Qt.Key_Plus])
+        self.serviceManagerList.expand.setObjectName(u'expand')
+        action_list.add_action(
+            self.serviceManagerList.expand, UiStrings().Service)
         self.serviceManagerList.collapse = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', '&Collapse all'),
             u':/services/service_collapse_all.png',
             translate('OpenLP.ServiceManager',
             'Collapse all the service items.'),
-            self.onCollapseAll, shortcut=QtCore.Qt.Key_Minus)
+            self.onCollapseAll, shortcuts=[QtCore.Qt.Key_Minus])
+        self.serviceManagerList.collapse.setObjectName(u'collapse')
+        action_list.add_action(
+            self.serviceManagerList.collapse, UiStrings().Service)
         self.orderToolbar.addSeparator()
         self.serviceManagerList.makeLive = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Go Live'),
             u':/general/general_live.png',
             translate('OpenLP.ServiceManager',
-            'Send the selected item to Live.'),
+            'Send the selected item to Live.'), self.makeLive,
-            self.makeLive, shortcut=QtCore.Qt.Key_Enter,
+            shortcuts=[QtCore.Qt.Key_Enter, QtCore.Qt.Key_Return])
-            alternate=QtCore.Qt.Key_Return)
+        self.serviceManagerList.makeLive.setObjectName(u'orderToolbar')
-        self.orderToolbar.setObjectName(u'orderToolbar')
+        action_list.add_action(
+            self.serviceManagerList.makeLive, UiStrings().Service)
         self.layout.addWidget(self.orderToolbar)
         # Connect up our signals and slots
         QtCore.QObject.connect(self.themeComboBox,
@@ -301,7 +328,6 @@ class ServiceManager(QtGui.QWidget):
         self.themeMenu = QtGui.QMenu(
             translate('OpenLP.ServiceManager', '&Change Item Theme'))
         self.menu.addMenu(self.themeMenu)
-        self.setServiceHotkeys()
         self.serviceManagerList.addActions(
             [self.serviceManagerList.moveDown,
             self.serviceManagerList.moveUp,
@@ -315,26 +341,14 @@ class ServiceManager(QtGui.QWidget):
             ])
         self.configUpdated()
 
-    def setServiceHotkeys(self):
-        actionList = self.mainwindow.actionList
-        actionList.add_action(self.serviceManagerList.moveDown, u'Service')
-        actionList.add_action(self.serviceManagerList.moveUp, u'Service')
-        actionList.add_action(self.serviceManagerList.moveTop, u'Service')
-        actionList.add_action(self.serviceManagerList.moveBottom, u'Service')
-        actionList.add_action(self.serviceManagerList.makeLive, u'Service')
-        actionList.add_action(self.serviceManagerList.up, u'Service')
-        actionList.add_action(self.serviceManagerList.down, u'Service')
-        actionList.add_action(self.serviceManagerList.expand, u'Service')
-        actionList.add_action(self.serviceManagerList.collapse, u'Service')
-
-
     def setModified(self, modified=True):
         """
         Setter for property "modified". Sets whether or not the current service
         has been modified.
         """
         self._modified = modified
-        serviceFile = self.shortFileName() or u'Untitled Service'
+        serviceFile = self.shortFileName() or translate(
+            'OpenLP.ServiceManager', 'Untitled Service')
         self.mainwindow.setServiceModified(modified, serviceFile)
 
     def isModified(self):
@@ -515,7 +529,7 @@ class ServiceManager(QtGui.QWidget):
         save the file.
         """
         fileName = unicode(QtGui.QFileDialog.getSaveFileName(self.mainwindow,
-            UiStrings.SaveService,
+            UiStrings().SaveService,
             SettingsManager.get_last_dir(
             self.mainwindow.serviceSettingsSection),
             translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz)')))
@@ -601,7 +615,7 @@ class ServiceManager(QtGui.QWidget):
                     u'%s' % fileName)
                 QtGui.QMessageBox.information(self,
                     translate('OpenLP.ServiceManager', 'Corrupt File'),
-                    translate('OpenLP.ServiceManager', 'This file is either'
+                    translate('OpenLP.ServiceManager', 'This file is either '
                     'corrupt or not an OpenLP 2.0 service file.'))
             return
         finally:
@@ -1260,7 +1274,7 @@ class ServiceManager(QtGui.QWidget):
         for theme in theme_list:
             self.themeComboBox.addItem(theme)
             action = context_menu_action(self.serviceManagerList, None, theme,
-                self.onThemeChangeAction)
+                self.onThemeChangeAction, context=QtCore.Qt.WidgetShortcut)
             self.themeMenu.addAction(action)
         find_and_set_in_combo_box(self.themeComboBox, self.service_theme)
         self.mainwindow.renderManager.set_service_theme(self.service_theme)

openlp/core/ui/settingsdialog.py

@@ -32,18 +32,29 @@ from openlp.core.lib.ui import create_accept_reject_button_box
 class Ui_SettingsDialog(object):
     def setupUi(self, settingsDialog):
         settingsDialog.setObjectName(u'settingsDialog')
-        settingsDialog.resize(700, 500)
+        settingsDialog.resize(800, 500)
         settingsDialog.setWindowIcon(
             build_icon(u':/system/system_settings.png'))
-        self.settingsLayout = QtGui.QVBoxLayout(settingsDialog)
+        self.dialogLayout = QtGui.QGridLayout(settingsDialog)
-        self.settingsLayout.setObjectName(u'settingsLayout')
+        self.dialogLayout.setObjectName(u'dialogLayout')
-        self.settingsTabWidget = QtGui.QTabWidget(settingsDialog)
+        self.dialogLayout.setMargin(8)
-        self.settingsTabWidget.setObjectName(u'settingsTabWidget')
+        self.settingListWidget = QtGui.QListWidget(settingsDialog)
-        self.settingsLayout.addWidget(self.settingsTabWidget)
+        self.settingListWidget.setUniformItemSizes(True)
+        self.settingListWidget.setMinimumSize(QtCore.QSize(150, 0))
+        self.settingListWidget.setHorizontalScrollBarPolicy(
+            QtCore.Qt.ScrollBarAlwaysOff)
+        self.settingListWidget.setObjectName(u'settingListWidget')
+        self.dialogLayout.addWidget(self.settingListWidget, 0, 0, 1, 1)
+        self.stackedLayout = QtGui.QStackedLayout()
+        self.stackedLayout.setObjectName(u'stackedLayout')
+        self.dialogLayout.addLayout(self.stackedLayout, 0, 1, 1, 1)
         self.buttonBox = create_accept_reject_button_box(settingsDialog, True)
-        self.settingsLayout.addWidget(self.buttonBox)
+        self.dialogLayout.addWidget(self.buttonBox, 1, 1, 1, 1)
         self.retranslateUi(settingsDialog)
         QtCore.QMetaObject.connectSlotsByName(settingsDialog)
+        QtCore.QObject.connect(self.settingListWidget,
+            QtCore.SIGNAL(u'currentRowChanged(int)'),
+            self.stackedLayout.setCurrentIndex)
 
     def retranslateUi(self, settingsDialog):
         settingsDialog.setWindowTitle(translate('OpenLP.SettingsForm',

openlp/core/ui/settingsform.py

@@ -28,9 +28,9 @@ The :mod:`settingsform` provides a user interface for the OpenLP settings
 """
 import logging
 
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 
-from openlp.core.lib import Receiver
+from openlp.core.lib import Receiver, build_icon, PluginStatus
 from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab
 from settingsdialog import Ui_SettingsDialog
 
@@ -47,48 +47,49 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
         # General tab
-        generalTab = GeneralTab(screens)
+        self.generalTab = GeneralTab(self, screens)
-        self.addTab(u'General', generalTab)
         # Themes tab
-        themesTab = ThemesTab(mainWindow)
+        self.themesTab = ThemesTab(self, mainWindow)
-        self.addTab(u'Themes', themesTab)
         # Advanced tab
-        advancedTab = AdvancedTab()
+        self.advancedTab = AdvancedTab(self)
-        self.addTab(u'Advanced', advancedTab)
 
-    def addTab(self, name, tab):
+    def exec_(self):
-        """
+        # load all the settings
-        Add a tab to the form
+        self.settingListWidget.clear()
-        """
+        for tabIndex in range(0, self.stackedLayout.count() + 1):
-        log.info(u'Adding %s tab' % tab.tabTitle)
+            # take at 0 and the rest shuffell up.
-        self.settingsTabWidget.addTab(tab, tab.tabTitleVisible)
+            self.stackedLayout.takeAt(0)
+        self.insertTab(self.generalTab, 0, PluginStatus.Active)
+        self.insertTab(self.themesTab, 1, PluginStatus.Active)
+        self.insertTab(self.advancedTab, 2, PluginStatus.Active)
+        count = 3
+        for plugin in self.plugins:
+            if plugin.settings_tab:
+                self.insertTab(plugin.settings_tab, count, plugin.status)
+                count += 1
+        self.settingListWidget.setCurrentRow(0)
+        return QtGui.QDialog.exec_(self)
 
-    def insertTab(self, tab, location):
+    def insertTab(self, tab, location, is_active):
         """
         Add a tab to the form at a specific location
         """
         log.debug(u'Inserting %s tab' % tab.tabTitle)
-        # 14 : There are 3 tables currently and locations starts at -10
+        pos = self.stackedLayout.addWidget(tab)
-        self.settingsTabWidget.insertTab(
+        if is_active:
-            location + 14, tab, tab.tabTitleVisible)
+            item_name = QtGui.QListWidgetItem(tab.tabTitleVisible)
-
+            icon = build_icon(tab.icon_path)
-    def removeTab(self, tab):
+            item_name.setIcon(icon)
-        """
+            self.settingListWidget.insertItem(location, item_name)
-        Remove a tab from the form
+        else:
-        """
+            self.stackedLayout.takeAt(location)
-        log.debug(u'remove %s tab' % tab.tabTitleVisible)
-        for tabIndex in range(0, self.settingsTabWidget.count()):
-            if self.settingsTabWidget.widget(tabIndex):
-                if self.settingsTabWidget.widget(tabIndex).tabTitleVisible == \
-                    tab.tabTitleVisible:
-                    self.settingsTabWidget.removeTab(tabIndex)
 
     def accept(self):
         """
         Process the form saving the settings
         """
-        for tabIndex in range(0, self.settingsTabWidget.count()):
+        for tabIndex in range(0, self.stackedLayout.count()):
-            self.settingsTabWidget.widget(tabIndex).save()
+            self.stackedLayout.widget(tabIndex).save()
         # Must go after all settings are save
         Receiver.send_message(u'config_updated')
         return QtGui.QDialog.accept(self)
@@ -97,13 +98,17 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         """
         Process the form saving the settings
         """
-        for tabIndex in range(0, self.settingsTabWidget.count()):
+        for tabIndex in range(0, self.stackedLayout.count()):
-            self.settingsTabWidget.widget(tabIndex).cancel()
+            self.stackedLayout.widget(tabIndex).cancel()
         return QtGui.QDialog.reject(self)
 
     def postSetUp(self):
         """
         Run any post-setup code for the tabs on the form
         """
-        for tabIndex in range(0, self.settingsTabWidget.count()):
+        self.generalTab.postSetUp()
-            self.settingsTabWidget.widget(tabIndex).postSetUp()
+        self.themesTab.postSetUp()
+        self.advancedTab.postSetUp()
+        for plugin in self.plugins:
+            if plugin.settings_tab:
+                plugin.settings_tab.postSetUp()

openlp/core/ui/shortcutlistdialog.py

@@ -31,41 +31,72 @@ from openlp.core.lib import translate, build_icon
 class Ui_ShortcutListDialog(object):
     def setupUi(self, shortcutListDialog):
         shortcutListDialog.setObjectName(u'shortcutListDialog')
-        self.dialogLayout = QtGui.QVBoxLayout(shortcutListDialog)
+        shortcutListDialog.resize(500, 438)
-        self.dialogLayout.setObjectName(u'dialogLayout')
+        self.shortcutListLayout = QtGui.QVBoxLayout(shortcutListDialog)
+        self.shortcutListLayout.setObjectName(u'shortcutListLayout')
+        self.descriptionLabel = QtGui.QLabel(shortcutListDialog)
+        self.descriptionLabel.setObjectName(u'descriptionLabel')
+        self.descriptionLabel.setWordWrap(True) 
+        self.shortcutListLayout.addWidget(self.descriptionLabel)
         self.treeWidget = QtGui.QTreeWidget(shortcutListDialog)
-        self.treeWidget.setAlternatingRowColors(True)
         self.treeWidget.setObjectName(u'treeWidget')
+        self.treeWidget.setAlternatingRowColors(True)
         self.treeWidget.setColumnCount(3)
-        self.dialogLayout.addWidget(self.treeWidget)
+        self.treeWidget.setColumnWidth(0, 250)
-        self.defaultButton = QtGui.QRadioButton(shortcutListDialog)
+        self.shortcutListLayout.addWidget(self.treeWidget)
-        self.defaultButton.setChecked(True)
+        self.detailsLayout = QtGui.QGridLayout()
-        self.defaultButton.setObjectName(u'defaultButton')
+        self.detailsLayout.setObjectName(u'detailsLayout')
-        self.dialogLayout.addWidget(self.defaultButton)
+        self.detailsLayout.setContentsMargins(-1, 0, -1, -1)
-        self.customLayout = QtGui.QHBoxLayout()
+        self.defaultRadioButton = QtGui.QRadioButton(shortcutListDialog)
-        self.customLayout.setObjectName(u'customLayout')
+        self.defaultRadioButton.setObjectName(u'defaultRadioButton')
-        self.customButton = QtGui.QRadioButton(shortcutListDialog)
+        self.defaultRadioButton.setChecked(True)
-        self.customButton.setObjectName(u'customButton')
+        self.detailsLayout.addWidget(self.defaultRadioButton, 0, 0, 1, 1)
-        self.customLayout.addWidget(self.customButton)
+        self.customRadioButton = QtGui.QRadioButton(shortcutListDialog)
-        self.shortcutButton = QtGui.QPushButton(shortcutListDialog)
+        self.customRadioButton.setObjectName(u'customRadioButton')
-        self.shortcutButton.setIcon(
+        self.detailsLayout.addWidget(self.customRadioButton, 1, 0, 1, 1)
+        self.primaryLayout = QtGui.QHBoxLayout()
+        self.primaryLayout.setObjectName(u'primaryLayout')
+        self.primaryPushButton = QtGui.QPushButton(shortcutListDialog)
+        self.primaryPushButton.setObjectName(u'primaryPushButton')
+        self.primaryPushButton.setMinimumSize(QtCore.QSize(84, 0))
+        self.primaryPushButton.setIcon(
             build_icon(u':/system/system_configure_shortcuts.png'))
-        self.shortcutButton.setCheckable(True)
+        self.primaryPushButton.setCheckable(True)
-        self.shortcutButton.setObjectName(u'shortcutButton')
+        self.primaryLayout.addWidget(self.primaryPushButton)
-        self.customLayout.addWidget(self.shortcutButton)
+        self.clearPrimaryButton = QtGui.QToolButton(shortcutListDialog)
-        self.clearShortcutButton = QtGui.QToolButton(shortcutListDialog)
+        self.clearPrimaryButton.setObjectName(u'clearPrimaryButton')
-        self.clearShortcutButton.setIcon(
+        self.clearPrimaryButton.setMinimumSize(QtCore.QSize(0, 16))
+        self.clearPrimaryButton.setIcon(
             build_icon(u':/system/clear_shortcut.png'))
-        self.clearShortcutButton.setAutoRaise(True)
+        self.primaryLayout.addWidget(self.clearPrimaryButton)
-        self.clearShortcutButton.setObjectName(u'clearShortcutButton')
+        self.detailsLayout.addLayout(self.primaryLayout, 1, 1, 1, 1)
-        self.customLayout.addWidget(self.clearShortcutButton)
+        self.alternateLayout = QtGui.QHBoxLayout()
-        self.customLayout.addStretch()
+        self.alternateLayout.setObjectName(u'alternateLayout')
-        self.dialogLayout.addLayout(self.customLayout)
+        self.alternatePushButton = QtGui.QPushButton(shortcutListDialog)
+        self.alternatePushButton.setObjectName(u'alternatePushButton')
+        self.alternatePushButton.setCheckable(True)
+        self.alternatePushButton.setIcon(
+            build_icon(u':/system/system_configure_shortcuts.png'))
+        self.alternateLayout.addWidget(self.alternatePushButton)
+        self.clearAlternateButton = QtGui.QToolButton(shortcutListDialog)
+        self.clearAlternateButton.setObjectName(u'clearAlternateButton')
+        self.clearAlternateButton.setIcon(
+            build_icon(u':/system/clear_shortcut.png'))
+        self.alternateLayout.addWidget(self.clearAlternateButton)
+        self.detailsLayout.addLayout(self.alternateLayout, 1, 2, 1, 1)
+        self.primaryLabel = QtGui.QLabel(shortcutListDialog)
+        self.primaryLabel.setObjectName(u'primaryLabel')
+        self.detailsLayout.addWidget(self.primaryLabel, 0, 1, 1, 1)
+        self.alternateLabel = QtGui.QLabel(shortcutListDialog)
+        self.alternateLabel.setObjectName(u'alternateLabel')
+        self.detailsLayout.addWidget(self.alternateLabel, 0, 2, 1, 1)
+        self.shortcutListLayout.addLayout(self.detailsLayout)
         self.buttonBox = QtGui.QDialogButtonBox(shortcutListDialog)
-        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
-            QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.Reset)
         self.buttonBox.setObjectName(u'buttonBox')
-        self.dialogLayout.addWidget(self.buttonBox)
+        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
+            QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.RestoreDefaults)
+        self.shortcutListLayout.addWidget(self.buttonBox)
         self.retranslateUi(shortcutListDialog)
         QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'),
             shortcutListDialog.accept)
@@ -76,13 +107,24 @@ class Ui_ShortcutListDialog(object):
     def retranslateUi(self, shortcutListDialog):
         shortcutListDialog.setWindowTitle(
             translate('OpenLP.ShortcutListDialog', 'Customize Shortcuts'))
+        self.descriptionLabel.setText(translate('OpenLP.ShortcutListDialog',
+            'Select an action and click one of the buttons below to start '
+            'capturing a new primary or alternate shortcut, respectively.'))
         self.treeWidget.setHeaderLabels([
             translate('OpenLP.ShortcutListDialog', 'Action'),
             translate('OpenLP.ShortcutListDialog', 'Shortcut'),
             translate('OpenLP.ShortcutListDialog', 'Alternate')])
-        self.defaultButton.setText(
+        self.defaultRadioButton.setText(
-            translate('OpenLP.ShortcutListDialog', 'Default: %s'))
+            translate('OpenLP.ShortcutListDialog', 'Default'))
-        self.customButton.setText(
+        self.customRadioButton.setText(
-            translate('OpenLP.ShortcutListDialog', 'Custom:'))
+            translate('OpenLP.ShortcutListDialog', 'Custom'))
-        self.shortcutButton.setText(
+        self.primaryPushButton.setToolTip(
-            translate('OpenLP.ShortcutListDialog', 'None'))
+            translate('OpenLP.ShortcutListDialog', 'Capture shortcut.'))
+        self.alternatePushButton.setToolTip(
+            translate('OpenLP.ShortcutListDialog', 'Capture shortcut.'))
+        self.clearPrimaryButton.setToolTip(
+            translate('OpenLP.ShortcutListDialog',
+            'Restore the default shortcut of this action.'))
+        self.clearAlternateButton.setToolTip(
+            translate('OpenLP.ShortcutListDialog',
+            'Restore the default shortcut of this action.'))

openlp/core/ui/shortcutlistform.py

@@ -30,6 +30,7 @@ import re
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.utils import translate
+from openlp.core.utils.actions import ActionList
 from shortcutlistdialog import Ui_ShortcutListDialog
 
 REMOVE_AMPERSAND = re.compile(r'&{1}')
@@ -41,72 +42,391 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
     The shortcut list dialog
     """
 
-    def __init__(self, parent):
+    def __init__(self, parent=None):
-        """
-        Do some initialisation stuff
-        """
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
-        self.actionList = None
+        self.changedActions = {}
-        self.captureShortcut = False
+        self.action_list = ActionList.get_instance()
-        QtCore.QObject.connect(self.shortcutButton,
+        QtCore.QObject.connect(self.primaryPushButton,
-            QtCore.SIGNAL(u'toggled(bool)'), self.onShortcutButtonClicked)
+            QtCore.SIGNAL(u'toggled(bool)'), self.onPrimaryPushButtonClicked)
+        QtCore.QObject.connect(self.alternatePushButton,
+            QtCore.SIGNAL(u'toggled(bool)'), self.onAlternatePushButtonClicked)
+        QtCore.QObject.connect(self.treeWidget, QtCore.SIGNAL(
+            u'currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)'),
+            self.onCurrentItemChanged)
+        QtCore.QObject.connect(self.treeWidget,
+            QtCore.SIGNAL(u'itemDoubleClicked(QTreeWidgetItem*, int)'),
+            self.onItemDoubleClicked)
+        QtCore.QObject.connect(self.clearPrimaryButton,
+            QtCore.SIGNAL(u'clicked(bool)'), self.onClearPrimaryButtonClicked)
+        QtCore.QObject.connect(self.clearAlternateButton,
+            QtCore.SIGNAL(u'clicked(bool)'), self.onClearAlternateButtonClicked)
+        QtCore.QObject.connect(self.buttonBox,
+            QtCore.SIGNAL(u'clicked(QAbstractButton*)'),
+            self.onRestoreDefaultsClicked)
+        QtCore.QObject.connect(self.defaultRadioButton,
+            QtCore.SIGNAL(u'clicked(bool)'), self.onDefaultRadioButtonClicked)
+        QtCore.QObject.connect(self.customRadioButton,
+            QtCore.SIGNAL(u'clicked(bool)'), self.onCustomRadioButtonClicked)
+
+    def keyPressEvent(self, event):
+        if self.primaryPushButton.isChecked() or \
+            self.alternatePushButton.isChecked():
+            event.ignore()
+        elif event.key() == QtCore.Qt.Key_Escape:
+            event.accept()
+            self.close()
 
     def keyReleaseEvent(self, event):
-        Qt = QtCore.Qt
+        if not self.primaryPushButton.isChecked() and \
-        if not self.captureShortcut:
+            not self.alternatePushButton.isChecked():
             return
         key = event.key()
-        if key == Qt.Key_Shift or key == Qt.Key_Control or \
+        if key == QtCore.Qt.Key_Shift or key == QtCore.Qt.Key_Control or \
-            key == Qt.Key_Meta or key == Qt.Key_Alt:
+            key == QtCore.Qt.Key_Meta or key == QtCore.Qt.Key_Alt:
             return
         key_string = QtGui.QKeySequence(key).toString()
-        if event.modifiers() & Qt.ControlModifier == Qt.ControlModifier:
+        if event.modifiers() & QtCore.Qt.ControlModifier == \
+            QtCore.Qt.ControlModifier:
             key_string = u'Ctrl+' + key_string
-        if event.modifiers() & Qt.AltModifier == Qt.AltModifier:
+        if event.modifiers() & QtCore.Qt.AltModifier == QtCore.Qt.AltModifier:
             key_string = u'Alt+' + key_string
-        if event.modifiers() & Qt.ShiftModifier == Qt.ShiftModifier:
+        if event.modifiers() & QtCore.Qt.ShiftModifier == \
+            QtCore.Qt.ShiftModifier:
             key_string = u'Shift+' + key_string
         key_sequence = QtGui.QKeySequence(key_string)
-        existing_key = QtGui.QKeySequence(u'Ctrl+Shift+F8')
+        # The action we are attempting to change.
-        if key_sequence == existing_key:
+        changing_action = self._currentItemAction()
-            QtGui.QMessageBox.warning(
+        shortcut_valid = True
-                self,
+        for category in self.action_list.categories:
+            for action in category.actions:
+                shortcuts = self._actionShortcuts(action)
+                if key_sequence not in shortcuts:
+                    continue
+                if action is changing_action:
+                    if self.primaryPushButton.isChecked() and \
+                        shortcuts.index(key_sequence) == 0:
+                        continue
+                    if self.alternatePushButton.isChecked() and \
+                        shortcuts.index(key_sequence) == 1:
+                        continue
+                # Have the same parent, thus they cannot have the same shortcut.
+                if action.parent() is changing_action.parent():
+                    shortcut_valid = False
+                # The new shortcut is already assigned, but if both shortcuts
+                # are only valid in a different widget the new shortcut is
+                # vaild, because they will not interfere.
+                if action.shortcutContext() in [QtCore.Qt.WindowShortcut,
+                    QtCore.Qt.ApplicationShortcut]:
+                    shortcut_valid = False
+                if changing_action.shortcutContext() in \
+                    [QtCore.Qt.WindowShortcut, QtCore.Qt.ApplicationShortcut]:
+                    shortcut_valid = False
+        if not shortcut_valid:
+            QtGui.QMessageBox.warning(self,
                 translate('OpenLP.ShortcutListDialog', 'Duplicate Shortcut'),
                 unicode(translate('OpenLP.ShortcutListDialog', 'The shortcut '
-                    '"%s" is already assigned to another action, please '
+                '"%s" is already assigned to another action, please '
-                    'use a different shortcut.')) % key_sequence.toString(),
+                'use a different shortcut.')) % key_sequence.toString(),
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
                 QtGui.QMessageBox.Ok
             )
         else:
-            self.shortcutButton.setText(key_sequence.toString())
+            if self.primaryPushButton.isChecked():
-        self.shortcutButton.setChecked(False)
+                self._adjustButton(self.primaryPushButton,
-        self.captureShortcut = False
+                    False, text=key_sequence.toString())
+            elif self.alternatePushButton.isChecked():
+                self._adjustButton(self.alternatePushButton,
+                    False, text=key_sequence.toString())
 
-    def exec_(self, actionList):
+    def exec_(self):
-        self.actionList = actionList
+        self.changedActions = {}
-        self.refreshActions()
+        self.reloadShortcutList()
+        self._adjustButton(self.primaryPushButton, False, False, u'')
+        self._adjustButton(self.alternatePushButton, False, False, u'')
         return QtGui.QDialog.exec_(self)
 
-    def refreshActions(self):
+    def reloadShortcutList(self):
+        """
+        Reload the ``treeWidget`` list to add new and remove old actions.
+        """
         self.treeWidget.clear()
-        for category in self.actionList.categories:
+        for category in self.action_list.categories:
+            # Check if the category is for internal use only.
+            if category.name is None:
+                continue
             item = QtGui.QTreeWidgetItem([category.name])
             for action in category.actions:
                 actionText = REMOVE_AMPERSAND.sub('', unicode(action.text()))
-                if (len(action.shortcuts()) == 2):
+                actionItem = QtGui.QTreeWidgetItem([actionText])
-                    shortcutText = action.shortcuts()[0].toString()
-                    alternateText = action.shortcuts()[1].toString()
-                else:
-                    shortcutText = action.shortcut().toString()
-                    alternateText = u''
-                actionItem = QtGui.QTreeWidgetItem(
-                    [actionText, shortcutText, alternateText])
                 actionItem.setIcon(0, action.icon())
+                actionItem.setData(0,
+                    QtCore.Qt.UserRole, QtCore.QVariant(action))
                 item.addChild(actionItem)
-            item.setExpanded(True)
             self.treeWidget.addTopLevelItem(item)
+            item.setExpanded(True)
+        self.refreshShortcutList()
 
-    def onShortcutButtonClicked(self, toggled):
+    def refreshShortcutList(self):
-        self.captureShortcut = toggled
+        """
+        This refreshes the item's shortcuts shown in the list. Note, this
+        neither adds new actions nor removes old actions.
+        """
+        iterator = QtGui.QTreeWidgetItemIterator(self.treeWidget)
+        while iterator.value():
+            item = iterator.value()
+            iterator += 1
+            action = self._currentItemAction(item)
+            if action is None:
+                continue
+            shortcuts = self._actionShortcuts(action)
+            if len(shortcuts) == 0:
+                item.setText(1, u'')
+                item.setText(2, u'')
+            elif len(shortcuts) == 1:
+                item.setText(1, shortcuts[0].toString())
+                item.setText(2, u'')
+            else:
+                item.setText(1, shortcuts[0].toString())
+                item.setText(2, shortcuts[1].toString())
+        self.onCurrentItemChanged()
+
+    def onPrimaryPushButtonClicked(self, toggled):
+        """
+        Save the new primary shortcut.
+        """
+        self.customRadioButton.setChecked(True)
+        if toggled:
+            self.alternatePushButton.setChecked(False)
+            return
+        action = self._currentItemAction()
+        if action is None:
+            return
+        shortcuts = self._actionShortcuts(action)
+        new_shortcuts = [QtGui.QKeySequence(self.primaryPushButton.text())]
+        if len(shortcuts) == 2:
+            new_shortcuts.append(shortcuts[1])
+        self.changedActions[action] = new_shortcuts
+        self.refreshShortcutList()
+
+    def onAlternatePushButtonClicked(self, toggled):
+        """
+        Save the new alternate shortcut.
+        """
+        self.customRadioButton.setChecked(True)
+        if toggled:
+            self.primaryPushButton.setChecked(False)
+            return
+        action = self._currentItemAction()
+        if action is None:
+            return
+        shortcuts = self._actionShortcuts(action)
+        new_shortcuts = []
+        if len(shortcuts) != 0:
+            new_shortcuts.append(shortcuts[0])
+        new_shortcuts.append(
+            QtGui.QKeySequence(self.alternatePushButton.text()))
+        self.changedActions[action] = new_shortcuts
+        self.refreshShortcutList()
+
+    def onItemDoubleClicked(self, item, column):
+        """
+        A item has been double clicked. The ``primaryPushButton`` will be
+        checked and the item's shortcut will be displayed.
+        """
+        action = self._currentItemAction(item)
+        if action is None:
+            return
+        self.primaryPushButton.setChecked(column in [0, 1])
+        self.alternatePushButton.setChecked(column not in [0, 1])
+        if column in [0, 1]:
+            self.primaryPushButton.setFocus(QtCore.Qt.OtherFocusReason)
+        else:
+            self.alternatePushButton.setFocus(QtCore.Qt.OtherFocusReason)
+        self.onCurrentItemChanged(item)
+
+    def onCurrentItemChanged(self, item=None, previousItem=None):
+        """
+        A item has been pressed. We adjust the button's text to the action's
+        shortcut which is encapsulate in the item.
+        """
+        action = self._currentItemAction(item)
+        self.primaryPushButton.setEnabled(action is not None)
+        self.alternatePushButton.setEnabled(action is not None)
+        primary_text = u''
+        alternate_text = u''
+        primary_label_text = u''
+        alternate_label_text = u''
+        if action is None:
+            self.primaryPushButton.setChecked(False)
+            self.alternatePushButton.setChecked(False)
+        else:
+            if len(action.defaultShortcuts) != 0:
+                primary_label_text = action.defaultShortcuts[0].toString()
+                if len(action.defaultShortcuts) == 2:
+                    alternate_label_text = action.defaultShortcuts[1].toString()
+            shortcuts = self._actionShortcuts(action)
+            # We do not want to loose pending changes, that is why we have to
+            # keep the text when, this function has not been triggered by a signal.
+            if item is None:
+                primary_text = self.primaryPushButton.text()
+                alternate_text = self.alternatePushButton.text()
+            elif len(shortcuts) == 1:
+                primary_text = shortcuts[0].toString()
+            elif len(shortcuts) == 2:
+                primary_text = shortcuts[0].toString()
+                alternate_text = shortcuts[1].toString()
+        self.primaryPushButton.setText(primary_text)
+        self.alternatePushButton.setText(alternate_text)
+        self.primaryLabel.setText(primary_label_text)
+        self.alternateLabel.setText(alternate_label_text)
+        # We do not want to toggle and radio button, as the function has not
+        # been triggered by a signal.
+        if item is None:
+            return
+        if primary_label_text == primary_text and \
+            alternate_label_text == alternate_text:
+            self.defaultRadioButton.toggle()
+        else:
+            self.customRadioButton.toggle()
+
+    def onRestoreDefaultsClicked(self, button):
+        """
+        Restores all default shortcuts.
+        """
+        if self.buttonBox.buttonRole(button) != QtGui.QDialogButtonBox.ResetRole:
+            return
+        if QtGui.QMessageBox.question(self,
+            translate('OpenLP.ShortcutListDialog', 'Restore Default Shortcuts'),
+            translate('OpenLP.ShortcutListDialog', 'Do you want to restore all '
+            'shortcuts to their defaults?'), QtGui.QMessageBox.StandardButtons(
+            QtGui.QMessageBox.Yes |
+            QtGui.QMessageBox.No)) == QtGui.QMessageBox.No:
+            return
+        self._adjustButton(self.primaryPushButton, False, text=u'')
+        self._adjustButton(self.alternatePushButton, False, text=u'')
+        for category in self.action_list.categories:
+            for action in category.actions:
+                self.changedActions[action] = action.defaultShortcuts
+        self.refreshShortcutList()
+
+    def onDefaultRadioButtonClicked(self, toggled):
+        """
+        The default radio button has been clicked, which means we have to make
+        sure, that we use the default shortcuts for the action.
+        """
+        if not toggled:
+            return
+        action = self._currentItemAction()
+        if action is None:
+            return
+        temp_shortcuts = self._actionShortcuts(action)
+        self.changedActions[action] = action.defaultShortcuts
+        self.refreshShortcutList()
+        primary_button_text = u''
+        alternate_button_text = u''
+        if len(temp_shortcuts) != 0:
+            primary_button_text = temp_shortcuts[0].toString()
+        if len(temp_shortcuts) == 2:
+            alternate_button_text = temp_shortcuts[1].toString()
+        self.primaryPushButton.setText(primary_button_text)
+        self.alternatePushButton.setText(alternate_button_text)
+
+    def onCustomRadioButtonClicked(self, toggled):
+        """
+        The custom shortcut radio button was clicked, thus we have to restore
+        the custom shortcuts by calling those functions triggered by button
+        clicks.
+        """
+        if not toggled:
+            return
+        self.onPrimaryPushButtonClicked(False)
+        self.onAlternatePushButtonClicked(False)
+        self.refreshShortcutList()
+
+    def save(self):
+        """
+        Save the shortcuts. **Note**, that we do not have to load the shortcuts,
+        as they are loaded in :class:`~openlp.core.utils.ActionList`.
+        """
+        settings = QtCore.QSettings()
+        settings.beginGroup(u'shortcuts')
+        for category in self.action_list.categories:
+            # Check if the category is for internal use only.
+            if category.name is None:
+                continue
+            for action in category.actions:
+                if self.changedActions .has_key(action):
+                    action.setShortcuts(self.changedActions[action])
+                settings.setValue(
+                    action.objectName(), QtCore.QVariant(action.shortcuts()))
+        settings.endGroup()
+
+    def onClearPrimaryButtonClicked(self, toggled):
+        """
+        Restore the defaults of this action.
+        """
+        self.primaryPushButton.setChecked(False)
+        action = self._currentItemAction()
+        if action is None:
+            return
+        shortcuts = self._actionShortcuts(action)
+        new_shortcuts = []
+        if len(action.defaultShortcuts) != 0:
+            new_shortcuts.append(action.defaultShortcuts[0])
+        if len(shortcuts) == 2:
+            new_shortcuts.append(shortcuts[1])
+        self.changedActions[action] = new_shortcuts
+        self.refreshShortcutList()
+        self.onCurrentItemChanged(self.treeWidget.currentItem())
+
+    def onClearAlternateButtonClicked(self, toggled):
+        """
+        Restore the defaults of this action.
+        """
+        self.alternatePushButton.setChecked(False)
+        action = self._currentItemAction()
+        if action is None:
+            return
+        shortcuts = self._actionShortcuts(action)
+        new_shortcuts = []
+        if len(shortcuts) != 0:
+            new_shortcuts.append(shortcuts[0])
+        if len(action.defaultShortcuts) == 2:
+            new_shortcuts.append(action.defaultShortcuts[1])
+        self.changedActions[action] = new_shortcuts
+        self.refreshShortcutList()
+        self.onCurrentItemChanged(self.treeWidget.currentItem())
+
+    def _actionShortcuts(self, action):
+        """
+        This returns the shortcuts for the given ``action``, which also includes
+        those shortcuts which are not saved yet but already assigned (as changes
+        are applied when closing the dialog).
+        """
+        if self.changedActions.has_key(action):
+            return self.changedActions[action]
+        return action.shortcuts()
+
+    def _currentItemAction(self, item=None):
+        """
+        Returns the action of the given ``item``. If no item is given, we return
+        the action of the current item of the ``treeWidget``.
+        """
+        if item is None:
+            item = self.treeWidget.currentItem()
+            if item is None:
+                return
+        return item.data(0, QtCore.Qt.UserRole).toPyObject()
+
+    def _adjustButton(self, button, checked=None, enabled=None, text=None):
+        """
+        Can be called to adjust more properties of the given ``button`` at once.
+        """
+        # Set the text before checking the button, because this emits a signal.
+        if text is not None:
+            button.setText(text)
+        if checked is not None:
+            button.setChecked(checked)
+        if enabled is not None:
+            button.setEnabled(enabled)

openlp/core/ui/slidecontroller.py

@@ -32,8 +32,9 @@ from PyQt4.phonon import Phonon
 
 from openlp.core.lib import OpenLPToolbar, Receiver, resize_image, \
     ItemCapabilities, translate
-from openlp.core.lib.ui import icon_action, UiStrings, shortcut_action
+from openlp.core.lib.ui import UiStrings, shortcut_action
 from openlp.core.ui import HideMode, MainDisplay
+from openlp.core.utils.actions import ActionList, CategoryOrder
 
 log = logging.getLogger(__name__)
 
@@ -87,11 +88,11 @@ class SlideController(QtGui.QWidget):
         # Type label for the top of the slide controller
         self.typeLabel = QtGui.QLabel(self.panel)
         if self.isLive:
-            self.typeLabel.setText(UiStrings.Live)
+            self.typeLabel.setText(UiStrings().Live)
             self.split = 1
             self.typePrefix = u'live'
         else:
-            self.typeLabel.setText(UiStrings.Preview)
+            self.typeLabel.setText(UiStrings().Preview)
             self.split = 0
             self.typePrefix = u'preview'
         self.typeLabel.setStyleSheet(u'font-weight: bold; font-size: 12pt;')
@@ -140,12 +141,16 @@ class SlideController(QtGui.QWidget):
             translate('OpenLP.SlideController', 'Previous Slide'),
             u':/slides/slide_previous.png',
             translate('OpenLP.SlideController', 'Move to previous'),
-            self.onSlideSelectedPrevious)
+            self.onSlideSelectedPrevious,
+            shortcuts=[QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp],
+            context=QtCore.Qt.WidgetWithChildrenShortcut)
         self.nextItem = self.toolbar.addToolbarButton(
             translate('OpenLP.SlideController', 'Next Slide'),
             u':/slides/slide_next.png',
             translate('OpenLP.SlideController', 'Move to next'),
-            self.onSlideSelectedNext)
+            self.onSlideSelectedNext,
+            shortcuts=[QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown],
+            context=QtCore.Qt.WidgetWithChildrenShortcut)
         self.toolbar.addToolbarSeparator(u'Close Separator')
         if self.isLive:
             self.hideMenu = QtGui.QToolButton(self.toolbar)
@@ -154,16 +159,20 @@ class SlideController(QtGui.QWidget):
             self.toolbar.addToolbarWidget(u'Hide Menu', self.hideMenu)
             self.hideMenu.setMenu(QtGui.QMenu(
                 translate('OpenLP.SlideController', 'Hide'), self.toolbar))
-            self.blankScreen = icon_action(self.hideMenu, u'Blank Screen',
+            self.blankScreen = shortcut_action(self.hideMenu, u'blankScreen',
-                u':/slides/slide_blank.png', False)
+                [QtCore.Qt.Key_Period], self.onBlankDisplay,
+                u':/slides/slide_blank.png', False, UiStrings().LiveToolbar)
             self.blankScreen.setText(
                 translate('OpenLP.SlideController', 'Blank Screen'))
-            self.themeScreen = icon_action(self.hideMenu, u'Blank Theme',
+            self.themeScreen = shortcut_action(self.hideMenu, u'themeScreen',
-                u':/slides/slide_theme.png', False)
+                [QtGui.QKeySequence(u'T')], self.onThemeDisplay,
+                u':/slides/slide_theme.png', False, UiStrings().LiveToolbar)
             self.themeScreen.setText(
                 translate('OpenLP.SlideController', 'Blank to Theme'))
-            self.desktopScreen = icon_action(self.hideMenu, u'Desktop Screen',
+            self.desktopScreen = shortcut_action(self.hideMenu,
-                u':/slides/slide_desktop.png', False)
+                u'desktopScreen', [QtGui.QKeySequence(u'D')],
+                self.onHideDisplay, u':/slides/slide_desktop.png', False,
+                UiStrings().LiveToolbar)
             self.desktopScreen.setText(
                 translate('OpenLP.SlideController', 'Show Desktop'))
             self.hideMenu.setDefaultAction(self.blankScreen)
@@ -185,7 +194,7 @@ class SlideController(QtGui.QWidget):
             self.delaySpinBox.setMinimum(1)
             self.delaySpinBox.setMaximum(180)
             self.toolbar.addToolbarWidget(u'Image SpinBox', self.delaySpinBox)
-            self.delaySpinBox.setSuffix(UiStrings.Seconds)
+            self.delaySpinBox.setSuffix(UiStrings().Seconds)
             self.delaySpinBox.setToolTip(translate('OpenLP.SlideController',
                 'Delay between slides in seconds'))
         else:
@@ -291,12 +300,6 @@ class SlideController(QtGui.QWidget):
         QtCore.QObject.connect(self.previewListWidget,
             QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
         if self.isLive:
-            QtCore.QObject.connect(self.blankScreen,
-                QtCore.SIGNAL(u'triggered(bool)'), self.onBlankDisplay)
-            QtCore.QObject.connect(self.themeScreen,
-                QtCore.SIGNAL(u'triggered(bool)'), self.onThemeDisplay)
-            QtCore.QObject.connect(self.desktopScreen,
-                QtCore.SIGNAL(u'triggered(bool)'), self.onHideDisplay)
             QtCore.QObject.connect(self.volumeSlider,
                 QtCore.SIGNAL(u'sliderReleased()'), self.mediaVolume)
             QtCore.QObject.connect(Receiver.get_receiver(),
@@ -362,33 +365,35 @@ class SlideController(QtGui.QWidget):
             QtCore.SIGNAL(u'config_screen_changed'), self.screenSizeChanged)
 
     def setPreviewHotkeys(self, parent=None):
-        actionList = self.parent.actionList
+        self.previousItem.setObjectName(u'previousItemPreview')
-        self.previousItem.setShortcuts([QtCore.Qt.Key_Up, 0])
+        self.nextItem.setObjectName(u'nextItemPreview')
-        actionList.add_action(self.previousItem, u'Preview')
+        action_list = ActionList.get_instance()
-        self.nextItem.setShortcuts([QtCore.Qt.Key_Down, 0])
+        action_list.add_action(self.previousItem)
-        actionList.add_action(self.nextItem, u'Preview')
+        action_list.add_action(self.nextItem)
 
     def setLiveHotkeys(self, parent=None):
-        actionList = self.parent.actionList
+        self.previousItem.setObjectName(u'previousItemLive')
-        self.previousItem.setShortcuts([QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp])
+        self.nextItem.setObjectName(u'nextItemLive')
-        self.previousItem.setShortcutContext(
+        action_list = ActionList.get_instance()
-            QtCore.Qt.WidgetWithChildrenShortcut)
+        action_list.add_category(
-        actionList.add_action(self.previousItem, u'Live')
+            UiStrings().LiveToolbar, CategoryOrder.standardToolbar)
-        self.nextItem.setShortcuts([QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown])
+        action_list.add_action(self.previousItem)
-        self.nextItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
+        action_list.add_action(self.nextItem)
-        actionList.add_action(self.nextItem, u'Live')
+        self.previousService = shortcut_action(parent, u'previousService',
-        self.previousService = shortcut_action(parent,
+            [QtCore.Qt.Key_Left], self.servicePrevious, UiStrings().LiveToolbar)
-            translate('OpenLP.SlideController', 'Previous Service'),
+        self.previousService.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
-            [QtCore.Qt.Key_Left, 0], self.servicePrevious)
+        self.previousService.setText(
-        actionList.add_action(self.previousService, u'Live')
+            translate('OpenLP.SlideController', 'Previous Service'))
-        self.nextService = shortcut_action(parent,
+        self.nextService = shortcut_action(parent, 'nextService',
-            translate('OpenLP.SlideController', 'Next Service'),
+            [QtCore.Qt.Key_Right], self.serviceNext, UiStrings().LiveToolbar)
-            [QtCore.Qt.Key_Right, 0], self.serviceNext)
+        self.nextService.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
-        actionList.add_action(self.nextService, u'Live')
+        self.nextService.setText(
-        self.escapeItem = shortcut_action(parent,
+            translate('OpenLP.SlideController', 'Next Service'))
-            translate('OpenLP.SlideController', 'Escape Item'),
+        self.escapeItem = shortcut_action(parent, 'escapeItem',
-            [QtCore.Qt.Key_Escape, 0], self.liveEscape)
+            [QtCore.Qt.Key_Escape], self.liveEscape, UiStrings().LiveToolbar)
-        actionList.add_action(self.escapeItem, u'Live')
+        self.escapeItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
+        self.escapeItem.setText(
+            translate('OpenLP.SlideController', 'Escape Item'))
 
     def liveEscape(self):
         self.display.setVisible(False)
@@ -460,7 +465,7 @@ class SlideController(QtGui.QWidget):
         request = unicode(self.sender().text())
         slideno = self.slideList[request]
         self.__updatePreviewSelection(slideno)
-        self.onSlideSelected()
+        self.slideSelected()
 
     def receiveSpinDelay(self, value):
         """
@@ -556,7 +561,7 @@ class SlideController(QtGui.QWidget):
         # If service item is the same as the current on only change slide
         if item.__eq__(self.serviceItem):
             self.__checkUpdateSelectedSlide(slideno)
-            self.onSlideSelected()
+            self.slideSelected()
             return
         self._processItem(item, slideno)
 
@@ -567,24 +572,15 @@ class SlideController(QtGui.QWidget):
         """
         log.debug(u'processManagerItem live = %s' % self.isLive)
         self.onStopLoop()
-        # If old item was a command tell it to stop
+        old_item = self.serviceItem
-        if self.serviceItem:
+        self.serviceItem = serviceItem
-            if self.serviceItem.is_command():
+        if old_item and self.isLive and old_item.is_capable(
-                Receiver.send_message(u'%s_stop' %
+            ItemCapabilities.ProvidesOwnDisplay):
-                    self.serviceItem.name.lower(), [serviceItem, self.isLive])
+            self._resetBlank()
-            if self.serviceItem.is_media():
-                self.onMediaClose()
-        if self.isLive:
-            if serviceItem.is_capable(ItemCapabilities.ProvidesOwnDisplay):
-                self._forceUnblank()
-            blanked = self.blankScreen.isChecked()
-        else:
-            blanked = False
         Receiver.send_message(u'%s_start' % serviceItem.name.lower(),
-            [serviceItem, self.isLive, blanked, slideno])
+            [serviceItem, self.isLive, self.hideMode(), slideno])
         self.slideList = {}
         width = self.parent.controlSplitter.sizes()[self.split]
-        self.serviceItem = serviceItem
         self.previewListWidget.clear()
         self.previewListWidget.setRowCount(0)
         self.previewListWidget.setColumnWidth(0, width)
@@ -643,12 +639,25 @@ class SlideController(QtGui.QWidget):
             self.previewListWidget.viewport().size().width())
         self.__updatePreviewSelection(slideno)
         self.enableToolBar(serviceItem)
-        # Pass to display for viewing
+        # Pass to display for viewing.
-        self.display.buildHtml(self.serviceItem)
+        # Postpone image build, we need to do this later to avoid the theme
+        # flashing on the screen
+        if not self.serviceItem.is_image():
+            self.display.buildHtml(self.serviceItem)
         if serviceItem.is_media():
             self.onMediaStart(serviceItem)
-        self.onSlideSelected()
+        self.slideSelected(True)
         self.previewListWidget.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 serviceItem.is_command():
+                Receiver.send_message(u'%s_stop' %
+                    old_item.name.lower(), [old_item, self.isLive])
+            if old_item.is_media() and not serviceItem.is_media():
+                self.onMediaClose()
         Receiver.send_message(u'slidecontroller_%s_started' % self.typePrefix,
             [serviceItem])
 
@@ -695,7 +704,7 @@ class SlideController(QtGui.QWidget):
             self.updatePreview()
         else:
             self.previewListWidget.selectRow(0)
-            self.onSlideSelected()
+            self.slideSelected()
 
     def onSlideSelectedIndex(self, message):
         """
@@ -710,7 +719,7 @@ class SlideController(QtGui.QWidget):
             self.updatePreview()
         else:
             self.__checkUpdateSelectedSlide(index)
-            self.onSlideSelected()
+            self.slideSelected()
 
     def mainDisplaySetBackground(self):
         """
@@ -741,80 +750,85 @@ class SlideController(QtGui.QWidget):
         """
         self.onBlankDisplay(False)
 
-    def onBlankDisplay(self, checked):
+    def onBlankDisplay(self, checked=None):
         """
         Handle the blank screen button actions
         """
+        if checked is None:
+            checked = self.blankScreen.isChecked()
         log.debug(u'onBlankDisplay %s' % checked)
         self.hideMenu.setDefaultAction(self.blankScreen)
         self.blankScreen.setChecked(checked)
         self.themeScreen.setChecked(False)
         self.desktopScreen.setChecked(False)
         if checked:
-            Receiver.send_message(u'maindisplay_hide', HideMode.Blank)
             QtCore.QSettings().setValue(
                 self.parent.generalSettingsSection + u'/screen blank',
                 QtCore.QVariant(u'blanked'))
         else:
-            Receiver.send_message(u'maindisplay_show')
             QtCore.QSettings().remove(
                 self.parent.generalSettingsSection + u'/screen blank')
-        self.blankPlugin(checked)
+        self.blankPlugin()
         self.updatePreview()
 
-    def onThemeDisplay(self, checked):
+    def onThemeDisplay(self, checked=None):
         """
         Handle the Theme screen button
         """
+        if checked is None:
+            checked = self.themeScreen.isChecked()
         log.debug(u'onThemeDisplay %s' % checked)
         self.hideMenu.setDefaultAction(self.themeScreen)
         self.blankScreen.setChecked(False)
         self.themeScreen.setChecked(checked)
         self.desktopScreen.setChecked(False)
         if checked:
-            Receiver.send_message(u'maindisplay_hide', HideMode.Theme)
             QtCore.QSettings().setValue(
                 self.parent.generalSettingsSection + u'/screen blank',
                 QtCore.QVariant(u'themed'))
         else:
-            Receiver.send_message(u'maindisplay_show')
             QtCore.QSettings().remove(
                 self.parent.generalSettingsSection + u'/screen blank')
-        self.blankPlugin(checked)
+        self.blankPlugin()
         self.updatePreview()
 
-    def onHideDisplay(self, checked):
+    def onHideDisplay(self, checked=None):
         """
         Handle the Hide screen button
         """
+        if checked is None:
+            checked = self.desktopScreen.isChecked()
         log.debug(u'onHideDisplay %s' % checked)
         self.hideMenu.setDefaultAction(self.desktopScreen)
         self.blankScreen.setChecked(False)
         self.themeScreen.setChecked(False)
         self.desktopScreen.setChecked(checked)
         if checked:
-            Receiver.send_message(u'maindisplay_hide', HideMode.Screen)
             QtCore.QSettings().setValue(
                 self.parent.generalSettingsSection + u'/screen blank',
                 QtCore.QVariant(u'hidden'))
         else:
-            Receiver.send_message(u'maindisplay_show')
             QtCore.QSettings().remove(
                 self.parent.generalSettingsSection + u'/screen blank')
         self.hidePlugin(checked)
         self.updatePreview()
 
-    def blankPlugin(self, blank):
+    def blankPlugin(self):
         """
-        Blank the display screen within a plugin if required.
+        Blank/Hide the display screen within a plugin if required.
         """
-        log.debug(u'blankPlugin %s ', blank)
+        hide_mode = self.hideMode()
+        log.debug(u'blankPlugin %s ', hide_mode)
         if self.serviceItem is not None:
-            if blank:
+            if hide_mode:
+                if not self.serviceItem.is_command():
+                    Receiver.send_message(u'maindisplay_hide', hide_mode)
                 Receiver.send_message(u'%s_blank'
                     % self.serviceItem.name.lower(),
-                    [self.serviceItem, self.isLive])
+                    [self.serviceItem, self.isLive, hide_mode])
             else:
+                if not self.serviceItem.is_command():
+                    Receiver.send_message(u'maindisplay_show')
                 Receiver.send_message(u'%s_unblank'
                     % self.serviceItem.name.lower(),
                     [self.serviceItem, self.isLive])
@@ -826,15 +840,24 @@ class SlideController(QtGui.QWidget):
         log.debug(u'hidePlugin %s ', hide)
         if self.serviceItem is not None:
             if hide:
+                Receiver.send_message(u'maindisplay_hide', HideMode.Screen)
                 Receiver.send_message(u'%s_hide'
                     % self.serviceItem.name.lower(),
                     [self.serviceItem, self.isLive])
             else:
+                if not self.serviceItem.is_command():
+                    Receiver.send_message(u'maindisplay_show')
                 Receiver.send_message(u'%s_unblank'
                     % self.serviceItem.name.lower(),
                     [self.serviceItem, self.isLive])
 
-    def onSlideSelected(self):
+    def onSlideSelected(self, start=False):
+        """
+        Slide selected in controller
+        """
+        self.slideSelected()
+
+    def slideSelected(self, start=False):
         """
         Generate the preview when you click on a slide.
         if this is the Live Controller also display on the screen
@@ -843,7 +866,7 @@ class SlideController(QtGui.QWidget):
         self.selectedRow = 0
         if row > -1 and row < self.previewListWidget.rowCount():
             if self.serviceItem.is_command():
-                if self.isLive:
+                if self.isLive and not start:
                     Receiver.send_message(
                         u'%s_slide' % self.serviceItem.name.lower(),
                         [self.serviceItem, self.isLive, row])
@@ -853,7 +876,11 @@ class SlideController(QtGui.QWidget):
                 if self.serviceItem.is_text():
                     frame = self.display.text(toDisplay)
                 else:
-                    frame = self.display.image(toDisplay)
+                    if start:
+                        self.display.buildHtml(self.serviceItem, toDisplay)
+                        frame = self.display.preview()
+                    else:
+                        frame = self.display.image(toDisplay)
                     # reset the store used to display first image
                     self.serviceItem.bg_image_bytes = None
                 self.slidePreview.setPixmap(QtGui.QPixmap.fromImage(frame))
@@ -919,7 +946,7 @@ class SlideController(QtGui.QWidget):
                     Receiver.send_message('servicemanager_next_item')
                     return
             self.__checkUpdateSelectedSlide(row)
-            self.onSlideSelected()
+            self.slideSelected()
 
     def onSlideSelectedPreviousNoloop(self):
         self.onSlideSelectedPrevious(False)
@@ -942,7 +969,7 @@ class SlideController(QtGui.QWidget):
                 else:
                     row = 0
             self.__checkUpdateSelectedSlide(row)
-            self.onSlideSelected()
+            self.slideSelected()
 
     def __checkUpdateSelectedSlide(self, row):
         if row + 1 < self.previewListWidget.rowCount():
@@ -963,7 +990,7 @@ class SlideController(QtGui.QWidget):
         else:
             self.previewListWidget.selectRow(
                         self.previewListWidget.rowCount() - 1)
-            self.onSlideSelected()
+            self.slideSelected()
 
     def onStartLoop(self):
         """
@@ -1095,20 +1122,32 @@ class SlideController(QtGui.QWidget):
         self.slidePreview.clear()
         self.slidePreview.show()
 
-    def _forceUnblank(self):
+    def _resetBlank(self):
         """
         Used by command items which provide their own displays to reset the
         screen hide attributes
         """
-        blank = None
+        hide_mode = self.hideMode()
-        if self.blankScreen.isChecked:
+        if hide_mode == HideMode.Blank:
-            blank = self.blankScreen
+            self.onBlankDisplay(True)
-        if self.themeScreen.isChecked:
+        elif hide_mode == HideMode.Theme:
-            blank = self.themeScreen
+            self.onThemeDisplay(True)
-        if self.desktopScreen.isChecked:
+        elif hide_mode == HideMode.Screen:
-            blank = self.desktopScreen
+            self.onHideDisplay(True)
-        if blank:
+        else:
-            blank.setChecked(False)
+            self.hidePlugin(False)
-            self.hideMenu.setDefaultAction(blank)
+
-            QtCore.QSettings().remove(
+    def hideMode(self):
-                self.parent.generalSettingsSection + u'/screen blank')
+        """
+        Determine what the hide mode should be according to the blank button
+        """
+        if not self.isLive:
+            return None
+        elif self.blankScreen.isChecked():
+            return HideMode.Blank
+        elif self.themeScreen.isChecked():
+            return HideMode.Theme
+        elif self.desktopScreen.isChecked():
+            return HideMode.Screen
+        else:
+            return None

openlp/core/ui/starttimedialog.py

@@ -107,12 +107,12 @@ class Ui_StartTimeDialog(object):
     def retranslateUi(self, StartTimeDialog):
         self.setWindowTitle(translate('OpenLP.StartTimeForm',
             'Item Start and Finish Time'))
-        self.hourSpinBox.setSuffix(UiStrings.Hours)
+        self.hourSpinBox.setSuffix(UiStrings().Hours)
-        self.minuteSpinBox.setSuffix(UiStrings.Minutes)
+        self.minuteSpinBox.setSuffix(UiStrings().Minutes)
-        self.secondSpinBox.setSuffix(UiStrings.Seconds)
+        self.secondSpinBox.setSuffix(UiStrings().Seconds)
-        self.hourFinishSpinBox.setSuffix(UiStrings.Hours)
+        self.hourFinishSpinBox.setSuffix(UiStrings().Hours)
-        self.minuteFinishSpinBox.setSuffix(UiStrings.Minutes)
+        self.minuteFinishSpinBox.setSuffix(UiStrings().Minutes)
-        self.secondFinishSpinBox.setSuffix(UiStrings.Seconds)
+        self.secondFinishSpinBox.setSuffix(UiStrings().Seconds)
         self.hourLabel.setText(translate('OpenLP.StartTimeForm', 'Hours:'))
         self.minuteLabel.setText(translate('OpenLP.StartTimeForm', 'Minutes:'))
         self.secondLabel.setText(translate('OpenLP.StartTimeForm', 'Seconds:'))

openlp/core/ui/starttimeform.py

@@ -53,11 +53,12 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog):
         self.hourFinishSpinBox.setValue(hours)
         self.minuteFinishSpinBox.setValue(minutes)
         self.secondFinishSpinBox.setValue(seconds)
-        self.hourFinishLabel.setText(u'%s%s' % (unicode(hour), UiStrings.Hours))
+        self.hourFinishLabel.setText(u'%s%s' % (unicode(hour),
+            UiStrings().Hours))
         self.minuteFinishLabel.setText(u'%s%s' %
-            (unicode(minutes), UiStrings.Minutes))
+            (unicode(minutes), UiStrings().Minutes))
         self.secondFinishLabel.setText(u'%s%s' %
-            (unicode(seconds), UiStrings.Seconds))
+            (unicode(seconds), UiStrings().Seconds))
         return QtGui.QDialog.exec_(self)
 
     def accept(self):

openlp/core/ui/themeform.py

@@ -290,7 +290,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
                 'Edit Theme - %s')) % self.theme.theme_name)
             self.next()
         else:
-            self.setWindowTitle(UiStrings.NewTheme)
+            self.setWindowTitle(UiStrings().NewTheme)
         return QtGui.QWizard.exec_(self)
 
     def initializePage(self, id):
@@ -473,7 +473,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         """
         images_filter = get_images_filter()
         images_filter = u'%s;;%s (*.*) (*)' % (
-            images_filter, UiStrings.AllFiles)
+            images_filter, UiStrings().AllFiles)
         filename = QtGui.QFileDialog.getOpenFileName(self,
             translate('OpenLP.ThemeForm', 'Select Image'), u'',
             images_filter)

openlp/core/ui/thememanager.py

@@ -63,7 +63,7 @@ class ThemeManager(QtGui.QWidget):
         self.layout.setMargin(0)
         self.layout.setObjectName(u'layout')
         self.toolbar = OpenLPToolbar(self)
-        self.toolbar.addToolbarButton(UiStrings.NewTheme,
+        self.toolbar.addToolbarButton(UiStrings().NewTheme,
             u':/themes/theme_new.png',
             translate('OpenLP.ThemeManager', 'Create a new theme.'),
             self.onAddTheme)
@@ -280,6 +280,8 @@ class ThemeManager(QtGui.QWidget):
             self.fileRenameForm.fileNameEdit.setText(oldThemeName)
             if self.fileRenameForm.exec_():
                 newThemeName = unicode(self.fileRenameForm.fileNameEdit.text())
+                if oldThemeName == newThemeName:
+                    return
                 if self.checkIfThemeExists(newThemeName):
                     oldThemeData = self.getThemeData(oldThemeName)
                     self.cloneThemeData(oldThemeData, newThemeName)
@@ -333,6 +335,7 @@ class ThemeManager(QtGui.QWidget):
                 self.oldBackgroundImage = theme.background_filename
             self.themeForm.theme = theme
             self.themeForm.exec_(True)
+            self.oldBackgroundImage = None
 
     def onDeleteTheme(self):
         """
@@ -449,7 +452,7 @@ class ThemeManager(QtGui.QWidget):
             # No themes have been found so create one
             if len(files) == 0:
                 theme = ThemeXML()
-                theme.theme_name = UiStrings.Default
+                theme.theme_name = UiStrings().Default
                 self._writeTheme(theme, None, None)
                 QtCore.QSettings().setValue(
                     self.settingsSection + u'/global theme',

openlp/core/ui/themestab.py

@@ -34,9 +34,11 @@ class ThemesTab(SettingsTab):
     """
     ThemesTab is the theme settings tab in the settings dialog.
     """
-    def __init__(self, parent):
+    def __init__(self, parent, mainwindow):
-        self.parent = parent
+        self.mainwindow = mainwindow
-        SettingsTab.__init__(self, u'Themes')
+        generalTranslated = translate('ThemeTab', 'Themes')
+        SettingsTab.__init__(self, parent, u'Themes', generalTranslated)
+        self.icon_path =  u':/themes/theme_new.png'
 
     def setupUi(self):
         self.setObjectName(u'ThemesTab')
@@ -100,7 +102,7 @@ class ThemesTab(SettingsTab):
             QtCore.SIGNAL(u'theme_update_list'), self.updateThemeList)
 
     def retranslateUi(self):
-        self.tabTitleVisible = UiStrings.Themes
+        self.tabTitleVisible = UiStrings().Themes
         self.GlobalGroupBox.setTitle(
             translate('OpenLP.ThemesTab', 'Global Theme'))
         self.LevelGroupBox.setTitle(
@@ -147,7 +149,7 @@ class ThemesTab(SettingsTab):
         settings.setValue(u'global theme',
             QtCore.QVariant(self.global_theme))
         settings.endGroup()
-        self.parent.renderManager.set_global_theme(
+        self.mainwindow.renderManager.set_global_theme(
             self.global_theme, self.theme_level)
         Receiver.send_message(u'theme_update_global', self.global_theme)
 
@@ -165,7 +167,7 @@ class ThemesTab(SettingsTab):
 
     def onDefaultComboBoxChanged(self, value):
         self.global_theme = unicode(self.DefaultComboBox.currentText())
-        self.parent.renderManager.set_global_theme(
+        self.mainwindow.renderManager.set_global_theme(
             self.global_theme, self.theme_level)
         self.__previewGlobalTheme()
 
@@ -186,7 +188,7 @@ class ThemesTab(SettingsTab):
         for theme in theme_list:
             self.DefaultComboBox.addItem(theme)
         find_and_set_in_combo_box(self.DefaultComboBox, self.global_theme)
-        self.parent.renderManager.set_global_theme(
+        self.mainwindow.renderManager.set_global_theme(
             self.global_theme, self.theme_level)
         if self.global_theme is not u'':
             self.__previewGlobalTheme()
@@ -195,7 +197,7 @@ class ThemesTab(SettingsTab):
         """
         Utility method to update the global theme preview image.
         """
-        image = self.parent.themeManagerContents.getPreviewImage(
+        image = self.mainwindow.themeManagerContents.getPreviewImage(
             self.global_theme)
         preview = QtGui.QPixmap(unicode(image))
         if not preview.isNull():

openlp/core/ui/themewizard.py

@@ -424,7 +424,7 @@ class Ui_ThemeWizard(object):
         self.backgroundComboBox.setItemText(BackgroundType.Gradient,
             translate('OpenLP.ThemeWizard', 'Gradient'))
         self.backgroundComboBox.setItemText(
-            BackgroundType.Image, UiStrings.Image)
+            BackgroundType.Image, UiStrings().Image)
         self.colorLabel.setText(translate('OpenLP.ThemeWizard', 'Color:'))
         self.gradientStartLabel.setText(
             translate(u'OpenLP.ThemeWizard', 'Starting color:'))
@@ -442,7 +442,7 @@ class Ui_ThemeWizard(object):
             translate('OpenLP.ThemeWizard', 'Top Left - Bottom Right'))
         self.gradientComboBox.setItemText(BackgroundGradientType.LeftBottom,
             translate('OpenLP.ThemeWizard', 'Bottom Left - Top Right'))
-        self.imageLabel.setText(u'%s:' % UiStrings.Image)
+        self.imageLabel.setText(u'%s:' % UiStrings().Image)
         self.mainAreaPage.setTitle(
             translate('OpenLP.ThemeWizard', 'Main Area Font Details'))
         self.mainAreaPage.setSubTitle(
@@ -451,17 +451,17 @@ class Ui_ThemeWizard(object):
         self.mainFontLabel.setText(translate('OpenLP.ThemeWizard', 'Font:'))
         self.mainColorLabel.setText(translate('OpenLP.ThemeWizard', 'Color:'))
         self.mainSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
-        self.mainSizeSpinBox.setSuffix(UiStrings.FontSizePtUnit)
+        self.mainSizeSpinBox.setSuffix(UiStrings().FontSizePtUnit)
         self.lineSpacingLabel.setText(
             translate('OpenLP.ThemeWizard', 'Line Spacing:'))
-        self.lineSpacingSpinBox.setSuffix(UiStrings.FontSizePtUnit)
+        self.lineSpacingSpinBox.setSuffix(UiStrings().FontSizePtUnit)
         self.outlineCheckBox.setText(
             translate('OpenLP.ThemeWizard', '&Outline:'))
         self.outlineSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
-        self.outlineSizeSpinBox.setSuffix(UiStrings.FontSizePtUnit)
+        self.outlineSizeSpinBox.setSuffix(UiStrings().FontSizePtUnit)
         self.shadowCheckBox.setText(translate('OpenLP.ThemeWizard', '&Shadow:'))
         self.shadowSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
-        self.shadowSizeSpinBox.setSuffix(UiStrings.FontSizePtUnit)
+        self.shadowSizeSpinBox.setSuffix(UiStrings().FontSizePtUnit)
         self.mainBoldCheckBox.setText(translate('OpenLP.ThemeWizard', 'Bold'))
         self.mainItalicsCheckBox.setText(
             translate('OpenLP.ThemeWizard', 'Italic'))
@@ -473,7 +473,7 @@ class Ui_ThemeWizard(object):
         self.footerFontLabel.setText(translate('OpenLP.ThemeWizard', 'Font:'))
         self.footerColorLabel.setText(translate('OpenLP.ThemeWizard', 'Color:'))
         self.footerSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
-        self.footerSizeSpinBox.setSuffix(UiStrings.FontSizePtUnit)
+        self.footerSizeSpinBox.setSuffix(UiStrings().FontSizePtUnit)
         self.alignmentPage.setTitle(
             translate('OpenLP.ThemeWizard', 'Text Formatting Details'))
         self.alignmentPage.setSubTitle(

openlp/core/ui/wizard.py

@@ -212,7 +212,7 @@ class OpenLPWizard(QtGui.QWizard):
         """
         if filters:
             filters += u';;'
-        filters += u'%s (*)' % UiStrings.AllFiles
+        filters += u'%s (*)' % UiStrings().AllFiles
         filename = QtGui.QFileDialog.getOpenFileName(self, title,
             os.path.dirname(SettingsManager.get_last_dir(
             self.plugin.settingsSection, 1)), filters)

openlp/core/utils/__init__.py

@@ -495,7 +495,7 @@ def get_uno_instance(resolver):
 from languagemanager import LanguageManager
 from actions import ActionList
 
-__all__ = [u'AppLocation', u'check_latest_version', u'add_actions',
+__all__ = [u'AppLocation', u'get_application_version', u'check_latest_version',
-    u'get_filesystem_encoding', u'LanguageManager', u'ActionList',
+    u'add_actions', u'get_filesystem_encoding', u'LanguageManager',
-    u'get_web_page', u'file_is_unicode', u'string_is_unicode',
+    u'ActionList', u'get_web_page', u'file_is_unicode', u'string_is_unicode',
     u'get_uno_command', u'get_uno_instance', u'delete_file']

openlp/core/utils/actions.py

@@ -27,6 +27,8 @@
 The :mod:`~openlp.core.utils.actions` module provides action list classes used
 by the shortcuts system.
 """
+from PyQt4 import QtCore, QtGui
+
 class ActionCategory(object):
     """
     The :class:`~openlp.core.utils.ActionCategory` class encapsulates a
@@ -67,6 +69,7 @@ class CategoryActionList(object):
         Python 3 "next" method.
         """
         if self.index >= len(self.actions):
+            self.index = 0
             raise StopIteration
         else:
             self.index += 1
@@ -94,6 +97,12 @@ class CategoryActionList(object):
         self.actions.append((weight, action))
         self.actions.sort(key=lambda act: act[0])
 
+    def remove(self, remove_action):
+        for action in self.actions:
+            if action[1] == remove_action:
+                self.actions.remove(action)
+                return
+
 
 class CategoryList(object):
     """
@@ -126,6 +135,7 @@ class CategoryList(object):
         Python 3 "next" method for iterator.
         """
         if self.index >= len(self.categories):
+            self.index = 0
             raise StopIteration
         else:
             self.index += 1
@@ -163,6 +173,11 @@ class CategoryList(object):
         self.categories.append(category)
         self.categories.sort(key=lambda cat: cat.weight)
 
+    def remove(self, name):
+        for category in self.categories:
+            if category.name == name:
+                self.categories.remove(category)
+
 
 class ActionList(object):
     """
@@ -171,13 +186,101 @@ class ActionList(object):
     has a weight by which it is sorted when iterating through the list of
     actions or categories.
     """
+    instance = None
+
     def __init__(self):
         self.categories = CategoryList()
 
-    def add_action(self, action, category=u'Default', weight=None):
+    @staticmethod
+    def get_instance():
+        if ActionList.instance is None:
+            ActionList.instance = ActionList()
+        return ActionList.instance
+
+    def add_action(self, action, category=None, weight=None):
+        """
+        Add an action to the list of actions.
+
+        ``action``
+            The action to add (QAction).
+
+        ``category``
+            The category this action belongs to. The category can be a QString
+            or python unicode string. **Note**, if the category is ``None``, the
+            category and its actions are being hidden in the shortcut dialog.
+            However, if they are added, it is possible to avoid assigning
+            shortcuts twice, which is important.
+
+        ``weight``
+            The weight specifies how important a category is. However, this only
+            has an impact on the order the categories are displayed.
+        """
+        if category is not None:
+            category = unicode(category)
         if category not in self.categories:
             self.categories.append(category)
+        action.defaultShortcuts = action.shortcuts()
         if weight is None:
             self.categories[category].actions.append(action)
         else:
             self.categories[category].actions.add(action, weight)
+        if category is None:
+            # Stop here, as this action is not configurable.
+            return
+        # Load the shortcut from the config.
+        settings = QtCore.QSettings()
+        settings.beginGroup(u'shortcuts')
+        shortcuts = settings.value(action.objectName(),
+            QtCore.QVariant(action.shortcuts())).toStringList()
+        action.setShortcuts(
+            [QtGui.QKeySequence(shortcut) for shortcut in shortcuts])
+        settings.endGroup()
+
+    def remove_action(self, action, category=None):
+        """
+        This removes an action from its category. Empty categories are
+        automatically removed.
+
+        ``action``
+            The QAction object to be removed.
+
+        ``category``
+            The name (unicode string) of the category, which contains the
+            action. Defaults to None.
+        """
+        if category is not None:
+            category = unicode(category)
+        if category not in self.categories:
+            return
+        self.categories[category].actions.remove(action)
+        # Remove empty categories.
+        if len(self.categories[category].actions) == 0:
+            self.categories.remove(category)
+
+    def add_category(self, name, weight):
+        """
+        Add an empty category to the list of categories. This is ony convenient
+        for categories with a given weight.
+
+        ``name``
+            The category's name.
+
+        ``weight``
+            The category's weight (int).
+        """
+        if name in self.categories:
+            # Only change the weight and resort the categories again.
+            for category in self.categories:
+                if category.name == name:
+                    category.weight = weight
+            self.categories.categories.sort(key=lambda cat: cat.weight)
+            return
+        self.categories.add(name, weight)
+
+
+class CategoryOrder(object):
+    """
+    An enumeration class for category weights.
+    """
+    standardMenu = -20
+    standardToolbar = -10

openlp/plugins/alerts/alertsplugin.py

@@ -30,6 +30,8 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
 from openlp.core.lib.db import Manager
+from openlp.core.lib.ui import icon_action, UiStrings
+from openlp.core.utils.actions import ActionList
 from openlp.plugins.alerts.lib import AlertsManager, AlertsTab
 from openlp.plugins.alerts.lib.db import init_schema
 from openlp.plugins.alerts.forms import AlertForm
@@ -41,9 +43,10 @@ class AlertsPlugin(Plugin):
 
     def __init__(self, plugin_helpers):
         Plugin.__init__(self, u'Alerts', plugin_helpers,
-            settingsTabClass=AlertsTab)
+            settings_tab_class=AlertsTab)
         self.weight = -3
-        self.icon = build_icon(u':/plugins/plugin_alerts.png')
+        self.icon_path = u':/plugins/plugin_alerts.png'
+        self.icon = build_icon(self.icon_path)
         self.alertsmanager = AlertsManager(self)
         self.manager = Manager(u'alerts', init_schema)
         self.alertForm = AlertForm(self)
@@ -58,9 +61,8 @@ class AlertsPlugin(Plugin):
             use it as their parent.
         """
         log.info(u'add tools menu')
-        self.toolsAlertItem = QtGui.QAction(tools_menu)
+        self.toolsAlertItem = icon_action(tools_menu, u'toolsAlertItem',
-        self.toolsAlertItem.setIcon(build_icon(u':/plugins/plugin_alerts.png'))
+            u':/plugins/plugin_alerts.png')
-        self.toolsAlertItem.setObjectName(u'toolsAlertItem')
         self.toolsAlertItem.setText(translate('AlertsPlugin', '&Alert'))
         self.toolsAlertItem.setStatusTip(
             translate('AlertsPlugin', 'Show an alert message.'))
@@ -74,6 +76,8 @@ class AlertsPlugin(Plugin):
         log.info(u'Alerts Initialising')
         Plugin.initialise(self)
         self.toolsAlertItem.setVisible(True)
+        action_list = ActionList.get_instance()
+        action_list.add_action(self.toolsAlertItem, UiStrings().Tools)
         self.liveController.alertTab = self.settings_tab
 
     def finalise(self):
@@ -84,6 +88,8 @@ class AlertsPlugin(Plugin):
         self.manager.finalise()
         Plugin.finalise(self)
         self.toolsAlertItem.setVisible(False)
+        action_list = ActionList.get_instance()
+        action_list.remove_action(self.toolsAlertItem, u'Tools')
 
     def toggleAlertsState(self):
         self.alertsActive = not self.alertsActive

openlp/plugins/alerts/forms/alertform.py

@@ -61,6 +61,12 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
         QtCore.QObject.connect(self.alertListWidget,
             QtCore.SIGNAL(u'currentRowChanged(int)'), self.onCurrentRowChanged)
 
+    def exec_(self):
+        self.displayButton.setEnabled(False)
+        self.displayCloseButton.setEnabled(False)
+        self.alertTextEdit.setText(u'')
+        return QtGui.QDialog.exec_(self)
+
     def loadList(self):
         """
         Loads the list with alerts.
@@ -125,6 +131,12 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
         # Only enable the button, if we are editing an item.
         if self.item_id:
             self.saveButton.setEnabled(True)
+        if self.alertTextEdit.text():
+            self.displayButton.setEnabled(True)
+            self.displayCloseButton.setEnabled(True)
+        else:
+            self.displayButton.setEnabled(False)
+            self.displayCloseButton.setEnabled(False)
 
     def onDoubleClick(self):
         """

openlp/plugins/alerts/lib/alertstab.py

@@ -33,8 +33,8 @@ class AlertsTab(SettingsTab):
     """
     AlertsTab is the alerts settings tab in the settings dialog.
     """
-    def __init__(self, name, visible_title):
+    def __init__(self, parent, name, visible_title, icon_path):
-        SettingsTab.__init__(self, name, visible_title)
+        SettingsTab.__init__(self, parent, name, visible_title, icon_path)
 
     def setupUi(self):
         self.setObjectName(u'AlertsTab')
@@ -109,12 +109,12 @@ class AlertsTab(SettingsTab):
             translate('AlertsPlugin.AlertsTab', 'Background color:'))
         self.FontSizeLabel.setText(
             translate('AlertsPlugin.AlertsTab', 'Font size:'))
-        self.FontSizeSpinBox.setSuffix(UiStrings.FontSizePtUnit)
+        self.FontSizeSpinBox.setSuffix(UiStrings().FontSizePtUnit)
         self.TimeoutLabel.setText(
             translate('AlertsPlugin.AlertsTab', 'Alert timeout:'))
-        self.TimeoutSpinBox.setSuffix(UiStrings.Seconds)
+        self.TimeoutSpinBox.setSuffix(UiStrings().Seconds)
-        self.PreviewGroupBox.setTitle(UiStrings.Preview)
+        self.PreviewGroupBox.setTitle(UiStrings().Preview)
-        self.FontPreview.setText(UiStrings.OLPV2)
+        self.FontPreview.setText(UiStrings().OLPV2)
 
     def onBackgroundColorButtonClicked(self):
         new_color = QtGui.QColorDialog.getColor(

openlp/plugins/bibles/bibleplugin.py

@@ -29,6 +29,8 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
+from openlp.core.lib.ui import base_action, UiStrings
+from openlp.core.utils.actions import ActionList
 from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem
 
 log = logging.getLogger(__name__)
@@ -50,6 +52,10 @@ class BiblePlugin(Plugin):
             self.manager = BibleManager(self)
         Plugin.initialise(self)
         self.importBibleItem.setVisible(True)
+        action_list = ActionList.get_instance()
+        action_list.add_action(self.importBibleItem, UiStrings().Import)
+        # Do not add the action to the list yet.
+        #action_list.add_action(self.exportBibleItem, UiStrings().Export)
         # Set to invisible until we can export bibles
         self.exportBibleItem.setVisible(False)
 
@@ -60,25 +66,25 @@ class BiblePlugin(Plugin):
         log.info(u'Plugin Finalise')
         self.manager.finalise()
         Plugin.finalise(self)
+        action_list = ActionList.get_instance()
+        action_list.remove_action(self.importBibleItem, UiStrings().Import)
         self.importBibleItem.setVisible(False)
+        #action_list.remove_action(self.exportBibleItem, UiStrings().Export)
         self.exportBibleItem.setVisible(False)
 
     def addImportMenuItem(self, import_menu):
-        self.importBibleItem = QtGui.QAction(import_menu)
+        self.importBibleItem = base_action(import_menu, u'importBibleItem')
-        self.importBibleItem.setObjectName(u'importBibleItem')
+        self.importBibleItem.setText(translate('BiblesPlugin', '&Bible'))
         import_menu.addAction(self.importBibleItem)
-        self.importBibleItem.setText(
-            translate('BiblesPlugin', '&Bible'))
         # signals and slots
         QtCore.QObject.connect(self.importBibleItem,
             QtCore.SIGNAL(u'triggered()'), self.onBibleImportClick)
         self.importBibleItem.setVisible(False)
 
     def addExportMenuItem(self, export_menu):
-        self.exportBibleItem = QtGui.QAction(export_menu)
+        self.exportBibleItem = base_action(export_menu, u'exportBibleItem')
-        self.exportBibleItem.setObjectName(u'exportBibleItem')
-        export_menu.addAction(self.exportBibleItem)
         self.exportBibleItem.setText(translate('BiblesPlugin', '&Bible'))
+        export_menu.addAction(self.exportBibleItem)
         self.exportBibleItem.setVisible(False)
 
     def onBibleImportClick(self):

openlp/plugins/bibles/forms/bibleimportform.py

@@ -377,7 +377,7 @@ class BibleImportForm(OpenLPWizard):
         self.formatComboBox.setItemText(BibleFormat.OpenSong, WizardStrings.OS)
         self.formatComboBox.setItemText(BibleFormat.WebDownload,
             translate('BiblesPlugin.ImportWizardForm', 'Web Download'))
-        self.formatComboBox.setItemText(BibleFormat.OpenLP1, UiStrings.OLPV1)
+        self.formatComboBox.setItemText(BibleFormat.OpenLP1, UiStrings().OLPV1)
         self.openlp1FileLabel.setText(
             translate('BiblesPlugin.ImportWizardForm', 'Bible file:'))
         self.osisFileLabel.setText(
@@ -451,13 +451,13 @@ class BibleImportForm(OpenLPWizard):
         elif self.currentPage() == self.selectPage:
             if self.field(u'source_format').toInt()[0] == BibleFormat.OSIS:
                 if not self.field(u'osis_location').toString():
-                    critical_error_message_box(UiStrings.NFSs,
+                    critical_error_message_box(UiStrings().NFSs,
                         WizardStrings.YouSpecifyFile % WizardStrings.OSIS)
                     self.osisFileEdit.setFocus()
                     return False
             elif self.field(u'source_format').toInt()[0] == BibleFormat.CSV:
                 if not self.field(u'csv_testamentsfile').toString():
-                    answer = critical_error_message_box(UiStrings.NFSs,
+                    answer = critical_error_message_box(UiStrings().NFSs,
                         translate('BiblesPlugin.ImportWizardForm',
                         'You have not specified a testaments file. Do you '
                         'want to proceed with the import?'), question=True)
@@ -465,14 +465,14 @@ class BibleImportForm(OpenLPWizard):
                         self.csvTestamentsEdit.setFocus()
                         return False
                 if not self.field(u'csv_booksfile').toString():
-                    critical_error_message_box(UiStrings.NFSs,
+                    critical_error_message_box(UiStrings().NFSs,
                         translate('BiblesPlugin.ImportWizardForm',
                         'You need to specify a file with books of '
                         'the Bible to use in the import.'))
                     self.csvBooksEdit.setFocus()
                     return False
                 elif not self.field(u'csv_versefile').toString():
-                    critical_error_message_box(UiStrings.NFSs,
+                    critical_error_message_box(UiStrings().NFSs,
                         translate('BiblesPlugin.ImportWizardForm',
                         'You need to specify a file of Bible '
                         'verses to import.'))
@@ -481,14 +481,14 @@ class BibleImportForm(OpenLPWizard):
             elif self.field(u'source_format').toInt()[0] == \
                 BibleFormat.OpenSong:
                 if not self.field(u'opensong_file').toString():
-                    critical_error_message_box(UiStrings.NFSs,
+                    critical_error_message_box(UiStrings().NFSs,
                         WizardStrings.YouSpecifyFile % WizardStrings.OS)
                     self.openSongFileEdit.setFocus()
                     return False
             elif self.field(u'source_format').toInt()[0] == BibleFormat.OpenLP1:
                 if not self.field(u'openlp1_location').toString():
-                    critical_error_message_box(UiStrings.NFSs,
+                    critical_error_message_box(UiStrings().NFSs,
-                        WizardStrings.YouSpecifyFile % UiStrings.OLPV1)
+                        WizardStrings.YouSpecifyFile % UiStrings().OLPV1)
                     self.openlp1FileEdit.setFocus()
                     return False
             return True
@@ -497,13 +497,13 @@ class BibleImportForm(OpenLPWizard):
             license_copyright = \
                 unicode(self.field(u'license_copyright').toString())
             if not license_version:
-                critical_error_message_box(UiStrings.EmptyField,
+                critical_error_message_box(UiStrings().EmptyField,
                     translate('BiblesPlugin.ImportWizardForm',
                     'You need to specify a version name for your Bible.'))
                 self.versionNameEdit.setFocus()
                 return False
             elif not license_copyright:
-                critical_error_message_box(UiStrings.EmptyField,
+                critical_error_message_box(UiStrings().EmptyField,
                     translate('BiblesPlugin.ImportWizardForm',
                     'You need to set a copyright for your Bible. '
                     'Bibles in the Public Domain need to be marked as such.'))
@@ -576,7 +576,7 @@ class BibleImportForm(OpenLPWizard):
         """
         Show the file open dialog for the openlp.org 1.x file.
         """
-        self.getFileName(WizardStrings.OpenTypeFile % UiStrings.OLPV1,
+        self.getFileName(WizardStrings.OpenTypeFile % UiStrings().OLPV1,
             self.openlp1FileEdit, u'%s (*.bible)' %
             translate('BiblesPlugin.ImportWizardForm',
             'openlp.org 1.x Bible Files'))

openlp/plugins/bibles/lib/biblestab.py

@@ -40,11 +40,11 @@ class BiblesTab(SettingsTab):
     """
     log.info(u'Bible Tab loaded')
 
-    def __init__(self, title, visible_title):
+    def __init__(self, parent, title, visible_title, icon_path):
         self.paragraph_style = True
         self.show_new_chapters = False
         self.display_style = 0
-        SettingsTab.__init__(self, title, visible_title)
+        SettingsTab.__init__(self, parent, title, visible_title, icon_path)
 
     def setupUi(self):
         self.setObjectName(u'BiblesTab')
@@ -118,17 +118,16 @@ class BiblesTab(SettingsTab):
         self.newChaptersCheckBox.setText(
             translate('BiblesPlugin.BiblesTab',
             'Only show new chapter numbers'))
-        self.layoutStyleLabel.setText(
+        self.layoutStyleLabel.setText(UiStrings().LayoutStyle)
-            translate('BiblesPlugin.BiblesTab', 'Layout style:'))
+        self.displayStyleLabel.setText(UiStrings().DisplayStyle)
-        self.displayStyleLabel.setText(UiStrings.DisplayStyle)
         self.bibleThemeLabel.setText(
             translate('BiblesPlugin.BiblesTab', 'Bible theme:'))
         self.layoutStyleComboBox.setItemText(LayoutStyle.VersePerSlide,
-            UiStrings.VersePerSlide)
+            UiStrings().VersePerSlide)
         self.layoutStyleComboBox.setItemText(LayoutStyle.VersePerLine,
-            UiStrings.VersePerLine)
+            UiStrings().VersePerLine)
         self.layoutStyleComboBox.setItemText(LayoutStyle.Continuous,
-            UiStrings.Continuous)
+            UiStrings().Continuous)
         self.displayStyleComboBox.setItemText(DisplayStyle.NoBrackets,
             translate('BiblesPlugin.BiblesTab', 'No Brackets'))
         self.displayStyleComboBox.setItemText(DisplayStyle.Round,

openlp/plugins/bibles/lib/db.py

@@ -177,10 +177,7 @@ class BibleDB(QtCore.QObject, Manager):
         Returns the version name of the Bible.
         """
         version_name = self.get_object(BibleMeta, u'Version')
-        if version_name:
+        self.name = version_name.value if version_name else None
-            self.name = version_name.value
-        else:
-            self.name = None
         return self.name
 
     def clean_filename(self, old_filename):
@@ -256,10 +253,10 @@ class BibleDB(QtCore.QObject, Manager):
         # Text list has book and chapter as first two elements of the array.
         for verse_number, verse_text in textlist.iteritems():
             verse = Verse.populate(
-                book_id = book_id,
+                book_id=book_id,
-                chapter = chapter,
+                chapter=chapter,
-                verse = verse_number,
+                verse=verse_number,
-                text = verse_text
+                text=verse_text
             )
             self.session.add(verse)
         self.session.commit()
@@ -383,15 +380,13 @@ class BibleDB(QtCore.QObject, Manager):
         log.debug(u'BibleDB.verse_search("%s")', text)
         verses = self.session.query(Verse)
         if text.find(u',') > -1:
-            or_clause = []
+            keywords = \
-            keywords = [u'%%%s%%' % keyword.strip()
+                [u'%%%s%%' % keyword.strip() for keyword in text.split(u',')]
-                for keyword in text.split(u',')]
+            or_clause = [Verse.text.like(keyword) for keyword in keywords]
-            for keyword in keywords:
-                or_clause.append(Verse.text.like(keyword))
             verses = verses.filter(or_(*or_clause))
         else:
-            keywords = [u'%%%s%%' % keyword.strip()
+            keywords = \
-                for keyword in text.split(u' ')]
+                [u'%%%s%%' % keyword.strip() for keyword in text.split(u' ')]
             for keyword in keywords:
                 verses = verses.filter(Verse.text.like(keyword))
         verses = verses.all()

openlp/plugins/bibles/lib/mediaitem.py

@@ -58,6 +58,7 @@ class BibleMediaItem(MediaManagerItem):
         MediaManagerItem.__init__(self, parent, plugin, icon)
         # Place to store the search results for both bibles.
         self.settings = self.parent.settings_tab
+        self.quickPreviewAllowed = True
         self.search_results = {}
         self.second_search_results = {}
         QtCore.QObject.connect(Receiver.get_receiver(),
@@ -99,12 +100,6 @@ class BibleMediaItem(MediaManagerItem):
         self.quickSearchEdit = SearchEdit(self.quickTab)
         self.quickSearchEdit.setObjectName(u'quickSearchEdit')
         self.quickSearchLabel.setBuddy(self.quickSearchEdit)
-        self.quickSearchEdit.setSearchTypes([
-            (BibleSearch.Reference, u':/bibles/bibles_search_reference.png',
-            translate('BiblesPlugin.MediaItem', 'Scripture Reference')),
-            (BibleSearch.Text, u':/bibles/bibles_search_text.png',
-            translate('BiblesPlugin.MediaItem', 'Text Search'))
-        ])
         self.quickLayout.addRow(self.quickSearchLabel, self.quickSearchEdit)
         self.quickLayoutLabel = QtGui.QLabel(self.quickTab)
         self.quickLayoutLabel.setObjectName(u'quickClearLabel')
@@ -198,7 +193,7 @@ class BibleMediaItem(MediaManagerItem):
         self.advancedSearchButtonLayout.addWidget(self.advancedSearchButton)
         self.advancedLayout.addLayout(
             self.advancedSearchButtonLayout, 7, 0, 1, 3)
-        self.searchTabWidget.addTab(self.advancedTab, UiStrings.Advanced)
+        self.searchTabWidget.addTab(self.advancedTab, UiStrings().Advanced)
         # Add the search tab widget to the page layout.
         self.pageLayout.addWidget(self.searchTabWidget)
         # Combo Boxes
@@ -247,15 +242,15 @@ class BibleMediaItem(MediaManagerItem):
 
     def retranslateUi(self):
         log.debug(u'retranslateUi')
-        self.quickVersionLabel.setText(u'%s:' % UiStrings.Version)
+        self.quickVersionLabel.setText(u'%s:' % UiStrings().Version)
         self.quickSecondLabel.setText(
             translate('BiblesPlugin.MediaItem', 'Second:'))
         self.quickSearchLabel.setText(
             translate('BiblesPlugin.MediaItem', 'Find:'))
-        self.quickSearchButton.setText(UiStrings.Search)
+        self.quickSearchButton.setText(UiStrings().Search)
         self.quickClearLabel.setText(
             translate('BiblesPlugin.MediaItem', 'Results:'))
-        self.advancedVersionLabel.setText(u'%s:' % UiStrings.Version)
+        self.advancedVersionLabel.setText(u'%s:' % UiStrings().Version)
         self.advancedSecondLabel.setText(
             translate('BiblesPlugin.MediaItem', 'Second:'))
         self.advancedBookLabel.setText(
@@ -270,7 +265,7 @@ class BibleMediaItem(MediaManagerItem):
             translate('BiblesPlugin.MediaItem', 'To:'))
         self.advancedClearLabel.setText(
             translate('BiblesPlugin.MediaItem', 'Results:'))
-        self.advancedSearchButton.setText(UiStrings.Search)
+        self.advancedSearchButton.setText(UiStrings().Search)
         self.quickClearComboBox.addItem(
             translate('BiblesPlugin.MediaItem', 'Clear'))
         self.quickClearComboBox.addItem(
@@ -279,19 +274,31 @@ class BibleMediaItem(MediaManagerItem):
             translate('BiblesPlugin.MediaItem', 'Clear'))
         self.advancedClearComboBox.addItem(
             translate('BiblesPlugin.MediaItem', 'Keep'))
-        self.quickLayoutLabel.setText(UiStrings.DisplayStyle)
+        self.quickLayoutLabel.setText(UiStrings().LayoutStyle)
         self.quickLayoutComboBox.setItemText(LayoutStyle.VersePerSlide,
-            UiStrings.VersePerSlide)
+            UiStrings().VersePerSlide)
         self.quickLayoutComboBox.setItemText(LayoutStyle.VersePerLine,
-            UiStrings.VersePerLine)
+            UiStrings().VersePerLine)
         self.quickLayoutComboBox.setItemText(LayoutStyle.Continuous,
-            UiStrings.Continuous)
+            UiStrings().Continuous)
 
     def initialise(self):
         log.debug(u'bible manager initialise')
         self.parent.manager.media = self
         self.loadBibles()
-        self.updateAutoCompleter(False)
+        bible = QtCore.QSettings().value(
+            self.settingsSection + u'/quick bible', QtCore.QVariant(
+            self.quickVersionComboBox.currentText())).toString()
+        find_and_set_in_combo_box(self.quickVersionComboBox, bible)
+        self.quickSearchEdit.setSearchTypes([
+            (BibleSearch.Reference, u':/bibles/bibles_search_reference.png',
+            translate('BiblesPlugin.MediaItem', 'Scripture Reference')),
+            (BibleSearch.Text, u':/bibles/bibles_search_text.png',
+            translate('BiblesPlugin.MediaItem', 'Text Search'))
+        ])
+        self.quickSearchEdit.setCurrentSearchType(QtCore.QSettings().value(
+            u'%s/last search type' % self.settingsSection,
+            QtCore.QVariant(BibleSearch.Reference)).toInt()[0])
         self.configUpdated()
         log.debug(u'bible manager initialise complete')
 
@@ -328,6 +335,8 @@ class BibleMediaItem(MediaManagerItem):
         if bible in bibles:
             find_and_set_in_combo_box(self.advancedVersionComboBox, bible)
             self.initialiseAdvancedBible(unicode(bible))
+        elif len(bibles):
+            self.initialiseAdvancedBible(bibles[0])
 
     def reloadBibles(self):
         log.debug(u'Reloading Bibles')
@@ -374,20 +383,19 @@ class BibleMediaItem(MediaManagerItem):
             self.adjustComboBox(1, verse_count, self.advancedFromVerse)
             self.adjustComboBox(1, verse_count, self.advancedToVerse)
 
-    def updateAutoCompleter(self, updateConfig=True):
+    def updateAutoCompleter(self):
         """
         This updates the bible book completion list for the search field. The
         completion depends on the bible. It is only updated when we are doing a
         reference search, otherwise the auto completion list is removed.
         """
-        if updateConfig:
+        # Save the current search type to the configuration.
-            QtCore.QSettings().setValue(self.settingsSection + u'/quick bible',
+        QtCore.QSettings().setValue(u'%s/last search type' %
-                QtCore.QVariant(self.quickVersionComboBox.currentText()))
+            self.settingsSection,
-        else:
+            QtCore.QVariant(self.quickSearchEdit.currentSearchType()))
-            book = QtCore.QSettings().value(
+        # Save the current bible to the configuration.
-                self.settingsSection + u'/quick bible',
+        QtCore.QSettings().setValue(self.settingsSection + u'/quick bible',
-                QtCore.QVariant(u'')).toString()
+            QtCore.QVariant(self.quickVersionComboBox.currentText()))
-            find_and_set_in_combo_box(self.quickVersionComboBox, book)
         books = []
         # We have to do a 'Reference Search'.
         if self.quickSearchEdit.currentSearchType() == BibleSearch.Reference:
@@ -395,7 +403,7 @@ class BibleMediaItem(MediaManagerItem):
             bible = unicode(self.quickVersionComboBox.currentText())
             if bible:
                 book_data = bibles[bible].get_books()
-                books = [book.name for book in book_data]
+                books = [book.name + u' ' for book in book_data]
                 books.sort()
         add_widget_completer(books, self.quickSearchEdit)
 

openlp/plugins/custom/forms/editcustomdialog.py

@@ -107,11 +107,11 @@ class Ui_CustomEditDialog(object):
             translate('CustomPlugin.EditCustomForm', 'Edit Custom Slides'))
         self.titleLabel.setText(
             translate('CustomPlugin.EditCustomForm', '&Title:'))
-        self.addButton.setText(UiStrings.Add)
+        self.addButton.setText(UiStrings().Add)
         self.addButton.setToolTip(
             translate('CustomPlugin.EditCustomForm', 'Add a new slide at '
             'bottom.'))
-        self.editButton.setText(UiStrings.Edit)
+        self.editButton.setText(UiStrings().Edit)
         self.editButton.setToolTip(
             translate('CustomPlugin.EditCustomForm', 'Edit the selected '
             'slide.'))
@@ -124,4 +124,4 @@ class Ui_CustomEditDialog(object):
             translate('CustomPlugin.EditCustomForm', 'The&me:'))
         self.creditLabel.setText(
             translate('CustomPlugin.EditCustomForm', '&Credits:'))
-        self.previewButton.setText(UiStrings.SaveAndPreview)
+        self.previewButton.setText(UiStrings().SaveAndPreview)

openlp/plugins/custom/lib/customtab.py

@@ -32,8 +32,8 @@ class CustomTab(SettingsTab):
     """
     CustomTab is the Custom settings tab in the settings dialog.
     """
-    def __init__(self, title, visible_title):
+    def __init__(self, parent, title, visible_title, icon_path):
-        SettingsTab.__init__(self, title, visible_title)
+        SettingsTab.__init__(self, parent, title, visible_title, icon_path)
 
     def setupUi(self):
         self.setObjectName(u'CustomTab')

openlp/plugins/custom/lib/mediaitem.py

@@ -110,7 +110,7 @@ class CustomMediaItem(MediaManagerItem):
         """
         Edit a custom item
         """
-        if check_item_selected(self.listView, UiStrings.SelectEdit):
+        if check_item_selected(self.listView, UiStrings().SelectEdit):
             item = self.listView.currentItem()
             item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
             self.parent.edit_custom_form.loadCustom(item_id, False)
@@ -121,7 +121,7 @@ class CustomMediaItem(MediaManagerItem):
         """
         Remove a custom item from the list and database
         """
-        if check_item_selected(self.listView, UiStrings.SelectDelete):
+        if check_item_selected(self.listView, UiStrings().SelectDelete):
             row_list = [item.row() for item in self.listView.selectedIndexes()]
             row_list.sort(reverse=True)
             id_list = [(item.data(QtCore.Qt.UserRole)).toInt()[0]

openlp/plugins/images/lib/mediaitem.py

@@ -55,11 +55,11 @@ class ImageMediaItem(MediaManagerItem):
             'Select Image(s)')
         file_formats = get_images_filter()
         self.onNewFileMasks = u'%s;;%s (*.*) (*)' % (file_formats,
-            UiStrings.AllFiles)
+            UiStrings().AllFiles)
-        self.replaceAction.setText(UiStrings.ReplaceBG)
+        self.replaceAction.setText(UiStrings().ReplaceBG)
-        self.replaceAction.setToolTip(UiStrings.ReplaceLiveBG)
+        self.replaceAction.setToolTip(UiStrings().ReplaceLiveBG)
-        self.resetAction.setText(UiStrings.ResetBG)
+        self.resetAction.setText(UiStrings().ResetBG)
-        self.resetAction.setToolTip(UiStrings.ResetLiveBG)
+        self.resetAction.setToolTip(UiStrings().ResetLiveBG)
 
     def requiredIcons(self):
         MediaManagerItem.requiredIcons(self)
@@ -198,7 +198,7 @@ class ImageMediaItem(MediaManagerItem):
                 self.parent.liveController.display.directImage(name, filename)
                 self.resetAction.setVisible(True)
             else:
-                critical_error_message_box(UiStrings.LiveBGError,
+                critical_error_message_box(UiStrings().LiveBGError,
                     unicode(translate('ImagePlugin.MediaItem',
                     'There was a problem replacing your background, '
                     'the image file "%s" no longer exists.')) % filename)

openlp/plugins/media/lib/mediaitem.py

@@ -60,11 +60,11 @@ class MediaMediaItem(MediaManagerItem):
         self.onNewFileMasks = unicode(translate('MediaPlugin.MediaItem',
             'Videos (%s);;Audio (%s);;%s (*)')) % (
             u' '.join(self.parent.video_extensions_list),
-            u' '.join(self.parent.audio_extensions_list), UiStrings.AllFiles)
+            u' '.join(self.parent.audio_extensions_list), UiStrings().AllFiles)
-        self.replaceAction.setText(UiStrings.ReplaceBG)
+        self.replaceAction.setText(UiStrings().ReplaceBG)
-        self.replaceAction.setToolTip(UiStrings.ReplaceLiveBG)
+        self.replaceAction.setToolTip(UiStrings().ReplaceLiveBG)
-        self.resetAction.setText(UiStrings.ResetBG)
+        self.resetAction.setText(UiStrings().ResetBG)
-        self.resetAction.setToolTip(UiStrings.ResetLiveBG)
+        self.resetAction.setToolTip(UiStrings().ResetLiveBG)
 
     def requiredIcons(self):
         MediaManagerItem.requiredIcons(self)
@@ -111,7 +111,7 @@ class MediaMediaItem(MediaManagerItem):
                 self.parent.liveController.display.video(filename, 0, True)
                 self.resetAction.setVisible(True)
             else:
-                critical_error_message_box(UiStrings.LiveBGError,
+                critical_error_message_box(UiStrings().LiveBGError,
                     unicode(translate('MediaPlugin.MediaItem',
                     'There was a problem replacing your background, '
                     'the media file "%s" no longer exists.')) % filename)

openlp/plugins/media/lib/mediatab.py

@@ -32,8 +32,8 @@ class MediaTab(SettingsTab):
     """
     MediaTab is the Media settings tab in the settings dialog.
     """
-    def __init__(self, title, visible_title):
+    def __init__(self, parent, title, visible_title, icon_path):
-        SettingsTab.__init__(self, title, visible_title)
+        SettingsTab.__init__(self, parent, title, visible_title, icon_path)
 
     def setupUi(self):
         self.setObjectName(u'MediaTab')

openlp/plugins/presentations/lib/mediaitem.py

@@ -203,7 +203,7 @@ class PresentationMediaItem(MediaManagerItem):
         """
         Remove a presentation item from the list
         """
-        if check_item_selected(self.listView, UiStrings.SelectDelete):
+        if check_item_selected(self.listView, UiStrings().SelectDelete):
             items = self.listView.selectedIndexes()
             row_list = [item.row() for item in items]
             row_list.sort(reverse=True)

openlp/plugins/presentations/lib/messagelistener.py

@@ -49,7 +49,7 @@ class Controller(object):
         self.doc = None
         log.info(u'%s controller loaded' % live)
 
-    def add_handler(self, controller, file, is_blank):
+    def add_handler(self, controller, file, hide_mode, slide_no):
         """
         Add a handler, which is an instance of a presentation and
         slidecontroller combination. If the slidecontroller has a display
@@ -64,12 +64,21 @@ class Controller(object):
             # Display error message to user
             # Inform slidecontroller that the action failed?
             return
+        self.doc.slidenumber = slide_no
         if self.is_live:
-            self.doc.start_presentation()
+            if hide_mode == HideMode.Screen:
-            if is_blank:
+                Receiver.send_message(u'maindisplay_hide', HideMode.Screen)
-                self.blank()
+                self.stop()
-            Receiver.send_message(u'maindisplay_hide', HideMode.Screen)
+            elif hide_mode == HideMode.Theme:
-        self.doc.slidenumber = 0
+                self.blank(hide_mode)
+            elif hide_mode == HideMode.Blank:
+                self.blank(hide_mode)
+            else:
+                self.doc.start_presentation()
+                Receiver.send_message(u'maindisplay_hide', HideMode.Screen)
+                self.doc.slidenumber = 0
+                if slide_no > 1:
+                    self.slide(slide_no)
 
     def activate(self):
         """
@@ -164,14 +173,10 @@ class Controller(object):
         Based on the handler passed at startup triggers slide show to shut down
         """
         log.debug(u'Live = %s, shutdown' % self.is_live)
-        if self.is_live:
-            Receiver.send_message(u'maindisplay_show')
         self.doc.close_presentation()
         self.doc = None
-        #self.doc.slidenumber = 0
-        #self.timer.stop()
 
-    def blank(self):
+    def blank(self, hide_mode):
         """
         Instruct the controller to blank the presentation
         """
@@ -182,6 +187,8 @@ class Controller(object):
             return
         if not self.doc.is_active():
             return
+        if hide_mode == HideMode.Theme:
+            Receiver.send_message(u'maindisplay_hide', HideMode.Theme)
         self.doc.blank_screen()
 
     def stop(self):
@@ -261,7 +268,7 @@ class MessageListener(object):
         is_live = message[1]
         item = message[0]
         log.debug(u'Startup called with message %s' % message)
-        is_blank = message[2]
+        hide_mode = message[2]
         file = os.path.join(item.get_frame_path(),
             item.get_frame_title())
         self.handler = item.title
@@ -273,7 +280,8 @@ class MessageListener(object):
             controller = self.live_handler
         else:
             controller = self.preview_handler
-        controller.add_handler(self.controllers[self.handler], file, is_blank)
+        controller.add_handler(self.controllers[self.handler], file, hide_mode,
+            message[3])
 
     def slide(self, message):
         """
@@ -333,7 +341,6 @@ class MessageListener(object):
         """
         is_live = message[1]
         if is_live:
-            Receiver.send_message(u'maindisplay_show')
             self.live_handler.shutdown()
         else:
             self.preview_handler.shutdown()
@@ -351,8 +358,9 @@ class MessageListener(object):
         React to the message to blank the display
         """
         is_live = message[1]
+        hide_mode = message[2]
         if is_live:
-            self.live_handler.blank()
+            self.live_handler.blank(hide_mode)
 
     def unblank(self, message):
         """

openlp/plugins/presentations/lib/powerpointcontroller.py

@@ -251,14 +251,13 @@ class PowerpointDocument(PresentationDocument):
                         win32ui.GetForegroundWindow().GetDC().GetDeviceCaps(88)
                 except win32ui.error:
                     dpi = 96
-            self.presentation.SlideShowSettings.Run()
-            self.presentation.SlideShowWindow.View.GotoSlide(1)
             rendermanager = self.controller.plugin.renderManager
             rect = rendermanager.screens.current[u'size']
-            self.presentation.SlideShowWindow.Top = rect.y() * 72 / dpi
+            ppt_window = self.presentation.SlideShowSettings.Run()
-            self.presentation.SlideShowWindow.Height = rect.height() * 72 / dpi
+            ppt_window.Top = rect.y() * 72 / dpi
-            self.presentation.SlideShowWindow.Left = rect.x() * 72 / dpi
+            ppt_window.Height = rect.height() * 72 / dpi
-            self.presentation.SlideShowWindow.Width = rect.width() * 72 / dpi
+            ppt_window.Left = rect.x() * 72 / dpi
+            ppt_window.Width = rect.width() * 72 / dpi
 
     def get_slide_number(self):
         """

openlp/plugins/presentations/lib/presentationtab.py

@@ -33,12 +33,12 @@ class PresentationTab(SettingsTab):
     """
     PresentationsTab is the Presentations settings tab in the settings dialog.
     """
-    def __init__(self, title, visible_title, controllers):
+    def __init__(self, parent, title, visible_title, controllers, icon_path):
         """
         Constructor
         """
         self.controllers = controllers
-        SettingsTab.__init__(self, title, visible_title)
+        SettingsTab.__init__(self, parent, title, visible_title, icon_path)
 
     def setupUi(self):
         """
@@ -86,7 +86,7 @@ class PresentationTab(SettingsTab):
                 checkbox.setText(
                     unicode(translate('PresentationPlugin.PresentationTab',
                     '%s (unavailable)')) % controller.name)
-        self.AdvancedGroupBox.setTitle(UiStrings.Advanced)
+        self.AdvancedGroupBox.setTitle(UiStrings().Advanced)
         self.OverrideAppCheckBox.setText(
             translate('PresentationPlugin.PresentationTab',
             'Allow presentation application to be overriden'))

openlp/plugins/presentations/presentationplugin.py

@@ -56,13 +56,13 @@ class PresentationPlugin(Plugin):
         self.icon_path = u':/plugins/plugin_presentations.png'
         self.icon = build_icon(self.icon_path)
 
-    def getSettingsTab(self):
+    def getSettingsTab(self, parent):
         """
         Create the settings Tab
         """
         visible_name = self.getString(StringContent.VisibleName)
-        return PresentationTab(self.name, visible_name[u'title'],
+        return PresentationTab(parent, self.name, visible_name[u'title'],
-            self.controllers)
+            self.controllers, self.icon_path)
 
     def initialise(self):
         """
@@ -71,7 +71,6 @@ class PresentationPlugin(Plugin):
         """
         log.info(u'Presentations Initialising')
         Plugin.initialise(self)
-        self.insertToolboxItem()
         for controller in self.controllers:
             if self.controllers[controller].enabled():
                 try:

openlp/plugins/remotes/lib/remotetab.py

@@ -32,8 +32,8 @@ class RemoteTab(SettingsTab):
     """
     RemoteTab is the Remotes settings tab in the settings dialog.
     """
-    def __init__(self, title, visible_title):
+    def __init__(self, parent, title, visible_title, icon_path):
-        SettingsTab.__init__(self, title, visible_title)
+        SettingsTab.__init__(self, parent, title, visible_title, icon_path)
 
     def setupUi(self):
         self.setObjectName(u'RemoteTab')

openlp/plugins/remotes/remoteplugin.py

@@ -39,8 +39,9 @@ class RemotesPlugin(Plugin):
         remotes constructor
         """
         Plugin.__init__(self, u'Remotes', plugin_helpers,
-            settingsTabClass=RemoteTab)
+            settings_tab_class=RemoteTab)
-        self.icon = build_icon(u':/plugins/plugin_remote.png')
+        self.icon_path = u':/plugins/plugin_remote.png'
+        self.icon = build_icon(self.icon_path)
         self.weight = -1
         self.server = None
 
@@ -50,7 +51,6 @@ class RemotesPlugin(Plugin):
         """
         log.debug(u'initialise')
         Plugin.initialise(self)
-        self.insertToolboxItem()
         self.server = HttpServer(self)
 
     def finalise(self):

openlp/plugins/songs/forms/editsongdialog.py

@@ -260,11 +260,11 @@ class Ui_EditSongDialog(object):
             translate('SongsPlugin.EditSongForm', '&Lyrics:'))
         self.verseOrderLabel.setText(
             translate('SongsPlugin.EditSongForm', '&Verse order:'))
-        self.verseAddButton.setText(UiStrings.Add)
+        self.verseAddButton.setText(UiStrings().Add)
-        self.verseEditButton.setText(UiStrings.Edit)
+        self.verseEditButton.setText(UiStrings().Edit)
         self.verseEditAllButton.setText(
             translate('SongsPlugin.EditSongForm', 'Ed&it All'))
-        self.verseDeleteButton.setText(UiStrings.Delete)
+        self.verseDeleteButton.setText(UiStrings().Delete)
         self.songTabWidget.setTabText(
             self.songTabWidget.indexOf(self.lyricsTab),
             translate('SongsPlugin.EditSongForm', 'Title && Lyrics'))
@@ -289,13 +289,13 @@ class Ui_EditSongDialog(object):
             self.songTabWidget.indexOf(self.authorsTab),
             translate('SongsPlugin.EditSongForm',
                 'Authors, Topics && Song Book'))
-        self.themeGroupBox.setTitle(UiStrings.Theme)
+        self.themeGroupBox.setTitle(UiStrings().Theme)
         self.themeAddButton.setText(
             translate('SongsPlugin.EditSongForm', 'New &Theme'))
         self.rightsGroupBox.setTitle(
             translate('SongsPlugin.EditSongForm', 'Copyright Information'))
         self.copyrightInsertButton.setText(SongStrings.CopyrightSymbol)
-        self.CCLILabel.setText(UiStrings.CCLINumberLabel)
+        self.CCLILabel.setText(UiStrings().CCLINumberLabel)
         self.commentsGroupBox.setTitle(
             translate('SongsPlugin.EditSongForm', 'Comments'))
         self.songTabWidget.setTabText(

openlp/plugins/songs/forms/editsongform.py

@@ -96,7 +96,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             QtCore.SIGNAL(u'theme_update_list'), self.loadThemes)
         self.previewButton = QtGui.QPushButton()
         self.previewButton.setObjectName(u'previewButton')
-        self.previewButton.setText(UiStrings.SaveAndPreview)
+        self.previewButton.setText(UiStrings().SaveAndPreview)
         self.buttonBox.addButton(
             self.previewButton, QtGui.QDialogButtonBox.ActionRole)
         QtCore.QObject.connect(self.buttonBox,
@@ -355,7 +355,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 self.__addAuthorToList(author)
             self.authorsComboBox.setCurrentIndex(0)
         else:
-            QtGui.QMessageBox.warning(self, UiStrings.NISs,
+            QtGui.QMessageBox.warning(self, UiStrings().NISs,
                 translate('SongsPlugin.EditSongForm', 'You have not selected '
                 'a valid author. Either select an author from the list, '
                 'or type in a new author and click the "Add Author to '
@@ -414,7 +414,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 self.topicsListView.addItem(topic_item)
             self.topicsComboBox.setCurrentIndex(0)
         else:
-            QtGui.QMessageBox.warning(self, UiStrings.NISs,
+            QtGui.QMessageBox.warning(self, UiStrings().NISs,
                 translate('SongsPlugin.EditSongForm', 'You have not selected '
                 'a valid topic. Either select a topic from the list, or '
                 'type in a new topic and click the "Add Topic to Song" '

openlp/plugins/songs/forms/songexportform.py

@@ -175,7 +175,7 @@ class SongExportForm(OpenLPWizard):
         self.availableSongsPage.setSubTitle(
             translate('SongsPlugin.ExportWizardForm',
             'Check the songs you want to export.'))
-        self.searchLabel.setText(u'%s:' % UiStrings.Search)
+        self.searchLabel.setText(u'%s:' % UiStrings().Search)
         self.uncheckButton.setText(
             translate('SongsPlugin.ExportWizardForm', 'Uncheck All'))
         self.checkButton.setText(
@@ -207,7 +207,7 @@ class SongExportForm(OpenLPWizard):
                 self.availableListWidget) if item.checkState()
             ]
             if not items:
-                critical_error_message_box(UiStrings.NISp,
+                critical_error_message_box(UiStrings().NISp,
                     translate('SongsPlugin.ExportWizardForm',
                     'You need to add at least one Song to export.'))
                 return False

openlp/plugins/songs/forms/songimportform.py

@@ -235,8 +235,8 @@ class SongImportForm(OpenLPWizard):
         self.sourcePage.setTitle(WizardStrings.ImportSelect)
         self.sourcePage.setSubTitle(WizardStrings.ImportSelectLong)
         self.formatLabel.setText(WizardStrings.FormatLabel)
-        self.formatComboBox.setItemText(SongFormat.OpenLP2, UiStrings.OLPV2)
+        self.formatComboBox.setItemText(SongFormat.OpenLP2, UiStrings().OLPV2)
-        self.formatComboBox.setItemText(SongFormat.OpenLP1, UiStrings.OLPV1)
+        self.formatComboBox.setItemText(SongFormat.OpenLP1, UiStrings().OLPV1)
         self.formatComboBox.setItemText(
             SongFormat.OpenLyrics, WizardStrings.OL)
         self.formatComboBox.setItemText(SongFormat.OpenSong, WizardStrings.OS)
@@ -261,10 +261,10 @@ class SongImportForm(OpenLPWizard):
 #        self.formatComboBox.setItemText(SongFormat.CSV, WizardStrings.CSV)
         self.openLP2FilenameLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'Filename:'))
-        self.openLP2BrowseButton.setText(UiStrings.Browse)
+        self.openLP2BrowseButton.setText(UiStrings().Browse)
         self.openLP1FilenameLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'Filename:'))
-        self.openLP1BrowseButton.setText(UiStrings.Browse)
+        self.openLP1BrowseButton.setText(UiStrings().Browse)
         self.openLP1DisabledLabel.setText(WizardStrings.NoSqlite)
         self.openLyricsAddButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
@@ -305,10 +305,10 @@ class SongImportForm(OpenLPWizard):
             'find OpenOffice.org on your computer.'))
         self.easiSlidesFilenameLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'Filename:'))
-        self.easiSlidesBrowseButton.setText(UiStrings.Browse)
+        self.easiSlidesBrowseButton.setText(UiStrings().Browse)
         self.ewFilenameLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'Filename:'))
-        self.ewBrowseButton.setText(UiStrings.Browse)
+        self.ewBrowseButton.setText(UiStrings().Browse)
         self.songBeamerAddButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
         self.songBeamerRemoveButton.setText(
@@ -323,7 +323,7 @@ class SongImportForm(OpenLPWizard):
             translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
 #        self.csvFilenameLabel.setText(
 #            translate('SongsPlugin.ImportWizardForm', 'Filename:'))
-#        self.csvBrowseButton.setText(UiStrings.Browse)
+#        self.csvBrowseButton.setText(UiStrings().Browse)
         self.progressPage.setTitle(WizardStrings.Importing)
         self.progressPage.setSubTitle(
             translate('SongsPlugin.ImportWizardForm',
@@ -346,49 +346,49 @@ class SongImportForm(OpenLPWizard):
             source_format = self.formatComboBox.currentIndex()
             if source_format == SongFormat.OpenLP2:
                 if self.openLP2FilenameEdit.text().isEmpty():
-                    critical_error_message_box(UiStrings.NFSs,
+                    critical_error_message_box(UiStrings().NFSs,
-                        WizardStrings.YouSpecifyFile % UiStrings.OLPV2)
+                        WizardStrings.YouSpecifyFile % UiStrings().OLPV2)
                     self.openLP2BrowseButton.setFocus()
                     return False
             elif source_format == SongFormat.OpenLP1:
                 if self.openLP1FilenameEdit.text().isEmpty():
-                    critical_error_message_box(UiStrings.NFSs,
+                    critical_error_message_box(UiStrings().NFSs,
-                        WizardStrings.YouSpecifyFile % UiStrings.OLPV1)
+                        WizardStrings.YouSpecifyFile % UiStrings().OLPV1)
                     self.openLP1BrowseButton.setFocus()
                     return False
             elif source_format == SongFormat.OpenLyrics:
                 if self.openLyricsFileListWidget.count() == 0:
-                    critical_error_message_box(UiStrings.NFSp,
+                    critical_error_message_box(UiStrings().NFSp,
                         WizardStrings.YouSpecifyFile % WizardStrings.OL)
                     self.openLyricsAddButton.setFocus()
                     return False
             elif source_format == SongFormat.OpenSong:
                 if self.openSongFileListWidget.count() == 0:
-                    critical_error_message_box(UiStrings.NFSp,
+                    critical_error_message_box(UiStrings().NFSp,
                         WizardStrings.YouSpecifyFile % WizardStrings.OS)
                     self.openSongAddButton.setFocus()
                     return False
             elif source_format == SongFormat.WordsOfWorship:
                 if self.wordsOfWorshipFileListWidget.count() == 0:
-                    critical_error_message_box(UiStrings.NFSp,
+                    critical_error_message_box(UiStrings().NFSp,
                         WizardStrings.YouSpecifyFile % WizardStrings.WoW)
                     self.wordsOfWorshipAddButton.setFocus()
                     return False
             elif source_format == SongFormat.CCLI:
                 if self.ccliFileListWidget.count() == 0:
-                    critical_error_message_box(UiStrings.NFSp,
+                    critical_error_message_box(UiStrings().NFSp,
                         WizardStrings.YouSpecifyFile % WizardStrings.CCLI)
                     self.ccliAddButton.setFocus()
                     return False
             elif source_format == SongFormat.SongsOfFellowship:
                 if self.songsOfFellowshipFileListWidget.count() == 0:
-                    critical_error_message_box(UiStrings.NFSp,
+                    critical_error_message_box(UiStrings().NFSp,
                         WizardStrings.YouSpecifyFile % WizardStrings.SoF)
                     self.songsOfFellowshipAddButton.setFocus()
                     return False
             elif source_format == SongFormat.Generic:
                 if self.genericFileListWidget.count() == 0:
-                    critical_error_message_box(UiStrings.NFSp,
+                    critical_error_message_box(UiStrings().NFSp,
                         translate('SongsPlugin.ImportWizardForm',
                         'You need to specify at least one document or '
                         'presentation file to import from.'))
@@ -396,31 +396,31 @@ class SongImportForm(OpenLPWizard):
                     return False
             elif source_format == SongFormat.EasiSlides:
                 if self.easiSlidesFilenameEdit.text().isEmpty():
-                    critical_error_message_box(UiStrings.NFSp,
+                    critical_error_message_box(UiStrings().NFSp,
                         WizardStrings.YouSpecifyFile % WizardStrings.ES)
                     self.easiSlidesBrowseButton.setFocus()
                     return False
             elif source_format == SongFormat.EasyWorship:
                 if self.ewFilenameEdit.text().isEmpty():
-                    critical_error_message_box(UiStrings.NFSs,
+                    critical_error_message_box(UiStrings().NFSs,
                         WizardStrings.YouSpecifyFile % WizardStrings.EW)
                     self.ewBrowseButton.setFocus()
                     return False
             elif source_format == SongFormat.SongBeamer:
                 if self.songBeamerFileListWidget.count() == 0:
-                    critical_error_message_box(UiStrings.NFSp,
+                    critical_error_message_box(UiStrings().NFSp,
                         WizardStrings.YouSpecifyFile % WizardStrings.SB)
                     self.songBeamerAddButton.setFocus()
                     return False
             elif source_format == SongFormat.SongShowPlus:
                 if self.songShowPlusFileListWidget.count() == 0:
-                    critical_error_message_box(UiStrings.NFSp,
+                    critical_error_message_box(UiStrings().NFSp,
                         WizardStrings.YouSpecifyFile % WizardStrings.SSP)
                     self.wordsOfWorshipAddButton.setFocus()
                     return False
             elif source_format == SongFormat.FoilPresenter:
                 if self.foilPresenterFileListWidget.count() == 0:
-                    critical_error_message_box(UiStrings.NFSp,
+                    critical_error_message_box(UiStrings().NFSp,
                         WizardStrings.YouSpecifyFile % WizardStrings.FP)
                     self.foilPresenterAddButton.setFocus()
                     return False
@@ -446,7 +446,7 @@ class SongImportForm(OpenLPWizard):
         """
         if filters:
             filters += u';;'
-        filters += u'%s (*)' % UiStrings.AllFiles
+        filters += u'%s (*)' % UiStrings().AllFiles
         filenames = QtGui.QFileDialog.getOpenFileNames(self, title,
             SettingsManager.get_last_dir(self.plugin.settingsSection, 1),
             filters)
@@ -476,7 +476,7 @@ class SongImportForm(OpenLPWizard):
         """
         Get OpenLP v2 song database file
         """
-        self.getFileName(WizardStrings.OpenTypeFile % UiStrings.OLPV2,
+        self.getFileName(WizardStrings.OpenTypeFile % UiStrings().OLPV2,
             self.openLP2FilenameEdit, u'%s (*.sqlite)'
             % (translate('SongsPlugin.ImportWizardForm',
             'OpenLP 2.0 Databases'))
@@ -486,7 +486,7 @@ class SongImportForm(OpenLPWizard):
         """
         Get OpenLP v1 song database file
         """
-        self.getFileName(WizardStrings.OpenTypeFile % UiStrings.OLPV1,
+        self.getFileName(WizardStrings.OpenTypeFile % UiStrings().OLPV1,
             self.openLP1FilenameEdit, u'%s (*.olp)'
             % translate('SongsPlugin.ImportWizardForm',
             'openlp.org v1.x Databases')

openlp/plugins/songs/forms/songmaintenancedialog.py

@@ -149,15 +149,15 @@ class Ui_SongMaintenanceDialog(object):
         self.listItemAuthors.setText(SongStrings.Authors)
         self.listItemTopics.setText(SongStrings.Topics)
         self.listItemBooks.setText(SongStrings.SongBooks)
-        self.authorsAddButton.setText(UiStrings.Add)
+        self.authorsAddButton.setText(UiStrings().Add)
-        self.authorsEditButton.setText(UiStrings.Edit)
+        self.authorsEditButton.setText(UiStrings().Edit)
-        self.authorsDeleteButton.setText(UiStrings.Delete)
+        self.authorsDeleteButton.setText(UiStrings().Delete)
-        self.topicsAddButton.setText(UiStrings.Add)
+        self.topicsAddButton.setText(UiStrings().Add)
-        self.topicsEditButton.setText(UiStrings.Edit)
+        self.topicsEditButton.setText(UiStrings().Edit)
-        self.topicsDeleteButton.setText(UiStrings.Delete)
+        self.topicsDeleteButton.setText(UiStrings().Delete)
-        self.booksAddButton.setText(UiStrings.Add)
+        self.booksAddButton.setText(UiStrings().Add)
-        self.booksEditButton.setText(UiStrings.Edit)
+        self.booksEditButton.setText(UiStrings().Edit)
-        self.booksDeleteButton.setText(UiStrings.Delete)
+        self.booksDeleteButton.setText(UiStrings().Delete)
         typeListWidth = max(self.fontMetrics().width(SongStrings.Authors),
             self.fontMetrics().width(SongStrings.Topics),
             self.fontMetrics().width(SongStrings.SongBooks))

openlp/plugins/songs/forms/songmaintenanceform.py

@@ -115,7 +115,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             else:
                 critical_error_message_box(dlg_title, err_text)
         else:
-            critical_error_message_box(dlg_title, UiStrings.NISs)
+            critical_error_message_box(dlg_title, UiStrings().NISs)
 
     def resetAuthors(self):
         """

openlp/plugins/songs/lib/mediaitem.py

@@ -137,8 +137,8 @@ class SongMediaItem(MediaManagerItem):
             QtCore.QVariant(u'True')).toBool()
 
     def retranslateUi(self):
-        self.searchTextLabel.setText(u'%s:' % UiStrings.Search)
+        self.searchTextLabel.setText(u'%s:' % UiStrings().Search)
-        self.searchTextButton.setText(UiStrings.Search)
+        self.searchTextButton.setText(UiStrings().Search)
         self.maintenanceAction.setText(SongStrings.SongMaintenance)
         self.maintenanceAction.setToolTip(translate('SongsPlugin.MediaItem',
             'Maintain the lists of authors, topics and books'))
@@ -153,11 +153,19 @@ class SongMediaItem(MediaManagerItem):
                 translate('SongsPlugin.MediaItem', 'Lyrics')),
             (SongSearch.Authors, u':/songs/song_search_author.png',
                 SongStrings.Authors),
-            (SongSearch.Themes, u':/slides/slide_theme.png', UiStrings.Themes)
+            (SongSearch.Themes, u':/slides/slide_theme.png', UiStrings().Themes)
         ])
+        self.searchTextEdit.setCurrentSearchType(QtCore.QSettings().value(
+            u'%s/last search type' % self.settingsSection,
+            QtCore.QVariant(SongSearch.Entire)).toInt()[0])
         self.configUpdated()
 
     def onSearchTextButtonClick(self):
+        # Save the current search type to the configuration.
+        QtCore.QSettings().setValue(u'%s/last search type' %
+            self.settingsSection,
+            QtCore.QVariant(self.searchTextEdit.currentSearchType()))
+        # Reload the list considering the new search type.
         search_keywords = unicode(self.searchTextEdit.displayText())
         search_results = []
         search_type = self.searchTextEdit.currentSearchType()
@@ -304,7 +312,7 @@ class SongMediaItem(MediaManagerItem):
         Edit a song
         """
         log.debug(u'onEditClick')
-        if check_item_selected(self.listView, UiStrings.SelectEdit):
+        if check_item_selected(self.listView, UiStrings().SelectEdit):
             self.editItem = self.listView.currentItem()
             item_id = (self.editItem.data(QtCore.Qt.UserRole)).toInt()[0]
             self.edit_song_form.loadSong(item_id, False)
@@ -315,7 +323,7 @@ class SongMediaItem(MediaManagerItem):
         """
         Remove a song from the list and database
         """
-        if check_item_selected(self.listView, UiStrings.SelectDelete):
+        if check_item_selected(self.listView, UiStrings().SelectDelete):
             items = self.listView.selectedIndexes()
             if QtGui.QMessageBox.question(self,
                 translate('SongsPlugin.MediaItem', 'Delete Song(s)?'),

openlp/plugins/songs/lib/songstab.py

@@ -32,8 +32,8 @@ class SongsTab(SettingsTab):
     """
     SongsTab is the Songs settings tab in the settings dialog.
     """
-    def __init__(self, title, visible_title):
+    def __init__(self, parent, title, visible_title, icon_path):
-        SettingsTab.__init__(self, title, visible_title)
+        SettingsTab.__init__(self, parent, title, visible_title, icon_path)
 
     def setupUi(self):
         self.setObjectName(u'SongsTab')

openlp/plugins/songs/songsplugin.py

@@ -33,7 +33,8 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import Plugin, StringContent, build_icon, translate, \
     Receiver
 from openlp.core.lib.db import Manager
-from openlp.core.lib.ui import UiStrings
+from openlp.core.lib.ui import UiStrings, base_action, icon_action
+from openlp.core.utils.actions import ActionList
 from openlp.plugins.songs.lib import clean_song, SongMediaItem, SongsTab
 from openlp.plugins.songs.lib.db import init_schema, Song
 from openlp.plugins.songs.lib.importer import SongFormat
@@ -65,8 +66,10 @@ class SongsPlugin(Plugin):
         log.info(u'Songs Initialising')
         Plugin.initialise(self)
         self.toolsReindexItem.setVisible(True)
-        self.mediaItem.displayResultsSong(
+        action_list = ActionList.get_instance()
-            self.manager.get_all_objects(Song, order_by_ref=Song.search_title))
+        action_list.add_action(self.SongImportItem, UiStrings().Import)
+        action_list.add_action(self.SongExportItem, UiStrings().Export)
+        action_list.add_action(self.toolsReindexItem, UiStrings().Tools)
 
     def addImportMenuItem(self, import_menu):
         """
@@ -78,10 +81,8 @@ class SongsPlugin(Plugin):
             use it as their parent.
         """
         # Main song import menu item - will eventually be the only one
-        self.SongImportItem = QtGui.QAction(import_menu)
+        self.SongImportItem = base_action(import_menu, u'SongImportItem')
-        self.SongImportItem.setObjectName(u'SongImportItem')
+        self.SongImportItem.setText(translate('SongsPlugin', '&Song'))
-        self.SongImportItem.setText(translate(
-            'SongsPlugin', '&Song'))
         self.SongImportItem.setToolTip(translate('SongsPlugin',
             'Import songs using the import wizard.'))
         import_menu.addAction(self.SongImportItem)
@@ -99,10 +100,8 @@ class SongsPlugin(Plugin):
             use it as their parent.
         """
         # Main song import menu item - will eventually be the only one
-        self.SongExportItem = QtGui.QAction(export_menu)
+        self.SongExportItem = base_action(export_menu, u'SongExportItem')
-        self.SongExportItem.setObjectName(u'SongExportItem')
+        self.SongExportItem.setText(translate('SongsPlugin', '&Song'))
-        self.SongExportItem.setText(translate(
-            'SongsPlugin', '&Song'))
         self.SongExportItem.setToolTip(translate('SongsPlugin',
             'Exports songs using the export wizard.'))
         export_menu.addAction(self.SongExportItem)
@@ -120,9 +119,8 @@ class SongsPlugin(Plugin):
             use it as their parent.
         """
         log.info(u'add tools menu')
-        self.toolsReindexItem = QtGui.QAction(tools_menu)
+        self.toolsReindexItem = icon_action(tools_menu, u'toolsReindexItem',
-        self.toolsReindexItem.setIcon(build_icon(u':/plugins/plugin_songs.png'))
+            u':/plugins/plugin_songs.png')
-        self.toolsReindexItem.setObjectName(u'toolsReindexItem')
         self.toolsReindexItem.setText(
             translate('SongsPlugin', '&Re-index Songs'))
         self.toolsReindexItem.setStatusTip(
@@ -141,7 +139,7 @@ class SongsPlugin(Plugin):
         if maxSongs == 0:
             return
         progressDialog = QtGui.QProgressDialog(
-            translate('SongsPlugin', 'Reindexing songs...'), UiStrings.Cancel,
+            translate('SongsPlugin', 'Reindexing songs...'), UiStrings().Cancel,
             0, maxSongs, self.formparent)
         progressDialog.setWindowModality(QtCore.Qt.WindowModal)
         songs = self.manager.get_all_objects(Song)
@@ -259,4 +257,8 @@ class SongsPlugin(Plugin):
         log.info(u'Songs Finalising')
         self.manager.finalise()
         self.toolsReindexItem.setVisible(False)
+        action_list = ActionList.get_instance()
+        action_list.remove_action(self.SongImportItem, UiStrings().Import)
+        action_list.remove_action(self.SongExportItem, UiStrings().Export)
+        action_list.remove_action(self.toolsReindexItem, UiStrings().Tools)
         Plugin.finalise(self)

openlp/plugins/songusage/songusageplugin.py

@@ -32,6 +32,8 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import Plugin, StringContent, Receiver, build_icon, \
     translate
 from openlp.core.lib.db import Manager
+from openlp.core.lib.ui import base_action, shortcut_action, UiStrings
+from openlp.core.utils.actions import ActionList
 from openlp.plugins.songusage.forms import SongUsageDetailForm, \
     SongUsageDeleteForm
 from openlp.plugins.songusage.lib.db import init_schema, SongUsageItem
@@ -63,30 +65,25 @@ class SongUsagePlugin(Plugin):
         self.SongUsageMenu.setObjectName(u'SongUsageMenu')
         self.SongUsageMenu.setTitle(translate(
             'SongUsagePlugin', '&Song Usage Tracking'))
-        #SongUsage Delete
+        # SongUsage Delete
-        self.SongUsageDelete = QtGui.QAction(tools_menu)
+        self.SongUsageDelete = base_action(tools_menu, u'SongUsageDelete')
         self.SongUsageDelete.setText(translate('SongUsagePlugin',
             '&Delete Tracking Data'))
         self.SongUsageDelete.setStatusTip(translate('SongUsagePlugin',
             'Delete song usage data up to a specified date.'))
-        self.SongUsageDelete.setObjectName(u'SongUsageDelete')
+        # SongUsage Report
-        #SongUsage Report
+        self.SongUsageReport = base_action(tools_menu, u'SongUsageReport')
-        self.SongUsageReport = QtGui.QAction(tools_menu)
         self.SongUsageReport.setText(
             translate('SongUsagePlugin', '&Extract Tracking Data'))
         self.SongUsageReport.setStatusTip(
             translate('SongUsagePlugin', 'Generate a report on song usage.'))
-        self.SongUsageReport.setObjectName(u'SongUsageReport')
+        # SongUsage activation
-        #SongUsage activation
+        self.SongUsageStatus = shortcut_action(tools_menu, u'SongUsageStatus',
-        self.SongUsageStatus = QtGui.QAction(tools_menu)
+            [QtCore.Qt.Key_F4], self.toggleSongUsageState, checked=False)
-        self.SongUsageStatus.setCheckable(True)
-        self.SongUsageStatus.setChecked(False)
         self.SongUsageStatus.setText(translate(
             'SongUsagePlugin', 'Toggle Tracking'))
         self.SongUsageStatus.setStatusTip(translate('SongUsagePlugin',
                 'Toggle the tracking of song usage.'))
-        self.SongUsageStatus.setShortcut(u'F4')
-        self.SongUsageStatus.setObjectName(u'SongUsageStatus')
         #Add Menus together
         self.toolsMenu.addAction(self.SongUsageMenu.menuAction())
         self.SongUsageMenu.addAction(self.SongUsageStatus)
@@ -97,9 +94,6 @@ class SongUsagePlugin(Plugin):
         QtCore.QObject.connect(self.SongUsageStatus,
             QtCore.SIGNAL(u'visibilityChanged(bool)'),
             self.SongUsageStatus.setChecked)
-        QtCore.QObject.connect(self.SongUsageStatus,
-            QtCore.SIGNAL(u'triggered(bool)'),
-            self.toggleSongUsageState)
         QtCore.QObject.connect(self.SongUsageDelete,
             QtCore.SIGNAL(u'triggered()'), self.onSongUsageDelete)
         QtCore.QObject.connect(self.SongUsageReport,
@@ -116,6 +110,13 @@ class SongUsagePlugin(Plugin):
             self.settingsSection + u'/active',
             QtCore.QVariant(False)).toBool()
         self.SongUsageStatus.setChecked(self.SongUsageActive)
+        action_list = ActionList.get_instance()
+        action_list.add_action(self.SongUsageDelete,
+            translate('SongUsagePlugin', 'Song Usage'))
+        action_list.add_action(self.SongUsageReport,
+            translate('SongUsagePlugin', 'Song Usage'))
+        action_list.add_action(self.SongUsageStatus,
+            translate('SongUsagePlugin', 'Song Usage'))
         if self.manager is None:
             self.manager = Manager(u'songusage', init_schema)
         self.SongUsagedeleteform = SongUsageDeleteForm(self.manager,
@@ -131,6 +132,13 @@ class SongUsagePlugin(Plugin):
         self.manager.finalise()
         Plugin.finalise(self)
         self.SongUsageMenu.menuAction().setVisible(False)
+        action_list = ActionList.get_instance()
+        action_list.remove_action(self.SongUsageDelete,
+            translate('SongUsagePlugin', 'Song Usage'))
+        action_list.remove_action(self.SongUsageReport,
+            translate('SongUsagePlugin', 'Song Usage'))
+        action_list.remove_action(self.SongUsageStatus,
+            translate('SongUsagePlugin', 'Song Usage'))
         #stop any events being processed
         self.SongUsageActive = False
 

resources/forms/settings.ui

@@ -14,565 +14,75 @@
    <string>Settings</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../images/openlp-2.qrc">
+   <iconset>
     <normaloff>:/icon/openlp.org-icon-32.bmp</normaloff>:/icon/openlp.org-icon-32.bmp</iconset>
   </property>
-  <layout class="QVBoxLayout" name="SettingsLayout">
+  <widget class="QWidget" name="layoutWidget">
-   <property name="spacing">
+   <property name="geometry">
-    <number>8</number>
+    <rect>
+     <x>10</x>
+     <y>30</y>
+     <width>691</width>
+     <height>441</height>
+    </rect>
    </property>
-   <property name="margin">
+   <layout class="QGridLayout" name="gridLayout">
-    <number>8</number>
+    <item row="0" column="0">
-   </property>
+     <widget class="QStackedWidget" name="tagStackedWidget">
-   <item>
+      <property name="minimumSize">
-    <widget class="QTabWidget" name="SettingsTabWidget">
+       <size>
-     <property name="currentIndex">
+        <width>500</width>
-      <number>2</number>
+        <height>0</height>
-     </property>
+       </size>
-     <widget class="QWidget" name="GeneralTab">
+      </property>
-      <attribute name="title">
+      <widget class="QWidget" name="page">
-       <string>General</string>
+       <widget class="QListWidget" name="settingListWidget">
-      </attribute>
+        <property name="geometry">
-      <layout class="QHBoxLayout" name="GeneralLayout">
+         <rect>
-       <property name="spacing">
+          <x>0</x>
-        <number>8</number>
+          <y>0</y>
-       </property>
+          <width>211</width>
-       <property name="margin">
+          <height>409</height>
-        <number>8</number>
+         </rect>
-       </property>
+        </property>
-       <item>
+        <property name="minimumSize">
-        <widget class="QWidget" name="GeneralLeftWidget" native="true">
+         <size>
-         <layout class="QVBoxLayout" name="verticalLayout">
+          <width>200</width>
-          <item>
+          <height>0</height>
-           <widget class="QGroupBox" name="MonitorGroupBox">
+         </size>
-            <property name="title">
+        </property>
-             <string>Monitors</string>
+        <property name="horizontalScrollBarPolicy">
-            </property>
+         <enum>Qt::ScrollBarAlwaysOff</enum>
-            <layout class="QVBoxLayout" name="MonitorLayout">
+        </property>
-             <property name="spacing">
+       </widget>
-              <number>8</number>
+      </widget>
-             </property>
+      <widget class="QWidget" name="page_2"/>
-             <property name="margin">
-              <number>8</number>
-             </property>
-             <item>
-              <widget class="QLabel" name="MonitorLabel">
-               <property name="text">
-                <string>Select monitor for output display:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="MonitorComboBox">
-               <item>
-                <property name="text">
-                 <string>Monitor 1 on X11 Windowing System</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>Monitor 2 on X11 Windowing System</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <widget class="QGroupBox" name="BlankScreenGroupBox">
-            <property name="title">
-             <string>Blank Screen</string>
-            </property>
-            <layout class="QVBoxLayout" name="BlankScreenLayout">
-             <property name="spacing">
-              <number>8</number>
-             </property>
-             <property name="margin">
-              <number>8</number>
-             </property>
-             <item>
-              <widget class="QCheckBox" name="WarningCheckBox">
-               <property name="text">
-                <string>Show warning on startup</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <widget class="QGroupBox" name="AutoOpenGroupBox">
-            <property name="title">
-             <string>Auto Open Last Service</string>
-            </property>
-            <layout class="QVBoxLayout" name="AutoOpenLayout">
-             <item>
-              <widget class="QCheckBox" name="AutoOpenCheckBox">
-               <property name="text">
-                <string>Automatically open the last service at startup</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <spacer name="GeneralLeftSpacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QWidget" name="GeneralRightWidget" native="true">
-         <layout class="QVBoxLayout" name="GeneralRightLayout">
-          <property name="spacing">
-           <number>8</number>
-          </property>
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="QGroupBox" name="CCLIGroupBox">
-            <property name="title">
-             <string>CCLI Details</string>
-            </property>
-            <layout class="QGridLayout" name="CCLILayout">
-             <property name="margin">
-              <number>8</number>
-             </property>
-             <property name="spacing">
-              <number>8</number>
-             </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="NumberLabel">
-               <property name="text">
-                <string>CCLI Number:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QLineEdit" name="NumberEdit"/>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="UsernameLabel">
-               <property name="text">
-                <string>SongSelect Username:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QLineEdit" name="UsernameEdit"/>
-             </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="PasswordLabel">
-               <property name="text">
-                <string>SongSelect Password:</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QLineEdit" name="PasswordEdit">
-               <property name="echoMode">
-                <enum>QLineEdit::Password</enum>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <spacer name="GeneralRightSpacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
      </widget>
-     <widget class="QWidget" name="ThemesTab">
+    </item>
-      <attribute name="title">
+    <item row="1" column="0">
-       <string>Themes</string>
+     <widget class="QDialogButtonBox" name="ButtonsBox">
-      </attribute>
+      <property name="sizePolicy">
-      <layout class="QHBoxLayout" name="ThemesTabLayout">
+       <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-       <property name="spacing">
+        <horstretch>0</horstretch>
-        <number>8</number>
+        <verstretch>0</verstretch>
-       </property>
+       </sizepolicy>
-       <property name="margin">
+      </property>
-        <number>8</number>
+      <property name="maximumSize">
-       </property>
+       <size>
-       <item>
+        <width>16777215</width>
-        <widget class="QGroupBox" name="GlobalGroupBox">
+        <height>16777215</height>
-         <property name="title">
+       </size>
-          <string>Global theme</string>
+      </property>
-         </property>
+      <property name="orientation">
-         <layout class="QVBoxLayout" name="GlobalGroupBoxLayout">
+       <enum>Qt::Horizontal</enum>
-          <property name="spacing">
+      </property>
-           <number>8</number>
+      <property name="standardButtons">
-          </property>
+       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-          <property name="margin">
+      </property>
-           <number>8</number>
-          </property>
-          <item>
-           <widget class="QComboBox" name="DefaultComboBox">
-            <item>
-             <property name="text">
-              <string>African Sunset</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Snowy Mountains</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Wilderness</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QListView" name="DefaultListView"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="LevelGroupBox">
-         <property name="title">
-          <string>Theme level</string>
-         </property>
-         <layout class="QFormLayout" name="formLayout">
-          <property name="labelAlignment">
-           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-          </property>
-          <property name="formAlignment">
-           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-          </property>
-          <property name="horizontalSpacing">
-           <number>8</number>
-          </property>
-          <property name="verticalSpacing">
-           <number>8</number>
-          </property>
-          <property name="margin">
-           <number>8</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QRadioButton" name="SongLevelRadioButton">
-            <property name="text">
-             <string>Song level</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLabel" name="SongLevelLabel">
-            <property name="text">
-             <string>Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme.</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QRadioButton" name="ServiceLevelRadioButton">
-            <property name="text">
-             <string>Service level</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLabel" name="ServiceLevelLabel">
-            <property name="text">
-             <string>Use the theme from the service, overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme.</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QRadioButton" name="GlobalLevelRadioButton">
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-            <property name="text">
-             <string>Global level</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLabel" name="GlobalLevelLabel">
-            <property name="text">
-             <string>Use the global theme, overriding any themes associated with either the service or the songs.</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
      </widget>
-     <widget class="QWidget" name="AlertsTab">
+    </item>
-      <attribute name="title">
+   </layout>
-       <string>Alerts</string>
+  </widget>
-      </attribute>
-      <layout class="QHBoxLayout" name="AlertsLayout">
-       <property name="spacing">
-        <number>8</number>
-       </property>
-       <property name="margin">
-        <number>8</number>
-       </property>
-       <item>
-        <widget class="QWidget" name="AlertLeftColumn" native="true">
-         <layout class="QVBoxLayout" name="SlideLeftLayout">
-          <property name="spacing">
-           <number>8</number>
-          </property>
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="QGroupBox" name="FontGroupBox">
-            <property name="title">
-             <string>Font</string>
-            </property>
-            <layout class="QVBoxLayout" name="FontLayout">
-             <property name="spacing">
-              <number>8</number>
-             </property>
-             <property name="margin">
-              <number>8</number>
-             </property>
-             <item>
-              <widget class="QLabel" name="FontLabel">
-               <property name="text">
-                <string>Font Name:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QFontComboBox" name="FontComboBox"/>
-             </item>
-             <item>
-              <widget class="QWidget" name="ColorWidget" native="true">
-               <layout class="QHBoxLayout" name="horizontalLayout">
-                <item>
-                 <widget class="QLabel" name="FontColorLabel">
-                  <property name="text">
-                   <string>Font Color:</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QPushButton" name="FontColourButton">
-                  <property name="text">
-                   <string/>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="ColorSpacer">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>40</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-                <item>
-                 <widget class="QLabel" name="BackgroundColorLabel">
-                  <property name="text">
-                   <string>Background Color:</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QPushButton" name="BackgroundColourButton">
-                  <property name="text">
-                   <string/>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QWidget" name="LengthWidget" native="true">
-               <layout class="QHBoxLayout" name="LengthLayout">
-                <property name="spacing">
-                 <number>8</number>
-                </property>
-                <property name="margin">
-                 <number>0</number>
-                </property>
-                <item>
-                 <widget class="QLabel" name="LengthLabel">
-                  <property name="text">
-                   <string>Display length:</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QSpinBox" name="LengthSpinBox">
-                  <property name="value">
-                   <number>5</number>
-                  </property>
-                  <property name="suffix">
-                   <string>s</string>
-                  </property>
-                  <property name="maximum">
-                   <number>180</number>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="LengthSpacer">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>147</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <spacer name="SlideLeftSpacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>94</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QWidget" name="SlideRightColumn" native="true">
-         <layout class="QVBoxLayout" name="SlideRightLayout">
-          <property name="spacing">
-           <number>8</number>
-          </property>
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="QGroupBox" name="PreviewGroupBox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="title">
-             <string>Preview</string>
-            </property>
-            <layout class="QVBoxLayout" name="PreviewLayout">
-             <property name="spacing">
-              <number>8</number>
-             </property>
-             <property name="margin">
-              <number>8</number>
-             </property>
-             <item>
-              <widget class="QGraphicsView" name="FontPreview">
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>64</height>
-                </size>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <spacer name="SlideRightSpacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="ButtonsBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
  </widget>
  <resources>
   <include location="../images/openlp-2.qrc"/>

resources/forms/shortcutlistdialog.ui

@@ -41,35 +41,35 @@
     </widget>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="shortcutLayout">
+    <layout class="QGridLayout" name="detailsLayout">
+     <property name="topMargin">
+      <number>0</number>
+     </property>
      <property name="spacing">
       <number>8</number>
      </property>
-     <property name="leftMargin">
+     <item row="0" column="0">
-      <number>0</number>
-     </property>
-     <item>
       <widget class="QRadioButton" name="defaultRadioButton">
        <property name="text">
-        <string>Default: None</string>
+        <string>Default:</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item>
+     <item row="1" column="0">
-      <layout class="QHBoxLayout" name="customShortcutLayout">
+      <widget class="QRadioButton" name="customRadioButton">
+       <property name="text">
+        <string>Custom:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <layout class="QHBoxLayout" name="shortcutLayout">
        <property name="spacing">
         <number>8</number>
        </property>
-       <item>
-        <widget class="QRadioButton" name="customRadioButton">
-         <property name="text">
-          <string>Custom:</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QPushButton" name="shortcutPushButton">
          <property name="minimumSize">
@@ -83,7 +83,7 @@
          </property>
          <property name="icon">
           <iconset resource="../images/openlp-2.qrc">
-           <normaloff>:/system/system_settings.png</normaloff>:/system/system_settings.png</iconset>
+           <normaloff>:/system/system_configure_shortcuts.png</normaloff>:/system/system_configure_shortcuts.png</iconset>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -110,21 +110,51 @@
          </property>
         </widget>
        </item>
+      </layout>
+     </item>
+     <item row="1" column="2">
+      <layout class="QHBoxLayout" name="alternateLayout">
+       <property name="spacing">
+        <number>8</number>
+       </property>
        <item>
-        <spacer name="customShortcutSpacer">
+        <widget class="QPushButton" name="alternatePushButton">
-         <property name="orientation">
+         <property name="text">
-          <enum>Qt::Horizontal</enum>
+          <string>None</string>
          </property>
-         <property name="sizeHint" stdset="0">
+         <property name="icon">
-          <size>
+          <iconset resource="../images/openlp-2.qrc">
-           <width>40</width>
+           <normaloff>:/system/system_configure_shortcuts.png</normaloff>:/system/system_configure_shortcuts.png</iconset>
-           <height>20</height>
-          </size>
          </property>
-        </spacer>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="clearAlternateButton">
+         <property name="text">
+          <string/>
+         </property>
+         <property name="icon">
+          <iconset resource="../images/openlp-2.qrc">
+           <normaloff>:/system/clear_shortcut.png</normaloff>:/system/clear_shortcut.png</iconset>
+         </property>
+        </widget>
        </item>
       </layout>
      </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="shortcutLabel">
+       <property name="text">
+        <string>Ctrl+V</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QLabel" name="alternateLabel">
+       <property name="text">
+        <string>Shift+Ins</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>