HEAD.

openlp.pyw

@@ -76,7 +76,7 @@ class OpenLP(QtGui.QApplication):
         """
         Load and store current Application Version
         """
-        if u'--dev-version' in sys.argv:
+        if u'--dev-version' in sys.argv or u'-d' in sys.argv:
             # If we're running the dev version, let's use bzr to get the version
             try:
                 # If bzrlib is availble, use it
@@ -216,6 +216,7 @@ class OpenLP(QtGui.QApplication):
         Sets the Busy Cursor for the Application
         """
         self.setOverrideCursor(QtCore.Qt.BusyCursor)
+        self.processEvents()
 
     def setNormalCursor(self):
         """

openlp/core/lib/db.py

@@ -86,10 +86,10 @@ class BaseModel(object):
         """
         Creates an instance of a class and populates it, returning the instance
         """
-        me = cls()
+        instance = cls()
         for key in kwargs:
-            me.__setattr__(key, kwargs[key])
+            instance.__setattr__(key, kwargs[key])
-        return me
+        return instance
 
 class Manager(object):
     """

openlp/core/lib/displaytags.py

@@ -60,8 +60,8 @@ class DisplayTags(object):
         DisplayTags.html_expands.append(tag)
 
     @staticmethod
-    def remove_html_tag(id):
+    def remove_html_tag(tag_id):
         """
-        Removes amd individual html_expands list.
+        Removes an individual html_expands tag.
         """
-        DisplayTags.html_expands.pop(id)
+        DisplayTags.html_expands.pop(tag_id)

openlp/core/lib/dockwidget.py

@@ -31,6 +31,8 @@ import logging
 
 from PyQt4 import QtGui
 
+from openlp.core.lib import build_icon
+
 log = logging.getLogger(__name__)
 
 class OpenLPDockWidget(QtGui.QDockWidget):
@@ -47,4 +49,4 @@ class OpenLPDockWidget(QtGui.QDockWidget):
         if name:
             self.setObjectName(name)
         if icon:
-            self.setWindowIcon(icon)
+            self.setWindowIcon(build_icon(icon))

openlp/core/lib/imagemanager.py

@@ -61,10 +61,10 @@ class Image(object):
     image = None
     image_bytes = None
 
+
 class ImageManager(QtCore.QObject):
     """
     Image Manager handles the conversion and sizing of images.
-
     """
     log.info(u'Image Manager loaded')
 

openlp/core/lib/mediamanageritem.py

@@ -158,7 +158,7 @@ class MediaManagerItem(QtGui.QWidget):
 
         ``icon``
             The icon of the button. This can be an instance of QIcon, or a
-            string cotaining either the absolute path to the image, or an
+            string containing either the absolute path to the image, or an
             internal resource path starting with ':/'.
 
         ``slot``
@@ -366,33 +366,34 @@ class MediaManagerItem(QtGui.QWidget):
             count += 1
         return filelist
 
-    def validate(self, file, thumb):
+    def validate(self, image, thumb):
         """
-        Validates to see if the file still exists or thumbnail is up to date
+        Validates whether an image still exists and, if it does, is the
+        thumbnail representation of the image up to date.
         """
-        if not os.path.exists(file):
+        if not os.path.exists(image):
             return False
         if os.path.exists(thumb):
-            filedate = os.stat(file).st_mtime
+            imageDate = os.stat(image).st_mtime
-            thumbdate = os.stat(thumb).st_mtime
+            thumbDate = os.stat(thumb).st_mtime
-            # if file updated rebuild icon
+            # If image has been updated rebuild icon
-            if filedate > thumbdate:
+            if imageDate > thumbDate:
-                self.iconFromFile(file, thumb)
+                self.iconFromFile(image, thumb)
         else:
-            self.iconFromFile(file, thumb)
+            self.iconFromFile(image, thumb)
         return True
 
-    def iconFromFile(self, file, thumb):
+    def iconFromFile(self, image, thumb):
         """
-        Create a thumbnail icon from a given file
+        Create a thumbnail icon from a given image.
 
-        ``file``
+        ``image``
-            The file to create the icon from
+            The image file to create the icon from.
 
         ``thumb``
             The filename to save the thumbnail to
         """
-        icon = build_icon(unicode(file))
+        icon = build_icon(unicode(image))
         pixmap = icon.pixmap(QtCore.QSize(88, 50))
         ext = os.path.splitext(thumb)[1].lower()
         pixmap.save(thumb, ext[1:])
@@ -403,12 +404,16 @@ class MediaManagerItem(QtGui.QWidget):
             u'defined by the plugin')
 
     def onNewClick(self):
-        raise NotImplementedError(u'MediaManagerItem.onNewClick needs to be '
+        """
-            u'defined by the plugin')
+        Hook for plugins to define behaviour for adding new items.
+        """
+        pass
 
     def onEditClick(self):
-        raise NotImplementedError(u'MediaManagerItem.onEditClick needs to be '
+        """
-            u'defined by the plugin')
+        Hook for plugins to define behaviour for editing items.
+        """
+        pass
 
     def onDeleteClick(self):
         raise NotImplementedError(u'MediaManagerItem.onDeleteClick needs to '

openlp/core/lib/plugin.py

@@ -31,6 +31,7 @@ import logging
 from PyQt4 import QtCore
 
 from openlp.core.lib import Receiver
+from openlp.core.lib.ui import UiStrings
 
 log = logging.getLogger(__name__)
 
@@ -44,6 +45,9 @@ class PluginStatus(object):
 
 
 class StringContent(object):
+    """
+    Provide standard strings for objects to use.
+    """
     Name = u'name'
     Import = u'import'
     Load = u'load'
@@ -320,4 +324,33 @@ class Plugin(QtCore.QObject):
         """
         Called to define all translatable texts of the plugin
         """
-        pass
+        ## Load Action ##
+        self._setSingularTextString(StringContent.Load,
+            UiStrings.Load, UiStrings.LoadANew)
+        ## New Action ##
+        self._setSingularTextString(StringContent.New,
+            UiStrings.Add, UiStrings.AddANew)
+        ## Edit Action ##
+        self._setSingularTextString(StringContent.Edit,
+            UiStrings.Edit, UiStrings.EditSelect)
+        ## Delete Action ##
+        self._setSingularTextString(StringContent.Delete,
+            UiStrings.Delete, UiStrings.DeleteSelect)
+        ## Preview Action ##
+        self._setSingularTextString(StringContent.Preview,
+            UiStrings.Preview, UiStrings.PreviewSelect)
+        ## Send Live Action ##
+        self._setSingularTextString(StringContent.Live,
+            UiStrings.Live, UiStrings.SendSelectLive)
+        ## Add to Service Action ##
+        self._setSingularTextString(StringContent.Service,
+            UiStrings.Service, UiStrings.AddSelectService)
+
+    def _setSingularTextString(self, name, title, tooltip):
+        """
+        Utility method for creating a plugin's textStrings. This method makes
+        use of the singular name of the plugin object so must only be called
+        after this has been set.
+        """
+        self.textStrings[name] = { u'title': title, u'tooltip': tooltip %
+            self.getString(StringContent.Name)[u'singular']}

openlp/core/lib/theme.py

@@ -583,8 +583,7 @@ class ThemeXML(object):
                 self.background_end_color,
                 self.background_direction)
         else:
-            filename = \
+            filename = os.path.split(self.background_filename)[1]
-                os.path.split(self.background_filename)[1]
             self.add_background_image(filename)
         self.add_font(self.font_main_name,
             self.font_main_color,

openlp/core/lib/toolbar.py

@@ -61,7 +61,7 @@ class OpenLPToolbar(QtGui.QToolBar):
 
         ``icon``
             The icon of the button. This can be an instance of QIcon, or a
-            string cotaining either the absolute path to the image, or an
+            string containing either the absolute path to the image, or an
             internal resource path starting with ':/'.
 
         ``tooltip``

openlp/core/lib/ui.py

@@ -30,14 +30,54 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import build_icon, Receiver, translate
 
 log = logging.getLogger(__name__)
 
+class UiStrings(object):
+    """
+    Provide standard strings for objects to use.
+    """
+    # These strings should need a good reason to be retranslated elsewhere.
+    # Should some/more/less of these have an & attached?
+    Add = translate('OpenLP.Ui', '&Add')
+    AddANew = unicode(translate('OpenLP.Ui', 'Add a new %s'))
+    AddSelectService = unicode(translate('OpenLP.Ui',
+        'Add the selected %s to the service'))
+    AllFiles = translate('OpenLP.Ui', 'All Files')
+    Authors = translate('OpenLP.Ui', 'Authors')
+    Delete = translate('OpenLP.Ui', '&Delete')
+    DeleteSelect = unicode(translate('OpenLP.Ui', 'Delete the selected %s'))
+    DeleteType = unicode(translate('OpenLP.Ui', 'Delete %s'))
+    Edit = translate('OpenLP.Ui', '&Edit')
+    EditSelect = unicode(translate('OpenLP.Ui', 'Edit the selected %s'))
+    EditType = unicode(translate('OpenLP.Ui', 'Edit %s'))
+    Error = translate('OpenLP.Ui', 'Error')
+    ExportType = unicode(translate('OpenLP.Ui', 'Export %s'))
+    Import = translate('OpenLP.Ui', 'Import')
+    ImportType = unicode(translate('OpenLP.Ui', 'Import %s'))
+    Live = translate('OpenLP.Ui', 'Live')
+    Load = translate('OpenLP.Ui', 'Load')
+    LoadANew = unicode(translate('OpenLP.Ui', 'Load a new %s'))
+    New = translate('OpenLP.Ui', 'New')
+    NewType = unicode(translate('OpenLP.Ui', 'New %s'))
+    OLPV2 = translate('OpenLP.Ui', 'OpenLP 2.0')
+    Preview = translate('OpenLP.Ui', 'Preview')
+    PreviewSelect = unicode(translate('OpenLP.Ui', 'Preview the selected %s'))
+    SendSelectLive = unicode(translate('OpenLP.Ui',
+        'Send the selected %s live'))
+    Service = translate('OpenLP.Ui', 'Service')
+    Theme = translate('OpenLP.Ui', 'Theme')
+    Themes = translate('OpenLP.Ui', 'Themes')
+
+
 def add_welcome_page(parent, image):
     """
     Generate an opening welcome page for a wizard using a provided image.
 
+    ``parent``
+        A ``QWizard`` object to add the welcome page to.
+
     ``image``
         A splash image for the wizard.
     """
@@ -58,9 +98,14 @@ def add_welcome_page(parent, image):
     parent.welcomeLayout.addStretch()
     parent.addPage(parent.welcomePage)
 
-def save_cancel_button_box(parent):
+def create_save_cancel_button_box(parent):
     """
-    Return a standard dialog button box with save and cancel buttons.
+    Creates a standard dialog button box with save and cancel buttons.  The
+    button box is connected to the parent's ``accept()`` and ``reject()``
+    methods to handle the default ``accepted()`` and ``rejected()`` signals.
+
+    ``parent``
+        The parent object.  This should be a ``QWidget`` descendant.
     """
     button_box = QtGui.QDialogButtonBox(parent)
     button_box.setStandardButtons(
@@ -90,13 +135,12 @@ def critical_error_message_box(title=None, message=None, parent=None,
     ``question``
         Should this message box question the user.
     """
-    error = translate('OpenLP.Ui', 'Error')
     if question:
-        return QtGui.QMessageBox.critical(parent, 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 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):
@@ -108,3 +152,131 @@ def media_item_combo_box(parent, name):
     combo.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength)
     combo.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
     return combo
+
+def create_delete_push_button(parent, icon=None):
+    """
+    Creates a standard push button with a delete label and optional icon.  The
+    button is connected to the parent's ``onDeleteButtonClicked()`` method to
+    handle the ``clicked()`` signal.
+
+    ``parent``
+        The parent object.  This should be a ``QWidget`` descendant.
+
+    ``icon``
+        An icon to display on the button.  This can be either a ``QIcon``, a
+        resource path or a file name.
+    """
+    delete_button = QtGui.QPushButton(parent)
+    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.setToolTip(
+        translate('OpenLP.Ui', 'Delete the selected item.'))
+    QtCore.QObject.connect(delete_button,
+        QtCore.SIGNAL(u'clicked()'), parent.onDeleteButtonClicked)
+    return delete_button
+
+def create_up_down_push_button_set(parent):
+    """
+    Creates a standard set of two push buttons, one for up and the other for
+    down, for use with lists.  The buttons use arrow icons and no text and are
+    connected to the parent's ``onUpButtonClicked()`` and
+    ``onDownButtonClicked()`` to handle their respective ``clicked()`` signals.
+
+    ``parent``
+        The parent object.  This should be a ``QWidget`` descendant.
+    """
+    up_button = QtGui.QPushButton(parent)
+    up_button.setIcon(build_icon(u':/services/service_up.png'))
+    up_button.setObjectName(u'upButton')
+    up_button.setToolTip(
+        translate('OpenLP.Ui', 'Move selection up one position.'))
+    down_button = QtGui.QPushButton(parent)
+    down_button.setIcon(build_icon(u':/services/service_down.png'))
+    down_button.setObjectName(u'downButton')
+    down_button.setToolTip(
+        translate('OpenLP.Ui', 'Move selection down one position.'))
+    QtCore.QObject.connect(up_button,
+        QtCore.SIGNAL(u'clicked()'), parent.onUpButtonClicked)
+    QtCore.QObject.connect(down_button,
+        QtCore.SIGNAL(u'clicked()'), parent.onDownButtonClicked)
+    return up_button, down_button
+
+def base_action(parent, name):
+    """
+    Return the most basic action with the object name set.
+    """
+    action = QtGui.QAction(parent)
+    action.setObjectName(name)
+    return action
+
+def checkable_action(parent, name, checked=None):
+    """
+    Return a standard action with the checkable attribute set.
+    """
+    action = base_action(parent, name)
+    action.setCheckable(True)
+    if checked is not None:
+        action.setChecked(checked)
+    return action
+
+def icon_action(parent, name, icon, checked=None):
+    """
+    Return a standard action with an icon.
+    """
+    if checked is not None:
+        action = checkable_action(parent, name, checked)
+    else:
+        action = base_action(parent, name)
+    action.setIcon(build_icon(icon))
+    return action
+
+def shortcut_action(parent, text, shortcuts, function):
+    """
+    Return a shortcut enabled action.
+    """
+    action = QtGui.QAction(text, parent)
+    action.setShortcuts(shortcuts)
+    action.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
+    QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), function)
+    return action
+
+def add_widget_completer(cache, widget):
+    """
+    Adds a text autocompleter to a widget.
+
+    ``cache``
+        The list of items to use as suggestions.
+
+    ``widget``
+        The object to use the completer.
+    """
+    completer = QtGui.QCompleter(cache)
+    completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
+    widget.setCompleter(completer)
+
+def create_valign_combo(form, parent, layout):
+    """
+    Creates a standard label and combo box for asking users to select a
+    vertical alignment.
+
+    ``form``
+        The UI screen that the label and combo will appear on.
+
+    ``parent``
+        The parent object.  This should be a ``QWidget`` descendant.
+
+    ``layout``
+        A layout object to add the label and combo widgets to.
+    """
+    verticalLabel = QtGui.QLabel(parent)
+    verticalLabel.setObjectName(u'VerticalLabel')
+    verticalLabel.setText(translate('OpenLP.Ui', '&Vertical Align:'))
+    form.verticalComboBox = QtGui.QComboBox(parent)
+    form.verticalComboBox.setObjectName(u'VerticalComboBox')
+    form.verticalComboBox.addItem(translate('OpenLP.Ui', 'Top'))
+    form.verticalComboBox.addItem(translate('OpenLP.Ui', 'Middle'))
+    form.verticalComboBox.addItem(translate('OpenLP.Ui', 'Bottom'))
+    verticalLabel.setBuddy(form.verticalComboBox)
+    layout.addRow(verticalLabel, form.verticalComboBox)

openlp/core/theme/theme.py

@@ -33,11 +33,14 @@ processing version 1 themes in OpenLP version 2.
 from xml.etree.ElementTree import ElementTree, XML
 from PyQt4 import QtGui
 
-DELPHI_COLORS = {u'clRed': 0xFF0000,
+DELPHI_COLORS = {
-                 u'clBlue': 0x0000FF,
+    u'clAqua': 0x00FFFF,    u'clBlack': 0x000000,   u'clBlue': 0x0000FF,
-                 u'clYellow': 0xFFFF00,
+    u'clFuchsia': 0xFF00FF, u'clGray': 0x808080,    u'clGreen': 0x008000,
-                 u'clBlack': 0x000000,
+    u'clLime': 0x00FF00,    u'clMaroon': 0x800000,  u'clNavy': 0x000080,
-                 u'clWhite': 0xFFFFFF}
+    u'clOlive': 0x808000,   u'clPurple': 0x800080,  u'clRed': 0xFF0000,
+    u'clSilver': 0xC0C0C0,  u'clTeal': 0x008080,    u'clWhite': 0xFFFFFF,
+    u'clYellow': 0xFFFF00
+}
 
 BLANK_STYLE_XML = \
 '''<?xml version="1.0" encoding="iso-8859-1"?>
@@ -184,7 +187,6 @@ class Theme(object):
             if element.tag != u'Theme':
                 element_text = element.text
                 val = 0
-                # easy!
                 if element_text is None:
                     val = element_text
                 # strings need special handling to sort the colours out

openlp/core/ui/advancedtab.py

@@ -80,16 +80,6 @@ class AdvancedTab(SettingsTab):
         self.hideMouseCheckBox.setObjectName(u'hideMouseCheckBox')
         self.hideMouseLayout.addWidget(self.hideMouseCheckBox)
         self.leftLayout.addWidget(self.hideMouseGroupBox)
-        self.serviceOrderGroupBox = QtGui.QGroupBox(self.leftColumn)
-        self.serviceOrderGroupBox.setObjectName(u'serviceOrderGroupBox')
-        self.serviceOrderLayout = QtGui.QVBoxLayout(self.serviceOrderGroupBox)
-        self.serviceOrderLayout.setObjectName(u'serviceOrderLayout')
-        self.detailedServicePrintCheckBox = QtGui.QCheckBox(
-            self.serviceOrderGroupBox)
-        self.detailedServicePrintCheckBox.setObjectName(
-            u'detailedServicePrintCheckBox')
-        self.serviceOrderLayout.addWidget(self.detailedServicePrintCheckBox)
-        self.leftLayout.addWidget(self.serviceOrderGroupBox)
 #        self.sharedDirGroupBox = QtGui.QGroupBox(self.leftColumn)
 #        self.sharedDirGroupBox.setObjectName(u'sharedDirGroupBox')
 #        self.sharedDirLayout = QtGui.QFormLayout(self.sharedDirGroupBox)
@@ -139,11 +129,6 @@ class AdvancedTab(SettingsTab):
             'Mouse Cursor'))
         self.hideMouseCheckBox.setText(translate('OpenLP.AdvancedTab',
             'Hide the mouse cursor when moved over the display window'))
-        self.serviceOrderGroupBox.setTitle(translate('OpenLP.AdvancedTab',
-            'Service Order Print'))
-        self.detailedServicePrintCheckBox.setText(
-            translate('OpenLP.AdvancedTab',
-            'Print slide texts and service item notes as well'))
 #        self.sharedDirGroupBox.setTitle(
 #            translate('AdvancedTab', 'Central Data Store'))
 #        self.sharedCheckBox.setText(
@@ -179,8 +164,6 @@ class AdvancedTab(SettingsTab):
             QtCore.QVariant(True)).toBool())
         self.hideMouseCheckBox.setChecked(
             settings.value(u'hide mouse', QtCore.QVariant(False)).toBool())
-        self.detailedServicePrintCheckBox.setChecked(settings.value(
-            u'detailed service print', QtCore.QVariant(False)).toBool())
         settings.endGroup()
 
     def save(self):
@@ -201,8 +184,6 @@ class AdvancedTab(SettingsTab):
             QtCore.QVariant(self.enableAutoCloseCheckBox.isChecked()))
         settings.setValue(u'hide mouse',
             QtCore.QVariant(self.hideMouseCheckBox.isChecked()))
-        settings.setValue(u'detailed service print',
-            QtCore.QVariant(self.detailedServicePrintCheckBox.isChecked()))
         settings.endGroup()
 
 #    def onSharedCheckBoxChanged(self, checked):

openlp/core/ui/displaytagtab.py

@@ -23,27 +23,27 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-'''
+"""
 The :mod:`DisplayTagTab` provides an Tag Edit facility.  The Base set are
 protected and included each time loaded.  Custom tags can be defined and saved.
 The Custom Tag arrays are saved in a pickle so QSettings works on them.  Base
 Tags cannot be changed.
-
+"""
-'''
 import cPickle
+
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import SettingsTab, translate, DisplayTags
-from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.lib.ui import UiStrings, critical_error_message_box
 
 class DisplayTagTab(SettingsTab):
-    '''
+    """
     The :class:`DisplayTagTab` manages the settings tab .
-    '''
+    """
     def __init__(self):
-        '''
+        """
         Initialise the settings tab
-        '''
+        """
         SettingsTab.__init__(self, u'Display Tags')
 
     def resizeEvent(self, event=None):
@@ -67,9 +67,9 @@ class DisplayTagTab(SettingsTab):
         self.selected = -1
 
     def setupUi(self):
-        '''
+        """
         Configure the UI elements for the tab.
