Start to add functionality to allow tags to be customised

openlp/core/lib/__init__.py

@@ -35,52 +35,51 @@ from PyQt4 import QtCore, QtGui
 
 log = logging.getLogger(__name__)
 
-# TODO make external and configurable in alpha 4 via a settings dialog
+base_html_expands = []
-html_expands = []
 
-html_expands.append({u'desc': u'Red', u'start tag': u'{r}',
+base_html_expands.append({u'desc': u'Red', u'start tag': u'{r}',
     u'start html': u'<span style="-webkit-text-fill-color:red">',
-    u'end tag': u'{/r}', u'end html': u'</span>', u'protected': False})
+    u'end tag': u'{/r}', u'end html': u'</span>', u'protected': True})
-html_expands.append({u'desc': u'Black', u'start tag': u'{b}',
+base_html_expands.append({u'desc': u'Black', u'start tag': u'{b}',
     u'start html': u'<span style="-webkit-text-fill-color:black">',
-    u'end tag': u'{/b}', u'end html': u'</span>', u'protected': False})
+    u'end tag': u'{/b}', u'end html': u'</span>', u'protected': True})
-html_expands.append({u'desc': u'Blue', u'start tag': u'{bl}',
+base_html_expands.append({u'desc': u'Blue', u'start tag': u'{bl}',
     u'start html': u'<span style="-webkit-text-fill-color:blue">',
-    u'end tag': u'{/bl}', u'end html': u'</span>', u'protected': False})
+    u'end tag': u'{/bl}', u'end html': u'</span>', u'protected': True})
-html_expands.append({u'desc': u'Yellow', u'start tag': u'{y}',
+base_html_expands.append({u'desc': u'Yellow', u'start tag': u'{y}',
     u'start html': u'<span style="-webkit-text-fill-color:yellow">',
-    u'end tag': u'{/y}', u'end html': u'</span>', u'protected': False})
+    u'end tag': u'{/y}', u'end html': u'</span>', u'protected': True})
-html_expands.append({u'desc': u'Green', u'start tag': u'{g}',
+base_html_expands.append({u'desc': u'Green', u'start tag': u'{g}',
     u'start html': u'<span style="-webkit-text-fill-color:green">',
-    u'end tag': u'{/g}', u'end html': u'</span>', u'protected': False})
+    u'end tag': u'{/g}', u'end html': u'</span>', u'protected': True})
-html_expands.append({u'desc': u'Pink', u'start tag': u'{pk}',
+base_html_expands.append({u'desc': u'Pink', u'start tag': u'{pk}',
     u'start html': u'<span style="-webkit-text-fill-color:#CC33CC">',
-    u'end tag': u'{/pk}', u'end html': u'</span>', u'protected': False})
+    u'end tag': u'{/pk}', u'end html': u'</span>', u'protected': True})
-html_expands.append({u'desc': u'Orange', u'start tag': u'{o}',
+base_html_expands.append({u'desc': u'Orange', u'start tag': u'{o}',
     u'start html': u'<span style="-webkit-text-fill-color:#CC0033">',
-    u'end tag': u'{/o}', u'end html': u'</span>', u'protected': False})
+    u'end tag': u'{/o}', u'end html': u'</span>', u'protected': True})
-html_expands.append({u'desc': u'Purple', u'start tag': u'{pp}',
+base_html_expands.append({u'desc': u'Purple', u'start tag': u'{pp}',
     u'start html': u'<span style="-webkit-text-fill-color:#9900FF">',
-    u'end tag': u'{/pp}', u'end html': u'</span>', u'protected': False})
+    u'end tag': u'{/pp}', u'end html': u'</span>', u'protected': True})
-html_expands.append({u'desc': u'White', u'start tag': u'{w}',
+base_html_expands.append({u'desc': u'White', u'start tag': u'{w}',
     u'start html': u'<span style="-webkit-text-fill-color:white">',
-    u'end tag': u'{/w}', u'end html': u'</span>', u'protected': False})
+    u'end tag': u'{/w}', u'end html': u'</span>', u'protected': True})
-html_expands.append({u'desc': u'Superscript', u'start tag': u'{su}',
+base_html_expands.append({u'desc': u'Superscript', u'start tag': u'{su}',
     u'start html': u'<sup>', u'end tag': u'{/su}', u'end html': u'</sup>',
     u'protected': True})
-html_expands.append({u'desc': u'Subscript', u'start tag': u'{sb}',
+base_html_expands.append({u'desc': u'Subscript', u'start tag': u'{sb}',
     u'start html': u'<sub>', u'end tag': u'{/sb}', u'end html': u'</sub>',
     u'protected': True})
-html_expands.append({u'desc': u'Paragraph', u'start tag': u'{p}',
+base_html_expands.append({u'desc': u'Paragraph', u'start tag': u'{p}',
     u'start html': u'<p>', u'end tag': u'{/p}', u'end html': u'</p>',
     u'protected': True})
-html_expands.append({u'desc': u'Bold', u'start tag': u'{st}',
+base_html_expands.append({u'desc': u'Bold', u'start tag': u'{st}',
     u'start html': u'<strong>', u'end tag': u'{/st}', u'end html': u'</strong>',
     u'protected': True})
-html_expands.append({u'desc': u'Italics', u'start tag': u'{it}',
+base_html_expands.append({u'desc': u'Italics', u'start tag': u'{it}',
     u'start html': u'<em>', u'end tag': u'{/it}', u'end html': u'</em>',
     u'protected': True})
-html_expands.append({u'desc': u'Underline', u'start tag': u'{u}',
+base_html_expands.append({u'desc': u'Underline', u'start tag': u'{u}',
     u'start html': u'<span style="text-decoration: underline;">',
     u'end tag': u'{/u}', u'end html': u'</span>', u'protected': True})
 
@@ -292,7 +291,7 @@ def clean_tags(text):
     Remove Tags from text for display
     """
     text = text.replace(u'<br>', u'\n')
-    for tag in html_expands:
+    for tag in DisplayTags.get_html_tags().html_expands:
         text = text.replace(tag[u'start tag'], u'')
         text = text.replace(tag[u'end tag'], u'')
     return text
@@ -301,13 +300,14 @@ def expand_tags(text):
     """
     Expand tags HTML for display
     """
-    for tag in html_expands:
+    for tag in DisplayTags.get_html_tags().html_expands:
         text = text.replace(tag[u'start tag'], tag[u'start html'])
         text = text.replace(tag[u'end tag'], tag[u'end html'])
     return text
 
 from theme import ThemeLevel, ThemeXML, BackgroundGradientType, \
     BackgroundType, HorizontalType, VerticalType
+from displaytags import DisplayTags
 from spelltextedit import SpellTextEdit
 from eventreceiver import Receiver
 from imagemanager import ImageManager

openlp/core/lib/displaytags.py

@@ -0,0 +1,66 @@
+# -*- 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                          #
+###############################################################################
+"""
+Provide Html Tag management and Display Tag access class
+"""
+
+from openlp.core.lib import base_html_expands
+
+class HtmlTags(object):
+    """
+    """
+    def __init__(self):
+        self.html_expands = []
+        self.eyeCatcher = "eyeCatcher"
+        self.reset_list()
+
+    def reset_list(self):
+        """
+        """
+        self.html_expands = []
+        for html in base_html_expands:
+            self.html_expands.append(html)
+
+    def add_tag(self, html):
+        """
+        """
+        self.html_expands.append(html)
+
+
+class DisplayTags(object):
+    """
+    Static Class to HTML Tags to be access around the code the list is managed
+    by the Options Tab.
+    """
+    html_tags = HtmlTags()
+
+    @staticmethod
+    def get_html_tags():
+        """
+        Provide access to the HtmlTags object.
+        """
+        return DisplayTags.html_tags
+

openlp/core/lib/plugin.py

@@ -175,6 +175,10 @@ class Plugin(QtCore.QObject):
         self.status = new_status
         QtCore.QSettings().setValue(
             self.settingsSection + u'/status', QtCore.QVariant(self.status))
+        if new_status == PluginStatus.Active:
+            self.initialise()
+        elif new_status == PluginStatus.InActive:
+            self.finalise()
 
     def isActive(self):
         """

openlp/core/lib/settingstab.py

@@ -87,6 +87,12 @@ class SettingsTab(QtGui.QWidget):
         """
         pass
 
+    def cancel(self):
+        """
+        Reset any settings
+        """
+        pass
+
     def postSetUp(self, postUpdate=False):
         """
         Changes which need to be made after setup of application

openlp/core/lib/spelltextedit.py

@@ -36,7 +36,7 @@ except ImportError:
 # http://john.nachtimwald.com/2009/08/22/qplaintextedit-with-in-line-spell-check
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import html_expands, translate
+from openlp.core.lib import translate, DisplayTags
 
 class SpellTextEdit(QtGui.QPlainTextEdit):
     """
@@ -88,7 +88,7 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
                     popupMenu.insertMenu(popupMenu.actions()[0], spell_menu)
         tagMenu = QtGui.QMenu(translate('OpenLP.SpellTextEdit',
             'Formatting Tags'))
-        for html in html_expands:
+        for html in DisplayTags.get_html_tags().html_expands:
             action = SpellAction( html[u'desc'], tagMenu)
             action.correct.connect(self.htmlTag)
             tagMenu.addAction(action)
@@ -110,7 +110,7 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
         """
         Replaces the selected text with word.
         """
-        for html in html_expands:
+        for html in DisplayTags.get_html_tags().html_expands:
             if tag == html[u'desc']:
                 cursor = self.textCursor()
                 if self.textCursor().hasSelection():

openlp/core/ui/__init__.py

@@ -48,6 +48,7 @@ from splashscreen import SplashScreen
 from generaltab import GeneralTab
 from themestab import ThemesTab
 from advancedtab import AdvancedTab
+from displaytagtab import DisplayTagTab
 from aboutform import AboutForm
 from pluginform import PluginForm
 from settingsform import SettingsForm

openlp/core/ui/displaytagtab.py

@@ -0,0 +1,344 @@
+# -*- 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                          #
+###############################################################################
+'''
+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
+
+class DisplayTagTab(SettingsTab):
+    '''
+    The :class:`DisplayTagTab` manages the settings tab .
+    '''
+    def __init__(self):
+        '''
+        Initialise the settings tab
+        '''
+        SettingsTab.__init__(self, u'Display Tags')
+
+    def preLoad(self):
+        """
+        Initialise values before the Load takes place
+        """
+        # Create initial copy from master
+        print DisplayTags.get_html_tags().eyeCatcher
+        DisplayTags.get_html_tags().reset_list()
+        user_expands = QtCore.QSettings().value(u'displayTags/html_tags',
+            QtCore.QVariant(u'')).toString()
+        # cPickle only accepts str not unicode strings
+        user_tags = cPickle.loads(str(user_expands))
+        # If we have some user ones added them as well
+        for t in user_tags:
+            DisplayTags.get_html_tags().add_tag(t)
+        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')
+        self.displayTagEdit = QtGui.QWidget(self)
+        self.editGroupBox = QtGui.QGroupBox(self.displayTagEdit)
+        self.editGroupBox.setGeometry(QtCore.QRect(10, 220, 691, 181))
+        self.editGroupBox.setObjectName(u'editGroupBox')
+        self.updatePushButton = QtGui.QPushButton(self.editGroupBox)
+        self.updatePushButton.setGeometry(QtCore.QRect(600, 140, 71, 26))
+        self.updatePushButton.setObjectName(u'updatePushButton')
+        self.layoutWidget = QtGui.QWidget(self.editGroupBox)
+        self.layoutWidget.setGeometry(QtCore.QRect(20, 50, 571, 114))
+        self.layoutWidget.setObjectName(u'layoutWidget')
+        self.formLayout = QtGui.QFormLayout(self.layoutWidget)
+        self.formLayout.setObjectName(u'formLayout')
+        self.descriptionLabel = QtGui.QLabel(self.layoutWidget)
+        self.descriptionLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.descriptionLabel.setObjectName(u'descriptionLabel')
+        self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+            self.descriptionLabel)
+        self.descriptionLineEdit = QtGui.QLineEdit(self.layoutWidget)
+        self.descriptionLineEdit.setObjectName(u'descriptionLineEdit')
+        self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+            self.descriptionLineEdit)
+        self.tagLabel = QtGui.QLabel(self.layoutWidget)
+        self.tagLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.tagLabel.setObjectName(u'tagLabel')
+        self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.tagLabel)
+        self.tagLineEdit = QtGui.QLineEdit(self.layoutWidget)
+        self.tagLineEdit.setMaximumSize(QtCore.QSize(50, 16777215))
+        self.tagLineEdit.setMaxLength(5)
+        self.tagLineEdit.setObjectName(u'tagLineEdit')
+        self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+            self.tagLineEdit)
+        self.startTagLabel = QtGui.QLabel(self.layoutWidget)
+        self.startTagLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.startTagLabel.setObjectName(u'startTagLabel')
+        self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
+            self.startTagLabel)
+        self.startTagLineEdit = QtGui.QLineEdit(self.layoutWidget)
+        self.startTagLineEdit.setObjectName(u'startTagLineEdit')
+        self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
+            self.startTagLineEdit)
+        self.endTagLabel = QtGui.QLabel(self.layoutWidget)
+        self.endTagLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.endTagLabel.setObjectName(u'endTagLabel')
+        self.formLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
+            self.endTagLabel)
+        self.endTagLineEdit = QtGui.QLineEdit(self.layoutWidget)
+        self.endTagLineEdit.setObjectName(u'endTagLineEdit')
+        self.formLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
+            self.endTagLineEdit)
+        self.defaultPushButton = QtGui.QPushButton(self.displayTagEdit)
+        self.defaultPushButton.setGeometry(QtCore.QRect(450, 188, 71, 26))
+        self.defaultPushButton.setObjectName(u'updatePushButton')
+        self.deletePushButton = QtGui.QPushButton(self.displayTagEdit)
+        self.deletePushButton.setGeometry(QtCore.QRect(530, 188, 71, 26))
+        self.deletePushButton.setObjectName(u'deletePushButton')
+        self.newPushButton = QtGui.QPushButton(self.displayTagEdit)
+        self.newPushButton.setGeometry(QtCore.QRect(610, 188, 71, 26))
+        self.newPushButton.setObjectName(u'newPushButton')
+        self.tagTableWidget = QtGui.QTableWidget(self.displayTagEdit)
+        self.tagTableWidget.setGeometry(QtCore.QRect(10, 10, 691, 171))
+        self.tagTableWidget.setHorizontalScrollBarPolicy(
+            QtCore.Qt.ScrollBarAlwaysOff)
+        self.tagTableWidget.setEditTriggers(
+            QtGui.QAbstractItemView.NoEditTriggers)
+        self.tagTableWidget.setAlternatingRowColors(True)
+        self.tagTableWidget.setSelectionMode(
+            QtGui.QAbstractItemView.SingleSelection)
+        self.tagTableWidget.setSelectionBehavior(
+            QtGui.QAbstractItemView.SelectRows)
+        self.tagTableWidget.setCornerButtonEnabled(False)
+        self.tagTableWidget.setObjectName(u'tagTableWidget')
+        self.tagTableWidget.setColumnCount(4)
+        self.tagTableWidget.setRowCount(0)
+        item = QtGui.QTableWidgetItem()
+        self.tagTableWidget.setHorizontalHeaderItem(0, item)
+        item = QtGui.QTableWidgetItem()
+        self.tagTableWidget.setHorizontalHeaderItem(1, item)
+        item = QtGui.QTableWidgetItem()
+        self.tagTableWidget.setHorizontalHeaderItem(2, item)
+        item = QtGui.QTableWidgetItem()
+        self.tagTableWidget.setHorizontalHeaderItem(3, item)
+        self.editGroupBox.setTitle(
+            translate('OpenLP.DisplayTagTab', 'Edit Selection'))
+        self.updatePushButton.setText(
+            translate('OpenLP.DisplayTagTab', 'Update'))
+        self.descriptionLabel.setText(
+            translate('OpenLP.DisplayTagTab', 'Description'))
+        self.tagLabel.setText(translate('OpenLP.DisplayTagTab', 'Tag'))
+        self.startTagLabel.setText(
+            translate('OpenLP.DisplayTagTab', 'Start tag'))
+        self.endTagLabel.setText(translate('OpenLP.DisplayTagTab', 'End tag'))
+        self.deletePushButton.setText(
+            translate('OpenLP.DisplayTagTab', 'Delete'))
+        self.defaultPushButton.setText(
+            translate('OpenLP.DisplayTagTab', 'Default'))
+        self.newPushButton.setText(translate('OpenLP.DisplayTagTab', 'New'))
+        self.tagTableWidget.horizontalHeaderItem(0). \
+            setText(translate('OpenLP.DisplayTagTab', 'Description'))
+        self.tagTableWidget.horizontalHeaderItem(1). \
+            setText(translate('OpenLP.DisplayTagTab', 'Tag id'))
+        self.tagTableWidget.horizontalHeaderItem(2). \
+            setText(translate('OpenLP.DisplayTagTab', 'Start Html'))
+        self.tagTableWidget.horizontalHeaderItem(3). \
+            setText(translate('OpenLP.DisplayTagTab', 'End Html'))
+        QtCore.QMetaObject.connectSlotsByName(self.displayTagEdit)
+        self.tagTableWidget.setColumnWidth(0, 120)
+        self.tagTableWidget.setColumnWidth(1, 40)
+        self.tagTableWidget.setColumnWidth(2, 280)
+        self.tagTableWidget.setColumnWidth(3, 200)
+        QtCore.QObject.connect(self.tagTableWidget,
+            QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onRowSelected)
+        QtCore.QObject.connect(self.defaultPushButton,
+            QtCore.SIGNAL(u'pressed()'), self.onDefaultPushed)
+        QtCore.QObject.connect(self.newPushButton,
+            QtCore.SIGNAL(u'pressed()'), self.onNewPushed)
+        QtCore.QObject.connect(self.updatePushButton,
+            QtCore.SIGNAL(u'pressed()'), self.onUpdatePushed)
+        QtCore.QObject.connect(self.deletePushButton,
+            QtCore.SIGNAL(u'pressed()'), self.onDeletePushed)
+
+    def load(self):
+        """
+        Load Display and set field state.
+        """
+        self.newPushButton.setEnabled(True)
+        self.updatePushButton.setEnabled(False)
+        self.deletePushButton.setEnabled(False)
+        for linenumber, html in enumerate(
+            DisplayTags.get_html_tags().html_expands):
+            self.tagTableWidget.setRowCount(
+                self.tagTableWidget.rowCount() + 1)
+            self.tagTableWidget.setItem(linenumber, 0,
+                QtGui.QTableWidgetItem(html[u'desc']))
+            self.tagTableWidget.setItem(linenumber, 1,
+                QtGui.QTableWidgetItem(self._strip(html[u'start tag'])))
+            self.tagTableWidget.setItem(linenumber, 2,
+                QtGui.QTableWidgetItem(html[u'start html']))
+            self.tagTableWidget.setItem(linenumber, 3,
+                QtGui.QTableWidgetItem(html[u'end html']))
+            self.tagTableWidget.resizeRowsToContents()
+        self.descriptionLineEdit.setText(u'')
+        self.tagLineEdit.setText(u'')
+        self.startTagLineEdit.setText(u'')
+        self.endTagLineEdit.setText(u'')
+        self.descriptionLineEdit.setEnabled(False)
+        self.tagLineEdit.setEnabled(False)
+        self.startTagLineEdit.setEnabled(False)
+        self.endTagLineEdit.setEnabled(False)
+
+    def save(self):
+        """
+        Save Custom tags in a pickle .
+        """
+        temp = []
+        for tag in DisplayTags.get_html_tags().html_expands:
+            if not tag[u'protected']:
+                temp.append(tag)
+        if temp:
+            ctemp = cPickle.dumps(temp)
+            QtCore.QSettings().setValue(u'displayTags/html_tags',
+                QtCore.QVariant(ctemp))
+        else:
+            QtCore.QSettings().setValue(u'displayTags/html_tags',
+                QtCore.QVariant(u''))
+
+    def cancel(self):
+        """
+        Reset Custom tags from Settings.
+        """
+        self.preLoad()
+        self._resetTable()
+
+    def onRowSelected(self):
+        """
+        Table Row selected so display items and set field state.
+        """
+        row = self.tagTableWidget.currentRow()
+        html = DisplayTags.get_html_tags().html_expands[row]
+        self.selected = row
+        self.descriptionLineEdit.setText(html[u'desc'])
+        self.tagLineEdit.setText(self._strip(html[u'start tag']))
+        self.startTagLineEdit.setText(html[u'start html'])
+        self.endTagLineEdit.setText(html[u'end html'])
+        if html[u'protected']:
+            self.descriptionLineEdit.setEnabled(False)
+            self.tagLineEdit.setEnabled(False)
+            self.startTagLineEdit.setEnabled(False)
+            self.endTagLineEdit.setEnabled(False)
+            self.updatePushButton.setEnabled(False)
+            self.deletePushButton.setEnabled(False)
+        else:
+            self.descriptionLineEdit.setEnabled(True)
+            self.tagLineEdit.setEnabled(True)
+            self.startTagLineEdit.setEnabled(True)
+            self.endTagLineEdit.setEnabled(True)
+            self.updatePushButton.setEnabled(True)
+            self.deletePushButton.setEnabled(True)
+
+    def onNewPushed(self):
+        """
+        Add a new tag to list only if it is not a duplicate.
+        """
+        for html in DisplayTags.get_html_tags().html_expands:
+            if self._strip(html[u'start tag']) == u'n':
+                QtGui.QMessageBox.critical(self,
+                    translate('OpenLP.DisplayTagTab', 'Update Error'),
+                    translate('OpenLP.DisplayTagTab',
+                    'Tag "n" already defined.'),
+                    QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
+                    QtGui.QMessageBox.Ok)
+                return
+        # Add new tag to list
+        DisplayTags.get_html_tags().html_expands.append(
+            {u'desc': u'New Item', u'start tag': u'{n}',
+            u'start html': u'<Html_here>', u'end tag': u'{/n}',
+            u'end html': u'</and here>', u'protected': False})
+        self._resetTable()
+
+    def onDefaultPushed(self):
+        """
+        Remove all Custom Tags and reset to base set only.
+        """
+        DisplayTags.get_html_tags().reset_list()
+        self._resetTable()
+
+    def onDeletePushed(self):
+        """
+        Delete selected custom tag.
+        """
+        if self.selected != -1:
+            DisplayTags.get_html_tags().html_expands.pop(self.selected)
+            self.selected = -1
+        self._resetTable()
+
+    def onUpdatePushed(self):
+        """
+        Update Custom Tag details if not duplicate.
+        """
+        html_expands = DisplayTags.get_html_tags().html_expands
+        if self.selected != -1:
+            html = html_expands[self.selected]
+            tag = unicode(self.tagLineEdit.text())
+            for linenumber, html1 in enumerate(html_expands):
+                if self._strip(html1[u'start tag']) == tag and \
+                    linenumber != self.selected:
+                    QtGui.QMessageBox.critical(self,
+                        translate('OpenLP.DisplayTagTab', 'Update Error'),
+                        unicode(translate('OpenLP.DisplayTagTab',
+                        'Tag %s already defined.')) % tag,
+                        QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
+                        QtGui.QMessageBox.Ok)
+                    return
+            html[u'desc'] = unicode(self.descriptionLineEdit.text())
+            html[u'start html'] = unicode(self.startTagLineEdit.text())
+            html[u'end html'] = unicode(self.endTagLineEdit.text())
+            html[u'start tag'] = u'{%s}' % tag
+            html[u'end tag'] = u'{/%s}' % tag
+            self.selected = -1
+        self._resetTable()
+
+    def _resetTable(self):
+        """
+        Reset List for loading.
+        """
+        self.tagTableWidget.clearContents()
+        self.tagTableWidget.setRowCount(0)
+        self.load()
+
+    def _strip(self, tag):
+        """
+        Remove tag wrappers for editing.
+        """
+        tag = tag.replace(u'{', u'')
+        tag = tag.replace(u'}', u'')
+        return tag

openlp/core/ui/maindisplay.py

@@ -31,7 +31,8 @@ import os
 from PyQt4 import QtCore, QtGui, QtWebKit
 from PyQt4.phonon import Phonon
 
-from openlp.core.lib import Receiver, build_html, ServiceItem, image_to_byte
+from openlp.core.lib import Receiver, build_html, ServiceItem, image_to_byte, \
+    build_icon
 from openlp.core.ui import HideMode
 
 log = logging.getLogger(__name__)
@@ -102,6 +103,8 @@ class MainDisplay(DisplayWidget):
         self.isLive = live
         self.alertTab = None
         self.hideMode = None
+        mainIcon = build_icon(u':/icon/openlp-logo-16x16.png')
+        self.setWindowIcon(mainIcon)
         self.setWindowTitle(u'OpenLP Display')
         self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
         self.setWindowFlags(QtCore.Qt.FramelessWindowHint |

openlp/core/ui/pluginform.py

@@ -125,10 +125,8 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
             return
         if status == 0:
             self.activePlugin.toggleStatus(PluginStatus.Active)
-            self.activePlugin.initialise()
         else:
             self.activePlugin.toggleStatus(PluginStatus.Inactive)
-            self.activePlugin.finalise()
         status_text = unicode(
             translate('OpenLP.PluginForm', '%s (Inactive)'))
         if self.activePlugin.status == PluginStatus.Active:

openlp/core/ui/settingsform.py

@@ -31,7 +31,7 @@ import logging
 from PyQt4 import QtGui
 
 from openlp.core.lib import Receiver
-from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab
+from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab, DisplayTagTab
 from settingsdialog import Ui_SettingsDialog
 
 log = logging.getLogger(__name__)
@@ -55,6 +55,9 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         # Advanced tab
         self.advancedTab = AdvancedTab()
         self.addTab(u'Advanced', self.advancedTab)
+        # Edit Tags tab
+        displayTagTab = DisplayTagTab()
+        self.addTab(u'Display Tags', displayTagTab)
 
     def addTab(self, name, tab):
         """
@@ -68,9 +71,9 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         Add a tab to the form at a specific location
         """
         log.debug(u'Inserting %s tab' % tab.tabTitle)
-        # 14 : There are 3 tables currently and locations starts at -10
+        # 15 : There are 4 tables currently and locations starts at -10
         self.settingsTabWidget.insertTab(
-            location + 14, tab, tab.tabTitleVisible)
+            location + 15, tab, tab.tabTitleVisible)
 
     def removeTab(self, tab):
         """
@@ -93,6 +96,14 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         Receiver.send_message(u'config_updated')
         return QtGui.QDialog.accept(self)
 
+    def reject(self):
+        """
+        Process the form saving the settings
+        """
+        for tabIndex in range(0, self.settingsTabWidget.count()):
+            self.settingsTabWidget.widget(tabIndex).cancel()
+        return QtGui.QDialog.reject(self)
+
     def postSetUp(self):
         """
         Run any post-setup code for the tabs on the form

resources/forms/displaytabeditdialog.ui

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>displayTagEdit</class>
+ <widget class="QWidget" name="displayTagEdit">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>717</width>
+    <height>554</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QGroupBox" name="editGroupBox">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>320</y>
+     <width>691</width>
+     <height>181</height>
+    </rect>
+   </property>
+   <property name="title">
+    <string>Edit Selection</string>
+   </property>
+   <widget class="QPushButton" name="updatePushButton">
+    <property name="geometry">
+     <rect>
+      <x>600</x>
+      <y>140</y>
+      <width>73</width>
+      <height>26</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Update</string>
+    </property>
+   </widget>
+   <widget class="QWidget" name="layoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>50</y>
+      <width>571</width>
+      <height>114</height>
+     </rect>
+    </property>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="descriptionLabel">
+       <property name="text">
+        <string>Description</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="descriptionLineEdit"/>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="tagLabel">
+       <property name="text">
+        <string>Tag</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="tagLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>50</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="maxLength">
+        <number>5</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="startTagLabel">
+       <property name="text">
+        <string>Start tag</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="startTagLineEdit"/>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="endTagLabel">
+       <property name="text">
+        <string>End tag</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="endTagLineEdit"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDialogButtonBox" name="buttonBox">
+   <property name="geometry">
+    <rect>
+     <x>540</x>
+     <y>510</y>
+     <width>162</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="standardButtons">
+    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="deletePushButton">
+   <property name="geometry">
+    <rect>
+     <x>530</x>
+     <y>280</y>
+     <width>71</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Delete</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="addPushButton">
+   <property name="geometry">
+    <rect>
+     <x>610</x>
+     <y>280</y>
+     <width>71</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Add</string>
+   </property>
+  </widget>
+  <widget class="QTableWidget" name="tagTableWidget">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>691</width>
+     <height>271</height>
+    </rect>
+   </property>
+   <property name="horizontalScrollBarPolicy">
+    <enum>Qt::ScrollBarAlwaysOff</enum>
+   </property>
+   <property name="editTriggers">
+    <set>QAbstractItemView::NoEditTriggers</set>
+   </property>
+   <property name="alternatingRowColors">
+    <bool>true</bool>
+   </property>
+   <property name="selectionMode">
+    <enum>QAbstractItemView::SingleSelection</enum>
+   </property>
+   <property name="selectionBehavior">
+    <enum>QAbstractItemView::SelectRows</enum>
+   </property>
+   <property name="cornerButtonEnabled">
+    <bool>false</bool>
+   </property>
+   <column>
+    <property name="text">
+     <string>Description</string>
+    </property>
+   </column>
+   <column>
+    <property name="text">
+     <string>Key</string>
+    </property>
+    <property name="textAlignment">
+     <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+    </property>
+   </column>
+   <column>
+    <property name="text">
+     <string>Start Tag</string>
+    </property>
+   </column>
+   <column>
+    <property name="text">
+     <string>End Tag</string>
+    </property>
+   </column>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>