-        '''
+        """
         self.setObjectName(u'DisplayTagTab')
         self.tabTitleVisible = \
             translate(u'OpenLP.DisplayTagTab', 'Display Tags')
@@ -164,8 +164,7 @@ class DisplayTagTab(SettingsTab):
         self.startTagLabel.setText(
             translate('OpenLP.DisplayTagTab', 'Start tag'))
         self.endTagLabel.setText(translate('OpenLP.DisplayTagTab', 'End tag'))
-        self.deletePushButton.setText(
+        self.deletePushButton.setText(UiStrings.Delete)
-            translate('OpenLP.DisplayTagTab', 'Delete'))
         self.defaultPushButton.setText(
             translate('OpenLP.DisplayTagTab', 'Default'))
         self.newPushButton.setText(translate('OpenLP.DisplayTagTab', 'New'))

openlp/core/ui/exceptiondialog.py

@@ -46,6 +46,15 @@ class Ui_ExceptionDialog(object):
         self.messageLabel.setObjectName(u'messageLabel')
         self.messageLayout.addWidget(self.messageLabel)
         self.exceptionLayout.addLayout(self.messageLayout)
+        self.descriptionExplanation = QtGui.QLabel(exceptionDialog)
+        self.descriptionExplanation.setObjectName(u'descriptionExplanation')
+        self.exceptionLayout.addWidget(self.descriptionExplanation)
+        self.descriptionTextEdit = QtGui.QPlainTextEdit(exceptionDialog)
+        self.descriptionTextEdit.setObjectName(u'descriptionTextEdit')
+        self.exceptionLayout.addWidget(self.descriptionTextEdit)
+        self.descriptionWordCount = QtGui.QLabel(exceptionDialog)
+        self.descriptionWordCount.setObjectName(u'descriptionWordCount')
+        self.exceptionLayout.addWidget(self.descriptionWordCount)
         self.exceptionTextEdit = QtGui.QPlainTextEdit(exceptionDialog)
         self.exceptionTextEdit.setReadOnly(True)
         self.exceptionTextEdit.setObjectName(u'exceptionTextEdit')
@@ -65,19 +74,31 @@ class Ui_ExceptionDialog(object):
         self.saveReportButton.setObjectName(u'saveReportButton')
         self.exceptionButtonBox.addButton(self.saveReportButton,
             QtGui.QDialogButtonBox.ActionRole)
+        self.attachFileButton = QtGui.QPushButton(exceptionDialog)
+        self.attachFileButton.setIcon(build_icon(u':/general/general_open.png'))
+        self.attachFileButton.setObjectName(u'attachFileButton')
+        self.exceptionButtonBox.addButton(self.attachFileButton,
+            QtGui.QDialogButtonBox.ActionRole)
 
         self.retranslateUi(exceptionDialog)
+        QtCore.QObject.connect(self.descriptionTextEdit,
+            QtCore.SIGNAL(u'textChanged()'), self.onDescriptionUpdated)
         QtCore.QObject.connect(self.exceptionButtonBox,
             QtCore.SIGNAL(u'rejected()'), exceptionDialog.reject)
         QtCore.QObject.connect(self.sendReportButton,
             QtCore.SIGNAL(u'pressed()'), self.onSendReportButtonPressed)
         QtCore.QObject.connect(self.saveReportButton,
             QtCore.SIGNAL(u'pressed()'), self.onSaveReportButtonPressed)
+        QtCore.QObject.connect(self.attachFileButton,
+            QtCore.SIGNAL(u'pressed()'), self.onAttachFileButtonPressed)
         QtCore.QMetaObject.connectSlotsByName(exceptionDialog)
 
     def retranslateUi(self, exceptionDialog):
         exceptionDialog.setWindowTitle(
             translate('OpenLP.ExceptionDialog', 'Error Occurred'))
+        self.descriptionExplanation.setText(translate('OpenLP.ExceptionDialog',
+            'Please enter a description of what you were doing to cause this '
+            'error \n(Minimum 20 characters)'))
         self.messageLabel.setText(translate('OpenLP.ExceptionDialog', 'Oops! '
             'OpenLP hit a problem, and couldn\'t recover. The text in the box '
             'below contains information that might be helpful to the OpenLP '
@@ -88,3 +109,5 @@ class Ui_ExceptionDialog(object):
             'Send E-Mail'))
         self.saveReportButton.setText(translate('OpenLP.ExceptionDialog',
             'Save to File'))
+        self.attachFileButton.setText(translate('OpenLP.ExceptionDialog',
+            'Attach File'))

openlp/core/ui/exceptionform.py

@@ -70,8 +70,15 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
         self.setupUi(self)
         self.settingsSection = u'crashreport'
 
+    def exec_(self):
+        self.descriptionTextEdit.setPlainText(u'')
+        self.onDescriptionUpdated()
+        self.fileAttachment = None
+        return QtGui.QDialog.exec_(self)
+
     def _createReport(self):
         openlp_version = self.parent().applicationVersion[u'full']
+        description = unicode(self.descriptionTextEdit.toPlainText())
         traceback = unicode(self.exceptionTextEdit.toPlainText())
         system = unicode(translate('OpenLP.ExceptionForm',
             'Platform: %s\n')) % platform.platform()
@@ -90,7 +97,7 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
                 system = system + u'Desktop: KDE SC\n'
             elif os.environ.get(u'GNOME_DESKTOP_SESSION_ID'):
                 system = system + u'Desktop: GNOME\n'
-        return (openlp_version, traceback, system, libraries)
+        return (openlp_version, description, traceback, system, libraries)
 
     def onSaveReportButtonPressed(self):
         """
@@ -99,6 +106,7 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
         report = unicode(translate('OpenLP.ExceptionForm',
             '**OpenLP Bug Report**\n'
             'Version: %s\n\n'
+            '--- Details of the Exception. ---\n\n%s\n\n '
             '--- Exception Traceback ---\n%s\n'
             '--- System information ---\n%s\n'
             '--- Library Versions ---\n%s\n'))
@@ -132,18 +140,48 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
         body = unicode(translate('OpenLP.ExceptionForm',
             '*OpenLP Bug Report*\n'
             'Version: %s\n\n'
-            '--- Please enter the report below this line. ---\n\n\n'
+            '--- Details of the Exception. ---\n\n%s\n\n '
             '--- Exception Traceback ---\n%s\n'
             '--- System information ---\n%s\n'
             '--- Library Versions ---\n%s\n',
             'Please add the information that bug reports are favoured written '
             'in English.'))
         content = self._createReport()
-        for line in content[1].split(u'\n'):
+        for line in content[2].split(u'\n'):
             if re.search(r'[/\\]openlp[/\\]', line):
                 source = re.sub(r'.*[/\\]openlp[/\\](.*)".*', r'\1', line)
             if u':' in line:
                 exception = line.split(u'\n')[-1].split(u':')[0]
         subject = u'Bug report: %s in %s' % (exception, source)
+        if self.fileAttachment:
+            mailto(address=u'bugs@openlp.org', subject=subject,
+                body=body % content, attach=self.fileAttachment)
+        else:
             mailto(address=u'bugs@openlp.org', subject=subject,
                 body=body % content)
+
+    def onDescriptionUpdated(self):
+        count = int(20 - len(self.descriptionTextEdit.toPlainText()))
+        if count < 0:
+            count = 0
+            self.__buttonState(True)
+        else:
+            self.__buttonState(False)
+        self.descriptionWordCount.setText(
+            unicode(translate('OpenLP.ExceptionDialog',
+            'Description characters to enter : %s')) % count )
+
+    def onAttachFileButtonPressed(self):
+        files = QtGui.QFileDialog.getOpenFileName(
+            self,translate('ImagePlugin.ExceptionDialog',
+            'Select Attachment'),
+            SettingsManager.get_last_dir(u'exceptions'),
+            u'%s (*.*) (*)' %
+            unicode(translate('ImagePlugin.MediaItem', 'All Files')))
+        log.info(u'New files(s) %s', unicode(files))
+        if files:
+            self.fileAttachment = unicode(files)
+
+    def __buttonState(self, state):
+        self.saveReportButton.setEnabled(state)
+        self.sendReportButton.setEnabled(state)

openlp/core/ui/maindisplay.py

@@ -72,7 +72,7 @@ class MainDisplay(DisplayWidget):
         self.setWindowIcon(mainIcon)
         self.retranslateUi()
         self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
-        self.setWindowFlags(QtCore.Qt.FramelessWindowHint |
+        self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |
             QtCore.Qt.WindowStaysOnTopHint)
         if self.isLive:
             QtCore.QObject.connect(Receiver.get_receiver(),
@@ -326,8 +326,7 @@ class MainDisplay(DisplayWidget):
         vol = float(volume)/float(10)
         if isBackground or not self.usePhonon:
             js = u'show_video("init", "%s", %s, true); show_video("play");' % \
-                (videoPath.replace(u'\\', u'\\\\'), \
+                (videoPath.replace(u'\\', u'\\\\'), str(vol))
-                str(vol))
             self.frame.evaluateJavaScript(js)
         else:
             self.phononActive = True
@@ -398,8 +397,7 @@ class MainDisplay(DisplayWidget):
             if u'video' in self.override:
                 Receiver.send_message(u'video_background_replaced')
                 self.override = {}
-            elif self.override[u'theme'] != \
+            elif self.override[u'theme'] != serviceItem.themedata.theme_name:
-                serviceItem.themedata.theme_name:
                 Receiver.send_message(u'live_theme_changed')
                 self.override = {}
             else:

openlp/core/ui/mainwindow.py

@@ -28,11 +28,13 @@ import logging
 
 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
 from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
     ThemeManager, SlideController, PluginForm, MediaDockManager, \
     ShortcutListForm
-from openlp.core.lib import RenderManager, build_icon, OpenLPDockWidget, \
-    SettingsManager, PluginManager, Receiver, translate
 from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
     ActionList
 
@@ -76,10 +78,10 @@ class Ui_MainWindow(object):
         self.MainContentLayout.setMargin(0)
         self.MainContentLayout.setObjectName(u'MainContentLayout')
         mainWindow.setCentralWidget(self.MainContent)
-        self.ControlSplitter = QtGui.QSplitter(self.MainContent)
+        self.controlSplitter = QtGui.QSplitter(self.MainContent)
-        self.ControlSplitter.setOrientation(QtCore.Qt.Horizontal)
+        self.controlSplitter.setOrientation(QtCore.Qt.Horizontal)
-        self.ControlSplitter.setObjectName(u'ControlSplitter')
+        self.controlSplitter.setObjectName(u'controlSplitter')
-        self.MainContentLayout.addWidget(self.ControlSplitter)
+        self.MainContentLayout.addWidget(self.controlSplitter)
         # Create slide controllers
         self.previewController = SlideController(self, self.settingsmanager,
             self.screens)
@@ -101,9 +103,9 @@ class Ui_MainWindow(object):
         self.FileExportMenu = QtGui.QMenu(self.FileMenu)
         self.FileExportMenu.setObjectName(u'FileExportMenu')
         # View Menu
-        self.ViewMenu = QtGui.QMenu(self.MenuBar)
+        self.viewMenu = QtGui.QMenu(self.MenuBar)
-        self.ViewMenu.setObjectName(u'ViewMenu')
+        self.viewMenu.setObjectName(u'viewMenu')
-        self.ViewModeMenu = QtGui.QMenu(self.ViewMenu)
+        self.ViewModeMenu = QtGui.QMenu(self.viewMenu)
         self.ViewModeMenu.setObjectName(u'ViewModeMenu')
         # Tools Menu
         self.ToolsMenu = QtGui.QMenu(self.MenuBar)
@@ -124,139 +126,103 @@ class Ui_MainWindow(object):
         self.DefaultThemeLabel.setObjectName(u'DefaultThemeLabel')
         self.StatusBar.addPermanentWidget(self.DefaultThemeLabel)
         # Create the MediaManager
-        self.MediaManagerDock = OpenLPDockWidget(
+        self.mediaManagerDock = OpenLPDockWidget(mainWindow,
-            mainWindow, u'MediaManagerDock',
+            u'mediaManagerDock', u':/system/system_mediamanager.png')
-            build_icon(u':/system/system_mediamanager.png'))
+        self.mediaManagerDock.setStyleSheet(MEDIA_MANAGER_STYLE)
-        self.MediaManagerDock.setStyleSheet(MEDIA_MANAGER_STYLE)
+        self.mediaManagerDock.setMinimumWidth(
-        self.MediaManagerDock.setMinimumWidth(
             self.settingsmanager.mainwindow_left)
         # Create the media toolbox
-        self.MediaToolBox = QtGui.QToolBox(self.MediaManagerDock)
+        self.MediaToolBox = QtGui.QToolBox(self.mediaManagerDock)
         self.MediaToolBox.setObjectName(u'MediaToolBox')
-        self.MediaManagerDock.setWidget(self.MediaToolBox)
+        self.mediaManagerDock.setWidget(self.MediaToolBox)
         mainWindow.addDockWidget(QtCore.Qt.LeftDockWidgetArea,
-            self.MediaManagerDock)
+            self.mediaManagerDock)
         # Create the service manager
-        self.ServiceManagerDock = OpenLPDockWidget(
+        self.serviceManagerDock = OpenLPDockWidget(mainWindow,
-            mainWindow, u'ServiceManagerDock',
+            u'serviceManagerDock', u':/system/system_servicemanager.png')
-            build_icon(u':/system/system_servicemanager.png'))
+        self.serviceManagerDock.setMinimumWidth(
-        self.ServiceManagerDock.setMinimumWidth(
             self.settingsmanager.mainwindow_right)
         self.ServiceManagerContents = ServiceManager(mainWindow,
-            self.ServiceManagerDock)
+            self.serviceManagerDock)
-        self.ServiceManagerDock.setWidget(self.ServiceManagerContents)
+        self.serviceManagerDock.setWidget(self.ServiceManagerContents)
         mainWindow.addDockWidget(QtCore.Qt.RightDockWidgetArea,
-            self.ServiceManagerDock)
+            self.serviceManagerDock)
         # Create the theme manager
-        self.ThemeManagerDock = OpenLPDockWidget(
+        self.themeManagerDock = OpenLPDockWidget(mainWindow,
-            mainWindow, u'ThemeManagerDock',
+            u'themeManagerDock', u':/system/system_thememanager.png')
-            build_icon(u':/system/system_thememanager.png'))
+        self.themeManagerDock.setMinimumWidth(
-        self.ThemeManagerDock.setMinimumWidth(
             self.settingsmanager.mainwindow_right)
         self.ThemeManagerContents = ThemeManager(mainWindow,
-            self.ThemeManagerDock)
+            self.themeManagerDock)
         self.ThemeManagerContents.setObjectName(u'ThemeManagerContents')
-        self.ThemeManagerDock.setWidget(self.ThemeManagerContents)
+        self.themeManagerDock.setWidget(self.ThemeManagerContents)
         mainWindow.addDockWidget(QtCore.Qt.RightDockWidgetArea,
-            self.ThemeManagerDock)
+            self.themeManagerDock)
         # Create the menu items
-        self.FileNewItem = QtGui.QAction(mainWindow)
+        self.FileNewItem = icon_action(mainWindow, u'FileNewItem',
-        self.FileNewItem.setIcon(build_icon(u':/general/general_new.png'))
+            u':/general/general_new.png')
-        self.FileNewItem.setObjectName(u'FileNewItem')
         mainWindow.actionList.add_action(self.FileNewItem, u'File')
-        self.FileOpenItem = QtGui.QAction(mainWindow)
+        self.FileOpenItem = icon_action(mainWindow, u'FileOpenItem',
-        self.FileOpenItem.setIcon(build_icon(u':/general/general_open.png'))
+            u':/general/general_open.png')
-        self.FileOpenItem.setObjectName(u'FileOpenItem')
         mainWindow.actionList.add_action(self.FileOpenItem, u'File')
-        self.FileSaveItem = QtGui.QAction(mainWindow)
+        self.FileSaveItem = icon_action(mainWindow, u'FileSaveItem',
-        self.FileSaveItem.setIcon(build_icon(u':/general/general_save.png'))
+            u':/general/general_save.png')
-        self.FileSaveItem.setObjectName(u'FileSaveItem')
         mainWindow.actionList.add_action(self.FileSaveItem, u'File')
-        self.FileSaveAsItem = QtGui.QAction(mainWindow)
+        self.FileSaveAsItem = base_action(mainWindow, u'FileSaveAsItem')
-        self.FileSaveAsItem.setObjectName(u'FileSaveAsItem')
         mainWindow.actionList.add_action(self.FileSaveAsItem, u'File')
-        self.printServiceOrderItem = QtGui.QAction(mainWindow) 
+        self.printServiceOrderItem = base_action(
-        self.printServiceOrderItem.setObjectName(u'printServiceItem')
+            mainWindow, u'printServiceItem')
         mainWindow.actionList.add_action(
             self.printServiceOrderItem, u'Print Service Order')
-        self.FileExitItem = QtGui.QAction(mainWindow)
+        self.FileExitItem = icon_action(mainWindow, u'FileExitItem',
-        self.FileExitItem.setIcon(build_icon(u':/system/system_exit.png'))
+            u':/system/system_exit.png')
-        self.FileExitItem.setObjectName(u'FileExitItem')
         mainWindow.actionList.add_action(self.FileExitItem, u'File')
-        self.ImportThemeItem = QtGui.QAction(mainWindow)
+        self.ImportThemeItem = base_action(mainWindow, u'ImportThemeItem')
-        self.ImportThemeItem.setObjectName(u'ImportThemeItem')
         mainWindow.actionList.add_action(self.ImportThemeItem, u'Import')
-        self.ImportLanguageItem = QtGui.QAction(mainWindow)
+        self.ImportLanguageItem = base_action(mainWindow, u'ImportLanguageItem')
-        self.ImportLanguageItem.setObjectName(u'ImportLanguageItem')
         mainWindow.actionList.add_action(self.ImportLanguageItem, u'Import')
-        self.ExportThemeItem = QtGui.QAction(mainWindow)
+        self.ExportThemeItem = base_action(mainWindow, u'ExportThemeItem')
-        self.ExportThemeItem.setObjectName(u'ExportThemeItem')
         mainWindow.actionList.add_action(self.ExportThemeItem, u'Export')
-        self.ExportLanguageItem = QtGui.QAction(mainWindow)
+        self.ExportLanguageItem = base_action(mainWindow, u'ExportLanguageItem')
-        self.ExportLanguageItem.setObjectName(u'ExportLanguageItem')
         mainWindow.actionList.add_action(self.ExportLanguageItem, u'Export')
-        self.ViewMediaManagerItem = QtGui.QAction(mainWindow)
+        self.ViewMediaManagerItem = icon_action(mainWindow,
-        self.ViewMediaManagerItem.setCheckable(True)
+            u'ViewMediaManagerItem', u':/system/system_mediamanager.png',
-        self.ViewMediaManagerItem.setChecked(self.MediaManagerDock.isVisible())
+            self.mediaManagerDock.isVisible())
-        self.ViewMediaManagerItem.setIcon(
+        self.ViewThemeManagerItem = icon_action(mainWindow,
-            build_icon(u':/system/system_mediamanager.png'))
+            u'ViewThemeManagerItem', u':/system/system_thememanager.png',
-        self.ViewMediaManagerItem.setObjectName(u'ViewMediaManagerItem')
+            self.themeManagerDock.isVisible())
-        self.ViewThemeManagerItem = QtGui.QAction(mainWindow)
-        self.ViewThemeManagerItem.setCheckable(True)
-        self.ViewThemeManagerItem.setChecked(self.ThemeManagerDock.isVisible())
-        self.ViewThemeManagerItem.setIcon(
-            build_icon(u':/system/system_thememanager.png'))
-        self.ViewThemeManagerItem.setObjectName(u'ViewThemeManagerItem')
         mainWindow.actionList.add_action(self.ViewMediaManagerItem, u'View')
-        self.ViewServiceManagerItem = QtGui.QAction(mainWindow)
+        self.ViewServiceManagerItem = icon_action(mainWindow,
-        self.ViewServiceManagerItem.setCheckable(True)
+            u'ViewServiceManagerItem', u':/system/system_servicemanager.png',
-        self.ViewServiceManagerItem.setChecked(
+            self.serviceManagerDock.isVisible())
-            self.ServiceManagerDock.isVisible())
-        self.ViewServiceManagerItem.setIcon(
-            build_icon(u':/system/system_servicemanager.png'))
-        self.ViewServiceManagerItem.setObjectName(u'ViewServiceManagerItem')
         mainWindow.actionList.add_action(self.ViewServiceManagerItem, u'View')
-        self.ViewPreviewPanel = QtGui.QAction(mainWindow)
+        self.ViewPreviewPanel = checkable_action(mainWindow,
-        self.ViewPreviewPanel.setCheckable(True)
+            u'ViewPreviewPanel', previewVisible)
-        self.ViewPreviewPanel.setChecked(previewVisible)
-        self.ViewPreviewPanel.setObjectName(u'ViewPreviewPanel')
         mainWindow.actionList.add_action(self.ViewPreviewPanel, u'View')
-        self.ViewLivePanel = QtGui.QAction(mainWindow)
+        self.ViewLivePanel = checkable_action(mainWindow, u'ViewLivePanel',
-        self.ViewLivePanel.setCheckable(True)
+            liveVisible)
-        self.ViewLivePanel.setChecked(liveVisible)
-        self.ViewLivePanel.setObjectName(u'ViewLivePanel')
         mainWindow.actionList.add_action(self.ViewLivePanel, u'View')
-        self.ModeDefaultItem = QtGui.QAction(mainWindow)
+        self.ModeDefaultItem = checkable_action(mainWindow, u'ModeDefaultItem')
-        self.ModeDefaultItem.setCheckable(True)
-        self.ModeDefaultItem.setObjectName(u'ModeDefaultItem')
         mainWindow.actionList.add_action(self.ModeDefaultItem, u'View Mode')
-        self.ModeSetupItem = QtGui.QAction(mainWindow)
+        self.ModeSetupItem = checkable_action(mainWindow, u'ModeLiveItem')
-        self.ModeSetupItem.setCheckable(True)
-        self.ModeSetupItem.setObjectName(u'ModeLiveItem')
         mainWindow.actionList.add_action(self.ModeSetupItem, u'View Mode')
-        self.ModeLiveItem = QtGui.QAction(mainWindow)
+        self.ModeLiveItem = checkable_action(mainWindow, u'ModeLiveItem')
-        self.ModeLiveItem.setCheckable(True)
-        self.ModeLiveItem.setObjectName(u'ModeLiveItem')
         mainWindow.actionList.add_action(self.ModeLiveItem, u'View Mode')
         self.ModeGroup = QtGui.QActionGroup(mainWindow)
         self.ModeGroup.addAction(self.ModeDefaultItem)
         self.ModeGroup.addAction(self.ModeSetupItem)
         self.ModeGroup.addAction(self.ModeLiveItem)
         self.ModeDefaultItem.setChecked(True)
-        self.ToolsAddToolItem = QtGui.QAction(mainWindow)
+        self.ToolsAddToolItem = icon_action(mainWindow, u'ToolsAddToolItem',
-        self.ToolsAddToolItem.setIcon(build_icon(u':/tools/tools_add.png'))
+            u':/tools/tools_add.png')
-        self.ToolsAddToolItem.setObjectName(u'ToolsAddToolItem')
         mainWindow.actionList.add_action(self.ToolsAddToolItem, u'Tools')
-        self.SettingsPluginListItem = QtGui.QAction(mainWindow)
+        self.settingsPluginListItem = icon_action(mainWindow,
-        self.SettingsPluginListItem.setIcon(
+            u'settingsPluginListItem', u':/system/settings_plugin_list.png')
-            build_icon(u':/system/settings_plugin_list.png'))
+        mainWindow.actionList.add_action(self.settingsPluginListItem,
-        self.SettingsPluginListItem.setObjectName(u'SettingsPluginListItem')
-        mainWindow.actionList.add_action(self.SettingsPluginListItem,
             u'Settings')
         # i18n Language Items
-        self.AutoLanguageItem = QtGui.QAction(mainWindow)
+        self.AutoLanguageItem = checkable_action(mainWindow,
-        self.AutoLanguageItem.setObjectName(u'AutoLanguageItem')
+            u'AutoLanguageItem')
-        self.AutoLanguageItem.setCheckable(True)
         mainWindow.actionList.add_action(self.AutoLanguageItem, u'Settings')
         self.LanguageGroup = QtGui.QActionGroup(mainWindow)
         self.LanguageGroup.setExclusive(True)
@@ -266,39 +232,28 @@ class Ui_MainWindow(object):
         qmList = LanguageManager.get_qm_list()
         savedLanguage = LanguageManager.get_language()
         for key in sorted(qmList.keys()):
-            languageItem = QtGui.QAction(mainWindow)
+            languageItem = checkable_action(mainWindow, key)
-            languageItem.setObjectName(key)
-            languageItem.setCheckable(True)
             if qmList[key] == savedLanguage:
                 languageItem.setChecked(True)
             add_actions(self.LanguageGroup, [languageItem])
-        self.SettingsShortcutsItem = QtGui.QAction(mainWindow)
+        self.SettingsShortcutsItem = icon_action(mainWindow,
-        self.SettingsShortcutsItem.setIcon(
+            u'SettingsShortcutsItem', 
-            build_icon(u':/system/system_configure_shortcuts.png'))
+            u':/system/system_configure_shortcuts.png')
-        self.SettingsShortcutsItem.setObjectName(u'SettingsShortcutsItem')
+        self.SettingsConfigureItem = icon_action(mainWindow,
-        self.SettingsConfigureItem = QtGui.QAction(mainWindow)
+            u'SettingsConfigureItem', u':/system/system_settings.png')
-        self.SettingsConfigureItem.setIcon(
-            build_icon(u':/system/system_settings.png'))
-        self.SettingsConfigureItem.setObjectName(u'SettingsConfigureItem')
         mainWindow.actionList.add_action(self.SettingsShortcutsItem,
             u'Settings')
-        self.HelpDocumentationItem = QtGui.QAction(mainWindow)
+        self.HelpDocumentationItem = icon_action(mainWindow,
-        self.HelpDocumentationItem.setIcon(
+            u'HelpDocumentationItem', u':/system/system_help_contents.png')
-            build_icon(u':/system/system_help_contents.png'))
-        self.HelpDocumentationItem.setObjectName(u'HelpDocumentationItem')
         self.HelpDocumentationItem.setEnabled(False)
         mainWindow.actionList.add_action(self.HelpDocumentationItem, u'Help')
-        self.HelpAboutItem = QtGui.QAction(mainWindow)
+        self.HelpAboutItem = icon_action(mainWindow, u'HelpAboutItem',
-        self.HelpAboutItem.setIcon(
+            u':/system/system_about.png')
-            build_icon(u':/system/system_about.png'))
-        self.HelpAboutItem.setObjectName(u'HelpAboutItem')
         mainWindow.actionList.add_action(self.HelpAboutItem, u'Help')
-        self.HelpOnlineHelpItem = QtGui.QAction(mainWindow)
+        self.HelpOnlineHelpItem = base_action(mainWindow, u'HelpOnlineHelpItem')
-        self.HelpOnlineHelpItem.setObjectName(u'HelpOnlineHelpItem')
         self.HelpOnlineHelpItem.setEnabled(False)
         mainWindow.actionList.add_action(self.HelpOnlineHelpItem, u'Help')
-        self.HelpWebSiteItem = QtGui.QAction(mainWindow)
+        self.HelpWebSiteItem = base_action(mainWindow, u'HelpWebSiteItem')
-        self.HelpWebSiteItem.setObjectName(u'HelpWebSiteItem')
         mainWindow.actionList.add_action(self.HelpWebSiteItem, u'Help')
         add_actions(self.FileImportMenu,
             (self.ImportThemeItem, self.ImportLanguageItem))
@@ -310,14 +265,14 @@ class Ui_MainWindow(object):
             self.FileExportMenu.menuAction(), self.FileExitItem)
         add_actions(self.ViewModeMenu, (self.ModeDefaultItem,
             self.ModeSetupItem, self.ModeLiveItem))
-        add_actions(self.ViewMenu, (self.ViewModeMenu.menuAction(),
+        add_actions(self.viewMenu, (self.ViewModeMenu.menuAction(),
             None, self.ViewMediaManagerItem, self.ViewServiceManagerItem,
             self.ViewThemeManagerItem, None, self.ViewPreviewPanel,
             self.ViewLivePanel))
         # i18n add Language Actions
         add_actions(self.SettingsLanguageMenu, (self.AutoLanguageItem, None))
         add_actions(self.SettingsLanguageMenu, self.LanguageGroup.actions())
-        add_actions(self.SettingsMenu, (self.SettingsPluginListItem,
+        add_actions(self.SettingsMenu, (self.settingsPluginListItem,
             self.SettingsLanguageMenu.menuAction(), None,
             self.SettingsShortcutsItem, self.SettingsConfigureItem))
         add_actions(self.ToolsMenu, (self.ToolsAddToolItem, None))
@@ -325,7 +280,7 @@ class Ui_MainWindow(object):
             self.HelpOnlineHelpItem, None, self.HelpWebSiteItem,
             self.HelpAboutItem))
         add_actions(self.MenuBar, (self.FileMenu.menuAction(),
-            self.ViewMenu.menuAction(), self.ToolsMenu.menuAction(),
+            self.viewMenu.menuAction(), self.ToolsMenu.menuAction(),
             self.SettingsMenu.menuAction(), self.HelpMenu.menuAction()))
         # Initialise the translation
         self.retranslateUi(mainWindow)
@@ -341,23 +296,23 @@ class Ui_MainWindow(object):
         """
         Set up the translation system
         """
-        mainWindow.mainTitle = translate('OpenLP.MainWindow', 'OpenLP 2.0')
+        mainWindow.mainTitle = UiStrings.OLPV2
         mainWindow.setWindowTitle(mainWindow.mainTitle)
         self.FileMenu.setTitle(translate('OpenLP.MainWindow', '&File'))
         self.FileImportMenu.setTitle(translate('OpenLP.MainWindow', '&Import'))
         self.FileExportMenu.setTitle(translate('OpenLP.MainWindow', '&Export'))
-        self.ViewMenu.setTitle(translate('OpenLP.MainWindow', '&View'))
+        self.viewMenu.setTitle(translate('OpenLP.MainWindow', '&View'))
         self.ViewModeMenu.setTitle(translate('OpenLP.MainWindow', 'M&ode'))
         self.ToolsMenu.setTitle(translate('OpenLP.MainWindow', '&Tools'))
         self.SettingsMenu.setTitle(translate('OpenLP.MainWindow', '&Settings'))
         self.SettingsLanguageMenu.setTitle(translate('OpenLP.MainWindow',
             '&Language'))
         self.HelpMenu.setTitle(translate('OpenLP.MainWindow', '&Help'))
-        self.MediaManagerDock.setWindowTitle(
+        self.mediaManagerDock.setWindowTitle(
             translate('OpenLP.MainWindow', 'Media Manager'))
-        self.ServiceManagerDock.setWindowTitle(
+        self.serviceManagerDock.setWindowTitle(
             translate('OpenLP.MainWindow', 'Service Manager'))
-        self.ThemeManagerDock.setWindowTitle(
+        self.themeManagerDock.setWindowTitle(
             translate('OpenLP.MainWindow', 'Theme Manager'))
         self.FileNewItem.setText(translate('OpenLP.MainWindow', '&New'))
         self.FileNewItem.setToolTip(
@@ -449,11 +404,11 @@ class Ui_MainWindow(object):
             'Toggle the visibility of the live panel.'))
         self.ViewLivePanel.setShortcut(
             translate('OpenLP.MainWindow', 'F12'))
-        self.SettingsPluginListItem.setText(translate('OpenLP.MainWindow',
+        self.settingsPluginListItem.setText(translate('OpenLP.MainWindow',
             '&Plugin List'))
-        self.SettingsPluginListItem.setStatusTip(
+        self.settingsPluginListItem.setStatusTip(
             translate('OpenLP.MainWindow', 'List the Plugins'))
-        self.SettingsPluginListItem.setShortcut(
+        self.settingsPluginListItem.setShortcut(
             translate('OpenLP.MainWindow', 'Alt+F7'))
         self.HelpDocumentationItem.setText(
             translate('OpenLP.MainWindow', '&User Guide'))
@@ -547,20 +502,20 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             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.QObject.connect(self.mediaManagerDock,
             QtCore.SIGNAL(u'visibilityChanged(bool)'),
             self.ViewMediaManagerItem.setChecked)
-        QtCore.QObject.connect(self.ServiceManagerDock,
+        QtCore.QObject.connect(self.serviceManagerDock,
             QtCore.SIGNAL(u'visibilityChanged(bool)'),
             self.ViewServiceManagerItem.setChecked)
-        QtCore.QObject.connect(self.ThemeManagerDock,
+        QtCore.QObject.connect(self.themeManagerDock,
             QtCore.SIGNAL(u'visibilityChanged(bool)'),
             self.ViewThemeManagerItem.setChecked)
         QtCore.QObject.connect(self.HelpWebSiteItem,
             QtCore.SIGNAL(u'triggered()'), self.onHelpWebSiteClicked)
         QtCore.QObject.connect(self.HelpAboutItem,
             QtCore.SIGNAL(u'triggered()'), self.onHelpAboutItemClicked)
-        QtCore.QObject.connect(self.SettingsPluginListItem,
+        QtCore.QObject.connect(self.settingsPluginListItem,
             QtCore.SIGNAL(u'triggered()'), self.onPluginItemClicked)
         QtCore.QObject.connect(self.SettingsConfigureItem,
             QtCore.SIGNAL(u'triggered()'), self.onSettingsConfigureItemClicked)
@@ -794,9 +749,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             settings = QtCore.QSettings()
             settings.setValue(u'%s/view mode' % self.generalSettingsSection,
                 mode)
-        self.MediaManagerDock.setVisible(media)
+        self.mediaManagerDock.setVisible(media)
-        self.ServiceManagerDock.setVisible(service)
+        self.serviceManagerDock.setVisible(service)
-        self.ThemeManagerDock.setVisible(theme)
+        self.themeManagerDock.setVisible(theme)
         self.setPreviewPanelVisibility(preview)
         self.setLivePanelVisibility(live)
 
@@ -913,16 +868,16 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
                 theme)
 
     def toggleMediaManager(self, visible):
-        if self.MediaManagerDock.isVisible() != visible:
+        if self.mediaManagerDock.isVisible() != visible:
-            self.MediaManagerDock.setVisible(visible)
+            self.mediaManagerDock.setVisible(visible)
 
     def toggleServiceManager(self, visible):
-        if self.ServiceManagerDock.isVisible() != visible:
+        if self.serviceManagerDock.isVisible() != visible:
-            self.ServiceManagerDock.setVisible(visible)
+            self.serviceManagerDock.setVisible(visible)
 
     def toggleThemeManager(self, visible):
-        if self.ThemeManagerDock.isVisible() != visible:
+        if self.themeManagerDock.isVisible() != visible:
-            self.ThemeManagerDock.setVisible(visible)
+            self.themeManagerDock.setVisible(visible)
 
     def setPreviewPanelVisibility(self, visible):
         """
@@ -999,8 +954,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             u'advanced/recent file count', QtCore.QVariant(4)).toInt()[0]
         self.FileMenu.clear()
         add_actions(self.FileMenu, self.FileMenuActions[:-1])
-        existingRecentFiles = [file for file in self.recentFiles
+        existingRecentFiles = [recentFile for recentFile in self.recentFiles
-            if QtCore.QFile.exists(file)]
+            if QtCore.QFile.exists(recentFile)]
         recentFilesToDisplay = existingRecentFiles[0:recentFileCount]
         if recentFilesToDisplay:
             self.FileMenu.addSeparator()

openlp/core/ui/pluginform.py

@@ -28,13 +28,15 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import PluginStatus, StringContent, translate
+from openlp.core.lib import PluginStatus, Receiver, StringContent, translate
 from plugindialog import Ui_PluginViewDialog
 
 log = logging.getLogger(__name__)
 
 class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
-
+    """
+    The plugin form provides user control over the plugins OpenLP uses.
+    """
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.parent = parent
@@ -129,7 +131,9 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
         if self.programaticChange:
             return
         if status == 0:
+            Receiver.send_message(u'cursor_busy')
             self.activePlugin.toggleStatus(PluginStatus.Active)
+            Receiver.send_message(u'cursor_normal')
         else:
             self.activePlugin.toggleStatus(PluginStatus.Inactive)
         status_text = unicode(

openlp/core/ui/printserviceorderdialog.py

@@ -0,0 +1,137 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Carsten Tinggaard, Frode Woldsund                                           #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import build_icon, translate, SpellTextEdit
+
+class Ui_PrintServiceOrderDialog(object):
+    def setupUi(self, printServiceOrderDialog):
+        printServiceOrderDialog.setObjectName(u'printServiceOrderDialog')
+        self.dialogLayout = QtGui.QGridLayout(printServiceOrderDialog)
+        self.dialogLayout.setObjectName(u'dialogLayout')
+        self.perviewLayout = QtGui.QVBoxLayout()
+        self.perviewLayout.setObjectName(u'perviewLayout')
+        self.previewLabel = QtGui.QLabel(printServiceOrderDialog)
+        self.previewLabel.setSizePolicy(
+            QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        self.previewLabel.setObjectName(u'previewLabel')
+        self.perviewLayout.addWidget(self.previewLabel)
+        self.previewWidget = QtGui.QPrintPreviewWidget(
+            self.printer, self, QtCore.Qt.Widget)
+        self.previewWidget.setEnabled(True)
+        self.previewWidget.setSizePolicy(
+            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Expanding)
+        self.previewWidget.setObjectName(u'previewWidget')
+        # Give the previewWidget a fixed size, to prevent resizing when clicking
+        # the zoom buttons.
+        self.previewWidget.setFixedWidth(350)
+        self.perviewLayout.addWidget(self.previewWidget)
+        self.dialogLayout.addLayout(self.perviewLayout, 0, 0, 1, 1)
+        self.settingsLayout = QtGui.QVBoxLayout()
+        self.settingsLayout.setObjectName(u'settingsLayout')
+        self.serviceTitleLayout = QtGui.QGridLayout()
+        self.serviceTitleLayout.setObjectName(u'serviceTitleLayout')
+        self.serviceTitleLineEdit = QtGui.QLineEdit(printServiceOrderDialog)
+        self.serviceTitleLineEdit.setSizePolicy(
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
+        self.serviceTitleLineEdit.setObjectName(u'serviceTitleLineEdit')
+        self.serviceTitleLayout.addWidget(self.serviceTitleLineEdit, 1, 1, 1, 1)
+        self.serviceTitleLabel = QtGui.QLabel(printServiceOrderDialog)
+        self.serviceTitleLabel.setSizePolicy(
+            QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        self.serviceTitleLabel.setObjectName(u'serviceTitleLabel')
+        self.serviceTitleLayout.addWidget(self.serviceTitleLabel, 1, 0, 1, 1)
+        self.settingsLayout.addLayout(self.serviceTitleLayout)
+        self.printSlideTextCheckBox = QtGui.QCheckBox(printServiceOrderDialog)
+        self.printSlideTextCheckBox.setObjectName(u'printSlideTextCheckBox')
+        self.settingsLayout.addWidget(self.printSlideTextCheckBox)
+        self.printNotesCheckBox = QtGui.QCheckBox(printServiceOrderDialog)
+        self.printNotesCheckBox.setObjectName(u'printNotesCheckBox')
+        self.settingsLayout.addWidget(self.printNotesCheckBox)
+        self.printMetaDataCheckBox = QtGui.QCheckBox(printServiceOrderDialog)
+        self.printMetaDataCheckBox.setObjectName(u'printMetaDataCheckBox')
+        self.settingsLayout.addWidget(self.printMetaDataCheckBox)
+        spacerItem = QtGui.QSpacerItem(20, 40,
+            QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.settingsLayout.addItem(spacerItem)
+        self.customNotesLabel = QtGui.QLabel(self)
+        self.customNotesLabel.setObjectName(u'customNotesLabel')
+        self.settingsLayout.addWidget(self.customNotesLabel)
+        self.customNoteEdit = SpellTextEdit(self)
+        self.customNoteEdit.setObjectName(u'customNoteEdit')
+        self.settingsLayout.addWidget(self.customNoteEdit)
+        self.dialogLayout.addLayout(self.settingsLayout, 0, 3, 1, 1)
+        self.buttonLayout = QtGui.QHBoxLayout()
+        self.buttonLayout.setObjectName(u'buttonLayout')
+        spacerItem = QtGui.QSpacerItem(40, 20,
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.buttonLayout.addItem(spacerItem)
+        self.cancelButton = QtGui.QPushButton(printServiceOrderDialog)
+        self.cancelButton.setObjectName(u'cancelButton')
+        self.buttonLayout.addWidget(self.cancelButton)
+        self.printButton = QtGui.QPushButton(printServiceOrderDialog)
+        self.printButton.setObjectName(u'printButton')
+        self.buttonLayout.addWidget(self.printButton)
+        self.dialogLayout.addLayout(self.buttonLayout, 1, 3, 1, 1)
+        self.zoomButtonLayout = QtGui.QHBoxLayout()
+        self.zoomButtonLayout.setObjectName(u'zoomButtonLayout')
+        spacerItem = QtGui.QSpacerItem(40, 20,
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.zoomButtonLayout.addItem(spacerItem)
+        self.zoomOutButton = QtGui.QToolButton(printServiceOrderDialog)
+        self.zoomOutButton.setIcon(
+            build_icon(u':/general/general_zoom_out.png'))
+        self.zoomOutButton.setObjectName(u'zoomOutButton')
+        self.zoomButtonLayout.addWidget(self.zoomOutButton)
+        self.zoomInButton = QtGui.QToolButton(printServiceOrderDialog)
+        self.zoomInButton.setIcon(build_icon(u':/general/general_zoom_in.png'))
+        self.zoomInButton.setObjectName(u'zoomInButton')
+        self.zoomButtonLayout.addWidget(self.zoomInButton)
+        self.dialogLayout.addLayout(self.zoomButtonLayout, 1, 0, 1, 1)
+        self.retranslateUi(printServiceOrderDialog)
+        QtCore.QMetaObject.connectSlotsByName(printServiceOrderDialog)
+
+    def retranslateUi(self, printServiceOrderDialog):
+        printServiceOrderDialog.setWindowTitle(
+            translate('OpenLP.PrintServiceOrderForm', 'Print Service Order'))
+        self.previewLabel.setText(
+            translate('OpenLP.ServiceManager', '<b>Preview:</b>'))
+        self.printSlideTextCheckBox.setText(translate(
+            'OpenLP.PrintServiceOrderForm', 'Include slide text if available'))
+        self.printNotesCheckBox.setText(translate(
+            'OpenLP.PrintServiceOrderForm', 'Include service item notes'))
+        self.printMetaDataCheckBox.setText(
+            translate('OpenLP.PrintServiceOrderForm',
+            'Include play length of media items'))
+        self.serviceTitleLabel.setText(translate(
+            'OpenLP.PrintServiceOrderForm', 'Title:'))
+        self.serviceTitleLineEdit.setText(translate('OpenLP.ServiceManager',
+            'Service Order Sheet'))
+        self.printButton.setText(translate('OpenLP.ServiceManager', 'Print'))
+        self.cancelButton.setText(translate('OpenLP.ServiceManager', 'Cancel'))
+        self.customNotesLabel.setText(
+            translate('OpenLP.ServiceManager', '<b>Custom Service Notes:</b>'))

openlp/core/ui/printserviceorderform.py

@@ -0,0 +1,184 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Carsten Tinggaard, Frode Woldsund                                           #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import datetime
+import mutagen
+import os
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import translate
+from openlp.core.ui.printserviceorderdialog import Ui_PrintServiceOrderDialog
+
+class PrintServiceOrderForm(QtGui.QDialog, Ui_PrintServiceOrderDialog):
+    def __init__(self, parent, serviceManager):
+        """
+        Constructor
+        """
+        QtGui.QDialog.__init__(self, parent)
+        self.serviceManager = serviceManager
+        self.printer = QtGui.QPrinter()
+        self.printDialog = QtGui.QPrintDialog(self.printer, self)
+        self.document = QtGui.QTextDocument()
+        self.setupUi(self)
+        # Load the settings for the dialog.
+        settings = QtCore.QSettings()
+        settings.beginGroup(u'advanced')
+        self.printSlideTextCheckBox.setChecked(settings.value(
+            u'print slide text', QtCore.QVariant(False)).toBool())
+        self.printMetaDataCheckBox.setChecked(settings.value(
+            u'print file meta data', QtCore.QVariant(False)).toBool())
+        self.printNotesCheckBox.setChecked(settings.value(
+            u'print notes', QtCore.QVariant(False)).toBool())
+        settings.endGroup()
+        # Signals
+        QtCore.QObject.connect(self.printButton,
+            QtCore.SIGNAL(u'clicked()'), self.printServiceOrder)
+        QtCore.QObject.connect(self.zoomOutButton,
+            QtCore.SIGNAL(u'clicked()'), self.zoomOut)
+        QtCore.QObject.connect(self.zoomInButton,
+            QtCore.SIGNAL(u'clicked()'), self.zoomIn)
+        QtCore.QObject.connect(self.previewWidget,
+            QtCore.SIGNAL(u'paintRequested(QPrinter *)'), self.paintRequested)
+        QtCore.QObject.connect(self.serviceTitleLineEdit,
+            QtCore.SIGNAL(u'textChanged(const QString)'),
+            self.updatePreviewText)
+        QtCore.QObject.connect(self.printSlideTextCheckBox,
+            QtCore.SIGNAL(u'stateChanged(int)'), self.updatePreviewText)
+        QtCore.QObject.connect(self.printNotesCheckBox,
+            QtCore.SIGNAL(u'stateChanged(int)'), self.updatePreviewText)
+        QtCore.QObject.connect(self.printMetaDataCheckBox,
+            QtCore.SIGNAL(u'stateChanged(int)'), self.updatePreviewText)
+        QtCore.QObject.connect(self.customNoteEdit,
+            QtCore.SIGNAL(u'textChanged()'), self.updatePreviewText)
+        QtCore.QObject.connect(self.cancelButton,
+            QtCore.SIGNAL(u'clicked()'), self.reject)
+        self.updatePreviewText()
+
+    def updatePreviewText(self):
+        """
+        Creates the html text and updates the html of *self.document*.
+        """
+        text = u''
+        if self.serviceTitleLineEdit.text():
+            text += u'<h2>%s</h2>' % unicode(self.serviceTitleLineEdit.text())
+        for item in self.serviceManager.serviceItems:
+            item = item[u'service_item']
+            # Add the title of the service item.
+            text += u'<h4><img src="%s" /> %s</h4>' % (item.icon,
+                item.get_display_title())
+            # Add slide text of the service item.
+            if self.printSlideTextCheckBox.isChecked():
+                if item.is_text():
+                    # Add the text of the service item.
+                    for slide in item.get_frames():
+                        text += u'<p>' + slide[u'text'] + u'</p>'
+                elif item.is_image():
+                    # Add the image names of the service item.
+                    text += u'<ol>'
+                    for slide in range(len(item.get_frames())):
+                        text += u'<li><p>%s</p></li>' % \
+                            item.get_frame_title(slide)
+                    text += u'</ol>'
+                if item.foot_text:
+                    # add footer
+                    text += u'<p>%s</p>' % item.foot_text
+            # Add service items' notes.
+            if self.printNotesCheckBox.isChecked():
+                if item.notes:
+                    text += u'<p><b>%s</b></p>%s' % (translate(
+                        'OpenLP.ServiceManager', 'Notes:'),
+                        item.notes.replace(u'\n', u'<br />'))
+            # Add play length of media files.
+            if item.is_media() and self.printMetaDataCheckBox.isChecked():
+                path = os.path.join(item.get_frames()[0][u'path'],
+                    item.get_frames()[0][u'title'])
+                if not os.path.isfile(path):
+                    continue
+                file = mutagen.File(path)
+                if file is not None:
+                    length = int(file.info.length)
+                    text += u'<p><b>%s</b> %s</p>' % (translate(
+                        'OpenLP.ServiceManager', u'Playing time:'),
+                        unicode(datetime.timedelta(seconds=length)))
+        if self.customNoteEdit.toPlainText():
+            text += u'<h4>%s</h4>%s' % (translate('OpenLP.ServiceManager',
+                u'Custom Service Notes:'), self.customNoteEdit.toPlainText())
+        self.document.setHtml(text)
+        self.previewWidget.updatePreview()
+
+    def paintRequested(self, printer):
+        """
+        Paint the preview of the *self.document*.
+
+        ``printer``
+            A *QPrinter* object.
+        """
+        self.document.print_(printer)
+
+    def printServiceOrder(self):
+        """
+        Called, when the *printButton* is clicked. Opens the *printDialog*.
+        """
+        if not self.printDialog.exec_():
+            return
+        # Print the document.
+        self.document.print_(self.printer)
+        self.accept()
+
+    def zoomIn(self):
+        """
+        Called when *zoomInButton* is clicked.
+        """
+        self.previewWidget.zoomIn()
+
+    def zoomOut(self):
+        """
+        Called when *zoomOutButton* is clicked.
+        """
+        self.previewWidget.zoomOut()
+
+    def accept(self):
+        """
+        Save the settings and close the dialog.
+        """
+        # Save the settings for this dialog.
+        settings = QtCore.QSettings()
+        settings.beginGroup(u'advanced')
+        settings.setValue(u'print slide text',
+            QtCore.QVariant(self.printSlideTextCheckBox.isChecked()))
+        settings.setValue(u'print file meta data',
+            QtCore.QVariant(self.printMetaDataCheckBox.isChecked()))
+        settings.setValue(u'print notes',
+            QtCore.QVariant(self.printNotesCheckBox.isChecked()))
+        settings.endGroup()
+        # Close the dialog.
+        return QtGui.QDialog.accept(self)
+
+    def reject(self):
+        """
+        Close the dialog, do not print the service and do not save the settings.
+        """
+        return QtGui.QDialog.reject(self)

openlp/core/ui/serviceitemeditdialog.py

@@ -26,8 +26,9 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, build_icon
+from openlp.core.lib import translate
-from openlp.core.lib.ui import save_cancel_button_box
+from openlp.core.lib.ui import create_save_cancel_button_box, \
+    create_delete_push_button, create_up_down_push_button_set
 
 class Ui_ServiceItemEditDialog(object):
     def setupUi(self, serviceItemEditDialog):
@@ -40,26 +41,19 @@ class Ui_ServiceItemEditDialog(object):
         self.dialogLayout.addWidget(self.listWidget, 0, 0)
         self.buttonLayout = QtGui.QVBoxLayout()
         self.buttonLayout.setObjectName(u'buttonLayout')
-        self.deleteButton = QtGui.QPushButton(serviceItemEditDialog)
+        self.deleteButton = create_delete_push_button(serviceItemEditDialog)
-        self.deleteButton.setObjectName(u'deleteButton')
         self.buttonLayout.addWidget(self.deleteButton)
         self.buttonLayout.addStretch()
-        self.upButton = QtGui.QPushButton(serviceItemEditDialog)
+        self.upButton, self.downButton = create_up_down_push_button_set(
-        self.upButton.setIcon(build_icon(u':/services/service_up.png'))
+            serviceItemEditDialog)
-        self.upButton.setObjectName(u'upButton')
         self.buttonLayout.addWidget(self.upButton)
-        self.downButton = QtGui.QPushButton(serviceItemEditDialog)
-        self.downButton.setIcon(build_icon(u':/services/service_down.png'))
-        self.downButton.setObjectName(u'downButton')
         self.buttonLayout.addWidget(self.downButton)
         self.dialogLayout.addLayout(self.buttonLayout, 0, 1)
         self.dialogLayout.addWidget(
-            save_cancel_button_box(serviceItemEditDialog), 1, 0, 1, 2)
+            create_save_cancel_button_box(serviceItemEditDialog), 1, 0, 1, 2)
         self.retranslateUi(serviceItemEditDialog)
         QtCore.QMetaObject.connectSlotsByName(serviceItemEditDialog)
 
     def retranslateUi(self, serviceItemEditDialog):
         serviceItemEditDialog.setWindowTitle(
             translate('OpenLP.ServiceItemEditForm', 'Reorder Service Item'))
-        self.deleteButton.setText(translate('OpenLP.ServiceItemEditForm',
-            'Delete'))

openlp/core/ui/serviceitemeditform.py

@@ -39,13 +39,6 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
         self.itemList = []
-        # enable drop
-        QtCore.QObject.connect(self.upButton,
-            QtCore.SIGNAL(u'clicked()'), self.onItemUp)
-        QtCore.QObject.connect(self.downButton,
-            QtCore.SIGNAL(u'clicked()'), self.onItemDown)
-        QtCore.QObject.connect(self.deleteButton,
-            QtCore.SIGNAL(u'clicked()'), self.onItemDelete)
         QtCore.QObject.connect(self.listWidget,
             QtCore.SIGNAL(u'currentRowChanged(int)'), self.onCurrentRowChanged)
 
@@ -77,7 +70,7 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
             item_name = QtGui.QListWidgetItem(frame[u'title'])
             self.listWidget.addItem(item_name)
 
-    def onItemDelete(self):
+    def onDeleteButtonClicked(self):
         """
         Delete the current row.
         """
@@ -92,13 +85,13 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
         else:
             self.listWidget.setCurrentRow(row)
 
-    def onItemUp(self):
+    def onUpButtonClicked(self):
         """
         Move the current row up in the list.
         """
         self.__moveItem(u'up')
 
-    def onItemDown(self):
+    def onDownButtonClicked(self):
         """
         Move the current row down in the list
         """

openlp/core/ui/servicemanager.py

@@ -23,10 +23,9 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-
-import os
-import logging
 import cPickle
+import logging
+import os
 import zipfile
 
 log = logging.getLogger(__name__)
@@ -38,6 +37,7 @@ from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \
     ThemeLevel
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm
+from openlp.core.ui.printserviceorderform import PrintServiceOrderForm
 from openlp.core.utils import AppLocation, delete_file, file_is_unicode, \
     split_filename
 
@@ -507,7 +507,6 @@ class ServiceManager(QtGui.QWidget):
                     p_file = filePath
             if 'p_file' in locals():
                 Receiver.send_message(u'cursor_busy')
-                Receiver.send_message(u'openlp_process_events')
                 fileTo = open(p_file, u'r')
                 items = cPickle.load(fileTo)
                 fileTo.close()
@@ -1188,41 +1187,5 @@ class ServiceManager(QtGui.QWidget):
         """
         Print a Service Order Sheet.
         """
-        if not self.serviceItems:
+        settingDialog = PrintServiceOrderForm(self.mainwindow, self)
-            critical_error_message_box(
+        settingDialog.exec_()
-                message=translate('OpenLP.ServiceManager',
-                'There is no service item in this service.'))
-            return
-        printDialog = QtGui.QPrintDialog()
-        if not printDialog.exec_():
-            return
-        text = u'<h2>%s</h2>' % translate('OpenLP.ServiceManager',
-            'Service Order Sheet')
-        for item in self.serviceItems:
-            item = item[u'service_item']
-            # add the title
-            text += u'<h4><img src="%s" /> %s</h4>' % (item.icon,
-                item.get_display_title())
-            if not QtCore.QSettings().value(u'advanced' +
-                u'/detailed service print', QtCore.QVariant(True)).toBool():
-                continue
-            if item.is_text():
-                # Add the text of the service item.
-                for slide in item.get_frames():
-                    text += u'<p>' + slide[u'text'] + u'</p>'
-            elif item.is_image():
-                # Add the image names of the service item.
-                text += u'<ol>'
-                for slide in range(len(item.get_frames())):
-                    text += u'<li><p>%s</p></li>' % item.get_frame_title(slide)
-                text += u'</ol>'
-            if item.foot_text:
-                # add footer
-                text += u'<p>%s</p>' % item.foot_text
-            if item.notes:
-                # add notes
-                text += u'<p><b>%s</b> %s</p>' % (translate(
-                    'OpenLP.ServiceManager', 'Notes:'), item.notes)
-        serviceDocument = QtGui.QTextDocument()
-        serviceDocument.setHtml(text)
-        serviceDocument.print_(printDialog.printer())

openlp/core/ui/servicenoteform.py

@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate
-from openlp.core.lib.ui import save_cancel_button_box
+from openlp.core.lib.ui import create_save_cancel_button_box
 
 class ServiceNoteForm(QtGui.QDialog):
     """
@@ -48,7 +48,7 @@ class ServiceNoteForm(QtGui.QDialog):
         self.textEdit = QtGui.QTextEdit(self)
         self.textEdit.setObjectName(u'textEdit')
         self.dialogLayout.addWidget(self.textEdit)
-        self.dialogLayout.addWidget(save_cancel_button_box(self))
+        self.dialogLayout.addWidget(create_save_cancel_button_box(self))
         QtCore.QMetaObject.connectSlotsByName(self)
 
     def retranslateUi(self):

openlp/core/ui/slidecontroller.py

@@ -30,9 +30,10 @@ import os
 from PyQt4 import QtCore, QtGui
 from PyQt4.phonon import Phonon
 
-from openlp.core.ui import HideMode, MainDisplay
 from openlp.core.lib import OpenLPToolbar, Receiver, resize_image, \
     ItemCapabilities, translate
+from openlp.core.lib.ui import UiStrings, shortcut_action
+from openlp.core.ui import HideMode, MainDisplay
 
 log = logging.getLogger(__name__)
 
@@ -77,7 +78,7 @@ class SlideController(QtGui.QWidget):
         self.selectedRow = 0
         self.serviceItem = None
         self.alertTab = None
-        self.panel = QtGui.QWidget(parent.ControlSplitter)
+        self.panel = QtGui.QWidget(parent.controlSplitter)
         self.slideList = {}
         # Layout for holding panel
         self.panelLayout = QtGui.QVBoxLayout(self.panel)
@@ -86,12 +87,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(translate('OpenLP.SlideController', 'Live'))
+            self.typeLabel.setText(UiStrings.Live)
             self.split = 1
             self.typePrefix = u'live'
         else:
-            self.typeLabel.setText(translate('OpenLP.SlideController',
+            self.typeLabel.setText(UiStrings.Preview)
-                'Preview'))
             self.split = 0
             self.typePrefix = u'preview'
         self.typeLabel.setStyleSheet(u'font-weight: bold; font-size: 12pt;')
@@ -178,10 +178,12 @@ class SlideController(QtGui.QWidget):
                     QtCore.SIGNAL(u'triggered(bool)'), self.onHideDisplay)
             self.toolbar.addToolbarSeparator(u'Loop Separator')
             self.toolbar.addToolbarButton(
+                # Does not need translating - control string.
                 u'Start Loop', u':/media/media_time.png',
                 translate('OpenLP.SlideController', 'Start continuous loop'),
                 self.onStartLoop)
             self.toolbar.addToolbarButton(
+                # Does not need translating - control string.
                 u'Stop Loop', u':/media/media_stop.png',
                 translate('OpenLP.SlideController', 'Stop continuous loop'),
                 self.onStopLoop)
@@ -196,11 +198,13 @@ class SlideController(QtGui.QWidget):
         else:
             self.toolbar.addToolbarSeparator(u'Close Separator')
             self.toolbar.addToolbarButton(
+                # Does not need translating - control string.
                 u'Go Live', u':/general/general_live.png',
                 translate('OpenLP.SlideController', 'Move to live'),
                 self.onGoLive)
             self.toolbar.addToolbarSeparator(u'Close Separator')
             self.toolbar.addToolbarButton(
+                # Does not need translating - control string.
                 u'Edit Song', u':/general/general_edit.png',
                 translate('OpenLP.SlideController',
                 'Edit and reload song preview'),
@@ -317,18 +321,8 @@ class SlideController(QtGui.QWidget):
         self.mediabar.setVisible(False)
         if self.isLive:
             self.setLiveHotkeys(self)
-            self.previewListWidget.addActions(
+            self.__addActionsToWidget(self.previewListWidget)
-                [self.previousItem,
+            self.__addActionsToWidget(self.display)
-                self.nextItem,
-                self.previousService,
-                self.nextService,
-                self.escapeItem])
-            self.display.addActions(
-                [self.previousItem,
-                self.nextItem,
-                self.previousService,
-                self.nextService,
-                self.escapeItem])
         else:
             self.setPreviewHotkeys()
             self.previewListWidget.addActions(
@@ -390,28 +384,17 @@ class SlideController(QtGui.QWidget):
         self.nextItem.setShortcuts([QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown])
         self.nextItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         actionList.add_action(self.nextItem, u'Live')
-        self.previousService = QtGui.QAction(translate(
+        self.previousService = shortcut_action(parent,
-            'OpenLP.SlideController', 'Previous Service'), parent)
+            translate('OpenLP.SlideController', 'Previous Service'),
-        self.previousService.setShortcuts([QtCore.Qt.Key_Left, 0])
+            [QtCore.Qt.Key_Left, 0], self.servicePrevious)
-        self.previousService.setShortcutContext(
-            QtCore.Qt.WidgetWithChildrenShortcut)
-        QtCore.QObject.connect(self.previousService,
-            QtCore.SIGNAL(u'triggered()'), self.servicePrevious)
         actionList.add_action(self.previousService, u'Live')
-        self.nextService = QtGui.QAction(translate(
+        self.nextService = shortcut_action(parent,
-            'OpenLP.SlideController', 'Next Service'), parent)
+            translate('OpenLP.SlideController', 'Next Service'),
-        self.nextService.setShortcuts([QtCore.Qt.Key_Right, 0])
+            [QtCore.Qt.Key_Right, 0], self.serviceNext)
-        self.nextService.setShortcutContext(
-            QtCore.Qt.WidgetWithChildrenShortcut)
-        QtCore.QObject.connect(self.nextService,
-            QtCore.SIGNAL(u'triggered()'), self.serviceNext)
         actionList.add_action(self.nextService, u'Live')
-        self.escapeItem = QtGui.QAction(translate(
+        self.escapeItem = shortcut_action(parent,
-            'OpenLP.SlideController', 'Escape Item'), parent)
+            translate('OpenLP.SlideController', 'Escape Item'),
-        self.escapeItem.setShortcuts([QtCore.Qt.Key_Escape, 0])
+            [QtCore.Qt.Key_Escape, 0], self.liveEscape)
-        self.escapeItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
-        QtCore.QObject.connect(self.escapeItem,
-            QtCore.SIGNAL(u'triggered()'), self.liveEscape)
         actionList.add_action(self.escapeItem, u'Live')
 
     def liveEscape(self):
@@ -435,12 +418,7 @@ class SlideController(QtGui.QWidget):
         self.display.alertTab = self.alertTab
         self.display.setup()
         if self.isLive:
-            self.display.addActions(
+            self.__addActionsToWidget(self.display)
-                [self.previousItem,
-                self.nextItem,
-                self.previousService,
-                self.nextService,
-                self.escapeItem])
         # The SlidePreview's ratio.
         self.ratio = float(self.screens.current[u'size'].width()) / \
             float(self.screens.current[u'size'].height())
@@ -448,6 +426,12 @@ class SlideController(QtGui.QWidget):
         if self.serviceItem:
             self.refreshServiceItem()
 
+    def __addActionsToWidget(self, widget):
+        widget.addActions([
+            self.previousItem, self.nextItem,
+            self.previousService, self.nextService,
+            self.escapeItem])
+
     def previewSizeChanged(self):
         """
         Takes care of the SlidePreview's size. Is called when one of the the
@@ -474,7 +458,7 @@ class SlideController(QtGui.QWidget):
                 self.previewListWidget.resizeRowsToContents()
             else:
                 # Sort out image heights.
-                width = self.parent.ControlSplitter.sizes()[self.split]
+                width = self.parent.controlSplitter.sizes()[self.split]
                 for framenumber in range(len(self.serviceItem.get_frames())):
                     self.previewListWidget.setRowHeight(
                         framenumber, width / self.ratio)
@@ -575,10 +559,7 @@ class SlideController(QtGui.QWidget):
             slideno = 0
         # If service item is the same as the current on only change slide
         if item.__eq__(self.serviceItem):
-            if slideno + 1 < self.previewListWidget.rowCount():
+            self.__checkUpdateSelectedSlide(slideno)
-                self.previewListWidget.scrollToItem(
-                    self.previewListWidget.item(slideno + 1, 0))
-            self.previewListWidget.selectRow(slideno)
             self.onSlideSelected()
             return
         self._processItem(item, slideno)
@@ -606,7 +587,7 @@ class SlideController(QtGui.QWidget):
         Receiver.send_message(u'%s_start' % serviceItem.name.lower(),
             [serviceItem, self.isLive, blanked, slideno])
         self.slideList = {}
-        width = self.parent.ControlSplitter.sizes()[self.split]
+        width = self.parent.controlSplitter.sizes()[self.split]
         self.serviceItem = serviceItem
         self.previewListWidget.clear()
         self.previewListWidget.setRowCount(0)
@@ -677,10 +658,7 @@ class SlideController(QtGui.QWidget):
             self.previewListWidget.selectRow(
                 self.previewListWidget.rowCount() - 1)
         else:
-            if slideno + 1 < self.previewListWidget.rowCount():
+            self.__checkUpdateSelectedSlide(slideno)
-                self.previewListWidget.scrollToItem(
-                    self.previewListWidget.item(slideno + 1, 0))
-            self.previewListWidget.selectRow(slideno)
 
     def onTextRequest(self):
         """
@@ -729,10 +707,7 @@ class SlideController(QtGui.QWidget):
                 [self.serviceItem, self.isLive, index])
             self.updatePreview()
         else:
-            if index + 1 < self.previewListWidget.rowCount():
+            self.__checkUpdateSelectedSlide(index)
-                self.previewListWidget.scrollToItem(
-                    self.previewListWidget.item(index + 1, 0))
-            self.previewListWidget.selectRow(index)
             self.onSlideSelected()
 
     def mainDisplaySetBackground(self):
@@ -891,10 +866,7 @@ class SlideController(QtGui.QWidget):
         """
         The slide has been changed. Update the slidecontroller accordingly
         """
-        if row + 1 < self.previewListWidget.rowCount():
+        self.__checkUpdateSelectedSlide(row)
-            self.previewListWidget.scrollToItem(
-                self.previewListWidget.item(row + 1, 0))
-        self.previewListWidget.selectRow(row)
         self.updatePreview()
         Receiver.send_message(u'slidecontroller_%s_changed' % self.typePrefix,
             row)
@@ -905,7 +877,8 @@ class SlideController(QtGui.QWidget):
         using *Blank to Theme*.
         """
         log.debug(u'updatePreview %s ' % self.screens.current[u'primary'])
-        if not self.screens.current[u'primary']:
+        if not self.screens.current[u'primary'] and \
+            self.serviceItem.is_capable(ItemCapabilities.ProvidesOwnDisplay):
             # Grab now, but try again in a couple of seconds if slide change
             # is slow
             QtCore.QTimer.singleShot(0.5, self.grabMainDisplay)
@@ -945,10 +918,7 @@ class SlideController(QtGui.QWidget):
                 else:
                     Receiver.send_message('servicemanager_next_item')
                     return
-            if row + 1 < self.previewListWidget.rowCount():
+            self.__checkUpdateSelectedSlide(row)
-                self.previewListWidget.scrollToItem(
-                    self.previewListWidget.item(row + 1, 0))
-            self.previewListWidget.selectRow(row)
             self.onSlideSelected()
 
     def onSlideSelectedPreviousNoloop(self):
@@ -971,11 +941,14 @@ class SlideController(QtGui.QWidget):
                     row = self.previewListWidget.rowCount() - 1
                 else:
                     row = 0
+            self.__checkUpdateSelectedSlide(row)
+            self.onSlideSelected()
+
+    def __checkUpdateSelectedSlide(self, row):
         if row + 1 < self.previewListWidget.rowCount():
             self.previewListWidget.scrollToItem(
                 self.previewListWidget.item(row + 1, 0))
         self.previewListWidget.selectRow(row)
-            self.onSlideSelected()
 
     def onSlideSelectedLast(self):
         """

openlp/core/ui/themeform.py

@@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate, BackgroundType, BackgroundGradientType, \
     Receiver
-from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.lib.ui import UiStrings, critical_error_message_box
 from openlp.core.utils import get_images_filter
 from themewizard import Ui_ThemeWizard
 
@@ -483,8 +483,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         Background Image button pushed.
         """
         images_filter = get_images_filter()
-        images_filter = '%s;;%s (*.*) (*)' % (images_filter,
+        images_filter = '%s;;%s (*.*) (*)' % (images_filter, UiStrings.AllFiles)
-            translate('OpenLP.ThemeForm', 'All Files'))
         filename = QtGui.QFileDialog.getOpenFileName(self,
             translate('OpenLP.ThemeForm', 'Select Image'), u'',
             images_filter)

openlp/core/ui/thememanager.py

@@ -35,7 +35,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import OpenLPToolbar, ThemeXML, get_text_file_string, \
     build_icon, Receiver, SettingsManager, translate, check_item_selected, \
     BackgroundType, BackgroundGradientType, check_directory_exists
-from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.lib.ui import UiStrings, critical_error_message_box
 from openlp.core.theme import Theme
 from openlp.core.ui import FileRenameForm, ThemeForm
 from openlp.core.utils import AppLocation, delete_file, file_is_unicode, \
@@ -62,28 +62,28 @@ class ThemeManager(QtGui.QWidget):
         self.layout.setObjectName(u'layout')
         self.toolbar = OpenLPToolbar(self)
         self.toolbar.addToolbarButton(
-            translate('OpenLP.ThemeManager', 'New Theme'),
+            UiStrings.NewType % UiStrings.Theme,
             u':/themes/theme_new.png',
             translate('OpenLP.ThemeManager', 'Create a new theme.'),
             self.onAddTheme)
         self.toolbar.addToolbarButton(
-            translate('OpenLP.ThemeManager', 'Edit Theme'),
+            UiStrings.EditType % UiStrings.Theme,
             u':/themes/theme_edit.png',
             translate('OpenLP.ThemeManager', 'Edit a theme.'),
             self.onEditTheme)
         self.deleteToolbarAction = self.toolbar.addToolbarButton(
-            translate('OpenLP.ThemeManager', 'Delete Theme'),
+            UiStrings.DeleteType % UiStrings.Theme,
             u':/general/general_delete.png',
             translate('OpenLP.ThemeManager', 'Delete a theme.'),
             self.onDeleteTheme)
         self.toolbar.addSeparator()
         self.toolbar.addToolbarButton(
-            translate('OpenLP.ThemeManager', 'Import Theme'),
+            UiStrings.ImportType % UiStrings.Theme,
             u':/general/general_import.png',
             translate('OpenLP.ThemeManager', 'Import a theme.'),
             self.onImportTheme)
         self.toolbar.addToolbarButton(
-            translate('OpenLP.ThemeManager', 'Export Theme'),
+            UiStrings.ExportType % UiStrings.Theme,
             u':/general/general_export.png',
             translate('OpenLP.ThemeManager', 'Export a theme.'),
             self.onExportTheme)
@@ -241,7 +241,7 @@ class ThemeManager(QtGui.QWidget):
                     QtCore.QVariant(self.global_theme))
                 Receiver.send_message(u'theme_update_global',
                     self.global_theme)
-                self.pushThemes()
+                self._pushThemes()
 
     def onAddTheme(self):
         """
@@ -260,7 +260,7 @@ class ThemeManager(QtGui.QWidget):
             'You must select a theme to rename.')),
             unicode(translate('OpenLP.ThemeManager', 'Rename Confirmation')),
             unicode(translate('OpenLP.ThemeManager', 'Rename %s theme?')),
-            False):
+            False, False):
             item = self.themeListWidget.currentItem()
             oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
             self.fileRenameForm.fileNameEdit.setText(oldThemeName)
@@ -268,11 +268,12 @@ class ThemeManager(QtGui.QWidget):
                 newThemeName =  unicode(self.fileRenameForm.fileNameEdit.text())
                 if self.checkIfThemeExists(newThemeName):
                     oldThemeData = self.getThemeData(oldThemeName)
-                    self.deleteTheme(oldThemeName)
                     self.cloneThemeData(oldThemeData, newThemeName)
+                    self.deleteTheme(oldThemeName)
                     for plugin in self.mainwindow.pluginManager.plugins:
                         if plugin.usesTheme(oldThemeName):
                             plugin.renameTheme(oldThemeName, newThemeName)
+                    self.loadThemes()
 
     def onCopyTheme(self):
         """
@@ -300,6 +301,7 @@ class ThemeManager(QtGui.QWidget):
                 os.path.split(unicode(themeData.background_filename))[1])
             saveFrom = themeData.background_filename
         themeData.theme_name = newThemeName
+        themeData.extend_image_filename(self.path)
         self.saveTheme(themeData, saveFrom, saveTo)
 
     def onEditTheme(self):
@@ -332,6 +334,9 @@ class ThemeManager(QtGui.QWidget):
             row = self.themeListWidget.row(item)
             self.themeListWidget.takeItem(row)
             self.deleteTheme(theme)
+            # As we do not reload the themes, push out the change. Reload the
+            # list as the internal lists and events need to be triggered.
+            self._pushThemes()
 
     def deleteTheme(self, theme):
         """
@@ -349,10 +354,6 @@ class ThemeManager(QtGui.QWidget):
             shutil.rmtree(os.path.join(self.path, theme).encode(encoding))
         except OSError:
             log.exception(u'Error deleting theme %s', theme)
-        # As we do not reload the themes push out the change
-        # Reaload the list as the internal lists and events need
-        # to be triggered
-        self.pushThemes()
 
     def onExportTheme(self):
         """
@@ -449,9 +450,9 @@ class ThemeManager(QtGui.QWidget):
                         QtCore.QVariant(textName))
                     self.themeListWidget.addItem(item_name)
                     self.themelist.append(textName)
-        self.pushThemes()
+        self._pushThemes()
 
-    def pushThemes(self):
+    def _pushThemes(self):
         """
         Notify listeners that the theme list has been updated
         """
@@ -571,6 +572,14 @@ class ThemeManager(QtGui.QWidget):
         Called by thememaintenance Dialog to save the theme
         and to trigger the reload of the theme list
         """
+        self._writeTheme(theme, imageFrom, imageTo)
+        self.loadThemes()
+
+    def _writeTheme(self, theme, imageFrom, imageTo):
+        """
+        Writes the theme to the disk and handles the background image if
+        necessary
+        """
         name = theme.theme_name
         theme_pretty_xml = theme.extract_formatted_xml()
         log.debug(u'saveTheme %s %s', name, theme_pretty_xml)
@@ -598,12 +607,9 @@ class ThemeManager(QtGui.QWidget):
             except IOError:
                 log.exception(u'Failed to save theme image')
         self.generateAndSaveImage(self.path, name, theme)
-        self.loadThemes()
-        self.pushThemes()
 
     def generateAndSaveImage(self, dir, name, theme):
         log.debug(u'generateAndSaveImage %s %s', dir, name)
-        theme_xml = theme.extract_xml()
         frame = self.generateImage(theme)
         samplepathname = os.path.join(self.path, name + u'.png')
         if os.path.exists(samplepathname):
@@ -669,7 +675,7 @@ class ThemeManager(QtGui.QWidget):
         return theme
 
     def _validate_theme_action(self, select_text, confirm_title, confirm_text,
-        testPlugin=True):
+        testPlugin=True, confirm=True):
         """
         Check to see if theme has been selected and the destructive action
         is allowed.
@@ -681,6 +687,7 @@ class ThemeManager(QtGui.QWidget):
             item = self.themeListWidget.currentItem()
             theme = unicode(item.text())
             # confirm deletion
+            if confirm:
                 answer = QtGui.QMessageBox.question(self, confirm_title,
                     confirm_text % theme, QtGui.QMessageBox.StandardButtons(
                     QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),

openlp/core/ui/themestab.py

@@ -27,6 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import SettingsTab, Receiver, ThemeLevel, translate
+from openlp.core.lib.ui import UiStrings
 
 class ThemesTab(SettingsTab):
     """
@@ -98,7 +99,7 @@ class ThemesTab(SettingsTab):
             QtCore.SIGNAL(u'theme_update_list'), self.updateThemeList)
 
     def retranslateUi(self):
-        self.tabTitleVisible = translate('OpenLP.ThemesTab', 'Themes')
+        self.tabTitleVisible = UiStrings.Themes
         self.GlobalGroupBox.setTitle(
             translate('OpenLP.ThemesTab', 'Global Theme'))
         self.LevelGroupBox.setTitle(

openlp/core/ui/themewizard.py

@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate, build_icon
-from openlp.core.lib.ui import add_welcome_page
+from openlp.core.lib.ui import add_welcome_page, create_valign_combo
 
 class Ui_ThemeWizard(object):
     def setupUi(self, themeWizard):
@@ -36,6 +36,8 @@ class Ui_ThemeWizard(object):
         themeWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
         themeWizard.setOptions(QtGui.QWizard.IndependentPages |
             QtGui.QWizard.NoBackButtonOnStartPage)
+        self.spacer = QtGui.QSpacerItem(10, 0,
+            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
         # Welcome Page
         add_welcome_page(themeWizard, u':/wizards/wizard_createtheme.bmp')
         # Background Page
@@ -52,10 +54,8 @@ class Ui_ThemeWizard(object):
         self.backgroundComboBox.setObjectName(u'BackgroundComboBox')
         self.backgroundTypeLayout.addRow(self.backgroundLabel,
             self.backgroundComboBox)
-        self.backgroundTypeSpacer = QtGui.QSpacerItem(10, 0,
-            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
         self.backgroundTypeLayout.setItem(1, QtGui.QFormLayout.LabelRole,
-            self.backgroundTypeSpacer)
+            self.spacer)
         self.backgroundLayout.addLayout(self.backgroundTypeLayout)
         self.backgroundStack = QtGui.QStackedLayout()
         self.backgroundStack.setObjectName(u'BackgroundStack')
@@ -69,10 +69,7 @@ class Ui_ThemeWizard(object):
         self.colorButton = QtGui.QPushButton(self.colorWidget)
         self.colorButton.setObjectName(u'ColorButton')
         self.colorLayout.addRow(self.colorLabel, self.colorButton)
-        self.colorSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+        self.colorLayout.setItem(1, QtGui.QFormLayout.LabelRole, self.spacer)
-            QtGui.QSizePolicy.Minimum)
-        self.colorLayout.setItem(1, QtGui.QFormLayout.LabelRole,
-            self.colorSpacer)
         self.backgroundStack.addWidget(self.colorWidget)
         self.gradientWidget = QtGui.QWidget(self.backgroundPage)
         self.gradientWidget.setObjectName(u'GradientWidget')
@@ -98,10 +95,7 @@ class Ui_ThemeWizard(object):
         self.gradientComboBox.addItems([u'', u'', u'', u'', u''])
         self.gradientLayout.addRow(self.gradientTypeLabel,
             self.gradientComboBox)
-        self.gradientSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+        self.gradientLayout.setItem(3, QtGui.QFormLayout.LabelRole, self.spacer)
-            QtGui.QSizePolicy.Minimum)
-        self.gradientLayout.setItem(3, QtGui.QFormLayout.LabelRole,
-            self.gradientSpacer)
         self.backgroundStack.addWidget(self.gradientWidget)
         self.imageWidget = QtGui.QWidget(self.backgroundPage)
         self.imageWidget.setObjectName(u'ImageWidget')
@@ -121,10 +115,7 @@ class Ui_ThemeWizard(object):
             build_icon(u':/general/general_open.png'))
         self.imageFileLayout.addWidget(self.imageBrowseButton)
         self.imageLayout.addRow(self.imageLabel, self.imageFileLayout)
-        self.imageSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+        self.imageLayout.setItem(1, QtGui.QFormLayout.LabelRole, self.spacer)
-            QtGui.QSizePolicy.Minimum)
-        self.imageLayout.setItem(1, QtGui.QFormLayout.LabelRole,
-            self.imageSpacer)
         self.backgroundStack.addWidget(self.imageWidget)
         self.backgroundLayout.addLayout(self.backgroundStack)
         themeWizard.addPage(self.backgroundPage)
@@ -236,6 +227,8 @@ class Ui_ThemeWizard(object):
         self.footerSizeSpinBox.setObjectName(u'FooterSizeSpinBox')
         self.footerAreaLayout.addRow(self.footerSizeLabel,
             self.footerSizeSpinBox)
+        self.footerAreaLayout.setItem(3, QtGui.QFormLayout.LabelRole,
+            self.spacer)
         themeWizard.addPage(self.footerAreaPage)
         # Alignment Page
         self.alignmentPage = QtGui.QWizardPage()
@@ -249,18 +242,16 @@ class Ui_ThemeWizard(object):
         self.horizontalComboBox.setObjectName(u'HorizontalComboBox')
         self.alignmentLayout.addRow(self.horizontalLabel,
             self.horizontalComboBox)
-        self.verticalLabel = QtGui.QLabel(self.alignmentPage)
+        create_valign_combo(themeWizard, self.alignmentPage,
-        self.verticalLabel.setObjectName(u'VerticalLabel')
+            self.alignmentLayout)
-        self.verticalComboBox = QtGui.QComboBox(self.alignmentPage)
-        self.verticalComboBox.addItems([u'', u'', u''])
-        self.verticalComboBox.setObjectName(u'VerticalComboBox')
-        self.alignmentLayout.addRow(self.verticalLabel, self.verticalComboBox)
         self.transitionsLabel = QtGui.QLabel(self.alignmentPage)
         self.transitionsLabel.setObjectName(u'TransitionsLabel')
         self.transitionsCheckBox = QtGui.QCheckBox(self.alignmentPage)
         self.transitionsCheckBox.setObjectName(u'TransitionsCheckBox')
         self.alignmentLayout.addRow(self.transitionsLabel,
             self.transitionsCheckBox)
+        self.alignmentLayout.setItem(3, QtGui.QFormLayout.LabelRole,
+            self.spacer)
         themeWizard.addPage(self.alignmentPage)
         # Area Position Page
         self.areaPositionPage = QtGui.QWizardPage()
@@ -455,8 +446,7 @@ class Ui_ThemeWizard(object):
         self.mainAreaPage.setSubTitle(
             translate('OpenLP.ThemeWizard', 'Define the font and display '
                 'characteristics for the Display text'))
-        self.mainFontLabel.setText(
+        self.mainFontLabel.setText(translate('OpenLP.ThemeWizard', 'Font:'))
-            translate('OpenLP.ThemeWizard', 'Font:'))
         self.mainColorLabel.setText(translate('OpenLP.ThemeWizard', 'Color:'))
         self.mainSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
         self.mainSizeSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'pt'))
@@ -470,8 +460,7 @@ class Ui_ThemeWizard(object):
         self.shadowCheckBox.setText(translate('OpenLP.ThemeWizard', '&Shadow:'))
         self.shadowSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
         self.shadowSizeSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'pt'))
-        self.mainBoldCheckBox.setText(
+        self.mainBoldCheckBox.setText(translate('OpenLP.ThemeWizard', 'Bold'))
-            translate('OpenLP.ThemeWizard', 'Bold'))
         self.mainItalicsCheckBox.setText(
             translate('OpenLP.ThemeWizard', 'Italic'))
         self.footerAreaPage.setTitle(
@@ -496,14 +485,6 @@ class Ui_ThemeWizard(object):
             translate('OpenLP.ThemeWizard', 'Right'))
         self.horizontalComboBox.setItemText(2,
             translate('OpenLP.ThemeWizard', 'Center'))
-        self.verticalLabel.setText(
-            translate('OpenLP.ThemeWizard', 'Vertical Align:'))
-        self.verticalComboBox.setItemText(0,
-            translate('OpenLP.ThemeWizard', 'Top'))
-        self.verticalComboBox.setItemText(1,
-            translate('OpenLP.ThemeWizard', 'Middle'))
-        self.verticalComboBox.setItemText(2,
-            translate('OpenLP.ThemeWizard', 'Bottom'))
         self.transitionsLabel.setText(
             translate('OpenLP.ThemeWizard', 'Transitions:'))
         self.areaPositionPage.setTitle(
@@ -552,16 +533,6 @@ class Ui_ThemeWizard(object):
             translate('OpenLP.ThemeWizard', 'Theme name:'))
         # Align all QFormLayouts towards each other.
         labelWidth = max(self.backgroundLabel.minimumSizeHint().width(),
-            self.colorLabel.minimumSizeHint().width(),
+            self.horizontalLabel.minimumSizeHint().width())
-            self.gradientStartLabel.minimumSizeHint().width(),
+        self.spacer.changeSize(labelWidth, 0,
-            self.gradientEndLabel.minimumSizeHint().width(),
-            self.gradientTypeLabel.minimumSizeHint().width(),
-            self.imageLabel.minimumSizeHint().width())
-        self.backgroundTypeSpacer.changeSize(labelWidth, 0,
-            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        self.colorSpacer.changeSize(labelWidth, 0,
-            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        self.gradientSpacer.changeSize(labelWidth, 0,
-            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        self.imageSpacer.changeSize(labelWidth, 0,
             QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)

openlp/plugins/alerts/forms/alertdialog.py

@@ -27,6 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon, translate
+from openlp.core.lib.ui import create_delete_push_button
 
 class Ui_AlertDialog(object):
     def setupUi(self, alertDialog):
@@ -65,10 +66,8 @@ class Ui_AlertDialog(object):
         self.saveButton.setIcon(build_icon(u':/general/general_save.png'))
         self.saveButton.setObjectName(u'saveButton')
         self.manageButtonLayout.addWidget(self.saveButton)
-        self.deleteButton = QtGui.QPushButton(alertDialog)
+        self.deleteButton = create_delete_push_button(alertDialog)
         self.deleteButton.setEnabled(False)
-        self.deleteButton.setIcon(build_icon(u':/general/general_delete.png'))
-        self.deleteButton.setObjectName(u'deleteButton')
         self.manageButtonLayout.addWidget(self.deleteButton)
         self.manageButtonLayout.addStretch()
         self.alertDialogLayout.addLayout(self.manageButtonLayout, 1, 1)
@@ -104,8 +103,6 @@ class Ui_AlertDialog(object):
             translate('AlertsPlugin.AlertForm', '&New'))
         self.saveButton.setText(
             translate('AlertsPlugin.AlertForm', '&Save'))
-        self.deleteButton.setText(
-            translate('AlertsPlugin.AlertForm', '&Delete'))
         self.displayButton.setText(
             translate('AlertsPlugin.AlertForm', 'Displ&ay'))
         self.displayCloseButton.setText(

openlp/plugins/alerts/forms/alertform.py

@@ -52,8 +52,6 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
             QtCore.SIGNAL(u'textChanged(const QString&)'), self.onTextChanged)
         QtCore.QObject.connect(self.newButton,
             QtCore.SIGNAL(u'clicked()'), self.onNewClick)
-        QtCore.QObject.connect(self.deleteButton,
-            QtCore.SIGNAL(u'clicked()'), self.onDeleteClick)
         QtCore.QObject.connect(self.saveButton,
             QtCore.SIGNAL(u'clicked()'), self.onSaveClick)
         QtCore.QObject.connect(self.alertListWidget,
@@ -82,7 +80,7 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
         if self.triggerAlert(unicode(self.alertTextEdit.text())):
             self.close()
 
-    def onDeleteClick(self):
+    def onDeleteButtonClicked(self):
         """
         Deletes the selected item.
         """

openlp/plugins/alerts/lib/alertstab.py

@@ -27,6 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import SettingsTab, translate
+from openlp.core.lib.ui import UiStrings, create_valign_combo
 
 class AlertsTab(SettingsTab):
     """
@@ -40,48 +41,43 @@ class AlertsTab(SettingsTab):
     def setupUi(self):
         self.setObjectName(u'AlertsTab')
         SettingsTab.setupUi(self)
-        self.FontGroupBox = QtGui.QGroupBox(self.leftColumn)
+        self.fontGroupBox = QtGui.QGroupBox(self.leftColumn)
-        self.FontGroupBox.setObjectName(u'FontGroupBox')
+        self.fontGroupBox.setObjectName(u'fontGroupBox')
-        self.FontLayout = QtGui.QFormLayout(self.FontGroupBox)
+        self.fontLayout = QtGui.QFormLayout(self.fontGroupBox)
-        self.FontLayout.setObjectName(u'FontLayout')
+        self.fontLayout.setObjectName(u'fontLayout')
-        self.FontLabel = QtGui.QLabel(self.FontGroupBox)
+        self.FontLabel = QtGui.QLabel(self.fontGroupBox)
         self.FontLabel.setObjectName(u'FontLabel')
-        self.FontComboBox = QtGui.QFontComboBox(self.FontGroupBox)
+        self.FontComboBox = QtGui.QFontComboBox(self.fontGroupBox)
         self.FontComboBox.setObjectName(u'FontComboBox')
-        self.FontLayout.addRow(self.FontLabel, self.FontComboBox)
+        self.fontLayout.addRow(self.FontLabel, self.FontComboBox)
-        self.FontColorLabel = QtGui.QLabel(self.FontGroupBox)
+        self.FontColorLabel = QtGui.QLabel(self.fontGroupBox)
         self.FontColorLabel.setObjectName(u'FontColorLabel')
         self.ColorLayout = QtGui.QHBoxLayout()
         self.ColorLayout.setObjectName(u'ColorLayout')
-        self.FontColorButton = QtGui.QPushButton(self.FontGroupBox)
+        self.FontColorButton = QtGui.QPushButton(self.fontGroupBox)
         self.FontColorButton.setObjectName(u'FontColorButton')
         self.ColorLayout.addWidget(self.FontColorButton)
         self.ColorLayout.addSpacing(20)
-        self.BackgroundColorLabel = QtGui.QLabel(self.FontGroupBox)
+        self.BackgroundColorLabel = QtGui.QLabel(self.fontGroupBox)
         self.BackgroundColorLabel.setObjectName(u'BackgroundColorLabel')
         self.ColorLayout.addWidget(self.BackgroundColorLabel)
-        self.BackgroundColorButton = QtGui.QPushButton(self.FontGroupBox)
+        self.BackgroundColorButton = QtGui.QPushButton(self.fontGroupBox)
         self.BackgroundColorButton.setObjectName(u'BackgroundColorButton')
         self.ColorLayout.addWidget(self.BackgroundColorButton)
-        self.FontLayout.addRow(self.FontColorLabel, self.ColorLayout)
+        self.fontLayout.addRow(self.FontColorLabel, self.ColorLayout)
-        self.FontSizeLabel = QtGui.QLabel(self.FontGroupBox)
+        self.FontSizeLabel = QtGui.QLabel(self.fontGroupBox)
         self.FontSizeLabel.setObjectName(u'FontSizeLabel')
-        self.FontSizeSpinBox = QtGui.QSpinBox(self.FontGroupBox)
+        self.FontSizeSpinBox = QtGui.QSpinBox(self.fontGroupBox)
         self.FontSizeSpinBox.setObjectName(u'FontSizeSpinBox')
-        self.FontLayout.addRow(self.FontSizeLabel, self.FontSizeSpinBox)
+        self.fontLayout.addRow(self.FontSizeLabel, self.FontSizeSpinBox)
-        self.TimeoutLabel = QtGui.QLabel(self.FontGroupBox)
+        self.TimeoutLabel = QtGui.QLabel(self.fontGroupBox)
         self.TimeoutLabel.setObjectName(u'TimeoutLabel')
-        self.TimeoutSpinBox = QtGui.QSpinBox(self.FontGroupBox)
+        self.TimeoutSpinBox = QtGui.QSpinBox(self.fontGroupBox)
         self.TimeoutSpinBox.setMaximum(180)
         self.TimeoutSpinBox.setObjectName(u'TimeoutSpinBox')
-        self.FontLayout.addRow(self.TimeoutLabel, self.TimeoutSpinBox)
+        self.fontLayout.addRow(self.TimeoutLabel, self.TimeoutSpinBox)
-        self.LocationLabel = QtGui.QLabel(self.FontGroupBox)
+        create_valign_combo(self, self.fontGroupBox, self.fontLayout)
-        self.LocationLabel.setObjectName(u'LocationLabel')
+        self.leftLayout.addWidget(self.fontGroupBox)
-        self.LocationComboBox = QtGui.QComboBox(self.FontGroupBox)
-        self.LocationComboBox.addItems([u'', u'', u''])
-        self.LocationComboBox.setObjectName(u'LocationComboBox')
-        self.FontLayout.addRow(self.LocationLabel, self.LocationComboBox)
-        self.leftLayout.addWidget(self.FontGroupBox)
         self.leftLayout.addStretch()
         self.PreviewGroupBox = QtGui.QGroupBox(self.rightColumn)
         self.PreviewGroupBox.setObjectName(u'PreviewGroupBox')
@@ -99,15 +95,13 @@ class AlertsTab(SettingsTab):
             QtCore.SIGNAL(u'pressed()'), self.onFontColorButtonClicked)
         QtCore.QObject.connect(self.FontComboBox,
             QtCore.SIGNAL(u'activated(int)'), self.onFontComboBoxClicked)
-        QtCore.QObject.connect(self.LocationComboBox,
-            QtCore.SIGNAL(u'activated(int)'), self.onLocationComboBoxClicked)
         QtCore.QObject.connect(self.TimeoutSpinBox,
             QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged)
         QtCore.QObject.connect(self.FontSizeSpinBox,
             QtCore.SIGNAL(u'valueChanged(int)'), self.onFontSizeSpinBoxChanged)
 
     def retranslateUi(self):
-        self.FontGroupBox.setTitle(
+        self.fontGroupBox.setTitle(
             translate('AlertsPlugin.AlertsTab', 'Font'))
         self.FontLabel.setText(
             translate('AlertsPlugin.AlertsTab', 'Font name:'))
@@ -123,18 +117,8 @@ class AlertsTab(SettingsTab):
             translate('AlertsPlugin.AlertsTab', 'Alert timeout:'))
         self.TimeoutSpinBox.setSuffix(
             translate('AlertsPlugin.AlertsTab', 's'))
-        self.LocationLabel.setText(
+        self.PreviewGroupBox.setTitle(UiStrings.Preview)
-            translate('AlertsPlugin.AlertsTab', 'Location:'))
+        self.FontPreview.setText(UiStrings.OLPV2)
-        self.PreviewGroupBox.setTitle(
-            translate('AlertsPlugin.AlertsTab', 'Preview'))
-        self.FontPreview.setText(
-            translate('AlertsPlugin.AlertsTab', 'OpenLP 2.0'))
-        self.LocationComboBox.setItemText(0,
-            translate('AlertsPlugin.AlertsTab', 'Top'))
-        self.LocationComboBox.setItemText(1,
-            translate('AlertsPlugin.AlertsTab', 'Middle'))
-        self.LocationComboBox.setItemText(2,
-            translate('AlertsPlugin.AlertsTab', 'Bottom'))
 
     def onBackgroundColorButtonClicked(self):
         new_color = QtGui.QColorDialog.getColor(
@@ -148,9 +132,6 @@ class AlertsTab(SettingsTab):
     def onFontComboBoxClicked(self):
         self.updateDisplay()
 
-    def onLocationComboBoxClicked(self, location):
-        self.location = location
-
     def onFontColorButtonClicked(self):
         new_color = QtGui.QColorDialog.getColor(
             QtGui.QColor(self.font_color), self)
@@ -188,7 +169,7 @@ class AlertsTab(SettingsTab):
             u'background-color: %s' % self.font_color)
         self.BackgroundColorButton.setStyleSheet(
             u'background-color: %s' % self.bg_color)
-        self.LocationComboBox.setCurrentIndex(self.location)
+        self.verticalComboBox.setCurrentIndex(self.location)
         font = QtGui.QFont()
         font.setFamily(self.font_face)
         self.FontComboBox.setCurrentFont(font)
@@ -197,14 +178,14 @@ class AlertsTab(SettingsTab):
     def save(self):
         settings = QtCore.QSettings()
         settings.beginGroup(self.settingsSection)
-        self.font_face = self.FontComboBox.currentFont().family()
         settings.setValue(u'background color', QtCore.QVariant(self.bg_color))
         settings.setValue(u'font color', QtCore.QVariant(self.font_color))
         settings.setValue(u'font size', QtCore.QVariant(self.font_size))
+        self.font_face = self.FontComboBox.currentFont().family()
         settings.setValue(u'font face', QtCore.QVariant(self.font_face))
         settings.setValue(u'timeout', QtCore.QVariant(self.timeout))
-        settings.setValue(u'location',
+        self.location = self.verticalComboBox.currentIndex()
-            QtCore.QVariant(self.LocationComboBox.currentIndex()))
+        settings.setValue(u'location', QtCore.QVariant(self.location))
         settings.endGroup()
 
     def updateDisplay(self):

openlp/plugins/bibles/bibleplugin.py

@@ -29,6 +29,7 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
+from openlp.core.lib.ui import UiStrings
 from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem
 
 log = logging.getLogger(__name__)
@@ -102,7 +103,7 @@ class BiblePlugin(Plugin):
         Called to find out if the bible plugin is currently using a theme.
         Returns True if the theme is being used, otherwise returns False.
         """
-        if self.settings_tab.bible_theme == theme:
+        if unicode(self.settings_tab.bible_theme) == theme:
             return True
         return False
 
@@ -119,6 +120,7 @@ class BiblePlugin(Plugin):
             The new name the plugin should now use.
         """
         self.settings_tab.bible_theme = newTheme
+        self.settings_tab.save()
 
     def setPluginTextStrings(self):
         """
@@ -136,38 +138,7 @@ class BiblePlugin(Plugin):
         # Middle Header Bar
         ## Import Action ##
         self.textStrings[StringContent.Import] = {
-            u'title': translate('BiblesPlugin', '&Import'),
+            u'title': UiStrings.Import,
             u'tooltip': translate('BiblesPlugin', 'Import a Bible')
         }
-        ## New Action ##
+        Plugin.setPluginTextStrings(self)
-        self.textStrings[StringContent.New] = {
-            u'title': translate('BiblesPlugin', '&Add'),
-            u'tooltip': translate('BiblesPlugin', 'Add a new Bible')
-        }
-        ## Edit Action ##
-        self.textStrings[StringContent.Edit] = {
-            u'title': translate('BiblesPlugin', '&Edit'),
-            u'tooltip': translate('BiblesPlugin', 'Edit the selected Bible')
-        }
-        ## Delete Action ##
-        self.textStrings[StringContent.Delete] = {
-            u'title': translate('BiblesPlugin', '&Delete'),
-            u'tooltip': translate('BiblesPlugin', 'Delete the selected Bible')
-        }
-        ## Preview Action ##
-        self.textStrings[StringContent.Preview] = {
-            u'title': translate('BiblesPlugin', 'Preview'),
-            u'tooltip': translate('BiblesPlugin', 'Preview the selected Bible')
-        }
-        ## Send Live Action ##
-        self.textStrings[StringContent.Live] = {
-            u'title': translate('BiblesPlugin', 'Live'),
-            u'tooltip': translate('BiblesPlugin',
-                'Send the selected Bible live')
-        }
-        ## Add to Service Action ##
-        self.textStrings[StringContent.Service] = {
-            u'title': translate('BiblesPlugin', 'Service'),
-            u'tooltip': translate('BiblesPlugin',
-                'Add the selected Bible to the service')
-        }

openlp/plugins/bibles/forms/bibleimportform.py

@@ -35,7 +35,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver, SettingsManager, translate
 from openlp.core.lib.db import delete_database
-from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.lib.ui import UiStrings, critical_error_message_box
 from openlp.core.ui.wizard import OpenLPWizard
 from openlp.core.utils import AppLocation, string_is_unicode
 from openlp.plugins.bibles.lib.manager import BibleFormat
@@ -157,10 +157,9 @@ class BibleImportForm(OpenLPWizard):
         self.formatComboBox.addItems([u'', u'', u'', u'', u''])
         self.formatComboBox.setObjectName(u'FormatComboBox')
         self.formatLayout.addRow(self.formatLabel, self.formatComboBox)
-        self.formatSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+        self.spacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
             QtGui.QSizePolicy.Minimum)
-        self.formatLayout.setItem(1, QtGui.QFormLayout.LabelRole,
+        self.formatLayout.setItem(1, QtGui.QFormLayout.LabelRole, self.spacer)
-            self.formatSpacer)
         self.selectPageLayout.addLayout(self.formatLayout)
         self.selectStack = QtGui.QStackedLayout()
         self.selectStack.setObjectName(u'SelectStack')
@@ -181,9 +180,7 @@ class BibleImportForm(OpenLPWizard):
         self.osisBrowseButton.setObjectName(u'OsisBrowseButton')
         self.osisFileLayout.addWidget(self.osisBrowseButton)
         self.osisLayout.addRow(self.osisFileLabel, self.osisFileLayout)
-        self.osisSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+        self.osisLayout.setItem(1, QtGui.QFormLayout.LabelRole, self.spacer)
-            QtGui.QSizePolicy.Minimum)
-        self.osisLayout.setItem(1, QtGui.QFormLayout.LabelRole, self.osisSpacer)
         self.selectStack.addWidget(self.osisWidget)
         self.csvWidget = QtGui.QWidget(self.selectPage)
         self.csvWidget.setObjectName(u'CsvWidget')
@@ -226,9 +223,7 @@ class BibleImportForm(OpenLPWizard):
         self.csvVersesButton.setObjectName(u'CsvVersesButton')
         self.csvVersesLayout.addWidget(self.csvVersesButton)
         self.csvLayout.addRow(self.csvVersesLabel, self.csvVersesLayout)
-        self.csvSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+        self.csvLayout.setItem(3, QtGui.QFormLayout.LabelRole, self.spacer)
-            QtGui.QSizePolicy.Minimum)
-        self.csvLayout.setItem(3, QtGui.QFormLayout.LabelRole, self.csvSpacer)
         self.selectStack.addWidget(self.csvWidget)
         self.openSongWidget = QtGui.QWidget(self.selectPage)
         self.openSongWidget.setObjectName(u'OpenSongWidget')
@@ -248,10 +243,7 @@ class BibleImportForm(OpenLPWizard):
         self.openSongFileLayout.addWidget(self.openSongBrowseButton)
         self.openSongLayout.addRow(self.openSongFileLabel,
             self.openSongFileLayout)
-        self.openSongSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+        self.openSongLayout.setItem(1, QtGui.QFormLayout.LabelRole, self.spacer)
-            QtGui.QSizePolicy.Minimum)
-        self.openSongLayout.setItem(1, QtGui.QFormLayout.LabelRole,
-            self.openSongSpacer)
         self.selectStack.addWidget(self.openSongWidget)
         self.webTabWidget = QtGui.QTabWidget(self.selectPage)
         self.webTabWidget.setObjectName(u'WebTabWidget')
@@ -330,10 +322,7 @@ class BibleImportForm(OpenLPWizard):
         self.openlp1DisabledLabel.setWordWrap(True)
         self.openlp1DisabledLabel.setObjectName(u'Openlp1DisabledLabel')
         self.openlp1Layout.addRow(self.openlp1DisabledLabel)
-        self.openlp1Spacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+        self.openlp1Layout.setItem(1, QtGui.QFormLayout.LabelRole, self.spacer)
-            QtGui.QSizePolicy.Minimum)
-        self.openlp1Layout.setItem(1, QtGui.QFormLayout.LabelRole,
-            self.openlp1Spacer)
         self.selectStack.addWidget(self.openlp1Widget)
         self.selectPageLayout.addLayout(self.selectStack)
         self.addPage(self.selectPage)
@@ -401,17 +390,17 @@ class BibleImportForm(OpenLPWizard):
         self.formatComboBox.setItemText(4,
             translate('BiblesPlugin.ImportWizardForm', 'openlp.org 1.x'))
         self.openlp1FileLabel.setText(
-            translate('BiblesPlugin.ImportWizardForm', 'File location:'))
+            translate('BiblesPlugin.ImportWizardForm', 'Bible file:'))
         self.osisFileLabel.setText(
-            translate('BiblesPlugin.ImportWizardForm', 'File location:'))
+            translate('BiblesPlugin.ImportWizardForm', 'Bible file:'))
         self.csvTestamentsLabel.setText(
-            translate('BiblesPlugin.ImportWizardForm', 'Testaments location:'))
+            translate('BiblesPlugin.ImportWizardForm', 'Testaments file:'))
         self.csvBooksLabel.setText(
-            translate('BiblesPlugin.ImportWizardForm', 'Books location:'))
+            translate('BiblesPlugin.ImportWizardForm', 'Books file:'))
         self.csvVersesLabel.setText(
-            translate('BiblesPlugin.ImportWizardForm', 'Verse location:'))
+            translate('BiblesPlugin.ImportWizardForm', 'Verses file:'))
         self.openSongFileLabel.setText(
-            translate('BiblesPlugin.ImportWizardForm', 'Bible filename:'))
+            translate('BiblesPlugin.ImportWizardForm', 'Bible file:'))
         self.webSourceLabel.setText(
             translate('BiblesPlugin.ImportWizardForm', 'Location:'))
         self.webSourceComboBox.setItemText(0,
@@ -462,19 +451,12 @@ class BibleImportForm(OpenLPWizard):
         # Align all QFormLayouts towards each other.
         labelWidth = max(self.formatLabel.minimumSizeHint().width(),
             self.osisFileLabel.minimumSizeHint().width(),
+            self.csvTestamentsLabel.minimumSizeHint().width(),
             self.csvBooksLabel.minimumSizeHint().width(),
             self.csvVersesLabel.minimumSizeHint().width(),
             self.openSongFileLabel.minimumSizeHint().width(),
             self.openlp1FileLabel.minimumSizeHint().width())
-        self.formatSpacer.changeSize(labelWidth, 0,
+        self.spacer.changeSize(labelWidth, 0,
-            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        self.osisSpacer.changeSize(labelWidth, 0,
-            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        self.csvSpacer.changeSize(labelWidth, 0,
-            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        self.openSongSpacer.changeSize(labelWidth, 0,
-            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        self.openlp1Spacer.changeSize(labelWidth, 0,
             QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
 
     def validateCurrentPage(self):
@@ -763,8 +745,7 @@ class BibleImportForm(OpenLPWizard):
         """
         if filters:
             filters += u';;'
-        filters += u'%s (*)' % translate('BiblesPlugin.ImportWizardForm',
+        filters += u'%s (*)' % UiStrings.AllFiles
-            'All Files')
         filename = QtGui.QFileDialog.getOpenFileName(self, title,
             os.path.dirname(SettingsManager.get_last_dir(
             self.plugin.settingsSection, 1)), filters)

openlp/plugins/bibles/lib/__init__.py

@@ -33,6 +33,13 @@ import re
 log = logging.getLogger(__name__)
 
 def get_reference_match(match_type):
+    """
+    Provides the regexes and matches to use while parsing strings for bible
+    references.
+
+    ``match_type``
+        The type of reference information trying to be extracted in this call.
+    """
     local_separator = unicode(u':;;\s*[:vV]\s*;;-;;\s*-\s*;;,;;\s*,\s*;;end'
         ).split(u';;') # English
     # local_separator = unicode(u',;;\s*,\s*;;-;;\s*-\s*;;.;;\.;;[Ee]nde'

openlp/plugins/bibles/lib/http.py

@@ -443,7 +443,6 @@ class HTTPBible(BibleDB):
             book = db_book.name
             if BibleDB.get_verse_count(self, book, reference[1]) == 0:
                 Receiver.send_message(u'cursor_busy')
-                Receiver.send_message(u'openlp_process_events')
                 search_results = self.get_chapter(book, reference[1])
                 if search_results and search_results.has_verselist():
                     ## We have found a book of the bible lets check to see

openlp/plugins/bibles/lib/mediaitem.py

@@ -30,7 +30,8 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import MediaManagerItem, Receiver, BaseListWithDnD, \
     ItemCapabilities, translate
-from openlp.core.lib.ui import critical_error_message_box, media_item_combo_box
+from openlp.core.lib.ui import add_widget_completer, media_item_combo_box, \
+    critical_error_message_box
 from openlp.plugins.bibles.forms import BibleImportForm
 from openlp.plugins.bibles.lib import get_reference_match
 
@@ -379,9 +380,7 @@ class BibleMediaItem(MediaManagerItem):
                 book_data = bibles[bible].get_books()
                 books = [book.name for book in book_data]
                 books.sort()
-        completer = QtGui.QCompleter(books)
+        add_widget_completer(books, self.quickSearchEdit)
-        completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
-        self.quickSearchEdit.setCompleter(completer)
 
     def onAdvancedVersionComboBox(self):
         self.initialiseBible(

openlp/plugins/bibles/lib/opensong.py

@@ -38,7 +38,6 @@ class OpenSongBible(BibleDB):
     """
     OpenSong Bible format importer class.
     """
-
     def __init__(self, parent, **kwargs):
         """
         Constructor to create and set up an instance of the OpenSongBible
@@ -81,14 +80,13 @@ class OpenSongBible(BibleDB):
                             db_book.id,
                             int(chapter.attrib[u'n'].split()[-1]),
                             int(verse.attrib[u'n']),
-                            unicode(verse.text)
+                            unicode(verse.text))
-                        )
-                        Receiver.send_message(u'openlp_process_events')
                     self.wizard.incrementProgressBar(unicode(translate(
                         'BiblesPlugin.Opensong', 'Importing %s %s...',
                         'Importing <book name> <chapter>...')) %
                         (db_book.name, int(chapter.attrib[u'n'].split()[-1])))
                 self.session.commit()
+            Receiver.send_message(u'openlp_process_events')
         except (IOError, AttributeError):
             log.exception(u'Loading bible from OpenSong file failed')
             success = False

openlp/plugins/custom/customplugin.py

@@ -30,6 +30,7 @@ from forms import EditCustomForm
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
 from openlp.core.lib.db import Manager
+from openlp.core.lib.ui import UiStrings
 from openlp.plugins.custom.lib import CustomMediaItem, CustomTab
 from openlp.plugins.custom.lib.db import CustomSlide, init_schema
 
@@ -114,52 +115,11 @@ class CustomPlugin(Plugin):
         # Middle Header Bar
         ## Import Action ##
         self.textStrings[StringContent.Import] = {
-            u'title': translate('CustomsPlugin', 'Import'),
+            u'title': UiStrings.Import,
             u'tooltip': translate('CustomsPlugin',
                 'Import a Custom')
         }
-        ## Load Action ##
+        Plugin.setPluginTextStrings(self)
-        self.textStrings[StringContent.Load] = {
-            u'title': translate('CustomsPlugin', 'Load'),
-            u'tooltip': translate('CustomsPlugin',
-                'Load a new Custom')
-        }
-        ## New Action ##
-        self.textStrings[StringContent.New] = {
-            u'title': translate('CustomsPlugin', 'Add'),
-            u'tooltip': translate('CustomsPlugin',
-                'Add a new Custom')
-        }
-        ## Edit Action ##
-        self.textStrings[StringContent.Edit] = {
-            u'title': translate('CustomsPlugin', 'Edit'),
-            u'tooltip': translate('CustomsPlugin',
-                'Edit the selected Custom')
-        }
-        ## Delete Action ##
-        self.textStrings[StringContent.Delete] = {
-            u'title': translate('CustomsPlugin', 'Delete'),
-            u'tooltip': translate('CustomsPlugin',
-                'Delete the selected Custom')
-        }
-        ## Preview Action ##
-        self.textStrings[StringContent.Preview] = {
-            u'title': translate('CustomsPlugin', 'Preview'),
-            u'tooltip': translate('CustomsPlugin',
-                'Preview the selected Custom')
-        }
-        ## Send Live Action ##
-        self.textStrings[StringContent.Live] = {
-            u'title': translate('CustomsPlugin', 'Live'),
-            u'tooltip': translate('CustomsPlugin',
-                'Send the selected Custom live')
-        }
-        ## Add to Service Action ##
-        self.textStrings[StringContent.Service] = {
-            u'title': translate('CustomsPlugin', 'Service'),
-            u'tooltip': translate('CustomsPlugin',
-                'Add the selected Custom to the service')
-        }
 
     def finalise(self):
         """

openlp/plugins/custom/forms/editcustomdialog.py

@@ -27,7 +27,8 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon, translate
-from openlp.core.lib.ui import save_cancel_button_box
+from openlp.core.lib.ui import UiStrings, create_save_cancel_button_box, \
+    create_delete_push_button, create_up_down_push_button_set
 
 class Ui_CustomEditDialog(object):
     def setupUi(self, customEditDialog):
@@ -59,22 +60,21 @@ class Ui_CustomEditDialog(object):
         self.addButton.setObjectName(u'addButton')
         self.buttonLayout.addWidget(self.addButton)
         self.editButton = QtGui.QPushButton(customEditDialog)
+        self.editButton.setEnabled(False)
         self.editButton.setObjectName(u'editButton')
         self.buttonLayout.addWidget(self.editButton)
         self.editAllButton = QtGui.QPushButton(customEditDialog)
         self.editAllButton.setObjectName(u'editAllButton')
         self.buttonLayout.addWidget(self.editAllButton)
-        self.deleteButton = QtGui.QPushButton(customEditDialog)
+        self.deleteButton = create_delete_push_button(customEditDialog)
-        self.deleteButton.setObjectName(u'deleteButton')
+        self.deleteButton.setEnabled(False)
         self.buttonLayout.addWidget(self.deleteButton)
         self.buttonLayout.addStretch()
-        self.upButton = QtGui.QPushButton(customEditDialog)
+        self.upButton, self.downButton = create_up_down_push_button_set(
-        self.upButton.setIcon(build_icon(u':/services/service_up.png'))
+            customEditDialog)
-        self.upButton.setObjectName(u'upButton')
+        self.upButton.setEnabled(False)
+        self.downButton.setEnabled(False)
         self.buttonLayout.addWidget(self.upButton)
-        self.downButton = QtGui.QPushButton(customEditDialog)
-        self.downButton.setIcon(build_icon(u':/services/service_down.png'))
-        self.downButton.setObjectName(u'downButton')
         self.buttonLayout.addWidget(self.downButton)
         self.centralLayout.addLayout(self.buttonLayout)
         self.dialogLayout.addLayout(self.centralLayout)
@@ -94,7 +94,10 @@ class Ui_CustomEditDialog(object):
         self.creditLabel.setBuddy(self.creditEdit)
         self.bottomFormLayout.addRow(self.creditLabel, self.creditEdit)
         self.dialogLayout.addLayout(self.bottomFormLayout)
-        self.buttonBox = save_cancel_button_box(customEditDialog)
+        self.buttonBox = create_save_cancel_button_box(customEditDialog)
+        self.previewButton = QtGui.QPushButton()
+        self.buttonBox.addButton(
+            self.previewButton, QtGui.QDialogButtonBox.ActionRole)
         self.dialogLayout.addWidget(self.buttonBox)
         self.retranslateUi(customEditDialog)
         QtCore.QMetaObject.connectSlotsByName(customEditDialog)
@@ -102,21 +105,13 @@ class Ui_CustomEditDialog(object):
     def retranslateUi(self, customEditDialog):
         customEditDialog.setWindowTitle(
             translate('CustomPlugin.EditCustomForm', 'Edit Custom Slides'))
-        self.upButton.setToolTip(
-            translate('CustomPlugin.EditCustomForm', 'Move slide up one '
-            'position.'))
-        self.downButton.setToolTip(
-            translate('CustomPlugin.EditCustomForm', 'Move slide down one '
-            'position.'))
         self.titleLabel.setText(
             translate('CustomPlugin.EditCustomForm', '&Title:'))
-        self.addButton.setText(
+        self.addButton.setText(UiStrings.Add)
-            translate('CustomPlugin.EditCustomForm', '&Add'))
         self.addButton.setToolTip(
             translate('CustomPlugin.EditCustomForm', 'Add a new slide at '
             'bottom.'))
-        self.editButton.setText(
+        self.editButton.setText(UiStrings.Edit)
-            translate('CustomPlugin.EditCustomForm', '&Edit'))
         self.editButton.setToolTip(
             translate('CustomPlugin.EditCustomForm', 'Edit the selected '
             'slide.'))
@@ -125,12 +120,9 @@ class Ui_CustomEditDialog(object):
         self.editAllButton.setToolTip(
             translate('CustomPlugin.EditCustomForm', 'Edit all the slides at '
             'once.'))
-        self.deleteButton.setText(
-            translate('CustomPlugin.EditCustomForm', '&Delete'))
-        self.deleteButton.setToolTip(
-            translate('CustomPlugin.EditCustomForm', 'Delete the selected '
-            'slide.'))
         self.themeLabel.setText(
             translate('CustomPlugin.EditCustomForm', 'The&me:'))
         self.creditLabel.setText(
             translate('CustomPlugin.EditCustomForm', '&Credits:'))
+        self.previewButton.setText(
+            translate('CustomPlugin.EditCustomForm', 'Save && Preview'))

openlp/plugins/custom/forms/editcustomform.py

@@ -48,52 +48,22 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         """
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
+        # Create other objects and forms.
+        self.manager = manager
+        self.editSlideForm = EditCustomSlideForm(self)
         # Connecting signals and slots
-        self.previewButton = QtGui.QPushButton()
+        QtCore.QObject.connect(self.previewButton,
-        self.previewButton.setText(
+            QtCore.SIGNAL(u'pressed()'), self.onPreviewButtonPressed)
-            translate('CustomPlugin.EditCustomForm', 'Save && Preview'))
-        self.buttonBox.addButton(
-            self.previewButton, QtGui.QDialogButtonBox.ActionRole)
-        QtCore.QObject.connect(self.buttonBox,
-            QtCore.SIGNAL(u'clicked(QAbstractButton*)'), self.onPreview)
         QtCore.QObject.connect(self.addButton,
             QtCore.SIGNAL(u'pressed()'), self.onAddButtonPressed)
         QtCore.QObject.connect(self.editButton,
             QtCore.SIGNAL(u'pressed()'), self.onEditButtonPressed)
         QtCore.QObject.connect(self.editAllButton,
             QtCore.SIGNAL(u'pressed()'), self.onEditAllButtonPressed)
-        QtCore.QObject.connect(self.deleteButton,
-            QtCore.SIGNAL(u'pressed()'), self.onDeleteButtonPressed)
-        QtCore.QObject.connect(self.upButton,
-            QtCore.SIGNAL(u'pressed()'), self.onUpButtonPressed)
-        QtCore.QObject.connect(self.downButton,
-            QtCore.SIGNAL(u'pressed()'), self.onDownButtonPressed)
-        QtCore.QObject.connect(self.slideListView,
-            QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'),
-            self.onSlideListViewPressed)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'theme_update_list'), self.loadThemes)
-        # Create other objects and forms.
+        QtCore.QObject.connect(self.slideListView,
-        self.manager = manager
+            QtCore.SIGNAL(u'currentRowChanged(int)'), self.onCurrentRowChanged)
-        self.editSlideForm = EditCustomSlideForm(self)
-        self.initialise()
-
-    def onPreview(self, button):
-        log.debug(u'onPreview')
-        if button.text() == unicode(translate('CustomPlugin.EditCustomForm',
-            'Save && Preview')) and self.saveCustom():
-            Receiver.send_message(u'custom_preview')
-
-    def initialise(self):
-        self.addButton.setEnabled(True)
-        self.deleteButton.setEnabled(False)
-        self.editButton.setEnabled(False)
-        self.editAllButton.setEnabled(True)
-        self.titleEdit.setText(u'')
-        self.creditEdit.setText(u'')
-        self.slideListView.clear()
-        # Make sure we have a new item.
-        self.customSlide = CustomSlide()
 
     def loadThemes(self, themelist):
         self.themeComboBox.clear()
@@ -112,9 +82,13 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
             States whether the custom is edited while being previewed in the
             preview panel.
         """
+        self.slideListView.clear()
+        if id == 0:
             self.customSlide = CustomSlide()
-        self.initialise()
+            self.titleEdit.setText(u'')
-        if id != 0:
+            self.creditEdit.setText(u'')
+            self.themeComboBox.setCurrentIndex(0)
+        else:
             self.customSlide = self.manager.get_object(CustomSlide, id)
             self.titleEdit.setText(self.customSlide.title)
             self.creditEdit.setText(self.customSlide.credits)
@@ -128,9 +102,6 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
             if id == -1:
                 id = 0
             self.themeComboBox.setCurrentIndex(id)
-        else:
-            self.themeComboBox.setCurrentIndex(0)
-            self.editAllButton.setEnabled(False)
         # If not preview hide the preview button.
         self.previewButton.setVisible(False)
         if preview:
@@ -150,9 +121,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         """
         Saves the custom.
         """
-        valid, message = self._validate()
+        if not self._validate():
-        if not valid:
-            critical_error_message_box(message=message)
             return False
         sxml = CustomXMLBuilder()
         sxml.new_document()
@@ -168,14 +137,14 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         self.customSlide.theme_name = unicode(self.themeComboBox.currentText())
         return self.manager.save_object(self.customSlide)
 
-    def onUpButtonPressed(self):
+    def onUpButtonClicked(self):
         selectedRow = self.slideListView.currentRow()
         if selectedRow != 0:
             qw = self.slideListView.takeItem(selectedRow)
             self.slideListView.insertItem(selectedRow - 1, qw)
             self.slideListView.setCurrentRow(selectedRow - 1)
 
-    def onDownButtonPressed(self):
+    def onDownButtonClicked(self):
         selectedRow = self.slideListView.currentRow()
         # zero base arrays
         if selectedRow != self.slideListView.count() - 1:
@@ -183,16 +152,11 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
             self.slideListView.insertItem(selectedRow + 1, qw)
             self.slideListView.setCurrentRow(selectedRow + 1)
 
-    def onSlideListViewPressed(self, item):
-        self.deleteButton.setEnabled(True)
-        self.editButton.setEnabled(True)
-
     def onAddButtonPressed(self):
         self.editSlideForm.setText(u'')
         if self.editSlideForm.exec_():
             for slide in self.editSlideForm.getText():
                 self.slideListView.addItem(slide)
-            self.editAllButton.setEnabled(True)
 
     def onEditButtonPressed(self):
         self.editSlideForm.setText(self.slideListView.currentItem().text())
@@ -203,7 +167,6 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         """
         Edits all slides.
         """
-        if self.slideListView.count() > 0:
         slide_list = u''
         for row in range(0, self.slideListView.count()):
             item = self.slideListView.item(row)
@@ -214,6 +177,14 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         if self.editSlideForm.exec_():
             self.updateSlideList(self.editSlideForm.getText(), True)
 
+    def onPreviewButtonPressed(self):
+        """
+        Save the custom item and preview it.
+        """
+        log.debug(u'onPreview')
+        if self.saveCustom():
+            Receiver.send_message(u'custom_preview')
+
     def updateSlideList(self, slides, edit_all=False):
         """
         Updates the slide list after editing slides.
@@ -243,14 +214,41 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
                 self.slideListView.addItem(slide)
         self.slideListView.repaint()
 
-    def onDeleteButtonPressed(self):
+    def onDeleteButtonClicked(self):
+        """
+        Removes the current row from the list.
+        """
         self.slideListView.takeItem(self.slideListView.currentRow())
-        self.editButton.setEnabled(True)
+        if self.slideListView.currentRow() == 0:
-        self.editAllButton.setEnabled(True)
+            self.upButton.setEnabled(False)
-        if self.slideListView.count() == 0:
+        if self.slideListView.currentRow() == self.slideListView.count():
+            self.downButton.setEnabled(False)
+
+    def onCurrentRowChanged(self, row):
+        """
+        Called when the *slideListView*'s current row has been changed. This
+        enables or disables buttons which require an slide to act on.
+
+        ``row``
+            The row (int). If there is no current row, the value is -1.
+        """
+        if row == -1:
             self.deleteButton.setEnabled(False)
             self.editButton.setEnabled(False)
-            self.editAllButton.setEnabled(False)
+            self.upButton.setEnabled(False)
+            self.downButton.setEnabled(False)
+        else:
+            self.deleteButton.setEnabled(True)
+            self.editButton.setEnabled(True)
+            # Decide if the up/down buttons should be enabled or not.
+            if self.slideListView.count() - 1 == row:
+                self.downButton.setEnabled(False)
+            else:
+                self.downButton.setEnabled(True)
+            if row == 0:
+                self.upButton.setEnabled(False)
+            else:
+                self.upButton.setEnabled(True)
 
     def _validate(self):
         """
@@ -259,10 +257,14 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         # We must have a title.
         if len(self.titleEdit.displayText()) == 0:
             self.titleEdit.setFocus()
-            return False, translate('CustomPlugin.EditCustomForm',
+            critical_error_message_box(
-                'You need to type in a title.')
+                message=translate('CustomPlugin.EditCustomForm',
+                'You need to type in a title.'))
+            return False
         # We must have at least one slide.
         if self.slideListView.count() == 0:
-            return False, translate('CustomPlugin.EditCustomForm',
+            critical_error_message_box(
-                'You need to add at least one slide')
+                message=translate('CustomPlugin.EditCustomForm',
-        return True, u''
+                'You need to add at least one slide'))
+            return False
+        return True

openlp/plugins/custom/forms/editcustomslidedialog.py

@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate, SpellTextEdit
-from openlp.core.lib.ui import save_cancel_button_box
+from openlp.core.lib.ui import create_save_cancel_button_box
 
 class Ui_CustomSlideEditDialog(object):
     def setupUi(self, customSlideEditDialog):
@@ -37,7 +37,7 @@ class Ui_CustomSlideEditDialog(object):
         self.slideTextEdit = SpellTextEdit(self)
         self.slideTextEdit.setObjectName(u'slideTextEdit')
         self.dialogLayout.addWidget(self.slideTextEdit)
-        self.buttonBox = save_cancel_button_box(customSlideEditDialog)
+        self.buttonBox = create_save_cancel_button_box(customSlideEditDialog)
         self.splitButton = QtGui.QPushButton(customSlideEditDialog)
         self.splitButton.setObjectName(u'splitButton')
         self.buttonBox.addButton(self.splitButton,

openlp/plugins/custom/lib/mediaitem.py

@@ -69,7 +69,7 @@ class CustomMediaItem(MediaManagerItem):
             QtCore.SIGNAL(u'custom_preview'), self.onPreviewClick)
 
     def initialise(self):
-        self.loadCustomListView(self.manager.get_all_objects(
+        self.loadList(self.manager.get_all_objects(
             CustomSlide, order_by_ref=CustomSlide.title))
         # Called to redisplay the custom list screen edith from a search
         # or from the exit of the Custom edit dialog. If remote editing is
@@ -80,7 +80,7 @@ class CustomMediaItem(MediaManagerItem):
             self.onPreviewClick()
         self.onRemoteEditClear()
 
-    def loadCustomListView(self, list):
+    def loadList(self, list):
         self.listView.clear()
         for customSlide in list:
             custom_name = QtGui.QListWidgetItem(customSlide.title)

openlp/plugins/images/imageplugin.py

@@ -27,6 +27,7 @@
 import logging
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
+from openlp.core.lib.ui import UiStrings
 from openlp.plugins.images.lib import ImageMediaItem
 
 log = logging.getLogger(__name__)
@@ -72,45 +73,4 @@ class ImagePlugin(Plugin):
             u'title': translate('ImagePlugin', 'Images', 'container title')
         }
         # Middle Header Bar
-        ## Load Button ##
+        Plugin.setPluginTextStrings(self)
-        self.textStrings[StringContent.Load] = {
-            u'title': translate('ImagePlugin', 'Load'),
-            u'tooltip': translate('ImagePlugin',
-                'Load a new Image')
-        }
-        ## New Button ##
-        self.textStrings[StringContent.New] = {
-            u'title': translate('ImagePlugin', 'Add'),
-            u'tooltip': translate('ImagePlugin',
-                'Add a new Image')
-        }
-        ## Edit Button ##
-        self.textStrings[StringContent.Edit] = {
-            u'title': translate('ImagePlugin', 'Edit'),
-            u'tooltip': translate('ImagePlugin',
-                'Edit the selected Image')
-        }
-        ## Delete Button ##
-        self.textStrings[StringContent.Delete] = {
-            u'title': translate('ImagePlugin', 'Delete'),
-            u'tooltip': translate('ImagePlugin',
-                'Delete the selected Image')
-        }
-        ## Preview ##
-        self.textStrings[StringContent.Preview] = {
-            u'title': translate('ImagePlugin', 'Preview'),
-            u'tooltip': translate('ImagePlugin',
-                'Preview the selected Image')
-        }
-        ## Live  Button ##
-        self.textStrings[StringContent.Live] = {
-            u'title': translate('ImagePlugin', 'Live'),
-            u'tooltip': translate('ImagePlugin',
-                'Send the selected Image live')
-        }
-        ## Add to service Button ##
-        self.textStrings[StringContent.Service] = {
-            u'title': translate('ImagePlugin', 'Service'),
-            u'tooltip': translate('ImagePlugin',
-                'Add the selected Image to the service')
-        }

openlp/plugins/images/lib/mediaitem.py

@@ -32,7 +32,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
     ItemCapabilities, SettingsManager, translate, check_item_selected, \
     check_directory_exists, Receiver
-from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.lib.ui import UiStrings, critical_error_message_box
 from openlp.core.utils import AppLocation, delete_file, get_images_filter
 
 log = logging.getLogger(__name__)
@@ -64,7 +64,7 @@ class ImageMediaItem(MediaManagerItem):
             'Select Image(s)')
         file_formats = get_images_filter()
         self.OnNewFileMasks = u'%s;;%s (*.*) (*)' % (file_formats,
-            unicode(translate('ImagePlugin.MediaItem', 'All Files')))
+            unicode(UiStrings.AllFiles))
         self.replaceAction.setText(
             translate('ImagePlugin.MediaItem', 'Replace Background'))
         self.replaceAction.setToolTip(
@@ -84,8 +84,6 @@ class ImageMediaItem(MediaManagerItem):
     def initialise(self):
         log.debug(u'initialise')
         self.listView.clear()
-        self.listView.setSelectionMode(
-            QtGui.QAbstractItemView.ExtendedSelection)
         self.listView.setIconSize(QtCore.QSize(88, 50))
         self.servicePath = os.path.join(
             AppLocation.get_section_data_path(self.settingsSection),
@@ -123,19 +121,19 @@ class ImageMediaItem(MediaManagerItem):
                 self.settingsSection, self.getFileList())
 
     def loadList(self, list):
-        for file in list:
+        for imageFile in list:
-            filename = os.path.split(unicode(file))[1]
+            filename = os.path.split(unicode(imageFile))[1]
             thumb = os.path.join(self.servicePath, filename)
             if os.path.exists(thumb):
-                if self.validate(file, thumb):
+                if self.validate(imageFile, thumb):
                     icon = build_icon(thumb)
                 else:
                     icon = build_icon(u':/general/general_delete.png')
             else:
-                icon = self.iconFromFile(file, thumb)
+                icon = self.iconFromFile(imageFile, thumb)
             item_name = QtGui.QListWidgetItem(filename)
             item_name.setIcon(icon)
-            item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
+            item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(imageFile))
             self.listView.addItem(item_name)
 
     def generateSlideData(self, service_item, item=None, xmlVersion=False):

openlp/plugins/media/lib/mediaitem.py

@@ -151,8 +151,6 @@ class MediaMediaItem(MediaManagerItem):
             return False
 
     def initialise(self):
-        self.listView.setSelectionMode(
-            QtGui.QAbstractItemView.ExtendedSelection)
         self.listView.setIconSize(QtCore.QSize(88, 50))
         self.loadList(SettingsManager.load_list(self.settingsSection,
             self.settingsSection))

openlp/plugins/media/mediaplugin.py

@@ -30,6 +30,7 @@ import mimetypes
 from PyQt4.phonon import Phonon
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
+from openlp.core.lib.ui import UiStrings
 from openlp.plugins.media.lib import MediaMediaItem, MediaTab
 
 log = logging.getLogger(__name__)
@@ -101,45 +102,4 @@ class MediaPlugin(Plugin):
             u'title': translate('MediaPlugin', 'Media', 'container title')
         }
         # Middle Header Bar
-        ## Load Action ##
+        Plugin.setPluginTextStrings(self)
-        self.textStrings[StringContent.Load] = {
-            u'title': translate('MediaPlugin', 'Load'),
-            u'tooltip': translate('MediaPlugin',
-                'Load a new Media')
-        }
-        ## New Action ##
-        self.textStrings[StringContent.New] = {
-            u'title': translate('MediaPlugin', 'Add'),
-            u'tooltip': translate('MediaPlugin',
-                'Add a new Media')
-        }
-        ## Edit Action ##
-        self.textStrings[StringContent.Edit] = {
-            u'title': translate('MediaPlugin', 'Edit'),
-            u'tooltip': translate('MediaPlugin',
-                'Edit the selected Media')
-        }
-        ## Delete Action ##
-        self.textStrings[StringContent.Delete] = {
-            u'title': translate('MediaPlugin', 'Delete'),
-            u'tooltip': translate('MediaPlugin',
-                'Delete the selected Media')
-        }
-        ## Preview Action ##
-        self.textStrings[StringContent.Preview] = {
-            u'title': translate('MediaPlugin', 'Preview'),
-            u'tooltip': translate('MediaPlugin',
-                'Preview the selected Media')
-        }
-        ## Send Live Action ##
-        self.textStrings[StringContent.Live] = {
-            u'title': translate('MediaPlugin', 'Live'),
-            u'tooltip': translate('MediaPlugin',
-                'Send the selected Media live')
-        }
-        ## Add to Service Action ##
-        self.textStrings[StringContent.Service] = {
-            u'title': translate('MediaPlugin', 'Service'),
-            u'tooltip': translate('MediaPlugin',
-                'Add the selected Media to the service')
-        }

openlp/plugins/presentations/lib/impresscontroller.py

@@ -69,7 +69,8 @@ class ImpressController(PresentationController):
         Initialise the class
         """
         log.debug(u'Initialising')
-        PresentationController.__init__(self, plugin, u'Impress')
+        PresentationController.__init__(self, plugin, u'Impress',
+            ImpressDocument)
         self.supports = [u'odp']
         self.alsosupports = [u'ppt', u'pps', u'pptx', u'ppsx']
         self.process = None
@@ -183,14 +184,6 @@ class ImpressController(PresentationController):
             except:
                 log.exception(u'Failed to terminate OpenOffice')
 
-    def add_doc(self, name):
-        """
-        Called when a new Impress document is opened
-        """
-        log.debug(u'Add Doc OpenOffice')
-        doc = ImpressDocument(self, name)
-        self.docs.append(doc)
-        return doc
 
 class ImpressDocument(PresentationDocument):
     """
@@ -431,35 +424,36 @@ class ImpressDocument(PresentationDocument):
 
     def get_slide_text(self, slide_no):
         """
-        Returns the text on the slide
+        Returns the text on the slide.
 
         ``slide_no``
             The slide the text is required for, starting at 1
         """
-        doc = self.document
+        return self.__get_text_from_page(slide_no)
-        pages = doc.getDrawPages()
+
+    def get_slide_notes(self, slide_no):
+        """
+        Returns the text in the slide notes.
+
+        ``slide_no``
+            The slide the notes are required for, starting at 1
+        """
+        return self.__get_text_from_page(slide_no, True)
+
+    def __get_text_from_page(self, slide_no, notes=False):
+        """
+        Return any text extracted from the presentation page.
+
+        ``notes``
+            A boolean. If set the method searches the notes of the slide.
+        """
         text = ''
+        pages = self.document.getDrawPages()
         page = pages.getByIndex(slide_no - 1)
+        if notes:
+            page = page.getNotesPage()
         for idx in range(page.getCount()):
             shape = page.getByIndex(idx)
             if shape.supportsService("com.sun.star.drawing.Text"):
                 text += shape.getString() + '\n'
         return text
-
-    def get_slide_notes(self, slide_no):
-        """
-        Returns the text on the slide
-
-        ``slide_no``
-        The slide the notes are required for, starting at 1
-        """
-        doc = self.document
-        pages = doc.getDrawPages()
-        text = ''
-        page = pages.getByIndex(slide_no - 1)
-        notes = page.getNotesPage()
-        for idx in range(notes.getCount()):
-            shape = notes.getByIndex(idx)
-            if shape.supportsService("com.sun.star.drawing.Text"):
-                text += shape.getString() + '\n'
-        return text

openlp/plugins/presentations/lib/mediaitem.py

@@ -186,7 +186,7 @@ class PresentationMediaItem(MediaManagerItem):
             controller_name = self.findControllerByType(filename)
             if controller_name:
                 controller = self.controllers[controller_name]
-                doc = controller.add_doc(unicode(file))
+                doc = controller.add_document(unicode(file))
                 thumb = os.path.join(doc.get_thumbnail_folder(), u'icon.png')
                 preview = doc.get_thumbnail_path(1, True)
                 if not preview and not initialLoad:
@@ -226,7 +226,7 @@ class PresentationMediaItem(MediaManagerItem):
                 filepath = unicode(item.data(
                     QtCore.Qt.UserRole).toString())
                 for cidx in self.controllers:
-                    doc = self.controllers[cidx].add_doc(filepath)
+                    doc = self.controllers[cidx].add_document(filepath)
                     doc.presentation_deleted()
                     doc.close_presentation()
             for row in row_list:
@@ -260,7 +260,7 @@ class PresentationMediaItem(MediaManagerItem):
                             return False
                     controller = self.controllers[service_item.shortname]
                     (path, name) = os.path.split(filename)
-                    doc = controller.add_doc(filename)
+                    doc = controller.add_document(filename)
                     if doc.get_thumbnail_path(1, True) is None:
                         doc.load_presentation()
                     i = 1

openlp/plugins/presentations/lib/messagelistener.py

@@ -59,7 +59,7 @@ class Controller(object):
         self.controller = controller
         if self.doc is not None:
             self.shutdown()
-        self.doc = self.controller.add_doc(file)
+        self.doc = self.controller.add_document(file)
         if not self.doc.load_presentation():
             # Display error message to user
             # Inform slidecontroller that the action failed?

openlp/plugins/presentations/lib/powerpointcontroller.py

@@ -53,7 +53,8 @@ class PowerpointController(PresentationController):
         Initialise the class
         """
         log.debug(u'Initialising')
-        PresentationController.__init__(self, plugin, u'Powerpoint')
+        PresentationController.__init__(self, plugin, u'Powerpoint',
+            PowerpointDocument)
         self.supports = [u'ppt', u'pps', u'pptx', u'ppsx']
         self.process = None
 
@@ -97,14 +98,6 @@ class PowerpointController(PresentationController):
                 pass
             self.process = None
 
-        def add_doc(self, name):
-            """
-            Called when a new powerpoint document is opened
-            """
-            log.debug(u'Add Doc PowerPoint')
-            doc = PowerpointDocument(self, name)
-            self.docs.append(doc)
-            return doc
 
 class PowerpointDocument(PresentationDocument):
     """
@@ -291,13 +284,7 @@ class PowerpointDocument(PresentationDocument):
         ``slide_no``
             The slide the text is required for, starting at 1.
         """
-        text = ''
+        return _get_text_from_shapes(self.presentation.Slides(slide_no).Shapes)
-        shapes = self.presentation.Slides(slide_no).Shapes
-        for idx in range(shapes.Count):
-            shape = shapes(idx + 1)
-            if shape.HasTextFrame:
-                text += shape.TextFrame.TextRange.Text + '\n'
-        return text
 
     def get_slide_notes(self, slide_no):
         """
@@ -306,8 +293,17 @@ class PowerpointDocument(PresentationDocument):
         ``slide_no``
             The slide the notes are required for, starting at 1.
         """
+        return _get_text_from_shapes(
+            self.presentation.Slides(slide_no).NotesPage.Shapes)
+
+def _get_text_from_shapes(shapes):
+    """
+    Returns any text extracted from the shapes on a presentation slide.
+
+    ``shapes``
+        A set of shapes to search for text.
+    """
     text = ''
-        shapes = self.presentation.Slides(slide_no).NotesPage.Shapes
     for idx in range(shapes.Count):
         shape = shapes(idx + 1)
         if shape.HasTextFrame:

openlp/plugins/presentations/lib/pptviewcontroller.py

@@ -49,7 +49,8 @@ class PptviewController(PresentationController):
         """
         log.debug(u'Initialising')
         self.process = None
-        PresentationController.__init__(self, plugin, u'Powerpoint Viewer')
+        PresentationController.__init__(self, plugin, u'Powerpoint Viewer',
+            PptviewDocument)
         self.supports = [u'ppt', u'pps', u'pptx', u'ppsx']
 
     def check_available(self):
@@ -93,14 +94,6 @@ class PptviewController(PresentationController):
             while self.docs:
                 self.docs[0].close_presentation()
 
-        def add_doc(self, name):
-            """
-            Called when a new powerpoint document is opened
-            """
-            log.debug(u'Add Doc PPTView')
-            doc = PptviewDocument(self, name)
-            self.docs.append(doc)
-            return doc
 
 class PptviewDocument(PresentationDocument):
     """

openlp/plugins/presentations/lib/presentationcontroller.py

@@ -35,151 +35,6 @@ from openlp.core.utils import AppLocation
 
 log = logging.getLogger(__name__)
 
-class PresentationController(object):
-    """
-    This class is used to control interactions with presentation applications
-    by creating a runtime environment. This is a base class for presentation
-    controllers to inherit from.
-
-    To create a new controller, take a copy of this file and name it so it ends
-    with ``controller.py``, i.e. ``foobarcontroller.py``. Make sure it inherits
-    :class:`~openlp.plugins.presentations.lib.presentationcontroller.PresentationController`,
-    and then fill in the blanks. If possible try to make sure it loads on all
-    platforms, usually by using :mod:``os.name`` checks, although
-    ``__init__``, ``check_available`` and ``presentation_deleted`` should
-    always be implemented.
-
-    See :class:`~openlp.plugins.presentations.lib.impresscontroller.ImpressController`,
-    :class:`~openlp.plugins.presentations.lib.powerpointcontroller.PowerpointController` or
-    :class:`~openlp.plugins.presentations.lib.pptviewcontroller.PptviewController`
-    for examples.
-
-    **Basic Attributes**
-
-    ``name``
-        The name that appears in the options and the media manager
-
-    ``enabled``
-        The controller is enabled
-
-    ``available``
-        The controller is available on this machine. Set by init via
-        call to check_available
-
-    ``plugin``
-        The presentationplugin object
-
-    ``supports``
-        The primary native file types this application supports
-
-    ``alsosupports``
-        Other file types the application can import, although not necessarily
-        the first choice due to potential incompatibilities
-
-    **Hook Functions**
-
-    ``kill()``
-        Called at system exit to clean up any running presentations
-
-    ``check_available()``
-        Returns True if presentation application is installed/can run on this
-        machine
-
-    ``presentation_deleted()``
-        Deletes presentation specific files, e.g. thumbnails
-
-    """
-    log.info(u'PresentationController loaded')
-
-    def __init__(self, plugin=None, name=u'PresentationController'):
-        """
-        This is the constructor for the presentationcontroller object.  This
-        provides an easy way for descendent plugins to populate common data.
-        This method *must* be overridden, like so::
-
-            class MyPresentationController(PresentationController):
-                def __init__(self, plugin):
-                    PresentationController.__init(
-                        self, plugin, u'My Presenter App')
-
-        ``plugin``
-            Defaults to *None*. The presentationplugin object
-
-        ``name``
-            Name of the application, to appear in the application
-        """
-        self.supports = []
-        self.alsosupports = []
-        self.docs = []
-        self.plugin = plugin
-        self.name = name
-        self.settings_section = self.plugin.settingsSection
-        self.available = self.check_available()
-        self.temp_folder = os.path.join(
-            AppLocation.get_section_data_path(self.settings_section), name)
-        self.thumbnail_folder = os.path.join(
-            AppLocation.get_section_data_path(self.settings_section),
-            u'thumbnails')
-        self.thumbnail_prefix = u'slide'
-        if not os.path.isdir(self.thumbnail_folder):
-            os.makedirs(self.thumbnail_folder)
-        if not os.path.isdir(self.temp_folder):
-            os.makedirs(self.temp_folder)
-
-    def enabled(self):
-        """
-        Return whether the controller is currently enabled
-        """
-        if self.available:
-            return QtCore.QSettings().value(
-                self.settings_section + u'/' + self.name,
-                QtCore.QVariant(QtCore.Qt.Checked)).toInt()[0] == \
-                    QtCore.Qt.Checked
-        else:
-            return False
-
-    def check_available(self):
-        """
-        Presentation app is able to run on this machine
-        """
-        return False
-
-    def start_process(self):
-        """
-        Loads a running version of the presentation application in the
-        background.
-        """
-        pass
-
-    def kill(self):
-        """
-        Called at system exit to clean up any running presentations and
-        close the application
-        """
-        log.debug(u'Kill')
-        self.close_presentation()
-
-    def add_doc(self, name):
-        """
-        Called when a new presentation document is opened
-        """
-        doc = PresentationDocument(self, name)
-        self.docs.append(doc)
-        return doc
-
-    def remove_doc(self, doc=None):
-        """
-        Called to remove an open document from the collection
-        """
-        log.debug(u'remove_doc Presentation')
-        if doc is None:
-            return
-        if doc in self.docs:
-            self.docs.remove(doc)
-
-    def close_presentation(self):
-        pass
-
 class PresentationDocument(object):
     """
     Base class for presentation documents to inherit from.
@@ -441,3 +296,151 @@ class PresentationDocument(object):
         The slide the notes are required for, starting at 1
         """
         return ''
+
+
+class PresentationController(object):
+    """
+    This class is used to control interactions with presentation applications
+    by creating a runtime environment. This is a base class for presentation
+    controllers to inherit from.
+
+    To create a new controller, take a copy of this file and name it so it ends
+    with ``controller.py``, i.e. ``foobarcontroller.py``. Make sure it inherits
+    :class:`~openlp.plugins.presentations.lib.presentationcontroller.PresentationController`,
+    and then fill in the blanks. If possible try to make sure it loads on all
+    platforms, usually by using :mod:``os.name`` checks, although
+    ``__init__``, ``check_available`` and ``presentation_deleted`` should
+    always be implemented.
+
+    See :class:`~openlp.plugins.presentations.lib.impresscontroller.ImpressController`,
+    :class:`~openlp.plugins.presentations.lib.powerpointcontroller.PowerpointController` or
+    :class:`~openlp.plugins.presentations.lib.pptviewcontroller.PptviewController`
+    for examples.
+
+    **Basic Attributes**
+
+    ``name``
+        The name that appears in the options and the media manager
+
+    ``enabled``
+        The controller is enabled
+
+    ``available``
+        The controller is available on this machine. Set by init via
+        call to check_available
+
+    ``plugin``
+        The presentationplugin object
+
+    ``supports``
+        The primary native file types this application supports
+
+    ``alsosupports``
+        Other file types the application can import, although not necessarily
+        the first choice due to potential incompatibilities
+
+    **Hook Functions**
+
+    ``kill()``
+        Called at system exit to clean up any running presentations
+
+    ``check_available()``
+        Returns True if presentation application is installed/can run on this
+        machine
+
+    ``presentation_deleted()``
+        Deletes presentation specific files, e.g. thumbnails
+
+    """
+    log.info(u'PresentationController loaded')
+
+    def __init__(self, plugin=None, name=u'PresentationController',
+        document_class=PresentationDocument):
+        """
+        This is the constructor for the presentationcontroller object.  This
+        provides an easy way for descendent plugins to populate common data.
+        This method *must* be overridden, like so::
+
+            class MyPresentationController(PresentationController):
+                def __init__(self, plugin):
+                    PresentationController.__init(
+                        self, plugin, u'My Presenter App')
+
+        ``plugin``
+            Defaults to *None*. The presentationplugin object
+
+        ``name``
+            Name of the application, to appear in the application
+        """
+        self.supports = []
+        self.alsosupports = []
+        self.docs = []
+        self.plugin = plugin
+        self.name = name
+        self.document_class = document_class
+        self.settings_section = self.plugin.settingsSection
+        self.available = self.check_available()
+        self.temp_folder = os.path.join(
+            AppLocation.get_section_data_path(self.settings_section), name)
+        self.thumbnail_folder = os.path.join(
+            AppLocation.get_section_data_path(self.settings_section),
+            u'thumbnails')
+        self.thumbnail_prefix = u'slide'
+        if not os.path.isdir(self.thumbnail_folder):
+            os.makedirs(self.thumbnail_folder)
+        if not os.path.isdir(self.temp_folder):
+            os.makedirs(self.temp_folder)
+
+    def enabled(self):
+        """
+        Return whether the controller is currently enabled
+        """
+        if self.available:
+            return QtCore.QSettings().value(
+                self.settings_section + u'/' + self.name,
+                QtCore.QVariant(QtCore.Qt.Checked)).toInt()[0] == \
+                    QtCore.Qt.Checked
+        else:
+            return False
+
+    def check_available(self):
+        """
+        Presentation app is able to run on this machine
+        """
+        return False
+
+    def start_process(self):
+        """
+        Loads a running version of the presentation application in the
+        background.
+        """
+        pass
+
+    def kill(self):
+        """
+        Called at system exit to clean up any running presentations and
+        close the application
+        """
+        log.debug(u'Kill')
+        self.close_presentation()
+
+    def add_document(self, name):
+        """
+        Called when a new presentation document is opened
+        """
+        document = self.document_class(self, name)
+        self.docs.append(document)
+        return document
+
+    def remove_doc(self, doc=None):
+        """
+        Called to remove an open document from the collection
+        """
+        log.debug(u'remove_doc Presentation')
+        if doc is None:
+            return
+        if doc in self.docs:
+            self.docs.remove(doc)
+
+    def close_presentation(self):
+        pass

openlp/plugins/presentations/presentationplugin.py

@@ -31,6 +31,7 @@ import os
 import logging
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
+from openlp.core.lib.ui import UiStrings
 from openlp.core.utils import AppLocation
 from openlp.plugins.presentations.lib import PresentationController, \
     PresentationMediaItem, PresentationTab
@@ -74,7 +75,11 @@ class PresentationPlugin(Plugin):
         self.insertToolboxItem()
         for controller in self.controllers:
             if self.controllers[controller].enabled():
+                try:
                     self.controllers[controller].start_process()
+                except:
+                    log.exception(u'Failed to start controller process')
+                    self.controllers[controller].available = False
         self.mediaItem.buildFileMaskString()
 
     def finalise(self):
@@ -163,33 +168,4 @@ class PresentationPlugin(Plugin):
                 'container title')
         }
         # Middle Header Bar
-        ## Load Action ##
+        Plugin.setPluginTextStrings(self)
-        self.textStrings[StringContent.Load] = {
-            u'title': translate('PresentationPlugin', 'Load'),
-            u'tooltip': translate('PresentationPlugin',
-                'Load a new Presentation')
-        }
-        ## Delete Action ##
-        self.textStrings[StringContent.Delete] = {
-            u'title': translate('PresentationPlugin', 'Delete'),
-            u'tooltip': translate('PresentationPlugin',
-                'Delete the selected Presentation')
-        }
-        ## Preview Action ##
-        self.textStrings[StringContent.Preview] = {
-            u'title': translate('PresentationPlugin', 'Preview'),
-            u'tooltip': translate('PresentationPlugin',
-                'Preview the selected Presentation')
-        }
-        ## Send Live Action ##
-        self.textStrings[StringContent.Live] = {
-            u'title': translate('PresentationPlugin', 'Live'),
-            u'tooltip': translate('PresentationPlugin',
-                'Send the selected Presentation live')
-        }
-        ## Add to Service Action ##
-        self.textStrings[StringContent.Service] = {
-            u'title': translate('PresentationPlugin', 'Service'),
-            u'tooltip': translate('PresentationPlugin',
-                'Add the selected Presentation to the service')
-        }

openlp/plugins/songs/forms/authorsdialog.py

@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate
-from openlp.core.lib.ui import save_cancel_button_box
+from openlp.core.lib.ui import create_save_cancel_button_box
 
 class Ui_AuthorsDialog(object):
     def setupUi(self, authorsDialog):
@@ -56,7 +56,8 @@ class Ui_AuthorsDialog(object):
         self.displayLabel.setBuddy(self.displayEdit)
         self.authorLayout.addRow(self.displayLabel, self.displayEdit)
         self.dialogLayout.addLayout(self.authorLayout)
-        self.dialogLayout.addWidget(save_cancel_button_box(authorsDialog))
+        self.dialogLayout.addWidget(
+            create_save_cancel_button_box(authorsDialog))
         self.retranslateUi(authorsDialog)
         authorsDialog.setMaximumHeight(authorsDialog.sizeHint().height())
         QtCore.QMetaObject.connectSlotsByName(authorsDialog)

openlp/plugins/songs/forms/editsongdialog.py

@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon, translate
-from openlp.core.lib.ui import save_cancel_button_box
+from openlp.core.lib.ui import UiStrings, create_save_cancel_button_box
 
 class Ui_EditSongDialog(object):
     def setupUi(self, editSongDialog):
@@ -241,7 +241,7 @@ class Ui_EditSongDialog(object):
         self.themeTabLayout.addWidget(self.commentsGroupBox)
         self.songTabWidget.addTab(self.themeTab, u'')
         self.dialogLayout.addWidget(self.songTabWidget)
-        self.buttonBox = save_cancel_button_box(editSongDialog)
+        self.buttonBox = create_save_cancel_button_box(editSongDialog)
         self.dialogLayout.addWidget(self.buttonBox)
         self.retranslateUi(editSongDialog)
         QtCore.QMetaObject.connectSlotsByName(editSongDialog)
@@ -257,19 +257,15 @@ class Ui_EditSongDialog(object):
             translate('SongsPlugin.EditSongForm', '&Lyrics:'))
         self.verseOrderLabel.setText(
             translate('SongsPlugin.EditSongForm', '&Verse order:'))
-        self.verseAddButton.setText(
+        self.verseAddButton.setText(UiStrings.Add)
-            translate('SongsPlugin.EditSongForm', '&Add'))
+        self.verseEditButton.setText(UiStrings.Edit)
-        self.verseEditButton.setText(
-            translate('SongsPlugin.EditSongForm', '&Edit'))
         self.verseEditAllButton.setText(
             translate('SongsPlugin.EditSongForm', 'Ed&it All'))
-        self.verseDeleteButton.setText(
+        self.verseDeleteButton.setText(UiStrings.Delete)
-            translate('SongsPlugin.EditSongForm', '&Delete'))
         self.songTabWidget.setTabText(
             self.songTabWidget.indexOf(self.lyricsTab),
             translate('SongsPlugin.EditSongForm', 'Title && Lyrics'))
-        self.authorsGroupBox.setTitle(
+        self.authorsGroupBox.setTitle(UiStrings.Authors)
-            translate('SongsPlugin.EditSongForm', 'Authors'))
         self.authorAddButton.setText(
             translate('SongsPlugin.EditSongForm', '&Add to Song'))
         self.authorRemoveButton.setText(
@@ -292,8 +288,7 @@ class Ui_EditSongDialog(object):
             self.songTabWidget.indexOf(self.authorsTab),
             translate('SongsPlugin.EditSongForm',
                 'Authors, Topics && Song Book'))
-        self.themeGroupBox.setTitle(
+        self.themeGroupBox.setTitle(UiStrings.Theme)
-            translate('SongsPlugin.EditSongForm', 'Theme'))
         self.themeAddButton.setText(
             translate('SongsPlugin.EditSongForm', 'New &Theme'))
         self.rightsGroupBox.setTitle(

openlp/plugins/songs/forms/editsongform.py

@@ -30,7 +30,7 @@ import re
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver, translate
-from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.lib.ui import add_widget_completer, critical_error_message_box
 from openlp.plugins.songs.forms import EditVerseForm
 from openlp.plugins.songs.lib import SongXML, VerseType
 from openlp.plugins.songs.lib.db import Book, Song, Author, Topic
@@ -129,37 +129,26 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             self.authorsComboBox.setItemData(
                 row, QtCore.QVariant(author.id))
             self.authors.append(author.display_name)
-        completer = QtGui.QCompleter(self.authors)
+        add_widget_completer(self.authors, self.authorsComboBox)
-        completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
-        self.authorsComboBox.setCompleter(completer)
 
     def loadTopics(self):
-        topics = self.manager.get_all_objects(Topic, order_by_ref=Topic.name)
-        self.topicsComboBox.clear()
-        self.topicsComboBox.addItem(u'')
         self.topics = []
-        for topic in topics:
+        self.__loadObjects(Topic, self.topicsComboBox, self.topics)
-            row = self.topicsComboBox.count()
-            self.topicsComboBox.addItem(topic.name)
-            self.topics.append(topic.name)
-            self.topicsComboBox.setItemData(row, QtCore.QVariant(topic.id))
-        completer = QtGui.QCompleter(self.topics)
-        completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
-        self.topicsComboBox.setCompleter(completer)
 
     def loadBooks(self):
-        books = self.manager.get_all_objects(Book, order_by_ref=Book.name)
-        self.songBookComboBox.clear()
-        self.songBookComboBox.addItem(u'')
         self.books = []
-        for book in books:
+        self.__loadObjects(Book, self.songBookComboBox, self.books)
-            row = self.songBookComboBox.count()
+
-            self.songBookComboBox.addItem(book.name)
+    def __loadObjects(self, cls, combo, cache):
-            self.books.append(book.name)
+        objects = self.manager.get_all_objects(cls, order_by_ref=cls.name)
-            self.songBookComboBox.setItemData(row, QtCore.QVariant(book.id))
+        combo.clear()
-        completer = QtGui.QCompleter(self.books)
+        combo.addItem(u'')
-        completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
+        for object in objects:
-        self.songBookComboBox.setCompleter(completer)
+            row = combo.count()
+            combo.addItem(object.name)
+            cache.append(object.name)
+            combo.setItemData(row, QtCore.QVariant(object.id))
+        add_widget_completer(cache, combo)
 
     def loadThemes(self, theme_list):
         self.themeComboBox.clear()
@@ -168,9 +157,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         for theme in theme_list:
             self.themeComboBox.addItem(theme)
             self.themes.append(theme)
-        completer = QtGui.QCompleter(self.themes)
+        add_widget_completer(self.themes, self.themeComboBox)
-        completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
-        self.themeComboBox.setCompleter(completer)
 
     def newSong(self):
         log.debug(u'New Song')

openlp/plugins/songs/forms/editversedialog.py

@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon, translate, SpellTextEdit
-from openlp.core.lib.ui import save_cancel_button_box
+from openlp.core.lib.ui import create_save_cancel_button_box
 from openlp.plugins.songs.lib import VerseType
 
 class Ui_EditVerseDialog(object):
@@ -60,7 +60,8 @@ class Ui_EditVerseDialog(object):
         self.verseTypeLayout.addWidget(self.insertButton)
         self.verseTypeLayout.addStretch()
         self.dialogLayout.addLayout(self.verseTypeLayout)
-        self.dialogLayout.addWidget(save_cancel_button_box(editVerseDialog))
+        self.dialogLayout.addWidget(
+            create_save_cancel_button_box(editVerseDialog))
         self.retranslateUi(editVerseDialog)
         QtCore.QMetaObject.connectSlotsByName(editVerseDialog)
 

openlp/plugins/songs/forms/songbookdialog.py

@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate
-from openlp.core.lib.ui import save_cancel_button_box
+from openlp.core.lib.ui import create_save_cancel_button_box
 
 class Ui_SongBookDialog(object):
     def setupUi(self, songBookDialog):
@@ -50,7 +50,8 @@ class Ui_SongBookDialog(object):
         self.publisherLabel.setBuddy(self.publisherEdit)
         self.bookLayout.addRow(self.publisherLabel, self.publisherEdit)
         self.dialogLayout.addLayout(self.bookLayout)
-        self.dialogLayout.addWidget(save_cancel_button_box(songBookDialog))
+        self.dialogLayout.addWidget(
+            create_save_cancel_button_box(songBookDialog))
         self.retranslateUi(songBookDialog)
         songBookDialog.setMaximumHeight(songBookDialog.sizeHint().height())
         QtCore.QMetaObject.connectSlotsByName(songBookDialog)

openlp/plugins/songs/forms/songimportform.py

@@ -32,7 +32,7 @@ import os
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver, SettingsManager, translate
-from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.lib.ui import UiStrings, critical_error_message_box
 from openlp.core.ui.wizard import OpenLPWizard
 from openlp.plugins.songs.lib.importer import SongFormat
 
@@ -162,6 +162,8 @@ class SongImportForm(OpenLPWizard):
         self.formatLayout.setItem(1, QtGui.QFormLayout.LabelRole,
             self.formatSpacer)
         self.sourceLayout.addLayout(self.formatLayout)
+        self.stackSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
+            QtGui.QSizePolicy.Expanding)
         self.formatStack = QtGui.QStackedLayout()
         self.formatStack.setObjectName(u'FormatStack')
         # OpenLP 2.0
@@ -213,8 +215,7 @@ class SongImportForm(OpenLPWizard):
             'Select the import format, and where to import from.'))
         self.formatLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'Format:'))
-        self.formatComboBox.setItemText(0,
+        self.formatComboBox.setItemText(0, UiStrings.OLPV2)
-            translate('SongsPlugin.ImportWizardForm', 'OpenLP 2.0'))
         self.formatComboBox.setItemText(1,
             translate('SongsPlugin.ImportWizardForm', 'openlp.org 1.x'))
         self.formatComboBox.setItemText(2,
@@ -487,8 +488,7 @@ class SongImportForm(OpenLPWizard):
         """
         if filters:
             filters += u';;'
-        filters += u'%s (*)' % translate('SongsPlugin.ImportWizardForm',
+        filters += u'%s (*)' % UiStrings.AllFiles
-            'All Files')
         filenames = QtGui.QFileDialog.getOpenFileNames(self, title,
             SettingsManager.get_last_dir(self.plugin.settingsSection, 1),
             filters)
@@ -807,10 +807,8 @@ class SongImportForm(OpenLPWizard):
             browseButton.setIcon(self.openIcon)
             browseButton.setObjectName(obj_prefix + u'BrowseButton')
             fileLayout.addWidget(browseButton)
-            formSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
-                QtGui.QSizePolicy.Expanding)
             importLayout.addLayout(fileLayout)
-            importLayout.addSpacerItem(formSpacer)
+            importLayout.addSpacerItem(self.stackSpacer)
         else:
             fileListWidget = QtGui.QListWidget(importWidget)
             fileListWidget.setSelectionMode(
@@ -859,6 +857,7 @@ class SongImportForm(OpenLPWizard):
         disabledLabel.setWordWrap(True)
         disabledLabel.setObjectName(obj_prefix + u'DisabledLabel')
         disabledLayout.addWidget(disabledLabel)
+        disabledLayout.addSpacerItem(self.stackSpacer)
         layout.addWidget(disabledWidget)
         importWidget = QtGui.QWidget(page)
         importWidget.setObjectName(obj_prefix + u'ImportWidget')

openlp/plugins/songs/forms/songmaintenancedialog.py

@@ -27,6 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon, translate
+from openlp.core.lib.ui import UiStrings
 
 class Ui_SongMaintenanceDialog(object):
     def setupUi(self, songMaintenanceDialog):
@@ -145,30 +146,21 @@ class Ui_SongMaintenanceDialog(object):
     def retranslateUi(self, songMaintenanceDialog):
         songMaintenanceDialog.setWindowTitle(
             translate('SongsPlugin.SongMaintenanceForm', 'Song Maintenance'))
-        authorsString = translate('SongsPlugin.SongMaintenanceForm', 'Authors')
+        authorsString = UiStrings.Authors
         topicsString = translate('SongsPlugin.SongMaintenanceForm', 'Topics')
         booksString = translate('SongsPlugin.SongMaintenanceForm', 'Song Books')
         self.listItemAuthors.setText(authorsString)
         self.listItemTopics.setText(topicsString)
         self.listItemBooks.setText(booksString)
-        self.authorsAddButton.setText(
+        self.authorsAddButton.setText(UiStrings.Add)
-            translate('SongsPlugin.SongMaintenanceForm', '&Add'))
+        self.authorsEditButton.setText(UiStrings.Edit)
-        self.authorsEditButton.setText(
+        self.authorsDeleteButton.setText(UiStrings.Delete)
-            translate('SongsPlugin.SongMaintenanceForm', '&Edit'))
+        self.topicsAddButton.setText(UiStrings.Add)
-        self.authorsDeleteButton.setText(
+        self.topicsEditButton.setText(UiStrings.Edit)
-            translate('SongsPlugin.SongMaintenanceForm', '&Delete'))
+        self.topicsDeleteButton.setText(UiStrings.Delete)
-        self.topicsAddButton.setText(
+        self.booksAddButton.setText(UiStrings.Add)
-            translate('SongsPlugin.SongMaintenanceForm', '&Add'))
+        self.booksEditButton.setText(UiStrings.Edit)
-        self.topicsEditButton.setText(
+        self.booksDeleteButton.setText(UiStrings.Delete)
-            translate('SongsPlugin.SongMaintenanceForm', '&Edit'))
-        self.topicsDeleteButton.setText(
-            translate('SongsPlugin.SongMaintenanceForm', '&Delete'))
-        self.booksAddButton.setText(
-            translate('SongsPlugin.SongMaintenanceForm', '&Add'))
-        self.booksEditButton.setText(
-            translate('SongsPlugin.SongMaintenanceForm', '&Edit'))
-        self.booksDeleteButton.setText(
-            translate('SongsPlugin.SongMaintenanceForm', '&Delete'))
         typeListWidth = max(self.fontMetrics().width(authorsString),
             self.fontMetrics().width(topicsString),
             self.fontMetrics().width(booksString))

openlp/plugins/songs/forms/songmaintenanceform.py

@@ -372,7 +372,6 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
         Utility method to merge two objects to leave one in the database.
         """
         Receiver.send_message(u'cursor_busy')
-        Receiver.send_message(u'openlp_process_events')
         merge(dbObject)
         reset()
         Receiver.send_message(u'songs_load_list')

openlp/plugins/songs/forms/topicsdialog.py

@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate
-from openlp.core.lib.ui import save_cancel_button_box
+from openlp.core.lib.ui import create_save_cancel_button_box
 
 class Ui_TopicsDialog(object):
     def setupUi(self, topicsDialog):
@@ -44,7 +44,8 @@ class Ui_TopicsDialog(object):
         self.nameLabel.setBuddy(self.nameEdit)
         self.nameLayout.addRow(self.nameLabel, self.nameEdit)
         self.dialogLayout.addLayout(self.nameLayout)
-        self.dialogLayout.addWidget(save_cancel_button_box(topicsDialog))
+        self.dialogLayout.addWidget(
+            create_save_cancel_button_box(topicsDialog))
         self.retranslateUi(topicsDialog)
         topicsDialog.setMaximumHeight(topicsDialog.sizeHint().height())
         QtCore.QMetaObject.connectSlotsByName(topicsDialog)

openlp/plugins/songs/lib/__init__.py

@@ -104,6 +104,15 @@ class VerseType(object):
 
 
 def retrieve_windows_encoding(recommendation=None):
+    """
+    Determines which encoding to use on an information source. The process uses
+    both automated detection, which is passed to this method as a
+    recommendation, and user confirmation to return an encoding.
+
+    ``recommendation``
+        A recommended encoding discovered programmatically for the user to
+        confirm.
+    """
     # map chardet result to compatible windows standard code page
     codepage_mapping = {'IBM866': u'cp866', 'TIS-620': u'cp874',
         'SHIFT_JIS': u'cp932', 'GB2312': u'cp936', 'HZ-GB-2312': u'cp936',

openlp/plugins/songs/lib/db.py

@@ -71,7 +71,6 @@ class Topic(BaseModel):
 
 
 def init_schema(url):
-
     """
     Setup the songs database connection and initialise the database schema.
 

openlp/plugins/songs/lib/easislidesimport.py

@@ -81,14 +81,14 @@ class EasiSlidesImport(SongImport):
 
     def _parse_song(self, song):
         self._success = True
-        self._add_title(self.title, song.Title1, True)
+        self._add_unicode_attribute(self.title, song.Title1, True)
-        self._add_alttitle(self.alternate_title, song.Title2)
+        self._add_unicode_attribute(self.alternate_title, song.Title2)
-        self._add_number(self.song_number, song.SongNumber)
+        self._add_unicode_attribute(self.song_number, song.SongNumber)
         if self.song_number == u'0':
             self.song_number = u''
         self._add_authors(song)
         self._add_copyright(song)
-        self._add_book(self.song_book_name, song.BookReference)
+        self._add_unicode_attribute(self.song_book_name, song.BookReference)
         self._parse_and_add_lyrics(song)
         return self._success
 

openlp/plugins/songs/lib/mediaitem.py

@@ -32,7 +32,8 @@ from PyQt4 import QtCore, QtGui
 from sqlalchemy.sql import or_
 
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, Receiver, \
-    ItemCapabilities, translate, check_item_selected
+    ItemCapabilities, translate, check_item_selected, PluginStatus
+from openlp.core.lib.ui import UiStrings
 from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm, \
     SongImportForm
 from openlp.plugins.songs.lib import OpenLyrics, SongXML
@@ -147,10 +148,8 @@ class SongMediaItem(MediaManagerItem):
                 translate('SongsPlugin.MediaItem', 'Titles')),
             (3, u':/songs/song_search_lyrics.png',
                 translate('SongsPlugin.MediaItem', 'Lyrics')),
-            (4, u':/songs/song_search_author.png',
+            (4, u':/songs/song_search_author.png', UiStrings.Authors),
-                translate('SongsPlugin.MediaItem', 'Authors')),
+            (5, u':/slides/slide_theme.png', UiStrings.Themes)
-            (5, u':/slides/slide_theme.png',
-                translate('SongsPlugin.MediaItem', 'Themes'))
         ])
         self.configUpdated()
 
@@ -378,6 +377,8 @@ class SongMediaItem(MediaManagerItem):
         raw_footer.append(song.title)
         raw_footer.append(author_list)
         raw_footer.append(song.copyright)
+        if QtCore.QSettings().value(u'general/ccli number',
+            QtCore.QVariant(u'')).toString():
             raw_footer.append(unicode(
                 translate('SongsPlugin.MediaItem', 'CCLI License: ') +
                 QtCore.QSettings().value(u'general/ccli number',
@@ -396,7 +397,8 @@ class SongMediaItem(MediaManagerItem):
         Triggered by a song being loaded by the service item
         """
         log.debug(u'serviceLoad')
-        if item.data_string:
+        if self.plugin.status != PluginStatus.Active or not item.data_string:
+            return
         search_results = self.parent.manager.get_all_objects(Song,
             Song.search_title == re.compile(r'\W+', re.UNICODE).sub(u' ',
             item.data_string[u'title'].split(u'@')[0].lower()).strip(),
@@ -412,10 +414,9 @@ class SongMediaItem(MediaManagerItem):
         if search_results:
             for song in search_results:
                 same_authors = True
-                    # If the author counts are different, we do not have to do
+                # If the author counts are different, we do not have to do any
-                    # any further checking. This is also important when a song
+                # further checking. This is also important when a song does not
-                    # does not have any author (because we can not loop over an
+                # have any author (because we can not loop over an empty list).
-                    # empty list).
                 if len(song.authors) == len(author_list):
                     for author in song.authors:
                         if author.display_name not in author_list:

openlp/plugins/songs/lib/opensongimport.py

@@ -36,9 +36,6 @@ from openlp.plugins.songs.lib.songimport import SongImport
 
 log = logging.getLogger(__name__)
 
-class OpenSongImportError(Exception):
-    pass
-
 class OpenSongImport(SongImport):
     """
     Import songs exported from OpenSong

openlp/plugins/songs/songsplugin.py

@@ -31,6 +31,7 @@ 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 UiStrings
 from openlp.plugins.songs.lib import SongMediaItem, SongsTab, SongXML
 from openlp.plugins.songs.lib.db import init_schema, Song
 from openlp.plugins.songs.lib.importer import SongFormat
@@ -225,42 +226,7 @@ class SongsPlugin(Plugin):
             u'title': translate('SongsPlugin', 'Songs', 'container title')
         }
         # Middle Header Bar
-        ## New Action ##
+        Plugin.setPluginTextStrings(self)
-        self.textStrings[StringContent.New] = {
-            u'title': translate('SongsPlugin', 'Add'),
-            u'tooltip': translate('SongsPlugin',
-                'Add a new Song')
-        }
-        ## Edit Action ##
-        self.textStrings[StringContent.Edit] = {
-            u'title': translate('SongsPlugin', 'Edit'),
-            u'tooltip': translate('SongsPlugin',
-                'Edit the selected Song')
-        }
-        ## Delete Action ##
-        self.textStrings[StringContent.Delete] = {
-            u'title': translate('SongsPlugin', 'Delete'),
-            u'tooltip': translate('SongsPlugin',
-                'Delete the selected Song')
-        }
-        ## Preview Action ##
-        self.textStrings[StringContent.Preview] = {
-            u'title': translate('SongsPlugin', 'Preview'),
-            u'tooltip': translate('SongsPlugin',
-                'Preview the selected Song')
-        }
-        ## Send Live Action ##
-        self.textStrings[StringContent.Live] = {
-            u'title': translate('SongsPlugin', 'Live'),
-            u'tooltip': translate('SongsPlugin',
-                'Send the selected Song live')
-        }
-        ## Add to Service Action ##
-        self.textStrings[StringContent.Service] = {
-            u'title': translate('SongsPlugin', 'Service'),
-            u'tooltip': translate('SongsPlugin',
-                'Add the selected Song to the service')
-        }
 
     def finalise(self):
         """

resources/forms/exceptiondialog.ui

@@ -13,14 +13,81 @@
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <layout class="QVBoxLayout" name="exceptionLayout">
+  <widget class="QPlainTextEdit" name="exceptionTextEdit">
-   <property name="spacing">
+   <property name="geometry">
-    <number>8</number>
+    <rect>
+     <x>8</x>
+     <y>194</y>
+     <width>564</width>
+     <height>171</height>
+    </rect>
    </property>
-   <property name="margin">
+   <property name="readOnly">
-    <number>8</number>
+    <bool>true</bool>
    </property>
-   <item>
+   <property name="backgroundVisible">
+    <bool>false</bool>
+   </property>
+  </widget>
+  <widget class="QDialogButtonBox" name="exceptionButtonBox">
+   <property name="geometry">
+    <rect>
+     <x>8</x>
+     <y>373</y>
+     <width>83</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <property name="standardButtons">
+    <set>QDialogButtonBox::Close</set>
+   </property>
+  </widget>
+  <widget class="QPlainTextEdit" name="discriptionplainTextEdit">
+   <property name="geometry">
+    <rect>
+     <x>8</x>
+     <y>103</y>
+     <width>561</width>
+     <height>71</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+  </widget>
+  <widget class="QLabel" name="characterCount">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>170</y>
+     <width>301</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>TextLabel</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="whatyouweredoinglabel">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>80</y>
+     <width>59</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>TextLabel</string>
+   </property>
+  </widget>
+  <widget class="QWidget" name="">
    <layout class="QHBoxLayout" name="messageLayout">
     <property name="spacing">
      <number>0</number>
@@ -67,28 +134,7 @@
      </widget>
     </item>
    </layout>
-   </item>
-   <item>
-    <widget class="QPlainTextEdit" name="exceptionTextEdit">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-     <property name="backgroundVisible">
-      <bool>false</bool>
-     </property>
   </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="exceptionButtonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
  </widget>
  <resources>
   <include location="../images/openlp-2.qrc"/>

resources/forms/printserviceorderdialog.ui

@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>494</width>
+    <height>426</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout_3">
+   <item>
+    <layout class="QGridLayout" name="dialogLayout">
+     <item row="0" column="3">
+      <layout class="QVBoxLayout" name="settingsLayout">
+       <item>
+        <layout class="QGridLayout" name="serviceTitleLayout">
+         <item row="1" column="1">
+          <widget class="QLineEdit" name="serviceTitleLineEdit">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="serviceTitleLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Service Title:</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="printSlideTextCheckBox">
+         <property name="text">
+          <string>Include slide text if avaialbe</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="printNotesCheckBox">
+         <property name="text">
+          <string>Include service item notes</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="printMetaDataCheckBox">
+         <property name="text">
+          <string>Include play lenght of media items</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="spacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="customNotesLabel">
+         <property name="text">
+          <string>&lt;b&gt;Custom Notes:&lt;/b&gt;</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QTextEdit" name="customNoteEdit"/>
+       </item>
+      </layout>
+     </item>
+     <item row="1" column="3">
+      <layout class="QHBoxLayout" name="buttonLayout">
+       <item>
+        <spacer name="spacer_3">
+         <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="QPushButton" name="cancelButton">
+         <property name="text">
+          <string>Cancel</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="printButton">
+         <property name="text">
+          <string>Print</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="1" column="0">
+      <layout class="QHBoxLayout" name="zoomButtonLayout">
+       <item>
+        <spacer name="spacer">
+         <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="QToolButton" name="zoomOutButton">
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset resource="../images/openlp-2.qrc">
+           <normaloff>:/general/general_zoom_out.png</normaloff>:/general/general_zoom_out.png</iconset>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="zoomInButton">
+         <property name="icon">
+          <iconset resource="../images/openlp-2.qrc">
+           <normaloff>:/general/general_zoom_in.png</normaloff>:/general/general_zoom_in.png</iconset>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="0" column="0">
+      <layout class="QVBoxLayout" name="perviewLayout">
+       <item>
+        <widget class="QLabel" name="previewLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Preview:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QWidget" name="previewWidget" native="true">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+  <zorder></zorder>
+ </widget>
+ <resources>
+  <include location="../images/openlp-2.qrc"/>
+ </resources>
+ <connections/>
+</ui>

resources/images/openlp-2.qrc

@@ -41,6 +41,8 @@
     <file>general_export.png</file>
     <file>general_import.png</file>
     <file>general_new.png</file>
+    <file>general_zoom_out.png</file>
+    <file>general_zoom_in.png</file>
     <file>general_open.png</file>
     <file>general_save.png</file>
     <file>general_email.png</file>

resources/windows/OpenLP-2.0.iss

@@ -83,6 +83,58 @@ Root: HKCU; SubKey: Software\OpenLP\OpenLP\custom; ValueType: dword; ValueName:
 Root: HKCU; SubKey: Software\OpenLP\OpenLP\images; ValueType: dword; ValueName: status; ValueData: $00000001
 Root: HKCU; SubKey: Software\OpenLP\OpenLP\media; ValueType: dword; ValueName: status; ValueData: $00000001
 Root: HKCU; SubKey: Software\OpenLP\OpenLP\presentations; ValueType: dword; ValueName: status; ValueData: $00000001
-Root: HKCU; SubKey: Software\OpenLP\OpenLP\remotes; ValueType: dword; ValueName: status; ValueData: $00000001
+Root: HKCU; SubKey: Software\OpenLP\OpenLP\remotes; ValueType: dword; ValueName: status; ValueData: $00000000
 Root: HKCU; SubKey: Software\OpenLP\OpenLP\songs; ValueType: dword; ValueName: status; ValueData: $00000001
 Root: HKCU; SubKey: Software\OpenLP\OpenLP\songusage; ValueType: dword; ValueName: status; ValueData: $00000001
+
+[Code]
+function GetUninstallString(): String;
+var
+  sUnInstPath: String;
+  sUnInstallString: String;
+begin
+  sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\{#emit SetupSetting("AppId")}_is1');
+  sUnInstallString := '';
+  if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then
+    RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString);
+  Result := sUnInstallString;
+end;
+
+function IsUpgrade(): Boolean;
+begin
+  Result := (GetUninstallString() <> '');
+end;
+
+// Return Values:
+// 1 - uninstall string is empty
+// 2 - error executing the UnInstallString
+// 3 - successfully executed the UnInstallString
+function UnInstallOldVersion(): Integer;
+var
+  sUnInstallString: String;
+  iResultCode: Integer;
+begin
+  Result := 0;
+  sUnInstallString := GetUninstallString();
+  if sUnInstallString <> '' then
+  begin
+    sUnInstallString := RemoveQuotes(sUnInstallString);
+    if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
+      Result := 3
+    else
+      Result := 2;
+  end
+  else
+    Result := 1;
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if (CurStep=ssInstall) then
+  begin
+    if (IsUpgrade()) then
+    begin
+      UnInstallOldVersion();
+    end;
+  end;
+end;

scripts/bible-1to2-converter.py

@@ -1,308 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
-# Carsten Tinggaard, Frode Woldsund                                           #
-# --------------------------------------------------------------------------- #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the Free  #
-# Software Foundation; version 2 of the License.                              #
-#                                                                             #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with this program; if not, write to the Free Software Foundation, Inc., 59  #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
-###############################################################################
-
-import sys
-import os
-import sqlite
-import sqlite3
-
-from optparse import OptionParser
-from traceback import format_tb as get_traceback
-
-# Some global options to be used throughout the import process
-verbose = False
-debug = False
-old_cursor = None
-new_cursor = None
-
-# SQL create statments
-create_statements = [
-    (u'table "book"', u"""CREATE TABLE book (
-        id INTEGER NOT NULL,
-        testament_id INTEGER,
-        name VARCHAR(30),
-        abbreviation VARCHAR(5),
-        PRIMARY KEY (id),
-        FOREIGN KEY(testament_id) REFERENCES testament (id)
-)"""),
-    (u'table "metadata"', u"""CREATE TABLE metadata (
-        "key" VARCHAR(255) NOT NULL,
-        value VARCHAR(255),
-        PRIMARY KEY ("key")
-)"""),
-    (u'table "testament"', u"""CREATE TABLE testament (
-        id INTEGER NOT NULL,
-        name VARCHAR(30),
-        PRIMARY KEY (id)
-)"""),
-    (u'table "verse"', u"""CREATE TABLE verse (
-        id INTEGER NOT NULL,
-        book_id INTEGER,
-        chapter INTEGER,
-        verse INTEGER,
-        text TEXT,
-        PRIMARY KEY (id),
-        FOREIGN KEY(book_id) REFERENCES book (id)
-)"""),
-    (u'index "idx_abbrev"',
-        u"""CREATE INDEX idx_abbrev ON book (abbreviation, id)"""),
-    (u'index "idx_chapter_verse_book',
-        u"""CREATE INDEX idx_chapter_verse_book ON verse (chapter, verse, book_id, id)"""),
-    (u'index "idx_chapter_verse_text"',
-        u"""CREATE INDEX idx_chapter_verse_text ON verse (text, verse, book_id, id)"""),
-    (u'index "idx_name"',
-        u"""CREATE INDEX idx_name ON book (name, id)""")
-]
-
-def display_sql(sql, params):
-    prepared_params = []
-    for param in params:
-        if isinstance(param, basestring):
-            prepared_params.append(u'"%s"' % param)
-        elif isinstance(param, (int, long)):
-            prepared_params.append(u'%d' % param)
-        elif isinstance(param, (float, complex)):
-            prepared_params.append(u'%f' % param)
-        else:
-            prepared_params.append(u'"%s"' % str(param))
-    for prepared_param in prepared_params:
-        sql = sql.replace(u'?', prepared_param, 1)
-    return sql
-
-def create_database():
-    global new_cursor, create_statements
-    if debug or verbose:
-        print 'Creating new database:'
-    else:
-        print 'Creating new database...',
-    for statement_type, sql_create in create_statements:
-        if debug:
-            print '... ', sql_create.replace('\n', ' ').replace('         ', ' ')
-        elif verbose:
-            print '... creating %s...' % statement_type,
-        new_cursor.execute(sql_create)
-        if verbose and not debug:
-            print 'done.'
-    if not verbose and not debug:
-        print 'done.'
-
-def import_bible():
-    global old_cursor, new_cursor, debug, verbose
-    if debug or verbose:
-        print 'Importing metadata:'
-    else:
-        print 'Importing metadata...',
-    if debug:
-        print '... SELECT "key", "value" FROM metadata'
-    elif verbose:
-        print '... fetching metadata from old database...',
-    old_cursor.execute(u'SELECT "key", "value" FROM metadata')
-    rows = old_cursor.fetchall()
-    if not debug and verbose:
-        print 'done.'
-    for row in rows:
-        key = unicode(row[0], u'cp1252')
-        value = unicode(row[1], u'cp1252')
-        if key == u'Permission':
-            key = u'Permissions'
-        sql_insert = u'INSERT INTO metadata '\
-            '("key", "value") '\
-            'VALUES (?, ?)'
-        sql_params = (key, value)
-        if debug:
-            print '...', display_sql(sql_insert, sql_params)
-        elif verbose:
-            print '... importing "%s"' % key
-        new_cursor.execute(sql_insert, sql_params)
-    if not verbose and not debug:
-        print 'done.'
-    if debug or verbose:
-        print 'Importing testaments:'
-    else:
-        print 'Importing testaments...',
-    if debug:
-        print '... SELECT id, name FROM testament'
-    elif verbose:
-        print '... fetching testaments from old database...',
-    old_cursor.execute(u'SELECT id, name FROM testament')
-    rows = old_cursor.fetchall()
-    if not debug and verbose:
-        print 'done.'
-    for row in rows:
-        id = int(row[0])
-        name = unicode(row[1], u'cp1252')
-        sql_insert = u'INSERT INTO testament '\
-            '(id, name) '\
-            'VALUES (?, ?)'
-        sql_params = (id, name)
-        if debug:
-            print '...', display_sql(sql_insert, sql_params)
-        elif verbose:
-            print '... importing "%s"' % name
-        new_cursor.execute(sql_insert, sql_params)
-    if not verbose and not debug:
-        print 'done.'
-    if debug or verbose:
-        print 'Importing books:'
-    else:
-        print 'Importing books...',
-    if debug:
-        print '... SELECT id, testament_id, name, abbreviation FROM book'
-    elif verbose:
-        print '... fetching books from old database...',
-    old_cursor.execute(u'SELECT id, testament_id, name, abbreviation FROM book')
-    rows = old_cursor.fetchall()
-    if not debug and verbose:
-        print 'done.'
-    book_map = {}
-    for row in rows:
-        testament_id = int(row[1])
-        name = unicode(row[2], u'cp1252')
-        abbreviation = unicode(row[3], u'cp1252')
-        sql_insert = u'INSERT INTO book '\
-            '(id, testament_id, name, abbreviation) '\
-            'VALUES (NULL, ?, ?, ?)'
-        sql_params = (testament_id, name, abbreviation)
-        if debug:
-            print '...', display_sql(sql_insert, sql_params)
-        elif verbose:
-            print '... importing "%s"' % name
-        new_cursor.execute(sql_insert, sql_params)
-        book_map[row[0]] = new_cursor.lastrowid
-        if debug:
-            print '    >>> (old) books.id =', row[0], ' (new) books.id =', book_map[row[0]]
-    if not verbose and not debug:
-        print 'done.'
-    if debug or verbose:
-        print 'Importing verses:'
-    else:
-        print 'Importing verses...',
-    if debug:
-        print '... SELECT id, book_id, chapter, verse, text || \'\' AS text FROM verse...',
-    elif verbose:
-        print '... fetching verses from old database...',
-    old_cursor.execute(u'SELECT id, book_id, chapter, verse, text || \'\' AS text FROM verse')
-    rows = old_cursor.fetchall()
-    if debug or verbose:
-        print 'done.'
-    for row in rows:
-        book_id = int(row[1])
-        chapter = int(row[2])
-        verse = int(row[3])
-        text = unicode(row[4], u'cp1252')
-        sql_insert = u'INSERT INTO verse '\
-            '(id, book_id, chapter, verse, text) '\
-            'VALUES (NULL, ?, ?, ?, ?)'
-        sql_params = (book_map[book_id], chapter, verse, text)
-        if debug:
-            print '...', display_sql(sql_insert, sql_params)
-        elif verbose:
-            print '... importing "%s..."' % text[:17]
-        new_cursor.execute(sql_insert, sql_params)
-    if not verbose and not debug:
-        print 'done.'
-
-def main(old_db, new_db):
-    global old_cursor, new_cursor, debug
-    old_connection = None
-    new_connection = None
-    try:
-        old_connection = sqlite.connect(old_db)
-    except:
-        if debug:
-            errormsg = '\n' + ''.join(get_traceback(sys.exc_info()[2]))\
-                + str(sys.exc_info()[1])
-        else:
-            errormsg = sys.exc_info()[1]
-        print 'There was a problem connecting to the old database:', errormsg
-        return 1
-    try:
-        new_connection = sqlite3.connect(new_db)
-    except:
-        if debug:
-            errormsg = '\n' + ''.join(get_traceback(sys.exc_info()[2]))\
-                + str(sys.exc_info()[1])
-        else:
-            errormsg = sys.exc_info()[1]
-        print 'There was a problem creating the new database:', errormsg
-        return 1
-    old_cursor = old_connection.cursor()
-    new_cursor = new_connection.cursor()
-    try:
-        create_database()
-    except:
-        if debug:
-            errormsg = '\n' + ''.join(get_traceback(sys.exc_info()[2]))\
-                + str(sys.exc_info()[1])
-        else:
-            errormsg = sys.exc_info()[1]
-        print 'There was a problem creating the database:', errormsg
-        return 1
-    try:
-        import_bible()
-        new_connection.commit()
-    except:
-        new_connection.rollback()
-        if debug:
-            errormsg = '\n' + ''.join(get_traceback(sys.exc_info()[2]))\
-                + str(sys.exc_info()[1])
-        else:
-            errormsg = sys.exc_info()[1]
-        print 'There was a problem importing songs:', errormsg
-        return 1
-    print 'Import complete.'
-
-if __name__ == u'__main__':
-    option_parser = OptionParser(usage='Usage: %prog [options] OLDDATABASE NEWDATABASE')
-    option_parser.add_option('-o', '--overwrite', dest='overwrite', default=False,
-        action=u'store_true', help='Overwrite database file if it already exists.')
-    option_parser.add_option('-v', '--verbose', dest='verbose', default=False,
-        action=u'store_true', help='Outputs additional progress data.')
-    option_parser.add_option('-d', '--debug', dest='debug', default=False,
-        action=u'store_true', help='Outputs raw SQL statements (overrides verbose).')
-    options, arguments = option_parser.parse_args()
-    if len(arguments) < 2:
-        if len(arguments) == 0:
-            option_parser.error('Please specify an old database and a new database.')
-        else:
-            option_parser.error('Please specify a new database.')
-    old_db = os.path.abspath(arguments[0])
-    new_db = os.path.abspath(arguments[1])
-    if not os.path.isfile(old_db):
-        option_parser.error('Old database file ("%s") is not a file.' % old_db)
-    if not os.path.exists(old_db):
-        option_parser.error('Old database file ("%s") does not exist.' % old_db)
-    if os.path.exists(new_db):
-        if not options.overwrite:
-            option_parser.error('New database file ("%s") exists. If you want to overwrite it, specify the --overwrite option.' % new_db)
-        else:
-            if not os.path.isfile(new_db):
-                option_parser.error('New database file ("%s") is not a file.' % new_db)
-            os.unlink(new_db)
-    verbose = options.verbose
-    debug = options.debug
-    main(old_db, new_db)

scripts/openlp-1to2-converter.py

@@ -1,323 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
-# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
-# Carsten Tinggaard, Frode Woldsund                                           #
-# --------------------------------------------------------------------------- #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the Free  #
-# Software Foundation; version 2 of the License.                              #
-#                                                                             #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with this program; if not, write to the Free Software Foundation, Inc., 59  #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
-###############################################################################
-
-import sys
-import os
-import sqlite
-import sqlite3
-import re
-from optparse import OptionParser
-from traceback import format_tb as get_traceback
-
-# Some global options to be used throughout the import process
-dirty_chars = re.compile(r'\W ', re.UNICODE)
-verbose = False
-debug = False
-old_cursor = None
-new_cursor = None
-
-# SQL create statments
-create_statements = [
-    (u'table "authors"', u"""CREATE TABLE authors (
-        id INTEGER NOT NULL,
-        first_name VARCHAR(128),
-        last_name VARCHAR(128),
-        display_name VARCHAR(255) NOT NULL,
-        PRIMARY KEY (id)
-)"""),
-    (u'table "song_books"', u"""CREATE TABLE song_books (
-        id INTEGER NOT NULL,
-        name VARCHAR(128) NOT NULL,
-        publisher VARCHAR(128),
-        PRIMARY KEY (id)
-)"""),
-    (u'table "songs"', u"""CREATE TABLE songs (
-        id INTEGER NOT NULL,
-        song_book_id INTEGER,
-        title VARCHAR(255) NOT NULL,
-        alternate_title VARCHAR(255),
-        lyrics TEXT NOT NULL,
-        verse_order VARCHAR(128),
-        copyright VARCHAR(255),
-        comments TEXT,
-        ccli_number VARCHAR(64),
-        song_number VARCHAR(64),
-        theme_name VARCHAR(128),
-        search_title VARCHAR(255) NOT NULL,
-        search_lyrics TEXT NOT NULL,
-        PRIMARY KEY (id),
-         FOREIGN KEY(song_book_id) REFERENCES song_books (id)
-)"""),
-    (u'table "topics"', u"""CREATE TABLE topics (
-        id INTEGER NOT NULL,
-        name VARCHAR(128) NOT NULL,
-        PRIMARY KEY (id)
-)"""),
-    (u'index "ix_songs_search_lyrics"',
-        u"""CREATE INDEX ix_songs_search_lyrics ON songs (search_lyrics)"""),
-    (u'index "ix_songs_search_title',
-        u"""CREATE INDEX ix_songs_search_title ON songs (search_title)"""),
-    (u'table "authors_songs"', u"""CREATE TABLE authors_songs (
-        author_id INTEGER NOT NULL,
-        song_id INTEGER NOT NULL,
-        PRIMARY KEY (author_id, song_id),
-         FOREIGN KEY(author_id) REFERENCES authors (id),
-         FOREIGN KEY(song_id) REFERENCES songs (id)
-)"""),
-    (u'table "songs_topics"', u"""CREATE TABLE songs_topics (
-        song_id INTEGER NOT NULL,
-        topic_id INTEGER NOT NULL,
-        PRIMARY KEY (song_id, topic_id),
-         FOREIGN KEY(song_id) REFERENCES songs (id),
-         FOREIGN KEY(topic_id) REFERENCES topics (id)
-)""")
-]
-
-def prepare_string(dirty):
-    return dirty_chars.sub(u'', dirty.replace(u'\r\n', u' ').replace(u'\n', u' '))
-
-def display_sql(sql, params):
-    prepared_params = []
-    for param in params:
-        if isinstance(param, basestring):
-            prepared_params.append(u'"%s"' % param)
-        elif isinstance(param, (int, long)):
-            prepared_params.append(u'%d' % param)
-        elif isinstance(param, (float, complex)):
-            prepared_params.append(u'%f' % param)
-        else:
-            prepared_params.append(u'"%s"' % str(param))
-    for prepared_param in prepared_params:
-        sql = sql.replace(u'?', prepared_param, 1)
-    return sql
-
-def create_database():
-    global new_cursor, create_statements
-    if debug or verbose:
-        print 'Creating new database:'
-    else:
-        print 'Creating new database...',
-    for statement_type, sql_create in create_statements:
-        if debug:
-            print '... ', sql_create.replace('\n', ' ').replace('         ', ' ')
-        elif verbose:
-            print '... creating %s...' % statement_type,
-        new_cursor.execute(sql_create)
-        if verbose and not debug:
-            print 'done.'
-    if not verbose and not debug:
-        print 'done.'
-
-def import_songs():
-    global old_cursor, new_cursor, debug, verbose
-    if debug or verbose:
-        print 'Importing authors:'
-    else:
-        print 'Importing authors...',
-    if debug:
-        print '... SELECT authorid AS id, authorname AS displayname FROM authors'
-    elif verbose:
-        print '... fetching authors from old database...',
-    old_cursor.execute(u'SELECT authorid AS id, authorname AS displayname FROM authors')
-    rows = old_cursor.fetchall()
-    if not debug and verbose:
-        print 'done.'
-    author_map = {}
-    for row in rows:
-        display_name = unicode(row[1], u'cp1252')
-        names = display_name.split(u' ')
-        first_name = names[0]
-        last_name = u' '.join(names[1:])
-        if last_name is None:
-            last_name = u''
-        sql_insert = u'INSERT INTO authors '\
-            '(id, first_name, last_name, display_name) '\
-            'VALUES (NULL, ?, ?, ?)'
-        sql_params = (first_name, last_name, display_name)
-        if debug:
-            print '...', display_sql(sql_insert, sql_params)
-        elif verbose:
-            print '... importing "%s"' % display_name
-        new_cursor.execute(sql_insert, sql_params)
-        author_map[row[0]] = new_cursor.lastrowid
-        if debug:
-            print '    >>> authors.authorid =', row[0], 'authors.id =', author_map[row[0]]
-    if not verbose and not debug:
-        print 'done.'
-    if debug or verbose:
-        print 'Importing songs:'
-    else:
-        print 'Importing songs...',
-    if debug:
-        print '... SELECT songid AS id, songtitle AS title, lyrics || \'\' AS lyrics, copyrightinfo AS copyright FROM songs...',
-    elif verbose:
-        print '... fetching songs from old database...',
-    old_cursor.execute(u'SELECT songid AS id, songtitle AS title, lyrics || \'\' AS lyrics, copyrightinfo AS copyright FROM songs')
-    rows = old_cursor.fetchall()
-    if debug or verbose:
-        print 'done.'
-    song_map = {}
-    xml_lyrics_template = u'<?xml version="1.0" encoding="utf-8"?><song version="1.0"><lyrics language="en">%s</lyrics></song>'
-    xml_verse_template = u'<verse label="%d" type="Verse"><![CDATA[%s]]></verse>'
-    for row in rows:
-        clean_title = unicode(row[1], u'cp1252')
-        clean_lyrics = unicode(row[2], u'cp1252').replace(u'\r\n', u'\n')
-        clean_copyright = unicode(row[3], u'cp1252')
-        verse_order = u''
-        text_lyrics = clean_lyrics.split(u'\n\n')
-        xml_verse = u''
-        verses = []
-        for line, verse in enumerate(text_lyrics):
-            if not verse:
-                continue
-            xml_verse += (xml_verse_template % (line + 1, verse))
-            verses.append(u'V%d' % (line + 1))
-        verse_order = u' '.join(verses)
-        xml_lyrics = xml_lyrics_template % xml_verse
-        search_title = prepare_string(clean_title)
-        search_lyrics = prepare_string(clean_lyrics)
-        sql_insert = u'INSERT INTO songs '\
-            '(id, song_book_id, title, lyrics, verse_order, copyright, search_title, search_lyrics) '\
-            'VALUES (NULL, 0, ?, ?, ?, ?, ?, ?)'
-        sql_params = (clean_title, xml_lyrics, verse_order, clean_copyright, search_title, search_lyrics)
-        if debug:
-            print '...', display_sql(sql_insert, (sql_params[0], u'%s...' % clean_lyrics[:7], sql_params[2], sql_params[3], sql_params[4], u'%s...' % search_lyrics[:7]))
-        elif verbose:
-            print '... importing "%s"' % clean_title
-        new_cursor.execute(sql_insert, sql_params)
-        song_map[row[0]] = new_cursor.lastrowid
-        if debug:
-            print '    >>> songs.songid =', row[0], 'songs.id =', song_map[row[0]]
-    if not verbose and not debug:
-        print 'done.'
-    if debug or verbose:
-        print 'Importing song-to-author mapping:'
-    else:
-        print 'Importing song-to-author mapping...',
-    if debug:
-        print '... SELECT authorid AS author_id, songid AS song_id FROM songauthors'
-    elif verbose:
-        print '... fetching song-to-author mapping from old database...',
-    old_cursor.execute(u'SELECT authorid AS author_id, songid AS song_id FROM songauthors')
-    rows = old_cursor.fetchall()
-    if not debug and verbose:
-        print 'done.'
-    for row in rows:
-        sql_insert = u'INSERT INTO authors_songs '\
-            '(author_id, song_id) '\
-            'VALUES (?, ?)'
-        sql_params = (author_map[row[0]], song_map[row[1]])
-        if debug:
-            print '... ', display_sql(sql_insert, sql_params)
-        elif verbose:
-            print '... Author %d (was %d) => Song %d (was %d)'\
-                % (int(row[0]), author_map[row[0]],
-                   int(row[1]), song_map[row[1]])
-        new_cursor.execute(sql_insert, sql_params)
-    if not verbose and not debug:
-        print 'done.'
-
-def main(old_db, new_db):
-    global old_cursor, new_cursor, debug
-    old_connection = None
-    new_connection = None
-    try:
-        old_connection = sqlite.connect(old_db)
-    except:
-        if debug:
-            errormsg = '\n' + ''.join(get_traceback(sys.exc_info()[2]))\
-                + str(sys.exc_info()[1])
-        else:
-            errormsg = sys.exc_info()[1]
-        print 'There was a problem connecting to the old database:', errormsg
-        return 1
-    try:
-        new_connection = sqlite3.connect(new_db)
-    except:
-        if debug:
-            errormsg = '\n' + ''.join(get_traceback(sys.exc_info()[2]))\
-                + str(sys.exc_info()[1])
-        else:
-            errormsg = sys.exc_info()[1]
-        print 'There was a problem creating the new database:', errormsg
-        return 1
-    old_cursor = old_connection.cursor()
-    new_cursor = new_connection.cursor()
-    try:
-        create_database()
-    except:
-        if debug:
-            errormsg = '\n' + ''.join(get_traceback(sys.exc_info()[2]))\
-                + str(sys.exc_info()[1])
-        else:
-            errormsg = sys.exc_info()[1]
-        print 'There was a problem creating the database:', errormsg
-        return 1
-    try:
-        import_songs()
-        new_connection.commit()
-    except:
-        new_connection.rollback()
-        if debug:
-            errormsg = '\n' + ''.join(get_traceback(sys.exc_info()[2]))\
-                + str(sys.exc_info()[1])
-        else:
-            errormsg = sys.exc_info()[1]
-        print 'There was a problem importing songs:', errormsg
-        return 1
-    print 'Import complete.'
-
-if __name__ == u'__main__':
-    option_parser = OptionParser(usage='Usage: %prog [options] OLDDATABASE NEWDATABASE')
-    option_parser.add_option('-o', '--overwrite', dest='overwrite', default=False,
-        action=u'store_true', help='Overwrite database file if it already exists.')
-    option_parser.add_option('-v', '--verbose', dest='verbose', default=False,
-        action=u'store_true', help='Outputs additional progress data.')
-    option_parser.add_option('-d', '--debug', dest='debug', default=False,
-        action=u'store_true', help='Outputs raw SQL statements (overrides verbose).')
-    options, arguments = option_parser.parse_args()
-    if len(arguments) < 2:
-        if len(arguments) == 0:
-            option_parser.error('Please specify an old database and a new database.')
-        else:
-            option_parser.error('Please specify a new database.')
-    old_db = os.path.abspath(arguments[0])
-    new_db = os.path.abspath(arguments[1])
-    if not os.path.isfile(old_db):
-        option_parser.error('Old database file ("%s") is not a file.' % old_db)
-    if not os.path.exists(old_db):
-        option_parser.error('Old database file ("%s") does not exist.' % old_db)
-    if os.path.exists(new_db):
-        if not options.overwrite:
-            option_parser.error('New database file ("%s") exists. If you want to overwrite it, specify the --overwrite option.' % new_db)
-        else:
-            if not os.path.isfile(new_db):
-                option_parser.error('New database file ("%s") is not a file.' % new_db)
-            os.unlink(new_db)
-    verbose = options.verbose
-    debug = options.debug
-    main(old_db, new_db)

setup.py

@@ -69,8 +69,7 @@ OpenLP (previously openlp.org) is free church presentation software, or lyrics p
     url='http://openlp.org/',
     license='GNU General Public License',
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
-    scripts=['openlp.pyw', 'scripts/openlp-1to2-converter.py',
+    scripts=['openlp.pyw', 'scripts/openlp-remoteclient.py'],
-        'scripts/bible-1to2-converter.py','scripts/openlp-remoteclient.py'],
     include_package_data=True,
     zip_safe=False,
     install_requires=[