From 2095a6d0d0957bd2148a60aefa662c542c3ff9b5 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 17 Jun 2012 18:25:56 +0200
Subject: [PATCH 01/51] fixed wrong image being kept in cache when aborting the
 themeform

---
 openlp/core/lib/renderer.py    | 1 +
 openlp/core/ui/themeform.py    | 1 +
 openlp/core/ui/thememanager.py | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index e35c78559..a7f830944 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -134,6 +134,7 @@ class Renderer(object):
         else:
             theme_data, main_rect, footer_rect = \
                 self._theme_dimensions[theme_name]
+        self.image_manager.deleteImage(theme_data.theme_name)
         # if No file do not update cache
         if theme_data.background_filename:
             self.image_manager.addImage(theme_data.theme_name,
diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index 60e073b13..5d3526adb 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -54,6 +54,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
             The QWidget-derived parent of the wizard.
         """
         QtGui.QWizard.__init__(self, parent)
+        #FIXME: remove self.thememanager and use self.parent() instead.
         self.thememanager = parent
         self.setupUi(self)
         self.registerFields()
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 7ca56ce08..72c354dff 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -138,13 +138,17 @@ class ThemeManager(QtGui.QWidget):
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'config_updated'), self.configUpdated)
         # Variables
+        #FIXME: convert to camelCase.
         self.theme_list = []
         self.path = AppLocation.get_section_data_path(self.settingsSection)
         check_directory_exists(self.path)
+        #FIXME: convert to camelCase.
         self.thumb_path = os.path.join(self.path, u'thumbnails')
         check_directory_exists(self.thumb_path)
         self.themeForm.path = self.path
+        #FIXME: convert to camelCase.
         self.old_background_image = None
+        #FIXME: convert to camelCase.
         self.bad_v1_name_chars = re.compile(r'[%+\[\]]')
         # Last little bits of setting up
         self.configUpdated()

From f2884f05936648b785bdf5a13d905572e68ab1bf Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 18 Jun 2012 14:07:26 +0200
Subject: [PATCH 02/51] update image in cache when timestamp changed; docs

---
 openlp/core/lib/__init__.py          |  1 +
 openlp/core/lib/imagemanager.py      | 57 +++++++++++++++++++++-------
 openlp/core/ui/thememanager.py       |  2 +-
 openlp/plugins/images/imageplugin.py |  3 +-
 4 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 9af8debb8..24786ff55 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -264,6 +264,7 @@ def resize_image(image_path, width, height, background=u'#000000'):
     if image_ratio == resize_ratio:
         # We neither need to centre the image nor add "bars" to the image.
         return preview
+    #FIXME: change variables to real_width and real_height
     realw = preview.width()
     realh = preview.height()
     # and move it to the centre of the preview space
diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py
index 1e2a3a698..1922cef34 100644
--- a/openlp/core/lib/imagemanager.py
+++ b/openlp/core/lib/imagemanager.py
@@ -31,6 +31,7 @@ A Thread is used to convert the image to a byte array so the user does not need
 to wait for the conversion to happen.
 """
 import logging
+import os
 import time
 import Queue
 
@@ -96,19 +97,39 @@ class Priority(object):
 
 class Image(object):
     """
-    This class represents an image. To mark an image as *dirty* set the instance
-    variables ``image`` and ``image_bytes`` to ``None`` and add the image object
-    to the queue of images to process.
+    This class represents an image. To mark an image as *dirty* call the
+    :class:`ImageManager`'s ``_resetImage`` method with the Image instance as
+    argument.
     """
     secondary_priority = 0
+    
     def __init__(self, name, path, source, background):
+        """
+        Create an image for the :class:`ImageManager`'s cache.
+        
+        ``name``
+            The image name. This does not have to be part of the ``path``. It
+            can be of any value. It can be considered an ID.
+            
+        ``path``
+            The image's file path. This should be an existing file path.
+            
+        ``source``
+            The source describes the image's origin. Possible values are
+            ``image`` and ``theme``.
+            
+        ``background``
+            A ``QtGui.QColor`` object specifying the colour to be used to fill
+            the gabs if the image's ratio does not match with the display ratio.
+        """
         self.name = name
         self.path = path
         self.image = None
         self.image_bytes = None
-        self.priority = Priority.Normal
         self.source = source
         self.background = background
+        self.timestamp = os.stat(path).st_mtime
+        self.priority = Priority.Normal
         self.secondary_priority = Image.secondary_priority
         Image.secondary_priority += 1
 
@@ -117,7 +138,7 @@ class PriorityQueue(Queue.PriorityQueue):
     """
     Customised ``Queue.PriorityQueue``.
 
-    Each item in the queue must be tuple with three values. The first value
+    Each item in the queue must be a tuple with three values. The first value
     is the :class:`Image`'s ``priority`` attribute, the second value
     the :class:`Image`'s ``secondary_priority`` attribute. The last value the
     :class:`Image` instance itself::
@@ -186,7 +207,7 @@ class ImageManager(QtCore.QObject):
         for image in self._cache.values():
             self._resetImage(image)
 
-    def updateImages(self, imageType, background):
+    def updateImagesBorder(self, source, background):
         """
         Border has changed so update all the images affected.
         """
@@ -194,23 +215,27 @@ class ImageManager(QtCore.QObject):
         # Mark the images as dirty for a rebuild by setting the image and byte
         # stream to None.
         for image in self._cache.values():
-            if image.source == imageType:
+            if image.source == source:
                 image.background = background
                 self._resetImage(image)
 
-    def updateImage(self, name, imageType, background):
+    def updateImageBorder(self, name, source, background):
         """
         Border has changed so update the image affected.
         """
         log.debug(u'updateImage')
-        # Mark the images as dirty for a rebuild by setting the image and byte
+        # Mark the image as dirty for a rebuild by setting the image and byte
         # stream to None.
-        for image in self._cache.values():
-            if image.source == imageType and image.name == name:
-                image.background = background
-                self._resetImage(image)
+        image = self._cache[name]
+        if image.source == source:
+            image.background = background
+            self._resetImage(image)
 
     def _resetImage(self, image):
+        """
+        Mark the given :class:`Image` instance as dirt by setting its ``image``
+        and ``image_bytes`` attributes to None.
+        """
         image.image = None
         image.image_bytes = None
         self._conversionQueue.modify_priority(image, Priority.Normal)
@@ -281,6 +306,12 @@ class ImageManager(QtCore.QObject):
             self._conversionQueue.put(
                 (image.priority, image.secondary_priority, image))
         else:
+            image = self._cache[name]
+            if os.path.isfile(path) and \
+                image.timestamp != os.stat(path).st_mtime:
+                image.path = path
+                image.timestamp = os.stat(path).st_mtime
+                self._resetImage(image)
             log.debug(u'Image in cache %s:%s' % (name, path))
         # We want only one thread.
         if not self.imageThread.isRunning():
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 7ca56ce08..497b50d33 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -668,7 +668,7 @@ class ThemeManager(QtGui.QWidget):
         self._writeTheme(theme, image_from, image_to)
         if theme.background_type == \
             BackgroundType.to_string(BackgroundType.Image):
-            self.mainwindow.imageManager.updateImage(theme.theme_name,
+            self.mainwindow.imageManager.updateImageBorder(theme.theme_name,
                 u'theme', QtGui.QColor(theme.background_border_color))
             self.mainwindow.imageManager.processUpdates()
         self.loadThemes()
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index e148f5625..95fc8c68a 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -97,4 +97,5 @@ class ImagePlugin(Plugin):
         """
         background = QtGui.QColor(Settings().value(self.settingsSection
             + u'/background color', QtCore.QVariant(u'#000000')))
-        self.liveController.imageManager.updateImages(u'image', background)
+        self.liveController.imageManager.updateImagesBorder(
+            u'image', background)

From d1f11138511c7807354c92ee9af530669ff26d8d Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 18 Jun 2012 14:27:04 +0200
Subject: [PATCH 03/51] use the update mechanism to reset images instead of
 deleting them (leading to a time advantage when the image did not change)

---
 openlp/core/lib/imagemanager.py | 9 ---------
 openlp/core/lib/renderer.py     | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py
index 1922cef34..fe1cd00f6 100644
--- a/openlp/core/lib/imagemanager.py
+++ b/openlp/core/lib/imagemanager.py
@@ -286,15 +286,6 @@ class ImageManager(QtCore.QObject):
                 time.sleep(0.1)
         return image.image_bytes
 
-    def deleteImage(self, name):
-        """
-        Delete the Image from the cache.
-        """
-        log.debug(u'deleteImage %s' % name)
-        if name in self._cache:
-            self._conversionQueue.remove(self._cache[name])
-            del self._cache[name]
-
     def addImage(self, name, path, source, background):
         """
         Add image to cache if it is not already there.
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index e35c78559..8fe2eed9b 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -134,6 +134,7 @@ class Renderer(object):
         else:
             theme_data, main_rect, footer_rect = \
                 self._theme_dimensions[theme_name]
+        #FIXME: REMOVE deleteImage() call which will be added soon.
         # if No file do not update cache
         if theme_data.background_filename:
             self.image_manager.addImage(theme_data.theme_name,
@@ -236,7 +237,6 @@ class Renderer(object):
             # make big page for theme edit dialog to get line count
             serviceItem.add_from_text(VERSE_FOR_LINE_COUNT)
         else:
-            self.image_manager.deleteImage(theme_data.theme_name)
             serviceItem.add_from_text(VERSE)
         serviceItem.renderer = self
         serviceItem.raw_footer = FOOTER

From 826f83e8bfc8052656ebea84f3e538135949ca82 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 18 Jun 2012 19:00:27 +0200
Subject: [PATCH 04/51] fixed 1014684 (OpenLP doesn't start on Windows XP)

Fixes: https://launchpad.net/bugs/1014684
---
 openlp/core/ui/firsttimeform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py
index 1866b88b5..75f87aa65 100644
--- a/openlp/core/ui/firsttimeform.py
+++ b/openlp/core/ui/firsttimeform.py
@@ -114,7 +114,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         Set up display at start of theme edit.
         """
         self.restart()
-        check_directory_exists(os.path.join(gettempdir(), u'openlp'))
+        check_directory_exists(os.path.join(uniocde(gettempdir()), u'openlp'))
         self.noInternetFinishButton.setVisible(False)
         # Check if this is a re-run of the wizard.
         self.hasRunWizard = Settings().value(

From 155e99d307fba0396da7f68624efd07763e13bea Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 19 Jun 2012 18:09:59 +0200
Subject: [PATCH 05/51] fixed other occurrences

---
 openlp/core/ui/firsttimeform.py                 | 6 +++---
 openlp/plugins/bibles/forms/bibleupgradeform.py | 2 +-
 openlp/plugins/songs/songsplugin.py             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py
index 75f87aa65..3e902b368 100644
--- a/openlp/core/ui/firsttimeform.py
+++ b/openlp/core/ui/firsttimeform.py
@@ -64,7 +64,7 @@ class ThemeScreenshotThread(QtCore.QThread):
             filename = config.get(u'theme_%s' % theme, u'filename')
             screenshot = config.get(u'theme_%s' % theme, u'screenshot')
             urllib.urlretrieve(u'%s%s' % (self.parent().web, screenshot),
-                os.path.join(gettempdir(), u'openlp', screenshot))
+                os.path.join(unicode(gettempdir()), u'openlp', screenshot))
             item = QtGui.QListWidgetItem(title, self.parent().themesListWidget)
             item.setData(QtCore.Qt.UserRole, QtCore.QVariant(filename))
             item.setCheckState(QtCore.Qt.Unchecked)
@@ -114,7 +114,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         Set up display at start of theme edit.
         """
         self.restart()
-        check_directory_exists(os.path.join(uniocde(gettempdir()), u'openlp'))
+        check_directory_exists(os.path.join(unicode(gettempdir()), u'openlp'))
         self.noInternetFinishButton.setVisible(False)
         # Check if this is a re-run of the wizard.
         self.hasRunWizard = Settings().value(
@@ -304,7 +304,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
                 if item.data(QtCore.Qt.UserRole) == QtCore.QVariant(filename):
                     break
             item.setIcon(build_icon(
-                os.path.join(gettempdir(), u'openlp', screenshot)))
+                os.path.join(unicode(gettempdir()), u'openlp', screenshot)))
 
     def _getFileSize(self, url):
         site = urllib.urlopen(url)
diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py
index 4013284e4..d0c4333f4 100644
--- a/openlp/plugins/bibles/forms/bibleupgradeform.py
+++ b/openlp/plugins/bibles/forms/bibleupgradeform.py
@@ -71,7 +71,7 @@ class BibleUpgradeForm(OpenLPWizard):
         self.suffix = u'.sqlite'
         self.settingsSection = u'bibles'
         self.path = AppLocation.get_section_data_path(self.settingsSection)
-        self.temp_dir = os.path.join(gettempdir(), u'openlp')
+        self.temp_dir = os.path.join(unicode(gettempdir()), u'openlp')
         self.files = self.manager.old_bible_databases
         self.success = {}
         self.newbibles = {}
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index 468c02968..0beead20a 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -233,7 +233,7 @@ class SongsPlugin(Plugin):
         new songs into the database.
         """
         self.onToolsReindexItemTriggered()
-        db_dir = unicode(os.path.join(gettempdir(), u'openlp'))
+        db_dir = unicode(os.path.join(unicode(gettempdir()), u'openlp'))
         if not os.path.exists(db_dir):
             return
         song_dbs = []

From 8a599eab43a970e20a93321f295af7b5f6e017d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Wed, 20 Jun 2012 00:56:19 +0300
Subject: [PATCH 06/51] Sunday Plus importer, strip_rtf might be yet
 nonfunctional.

---
 openlp/core/ui/wizard.py                     |   1 +
 openlp/plugins/songs/forms/songimportform.py |  36 ++
 openlp/plugins/songs/lib/importer.py         |  39 +-
 openlp/plugins/songs/lib/sundayplusimport.py | 386 +++++++++++++++++++
 4 files changed, 445 insertions(+), 17 deletions(-)
 create mode 100644 openlp/plugins/songs/lib/sundayplusimport.py

diff --git a/openlp/core/ui/wizard.py b/openlp/core/ui/wizard.py
index 91aa42e43..e51c14274 100644
--- a/openlp/core/ui/wizard.py
+++ b/openlp/core/ui/wizard.py
@@ -55,6 +55,7 @@ class WizardStrings(object):
     SB = u'SongBeamer'
     SoF = u'Songs of Fellowship'
     SSP = u'SongShow Plus'
+    SP = u'Sunday Plus'
     WoW = u'Words of Worship'
     # These strings should need a good reason to be retranslated elsewhere.
     FinishedImport = translate('OpenLP.Ui', 'Finished import.')
diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py
index db4d9bf56..214b1a978 100644
--- a/openlp/plugins/songs/forms/songimportform.py
+++ b/openlp/plugins/songs/forms/songimportform.py
@@ -159,6 +159,12 @@ class SongImportForm(OpenLPWizard):
         QtCore.QObject.connect(self.songShowPlusRemoveButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onSongShowPlusRemoveButtonClicked)
+        QtCore.QObject.connect(self.sundayPlusAddButton,
+            QtCore.SIGNAL(u'clicked()'),
+            self.onSundayPlusAddButtonClicked)
+        QtCore.QObject.connect(self.sundayPlusRemoveButton,
+            QtCore.SIGNAL(u'clicked()'),
+            self.onSundayPlusRemoveButtonClicked)
         QtCore.QObject.connect(self.foilPresenterAddButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onFoilPresenterAddButtonClicked)
@@ -215,6 +221,8 @@ class SongImportForm(OpenLPWizard):
         self.addFileSelectItem(u'songShowPlus')
         # Songs of Fellowship
         self.addFileSelectItem(u'songsOfFellowship', None, True)
+        # Sunday Plus
+        self.addFileSelectItem(u'sundayPlus')
         # Words of Worship
         self.addFileSelectItem(u'wordsOfWorship')
 #        Commented out for future use.
@@ -258,6 +266,8 @@ class SongImportForm(OpenLPWizard):
             SongFormat.SongBeamer, WizardStrings.SB)
         self.formatComboBox.setItemText(
             SongFormat.SongShowPlus, WizardStrings.SSP)
+        self.formatComboBox.setItemText(
+            SongFormat.SundayPlus, WizardStrings.SP)
         self.formatComboBox.setItemText(
             SongFormat.SongsOfFellowship, WizardStrings.SoF)
         self.formatComboBox.setItemText(
@@ -321,6 +331,10 @@ class SongImportForm(OpenLPWizard):
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
         self.songShowPlusRemoveButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+        self.sundayPlusAddButton.setText(
+            translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+        self.sundayPlusRemoveButton.setText(
+            translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
         self.foilPresenterAddButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
         self.foilPresenterRemoveButton.setText(
@@ -636,6 +650,22 @@ class SongImportForm(OpenLPWizard):
         """
         self.removeSelectedItems(self.songShowPlusFileListWidget)
 
+    def onSundayPlusAddButtonClicked(self):
+        """
+        Get Sunday Plus song database files
+        """
+        self.getFiles(WizardStrings.OpenTypeFile % WizardStrings.SP,
+            self.sundayPlusFileListWidget, u'%s (*.ptf)'
+            % translate('SongsPlugin.ImportWizardForm',
+            'Sunday Plus Song Files')
+        )
+
+    def onSundayPlusRemoveButtonClicked(self):
+        """
+        Remove selected Sunday Plus files from the import list
+        """
+        self.removeSelectedItems(self.sundayPlusFileListWidget)
+
     def onFoilPresenterAddButtonClicked(self):
         """
         Get FoilPresenter song database files
@@ -677,6 +707,7 @@ class SongImportForm(OpenLPWizard):
         self.ewFilenameEdit.setText(u'')
         self.songBeamerFileListWidget.clear()
         self.songShowPlusFileListWidget.clear()
+        self.sundayPlusFileListWidget.clear()
         self.foilPresenterFileListWidget.clear()
         #self.csvFilenameEdit.setText(u'')
         self.errorReportTextEdit.clear()
@@ -763,6 +794,11 @@ class SongImportForm(OpenLPWizard):
             importer = self.plugin.importSongs(SongFormat.SongShowPlus,
                 filenames=self.getListOfFiles(self.songShowPlusFileListWidget)
             )
+        elif source_format == SongFormat.SundayPlus:
+            # Import Sunday Plus songs
+            importer = self.plugin.importSongs(SongFormat.SundayPlus,
+                filenames=self.getListOfFiles(self.sundayPlusFileListWidget)
+            )
         elif source_format == SongFormat.FoilPresenter:
             # Import Foilpresenter songs
             importer = self.plugin.importSongs(SongFormat.FoilPresenter,
diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
index 867b28c91..14a6d771c 100644
--- a/openlp/plugins/songs/lib/importer.py
+++ b/openlp/plugins/songs/lib/importer.py
@@ -29,16 +29,17 @@ The :mod:`importer` modules provides the general song import functionality.
 """
 import logging
 
-from opensongimport import OpenSongImport
+from cclifileimport import CCLIFileImport
 from easyslidesimport import EasySlidesImport
+from foilpresenterimport import FoilPresenterImport
+from ewimport import EasyWorshipSongImport
 from olpimport import OpenLPSongImport
 from openlyricsimport import OpenLyricsImport
-from wowimport import WowImport
-from cclifileimport import CCLIFileImport
-from ewimport import EasyWorshipSongImport
+from opensongimport import OpenSongImport
 from songbeamerimport import SongBeamerImport
 from songshowplusimport import SongShowPlusImport
-from foilpresenterimport import FoilPresenterImport
+from sundayplusimport import SundayPlusImport
+from wowimport import WowImport
 # Imports that might fail
 log = logging.getLogger(__name__)
 try:
@@ -80,7 +81,8 @@ class SongFormat(object):
     SongBeamer = 9
     SongShowPlus = 10
     SongsOfFellowship = 11
-    WordsOfWorship = 12
+    SundayPlus = 12
+    WordsOfWorship = 13
     #CSV = 13
 
     @staticmethod
@@ -91,18 +93,12 @@ class SongFormat(object):
         ``format``
             The song format.
         """
-        if format == SongFormat.OpenLP2:
+        if format == SongFormat.OpenLyrics:
+            return OpenLyricsImport
+        elif format == SongFormat.OpenLP2:
             return OpenLPSongImport
         elif format == SongFormat.OpenLP1:
             return OpenLP1SongImport
-        elif format == SongFormat.OpenLyrics:
-            return OpenLyricsImport
-        elif format == SongFormat.OpenSong:
-            return OpenSongImport
-        elif format == SongFormat.SongsOfFellowship:
-            return SofImport
-        elif format == SongFormat.WordsOfWorship:
-            return WowImport
         elif format == SongFormat.Generic:
             return OooImport
         elif format == SongFormat.CCLI:
@@ -111,12 +107,20 @@ class SongFormat(object):
             return EasySlidesImport
         elif format == SongFormat.EasyWorship:
             return EasyWorshipSongImport
+        elif format == SongFormat.FoilPresenter:
+            return FoilPresenterImport
+        elif format == SongFormat.OpenSong:
+            return OpenSongImport
         elif format == SongFormat.SongBeamer:
             return SongBeamerImport
         elif format == SongFormat.SongShowPlus:
             return SongShowPlusImport
-        elif format == SongFormat.FoilPresenter:
-            return FoilPresenterImport
+        elif format == SongFormat.SongsOfFellowship:
+            return SofImport
+        elif format == SongFormat.SundayPlus:
+            return SundayPlusImport
+        elif format == SongFormat.WordsOfWorship:
+            return WowImport
         return None
 
     @staticmethod
@@ -137,6 +141,7 @@ class SongFormat(object):
             SongFormat.SongBeamer,
             SongFormat.SongShowPlus,
             SongFormat.SongsOfFellowship,
+            SongFormat.SundayPlus,
             SongFormat.WordsOfWorship
         ]
 
diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
new file mode 100644
index 000000000..521b7e646
--- /dev/null
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -0,0 +1,386 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2012 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan      #
+# Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan,      #
+# Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias     #
+# Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,    #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 logging
+import re
+
+from lxml import objectify
+from lxml.etree import Error, LxmlError
+from os.path import split
+
+from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding
+from openlp.plugins.songs.lib.songimport import SongImport
+from openlp.plugins.songs.lib.ui import SongStrings
+
+log = logging.getLogger(__name__)
+
+class SundayPlusImport(SongImport):
+    """
+    Import Sunday Plus songs
+
+    The format examples can be found attached to bug report at
+    <http://support.openlp.org/issues/395>
+    """
+    hotkey_to_verse_type = {
+        u'1': u'v1',
+        u'2': u'v2',
+        u'3': u'v3',
+        u'4': u'v4',
+        u'5': u'v5',
+        u'6': u'v6',
+        u'7': u'v7',
+        u'8': u'v8',
+        u'9': u'v9',
+        u'C': u'c',
+        u'+': u'b',
+        u'Z': u'o'}
+
+    def __init__(self, manager, **kwargs):
+        """
+        Initialise the class.
+        """
+        SongImport.__init__(self, manager, **kwargs)
+
+    def doImport(self):
+        self.importWizard.progressBar.setMaximum(len(self.importSource))
+        self.encoding = 'us-ascii'
+        for filename in self.importSource:
+            if self.stopImportFlag:
+                return
+            song_file = open(filename)
+            self.doImportFile(song_file)
+            song_file.close()
+
+    def doImportFile(self, file):
+        """
+        Process the Sunday Plus file object.
+        """
+        self.setDefaults()
+        if not self.parse(file.read()):
+            self.logError(file.name)
+            return
+        if self.title == '':
+            self.title = self.title_from_filename(file.name)
+        if not self.finish():
+            self.logError(file.name)
+
+    def parse(self, data, cell = False):
+        if data[0] != '[' and data[-1] != ']':
+            self.logError(u'File is malformed')
+            return False
+        i = 1
+        verse_type = VerseType.Tags[VerseType.Verse]
+        while i < len(data):
+            byte = data[i]
+            if byte == '#':
+                end = data.find(':', i+1)
+                name = data[i+1:end]
+                i = end + 1
+                while data[i] == ' ':
+                    i += 1
+                if data[i] == '"':
+                    end = data.find('"', i+1)
+                    value = data[i+1:end]
+                elif data[i] == '[':
+                    j = i
+                    inside_quotes = False
+                    while j < len(data):
+                        char = data[j]
+                        if char == '"':
+                            inside_quotes = not inside_quotes
+                        elif not inside_quotes and char == ']':
+                            end = j + 1
+                            break
+                        j += 1
+                    value = data[i:end]
+                else:
+                    end = data.find(',', i+1)
+                    if data.find('(', i, end) != -1:
+                        end = data.find(')', i) + 1
+                    value = data[i:end]
+                if cell == False:
+                    if name == 'title':
+                        self.title = self.decode(self.unescape(value))
+                    elif name == 'Author':
+                        author = self.decode(self.unescape(value))
+                        if len(author):
+                            self.addAuthor(author)
+                    elif name == 'Copyright':
+                        self.copyright = self.decode(self.unescape(value))
+                    elif name[0:4] == 'CELL':
+                        self.parse(value, cell = name[4:])
+                else:
+                    if name == 'MARKER_NAME':
+                        value = value.strip()
+                        if len(value):
+                            verse_type = VerseType.Tags[
+                                VerseType.from_loose_input(value[0])]
+                            if len(value) >= 2 and value[-1] in ['0', '1', '2',
+                                '3', '4', '5', '6', '7', '8', '9']:
+                                verse_type = "%s%s" % (verse_type, value[-1])
+                    elif name == 'Hotkey':
+                        # Hotkey always appears after MARKER_NAME, so it
+                        # effectivetly overrides MARKER_NAME, if present.
+                        if len(value) and \
+                            value in self.hotkey_to_verse_type.keys():
+                            verse_type = self.hotkey_to_verse_type[value]
+                    if name == 'rtf':
+                        value = self.unescape(value)
+                        verse = strip_rtf(value, self.encoding).strip()
+                        lines = verse.split('\n')
+                        for i in xrange(len(lines)):
+                            lines[i] = lines[i].strip()
+                            line = lines[i]
+                            if line[:4] in u'CCLI':
+                                m = re.search(r'[0-9]+', line)
+                                if m:
+                                    self.ccliNumber = int(m.group(0))
+                                    lines.pop(i)
+                            elif line.lower() == u'public domain':
+                                lines.pop(i)
+                        self.addVerse('\n'.join(lines).strip(), verse_type)
+                if end == -1:
+                    break
+                i = end + 1
+            i += 1
+        return True
+
+    def title_from_filename(self, filename):
+        filename = split(filename)[1]
+        if len(filename) > 4 and filename[-4:].lower() == u'.ptf':
+            title = filename[:-4]
+        else:
+            title = filename
+        if title[-3:] == '1-7':
+            title = title[:-3]
+        return title.replace(u'_', u' ')
+
+    def decode(self, blob):
+        while True:
+            try:
+                return unicode(blob, self.encoding)
+            except:
+                # This is asked again every time the previously chosen
+                # encoding does not work.
+                self.encoding = retrieve_windows_encoding()
+
+    def unescape(self, text):
+        text = text.replace('^^', '"')
+        text = text.replace('^', '\'')
+        return text.strip()
+
+    def strip_rtf(self, text, encoding):
+        # Thanks to Markus Jarderot (MizardX) for this code, used by permission
+        # <http://stackoverflow.com/questions/188545/regular-expression-for-
+        # extracting-text-from-an-rtf-string>
+        pattern = re.compile(r"\\([a-z]{1,32})(-?\d{1,10})?[ ]?|\\'"
+            r"([0-9a-f]{2})|\\([^a-z])|([{}])|[\r\n]+|(.)", re.I)
+        # Control words which specify a "destination" and we can ignore it.
+        destinations = frozenset((
+            'aftncn', 'aftnsep', 'aftnsepc', 'annotation', 'atnauthor', 
+            'atndate', 'atnicn', 'atnid', 'atnparent', 'atnref', 'atntime',
+            'atrfend', 'atrfstart', 'author', 'background', 'bkmkend',
+            'bkmkstart', 'blipuid', 'buptim', 'category', 'colorschememapping',
+            'colortbl', 'comment', 'company', 'creatim', 'datafield',
+            'datastore', 'defchp', 'defpap', 'do', 'doccomm', 'docvar',
+            'dptxbxtext', 'ebcend', 'ebcstart', 'factoidname', 'falt', 'fchars',
+            'ffdeftext', 'ffentrymcr', 'ffexitmcr', 'ffformat', 'ffhelptext',
+            'ffl', 'ffname', 'ffstattext', 'field', 'file', 'filetbl',
+            'fldinst', 'fldrslt', 'fldtype', 'fname', 'fontemb', 'fontfile', 
+            'footer', 'footerf', 'footerl', 'footerr', 'footnote',
+            'formfield', 'ftncn', 'ftnsep', 'ftnsepc', 'g', 'generator',
+            'gridtbl', 'header', 'headerf', 'headerl', 'headerr', 'hl', 'hlfr',
+            'hlinkbase', 'hlloc', 'hlsrc', 'hsv', 'htmltag', 'info', 'keycode',
+            'keywords', 'latentstyles', 'lchars', 'levelnumbers', 'leveltext',
+            'lfolevel', 'linkval', 'list', 'listlevel', 'listname',
+            'listoverride', 'listoverridetable', 'listpicture', 'liststylename',
+            'listtable', 'listtext', 'lsdlockedexcept', 'macc', 'maccPr', 
+            'mailmerge', 'maln', 'malnScr', 'manager', 'margPr', 'mbar',
+            'mbarPr', 'mbaseJc', 'mbegChr', 'mborderBox', 'mborderBoxPr',
+            'mbox', 'mboxPr', 'mchr', 'mcount', 'mctrlPr', 'md', 'mdeg', 
+            'mdegHide', 'mden', 'mdiff', 'mdPr', 'me', 'mendChr', 'meqArr',
+            'meqArrPr', 'mf', 'mfName', 'mfPr', 'mfunc', 'mfuncPr', 'mgroupChr',
+            'mgroupChrPr', 'mgrow', 'mhideBot', 'mhideLeft', 'mhideRight',
+            'mhideTop', 'mhtmltag', 'mlim', 'mlimloc', 'mlimlow', 'mlimlowPr',
+            'mlimupp', 'mlimuppPr', 'mm', 'mmaddfieldname', 'mmath',
+            'mmathPict', 'mmathPr', 'mmaxdist', 'mmc', 'mmcJc', 'mmconnectstr',
+            'mmconnectstrdata', 'mmcPr', 'mmcs', 'mmdatasource',
+            'mmheadersource', 'mmmailsubject', 'mmodso', 'mmodsofilter',
+            'mmodsofldmpdata', 'mmodsomappedname', 'mmodsoname',
+            'mmodsorecipdata', 'mmodsosort', 'mmodsosrc', 'mmodsotable',
+            'mmodsoudl', 'mmodsoudldata', 'mmodsouniquetag', 'mmPr', 'mmquery',
+            'mmr', 'mnary', 'mnaryPr', 'mnoBreak', 'mnum', 'mobjDist', 'moMath',
+            'moMathPara', 'moMathParaPr', 'mopEmu', 'mphant', 'mphantPr',
+            'mplcHide', 'mpos', 'mr', 'mrad', 'mradPr', 'mrPr', 'msepChr',
+            'mshow', 'mshp', 'msPre', 'msPrePr', 'msSub', 'msSubPr', 'msSubSup',
+            'msSubSupPr', 'msSup', 'msSupPr', 'mstrikeBLTR', 'mstrikeH',
+            'mstrikeTLBR', 'mstrikeV', 'msub', 'msubHide', 'msup', 'msupHide',
+            'mtransp', 'mtype', 'mvertJc', 'mvfmf', 'mvfml', 'mvtof', 'mvtol',
+            'mzeroAsc', 'mzeroDesc', 'mzeroWid', 'nesttableprops', 'nextfile',
+            'nonesttables', 'objalias', 'objclass', 'objdata', 'object',
+            'objname', 'objsect', 'objtime', 'oldcprops', 'oldpprops',
+            'oldsprops', 'oldtprops', 'oleclsid', 'operator', 'panose',
+            'password', 'passwordhash', 'pgp', 'pgptbl', 'picprop', 'pict',
+            'pn', 'pnseclvl', 'pntext', 'pntxta', 'pntxtb', 'printim',
+            'private', 'propname', 'protend', 'protstart', 'protusertbl', 'pxe',
+            'result', 'revtbl', 'revtim', 'rsidtbl', 'rxe', 'shp', 'shpgrp',
+            'shpinst', 'shppict', 'shprslt', 'shptxt', 'sn', 'sp', 'staticval',
+            'stylesheet', 'subject', 'sv', 'svb', 'tc', 'template', 'themedata',
+            'title', 'txe', 'ud', 'upr', 'userprops', 'wgrffmtfilter',
+            'windowcaption', 'writereservation', 'writereservhash', 'xe',
+            'xform', 'xmlattrname', 'xmlattrvalue', 'xmlclose', 'xmlname',
+            'xmlnstbl', 'xmlopen'))
+        # Translation of some special characters.
+        specialchars = {
+            u'par': u'\n',
+            u'sect': u'\n\n',
+            u'page': u'\n\n',
+            u'line': u'\n',
+            u'tab': u'\t',
+            u'emdash': u'\u2014',
+            u'endash': u'\u2013',
+            u'emspace': u'\u2003',
+            u'enspace': u'\u2002',
+            u'qmspace': u'\u2005',
+            u'bullet': u'\u2022',
+            u'lquote': u'\u2018',
+            u'rquote': u'\u2019',
+            u'ldblquote': u'\u201C',
+            u'rdblquote': u'\u201D'}
+        charset_mapping = {
+            # Thai encoding
+            'fcharset222': u'cp874',
+            'ansicpg874': u'cp874',
+            # Central+East European encoding
+            'fcharset238': u'cp1250',
+            'ansicpg1250': u'cp1250',
+            # Cyrillic encoding
+            'fcharset204': u'cp1251',
+            'ansicpg1251': u'cp1251',
+            # West European encoding
+            'fcharset0': u'cp1252',
+            'ansicpg1252': u'cp1252',
+            # Greek encoding
+            'fcharset161': u'cp1253',
+            'ansicpg1253': u'cp1253',
+            # Turkish encoding
+            'fcharset162': u'cp1254',
+            'ansicpg1254': u'cp1254',
+            # Hebrew encoding
+            'fcharset177': u'cp1255',
+            'ansicpg1255': u'cp1255',
+            # Arabic encoding
+            'fcharset178': u'cp1256',
+            'ansicpg1256': u'cp1256',
+            # Baltic encoding
+            'fcharset186': u'cp1257',
+            'ansicpg1257': u'cp1257',
+            # Vietnamese encoding
+            'fcharset163': u'cp1258',
+            'ansicpg1258': u'cp1258'}
+        charsets = charset_mapping.keys()
+        # Character encoding is defined together with fonts.
+        # font_table could contain eg 'f0': 'cp1252'
+        font_table = {'default': encoding}
+        stack = []
+        # Whether this group (and all inside it) are "ignorable".
+        ignorable = False
+        # Inside font table
+        inside_font_table = False
+        current_font = ''
+        # Number of ASCII characters to skip after a unicode character.
+        ucskip = 1
+        # Number of ASCII characters left to skip.
+        curskip = 0
+        # Output buffer.
+        out = []
+        for match in pattern.finditer(text):
+            word, arg, hex, char, brace, tchar = match.groups()
+            if brace:
+                curskip = 0
+                if brace == u'{':
+                    # Push state
+                    stack.append((ucskip, ignorable))
+                elif brace == u'}':
+                    # Pop state
+                    ucskip, ignorable = stack.pop()
+            # \x (not a letter)
+            elif char:
+                curskip = 0
+                if char == '~':
+                    if not ignorable:
+                        out.append(u'\xA0')
+                elif char in u'{}\\':
+                    if not ignorable:
+                        out.append(char)
+                elif char == u'*':
+                    ignorable = True
+            # \foo
+            elif word:
+                curskip = 0
+                if word in destinations:
+                    ignorable = True
+                elif word in specialchars:
+                    out.append(specialchars[word])
+                elif word == u'uc':
+                    ucskip = int(arg)
+                elif word == u'u':
+                    c = int(arg)
+                    if c < 0:
+                        c += 0x10000
+                    out.append(unichr(c))
+                    curskip = ucskip
+                elif word == 'fonttbl':
+                    inside_font_table = True
+                elif word == 'f':
+                    if inside_font_table:
+                        font_table[current_font] = font_table['default']
+                    else:
+                        encoding = font_table[arg]
+                elif word in charsets:
+                    if inside_font_table:
+                        font_table[current_font] = charset_mapping[word]
+                    else:
+                        font_table['default'] = charset_mapping[word]
+                elif inside_font_table:
+                    pass
+                elif ignorable:
+                    pass
+            # \'xx
+            elif hex:
+                if curskip > 0:
+                    curskip -= 1
+                elif not ignorable:
+                    c = int(hex, 16)
+                    out.append(chr(c).decode(encoding))
+            elif tchar:
+                if curskip > 0:
+                    curskip -= 1
+                elif not ignorable:
+                    out.append(tchar)
+        return ''.join(out)
+

From 92baf9887c26d1a6cea251653a62135ffe40ca2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Wed, 20 Jun 2012 10:03:25 +0300
Subject: [PATCH 07/51] Fix strip_rtf()

---
 openlp/plugins/songs/lib/sundayplusimport.py | 28 +++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index 12297d520..706e65263 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -304,15 +304,15 @@ class SundayPlusImport(SongImport):
             'ansicpg1258': u'cp1258'}
         charsets = charset_mapping.keys()
         # Character encoding is defined together with fonts.
-        # font_table could contain eg 'f0': 'cp1252'
-        font_table = {'default': encoding}
+        # font_table could contain eg '0': 'cp1252'
+        font_table = {}
         stack = []
         # Whether this group (and all inside it) are "ignorable".
         ignorable = False
-        # Inside font table
+        # Whether we are inside the font table.
         inside_font_table = False
         current_font = ''
-        # Number of ASCII characters to skip after a unicode character.
+        # Number of ASCII characters to skip after an unicode character.
         ucskip = 1
         # Number of ASCII characters left to skip.
         curskip = 0
@@ -324,10 +324,10 @@ class SundayPlusImport(SongImport):
                 curskip = 0
                 if brace == u'{':
                     # Push state
-                    stack.append((ucskip, ignorable))
+                    stack.append((ucskip, ignorable, inside_font_table))
                 elif brace == u'}':
                     # Pop state
-                    ucskip, ignorable = stack.pop()
+                    ucskip, ignorable, inside_font_table = stack.pop()
             # \x (not a letter)
             elif char:
                 curskip = 0
@@ -356,20 +356,16 @@ class SundayPlusImport(SongImport):
                     curskip = ucskip
                 elif word == 'fonttbl':
                     inside_font_table = True
+                    ignorable = True
                 elif word == 'f':
-                    if inside_font_table:
-                        font_table[current_font] = font_table['default']
-                    else:
+                    current_font = arg
+                    if not inside_font_table:
                         encoding = font_table[arg]
-                elif word in charsets:
+                elif word in ('ansicpg', 'fcharset'):
                     if inside_font_table:
-                        font_table[current_font] = charset_mapping[word]
+                        font_table[current_font] = charset_mapping[word + arg]
                     else:
-                        font_table['default'] = charset_mapping[word]
-                elif inside_font_table:
-                    pass
-                elif ignorable:
-                    pass
+                        encoding = charset_mapping[word + arg]
             # \'xx
             elif hex:
                 if curskip > 0:

From 76694891faa17e0baad481f0ac534c1350424957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Wed, 20 Jun 2012 10:15:40 +0300
Subject: [PATCH 08/51] SundayPlus is written together on their own site.

---
 openlp/plugins/songs/lib/importer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
index 79bbccdff..862a8464c 100644
--- a/openlp/plugins/songs/lib/importer.py
+++ b/openlp/plugins/songs/lib/importer.py
@@ -280,10 +280,10 @@ class SongFormat(object):
         },
         SundayPlus: {
             u'class': SundayPlusImport,
-            u'name': u'Sunday Plus',
+            u'name': u'SundayPlus',
             u'prefix': u'sundayPlus',
             u'filter': u'%s (*.ptf)' % translate(
-                'SongsPlugin.ImportWizardForm', 'Sunday Plus Song Files')
+                'SongsPlugin.ImportWizardForm', 'SundayPlus Song Files')
         },
         WordsOfWorship: {
             u'class': WowImport,

From 53e490995274d8f59eee56ee7de1f90ea9aab548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Wed, 20 Jun 2012 10:23:41 +0300
Subject: [PATCH 09/51] Remove unnecessary imports.

---
 openlp/plugins/songs/lib/sundayplusimport.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index 706e65263..eabf3d40f 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -28,13 +28,10 @@
 import logging
 import re
 
-from lxml import objectify
-from lxml.etree import Error, LxmlError
 from os.path import split
 
 from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding
 from openlp.plugins.songs.lib.songimport import SongImport
-from openlp.plugins.songs.lib.ui import SongStrings
 
 log = logging.getLogger(__name__)
 

From 0a2ea0fc51cf2ca8631c76b7ca52ee2120adb632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Wed, 20 Jun 2012 10:43:35 +0300
Subject: [PATCH 10/51] Remove unnecessary reimports which slipped in by
 accident.

---
 openlp/plugins/songs/lib/importer.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
index 862a8464c..c97d09b8c 100644
--- a/openlp/plugins/songs/lib/importer.py
+++ b/openlp/plugins/songs/lib/importer.py
@@ -34,8 +34,6 @@ from openlp.core.lib.ui import UiStrings
 from openlp.core.ui.wizard import WizardStrings
 from opensongimport import OpenSongImport
 from easyslidesimport import EasySlidesImport
-from foilpresenterimport import FoilPresenterImport
-from ewimport import EasyWorshipSongImport
 from olpimport import OpenLPSongImport
 from openlyricsimport import OpenLyricsImport
 from wowimport import WowImport

From ab8e6ee30ae0e1d7bc150e932f75a7594599568d Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 22 Jun 2012 22:12:43 +0200
Subject: [PATCH 11/51] use get_filesystem_encoding

---
 openlp/core/ui/firsttimeform.py                 | 14 ++++++++------
 openlp/core/ui/mainwindow.py                    |  4 ++--
 openlp/plugins/bibles/forms/bibleupgradeform.py |  5 +++--
 openlp/plugins/songs/songsplugin.py             |  4 +++-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py
index 3e902b368..4597c6a16 100644
--- a/openlp/core/ui/firsttimeform.py
+++ b/openlp/core/ui/firsttimeform.py
@@ -40,7 +40,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import translate, PluginStatus, Receiver, build_icon, \
     check_directory_exists
 from openlp.core.lib.settings import Settings
-from openlp.core.utils import get_web_page, AppLocation
+from openlp.core.utils import get_web_page, AppLocation, get_filesystem_encoding
 from firsttimewizard import Ui_FirstTimeWizard, FirstTimePage
 
 log = logging.getLogger(__name__)
@@ -64,7 +64,7 @@ class ThemeScreenshotThread(QtCore.QThread):
             filename = config.get(u'theme_%s' % theme, u'filename')
             screenshot = config.get(u'theme_%s' % theme, u'screenshot')
             urllib.urlretrieve(u'%s%s' % (self.parent().web, screenshot),
-                os.path.join(unicode(gettempdir()), u'openlp', screenshot))
+                os.path.join(unicode(gettempdir(), get_filesystem_encoding()), u'openlp', screenshot))
             item = QtGui.QListWidgetItem(title, self.parent().themesListWidget)
             item.setData(QtCore.Qt.UserRole, QtCore.QVariant(filename))
             item.setCheckState(QtCore.Qt.Unchecked)
@@ -114,7 +114,8 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         Set up display at start of theme edit.
         """
         self.restart()
-        check_directory_exists(os.path.join(unicode(gettempdir()), u'openlp'))
+        check_directory_exists(os.path.join(
+            unicode(gettempdir(), get_filesystem_encoding()), u'openlp'))
         self.noInternetFinishButton.setVisible(False)
         # Check if this is a re-run of the wizard.
         self.hasRunWizard = Settings().value(
@@ -303,8 +304,8 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
                 item = self.themesListWidget.item(index)
                 if item.data(QtCore.Qt.UserRole) == QtCore.QVariant(filename):
                     break
-            item.setIcon(build_icon(
-                os.path.join(unicode(gettempdir()), u'openlp', screenshot)))
+            item.setIcon(build_icon(os.path.join(unicode(gettempdir(),
+                get_filesystem_encoding()), u'openlp', screenshot)))
 
     def _getFileSize(self, url):
         site = urllib.urlopen(url)
@@ -425,7 +426,8 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
         self._setPluginStatus(self.alertCheckBox, u'alerts/status')
         if self.webAccess:
             # Build directories for downloads
-            songs_destination = os.path.join(unicode(gettempdir()), u'openlp')
+            songs_destination = os.path.join(
+                unicode(gettempdir(), get_filesystem_encoding()), u'openlp')
             bibles_destination = AppLocation.get_section_data_path(u'bibles')
             themes_destination = AppLocation.get_section_data_path(u'themes')
             # Download songs
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index be58e1cd6..9db774153 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -1034,8 +1034,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             # Make sure it's a .conf file.
         if not export_file_name.endswith(u'conf'):
             export_file_name = export_file_name + u'.conf'
-        temp_file = os.path.join(unicode(gettempdir()),
-            u'openlp', u'exportConf.tmp')
+        temp_file = os.path.join(unicode(gettempdir(),
+            get_filesystem_encoding()), u'openlp', u'exportConf.tmp')
         self.saveSettings()
         setting_sections = []
         # Add main sections.
diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py
index d0c4333f4..f799205c6 100644
--- a/openlp/plugins/bibles/forms/bibleupgradeform.py
+++ b/openlp/plugins/bibles/forms/bibleupgradeform.py
@@ -38,7 +38,7 @@ from openlp.core.lib import Receiver, SettingsManager, translate, \
 from openlp.core.lib.ui import UiStrings, critical_error_message_box
 from openlp.core.lib.settings import Settings
 from openlp.core.ui.wizard import OpenLPWizard, WizardStrings
-from openlp.core.utils import AppLocation, delete_file
+from openlp.core.utils import AppLocation, delete_file, get_filesystem_encoding
 from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta, OldBibleDB, \
     BiblesResourcesDB
 from openlp.plugins.bibles.lib.http import BSExtract, BGExtract, CWExtract
@@ -71,7 +71,8 @@ class BibleUpgradeForm(OpenLPWizard):
         self.suffix = u'.sqlite'
         self.settingsSection = u'bibles'
         self.path = AppLocation.get_section_data_path(self.settingsSection)
-        self.temp_dir = os.path.join(unicode(gettempdir()), u'openlp')
+        self.temp_dir = os.path.join(
+            unicode(gettempdir(), get_filesystem_encoding()), u'openlp')
         self.files = self.manager.old_bible_databases
         self.success = {}
         self.newbibles = {}
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index 0beead20a..be92f615d 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -35,6 +35,7 @@ from openlp.core.lib import Plugin, StringContent, build_icon, translate, \
     Receiver
 from openlp.core.lib.db import Manager
 from openlp.core.lib.ui import UiStrings, create_action
+from openlp.core.utils import get_filesystem_encoding
 from openlp.core.utils.actions import ActionList
 from openlp.plugins.songs.lib import clean_song, upgrade, SongMediaItem, \
     SongsTab
@@ -233,7 +234,8 @@ class SongsPlugin(Plugin):
         new songs into the database.
         """
         self.onToolsReindexItemTriggered()
-        db_dir = unicode(os.path.join(unicode(gettempdir()), u'openlp'))
+        db_dir = unicode(os.path.join(
+            unicode(gettempdir(), get_filesystem_encoding()), u'openlp'))
         if not os.path.exists(db_dir):
             return
         song_dbs = []

From d3e8950db8bb0f00a8770923d70ba7ffa52fb0f1 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 22 Jun 2012 22:18:50 +0200
Subject: [PATCH 12/51] fixed long line

---
 openlp/core/ui/firsttimeform.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py
index 4597c6a16..eda0eefec 100644
--- a/openlp/core/ui/firsttimeform.py
+++ b/openlp/core/ui/firsttimeform.py
@@ -64,7 +64,8 @@ class ThemeScreenshotThread(QtCore.QThread):
             filename = config.get(u'theme_%s' % theme, u'filename')
             screenshot = config.get(u'theme_%s' % theme, u'screenshot')
             urllib.urlretrieve(u'%s%s' % (self.parent().web, screenshot),
-                os.path.join(unicode(gettempdir(), get_filesystem_encoding()), u'openlp', screenshot))
+                os.path.join(unicode(gettempdir(), get_filesystem_encoding()),
+                u'openlp', screenshot))
             item = QtGui.QListWidgetItem(title, self.parent().themesListWidget)
             item.setData(QtCore.Qt.UserRole, QtCore.QVariant(filename))
             item.setCheckState(QtCore.Qt.Unchecked)

From 39916e423210c836f65b20da39b2b020f45eac6e Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 23 Jun 2012 19:21:27 +0200
Subject: [PATCH 13/51] fixed code, fixed long lines

---
 openlp/core/lib/renderer.py    |  1 -
 openlp/core/ui/thememanager.py | 23 ++++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index a7f830944..e35c78559 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -134,7 +134,6 @@ class Renderer(object):
         else:
             theme_data, main_rect, footer_rect = \
                 self._theme_dimensions[theme_name]
-        self.image_manager.deleteImage(theme_data.theme_name)
         # if No file do not update cache
         if theme_data.background_filename:
             self.image_manager.addImage(theme_data.theme_name,
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 72c354dff..2db482aa3 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -197,6 +197,11 @@ class ThemeManager(QtGui.QWidget):
             return
         real_theme_name = unicode(item.data(QtCore.Qt.UserRole).toString())
         theme_name = unicode(item.text())
+        # FIXME: Shorten code.
+#        visible = real_theme_name == theme_name:
+#        self.deleteAction.setVisible(visible)
+#        self.renameAction.setVisible(visible)
+#        self.globalAction.setVisible(visible)
         self.deleteAction.setVisible(False)
         self.renameAction.setVisible(False)
         self.globalAction.setVisible(False)
@@ -336,6 +341,7 @@ class ThemeManager(QtGui.QWidget):
                 self.old_background_image = theme.background_filename
             self.themeForm.theme = theme
             self.themeForm.exec_(True)
+            self.mainwindow.imageManager.deleteImage(theme.theme_name)
             self.old_background_image = None
             self.mainwindow.renderer.update_theme(theme.theme_name)
 
@@ -483,7 +489,8 @@ class ThemeManager(QtGui.QWidget):
                 else:
                     icon = create_thumb(theme, thumb)
                 item_name.setIcon(icon)
-                item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(text_name))
+                item_name.setData(
+                    QtCore.Qt.UserRole, QtCore.QVariant(text_name))
                 self.themeListWidget.addItem(item_name)
                 self.theme_list.append(text_name)
         self._pushThemes()
@@ -512,7 +519,7 @@ class ThemeManager(QtGui.QWidget):
             unicode(theme_name) + u'.xml')
         xml = get_text_file_string(xml_file)
         if not xml:
-            log.debug("No theme data - using default theme")
+            log.debug(u'No theme data - using default theme')
             return ThemeXML()
         else:
             return self._createThemeFromXml(xml, self.path)
@@ -550,8 +557,9 @@ class ThemeManager(QtGui.QWidget):
             xml_tree = ElementTree(element=XML(zip.read(xml_file[0]))).getroot()
             v1_background = xml_tree.find(u'BackgroundType')
             if v1_background is not None:
-                theme_name, file_xml, out_file, abort_import = self.unzipVersion122(dir, zip,
-                    xml_file[0], xml_tree, v1_background, out_file)
+                theme_name, file_xml, out_file, abort_import = \
+                    self.unzipVersion122(
+                    dir, zip, xml_file[0], xml_tree, v1_background, out_file)
             else:
                 theme_name = xml_tree.find(u'name').text.strip()
                 theme_folder = os.path.join(dir, theme_name)
@@ -604,8 +612,8 @@ class ThemeManager(QtGui.QWidget):
                 if file_xml:
                     theme = self._createThemeFromXml(file_xml, self.path)
                     self.generateAndSaveImage(dir, theme_name, theme)
-                # Only show the error message, when IOError was not raised (in this
-                # case the error message has already been shown).
+                # Only show the error message, when IOError was not raised (in
+                # this case the error message has already been shown).
                 elif zip is not None:
                     critical_error_message_box(
                         translate('OpenLP.ThemeManager', 'Validation Error'),
@@ -614,7 +622,8 @@ class ThemeManager(QtGui.QWidget):
                     log.exception(u'Theme file does not contain XML data %s' %
                         file_name)
 
-    def unzipVersion122(self, dir, zip, xml_file, xml_tree, background, out_file):
+    def unzipVersion122(self, dir, zip, xml_file, xml_tree, background,
+        out_file):
         """
         Unzip openlp.org 1.2x theme file and upgrade the theme xml. When calling
         this method, please keep in mind, that some parameters are redundant.

From 36f7e03dc0a68373b750f29f6c7157adcef43106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Sun, 24 Jun 2012 21:08:20 +0300
Subject: [PATCH 14/51] Move strip_rtf and change it into a class StripRtf +
 other changes. It might not work that well yet.

---
 openlp/plugins/songs/lib/__init__.py         | 219 +++++++++++++++-
 openlp/plugins/songs/lib/ewimport.py         | 100 +-------
 openlp/plugins/songs/lib/sundayplusimport.py | 248 +++----------------
 3 files changed, 255 insertions(+), 312 deletions(-)

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 87540ce54..c7f7ea6b7 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -24,6 +24,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
+import logging
 import re
 
 from PyQt4 import QtGui
@@ -33,6 +34,8 @@ from openlp.core.utils import CONTROL_CHARS
 from db import Author
 from ui import SongStrings
 
+log = logging.getLogger(__name__)
+
 WHITESPACE = re.compile(r'[\W_]+', re.UNICODE)
 APOSTROPHE = re.compile(u'[\'`’ʻ′]', re.UNICODE)
 
@@ -194,7 +197,7 @@ class VerseType(object):
         return verse_index
 
 
-def retrieve_windows_encoding(recommendation=None):
+def retrieve_windows_encoding(recommendation=None, example_text=None):
     """
     Determines which encoding to use on an information source. The process uses
     both automated detection, which is passed to this method as a
@@ -203,6 +206,9 @@ def retrieve_windows_encoding(recommendation=None):
     ``recommendation``
         A recommended encoding discovered programmatically for the user to
         confirm.
+
+    ``example_text``
+        Still not decoded text to show to users to help them decide.
     """
     # map chardet result to compatible windows standard code page
     codepage_mapping = {'IBM866': u'cp866', 'TIS-620': u'cp874',
@@ -365,6 +371,217 @@ def clean_song(manager, song):
     if song.copyright:
         song.copyright = CONTROL_CHARS.sub(u'', song.copyright).strip()
 
+class StripRtf():
+    """
+    This class strips RTF control structures and returns an unicode string.
+
+    Thanks to Markus Jarderot (MizardX) for this code, used by permission.
+    http://stackoverflow.com/questions/188545
+    """
+    pattern = re.compile(r"\\([a-z]{1,32})(-?\d{1,10})?[ ]?|\\'"
+        r"([0-9a-f]{2})|\\([^a-z])|([{}])|[\r\n]+|(.)", re.I)
+    # Control words which specify a "destination" to be ignored.
+    destinations = frozenset((
+        u'aftncn', u'aftnsep', u'aftnsepc', u'annotation', u'atnauthor', 
+        u'atndate', u'atnicn', u'atnid', u'atnparent', u'atnref', u'atntime',
+        u'atrfend', u'atrfstart', u'author', u'background', u'bkmkend',
+        u'bkmkstart', u'blipuid', u'buptim', u'category',
+        u'colorschememapping', u'colortbl', u'comment', u'company', u'creatim',
+        u'datafield', u'datastore', u'defchp', u'defpap', u'do', u'doccomm',
+        u'docvar', u'dptxbxtext', u'ebcend', u'ebcstart', u'factoidname',
+        u'falt', u'fchars', u'ffdeftext', u'ffentrymcr', u'ffexitmcr',
+        u'ffformat', u'ffhelptext', u'ffl', u'ffname', u'ffstattext', u'field',
+        u'file', u'filetbl', u'fldinst', u'fldrslt', u'fldtype', u'fname',
+        u'fontemb', u'fontfile', u'footer', u'footerf', u'footerl', u'footerr',
+        u'footnote', u'formfield', u'ftncn', u'ftnsep', u'ftnsepc', u'g',
+        u'generator', u'gridtbl', u'header', u'headerf', u'headerl',
+        u'headerr', u'hl', u'hlfr', u'hlinkbase', u'hlloc', u'hlsrc', u'hsv',
+        u'htmltag', u'info', u'keycode', u'keywords', u'latentstyles',
+        u'lchars', u'levelnumbers', u'leveltext', u'lfolevel', u'linkval',
+        u'list', u'listlevel', u'listname', u'listoverride',
+        u'listoverridetable', u'listpicture', u'liststylename', u'listtable',
+        u'listtext', u'lsdlockedexcept', u'macc', u'maccPr', u'mailmerge',
+        u'maln', u'malnScr', u'manager', u'margPr', u'mbar', u'mbarPr',
+        u'mbaseJc', u'mbegChr', u'mborderBox', u'mborderBoxPr', u'mbox',
+        u'mboxPr', u'mchr', u'mcount', u'mctrlPr', u'md', u'mdeg', u'mdegHide',
+        u'mden', u'mdiff', u'mdPr', u'me', u'mendChr', u'meqArr', u'meqArrPr',
+        u'mf', u'mfName', u'mfPr', u'mfunc', u'mfuncPr', u'mgroupChr',
+        u'mgroupChrPr', u'mgrow', u'mhideBot', u'mhideLeft', u'mhideRight',
+        u'mhideTop', u'mhtmltag', u'mlim', u'mlimloc', u'mlimlow',
+        u'mlimlowPr', u'mlimupp', u'mlimuppPr', u'mm', u'mmaddfieldname',
+        u'mmath', u'mmathPict', u'mmathPr', u'mmaxdist', u'mmc', u'mmcJc',
+        u'mmconnectstr', u'mmconnectstrdata', u'mmcPr', u'mmcs',
+        u'mmdatasource', u'mmheadersource', u'mmmailsubject', u'mmodso',
+        u'mmodsofilter', u'mmodsofldmpdata', u'mmodsomappedname',
+        u'mmodsoname', u'mmodsorecipdata', u'mmodsosort', u'mmodsosrc',
+        u'mmodsotable', u'mmodsoudl', u'mmodsoudldata', u'mmodsouniquetag',
+        u'mmPr', u'mmquery', u'mmr', u'mnary', u'mnaryPr', u'mnoBreak',
+        u'mnum', u'mobjDist', u'moMath', u'moMathPara', u'moMathParaPr',
+        u'mopEmu', u'mphant', u'mphantPr', u'mplcHide', u'mpos', u'mr',
+        u'mrad', u'mradPr', u'mrPr', u'msepChr', u'mshow', u'mshp', u'msPre',
+        u'msPrePr', u'msSub', u'msSubPr', u'msSubSup', u'msSubSupPr', u'msSup',
+        u'msSupPr', u'mstrikeBLTR', u'mstrikeH', u'mstrikeTLBR', u'mstrikeV',
+        u'msub', u'msubHide', u'msup', u'msupHide', u'mtransp', u'mtype',
+        u'mvertJc', u'mvfmf', u'mvfml', u'mvtof', u'mvtol', u'mzeroAsc',
+        u'mzeroDesc', u'mzeroWid', u'nesttableprops', u'nextfile',
+        u'nonesttables', u'objalias', u'objclass', u'objdata', u'object',
+        u'objname', u'objsect', u'objtime', u'oldcprops', u'oldpprops',
+        u'oldsprops', u'oldtprops', u'oleclsid', u'operator', u'panose',
+        u'password', u'passwordhash', u'pgp', u'pgptbl', u'picprop', u'pict',
+        u'pn', u'pnseclvl', u'pntext', u'pntxta', u'pntxtb', u'printim',
+        u'private', u'propname', u'protend', u'protstart', u'protusertbl',
+        u'pxe', u'result', u'revtbl', u'revtim', u'rsidtbl', u'rxe', u'shp',
+        u'shpgrp', u'shpinst', u'shppict', u'shprslt', u'shptxt', u'sn', u'sp',
+        u'staticval', u'stylesheet', u'subject', u'sv', u'svb', u'tc',
+        u'template', u'themedata', u'title', u'txe', u'ud', u'upr',
+        u'userprops', u'wgrffmtfilter', u'windowcaption', u'writereservation',
+        u'writereservhash', u'xe', u'xform', u'xmlattrname', u'xmlattrvalue',
+        u'xmlclose', u'xmlname', u'xmlnstbl', u'xmlopen'))
+    # Translation of some special characters.
+    specialchars = {
+        u'par': u'\n',
+        u'sect': u'\n\n',
+        u'page': u'\n\n',
+        u'line': u'\n',
+        u'tab': u'\t',
+        u'emdash': u'\u2014',
+        u'endash': u'\u2013',
+        u'emspace': u'\u2003',
+        u'enspace': u'\u2002',
+        u'qmspace': u'\u2005',
+        u'bullet': u'\u2022',
+        u'lquote': u'\u2018',
+        u'rquote': u'\u2019',
+        u'ldblquote': u'\u201C',
+        u'rdblquote': u'\u201D'}
+    charset_mapping = {
+        u'fcharset0': u'cp1252',
+        u'fcharset1': None,
+        u'fcharset2': None,
+        u'fcharset77': None,
+        u'fcharset128': None,
+        u'fcharset129': None,
+        u'fcharset130': None,
+        u'fcharset134': None,
+        u'fcharset136': None,
+        u'fcharset161': u'cp1253',
+        u'fcharset162': u'cp1254',
+        u'fcharset163': u'cp1258',
+        u'fcharset177': u'cp1255',
+        u'fcharset178': u'cp1256',
+        u'fcharset186': u'cp1257',
+        u'fcharset204': u'cp1251',
+        u'fcharset222': u'cp874',
+        u'fcharset238': u'cp1250'}
+
+    def strip_rtf(self, text, default_encoding=None):
+        # Current font is the font tag we last met.
+        font = u''
+        # Character encoding is defined inside fonttable.
+        # font_table could contain eg u'0': u'cp1252'
+        font_table = {u'': default_encoding}
+        # Whether we are inside the font table.
+        inside_font_table = False
+        # Stack of things to keep track of when entering/leaving groups.
+        stack = []
+        # Whether this group (and all inside it) are "ignorable".
+        ignorable = False
+        # Number of ASCII characters to skip after an unicode character.
+        ucskip = 1
+        # Number of ASCII characters left to skip.
+        curskip = 0
+        # Output buffer.
+        out = []
+        for match in self.pattern.finditer(text):
+            word, arg, hex, char, brace, tchar = match.groups()
+            if brace:
+                curskip = 0
+                if brace == u'{':
+                    # Push state
+                    stack.append((ucskip, ignorable, font, inside_font_table))
+                elif brace == u'}':
+                    # Pop state
+                    ucskip, ignorable, font, inside_font_table = stack.pop()
+            # \x (not a letter)
+            elif char:
+                curskip = 0
+                if char == u'~':
+                    if not ignorable:
+                        out.append(u'\xA0')
+                elif char in u'{}\\':
+                    if not ignorable:
+                        out.append(char)
+                elif char == u'*':
+                    ignorable = True
+            # \command
+            elif word:
+                curskip = 0
+                if word in self.destinations:
+                    ignorable = True
+                elif word in self.specialchars:
+                    out.append(self.specialchars[word])
+                elif word == u'uc':
+                    ucskip = int(arg)
+                elif word == u' ':
+                    c = int(arg)
+                    if c < 0:
+                        c += 0x10000
+                    out.append(unichr(c))
+                    curskip = ucskip
+                elif word == u'fonttbl':
+                    inside_font_table = True
+                    ignorable = True
+                elif word == u'f':
+                    font = arg
+                    if not inside_font_table:
+                        if arg in font_table.keys():
+                            encoding = font_table[arg]
+                        else:
+                            encoding = default_encoding
+                elif word == u'ansicpg':
+                    if font == u'':
+                        print "JEEEPASOIDFIJAD"
+                    if inside_font_table or font == u'':
+                        font_table[font] = 'cp' + arg
+                elif word == u'fcharset':
+                    charset_reference = word + arg
+                    if charset_reference in self.charset_mapping:
+                        charset = self.charset_mapping[charset_reference]
+                        if not charset:
+                            charset = default_encoding
+                    else:
+                        log.error(u"Charset '%s' not in charset_mapping "
+                            u"dictionary in "
+                            u"openlp/plugins/songs/lib/__init__.py"
+                            % charset_reference)
+                        charset = default_encoding
+                    if font == u'':
+                        print "JEEEPASOIDFIadsfJAD"
+                    if inside_font_table or font == u'':
+                        font_table[font] = charset
+            # \'xx
+            elif hex:
+                if curskip > 0:
+                    curskip -= 1
+                elif not ignorable:
+                    charcode = int(hex, 16)
+                    while True:
+                        try:
+                            out.append(chr(charcode).decode(encoding))
+                        except UnicodeDecodeError:
+                            encoding = \
+                                retrieve_windows_encoding(default_encoding)
+                            if font:
+                                font_table[font] = encoding
+                        else:
+                            break
+            elif tchar:
+                if curskip > 0:
+                    curskip -= 1
+                elif not ignorable:
+                    out.append(tchar)
+        return u''.join(out)
+
 from xml import OpenLyrics, SongXML
 from songstab import SongsTab
 from mediaitem import SongMediaItem
diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py
index d58734610..7ecabcdd6 100644
--- a/openlp/plugins/songs/lib/ewimport.py
+++ b/openlp/plugins/songs/lib/ewimport.py
@@ -35,7 +35,7 @@ import re
 
 from openlp.core.lib import translate
 from openlp.plugins.songs.lib import VerseType
-from openlp.plugins.songs.lib import retrieve_windows_encoding
+from openlp.plugins.songs.lib import retrieve_windows_encoding, StripRtf
 from songimport import SongImport
 
 RTF_STRIPPING_REGEX = re.compile(r'\{\\tx[^}]*\}')
@@ -44,101 +44,6 @@ SLIDE_BREAK_REGEX = re.compile(r'\n *?\n[\n ]*')
 NUMBER_REGEX = re.compile(r'[0-9]+')
 NOTE_REGEX = re.compile(r'\(.*?\)')
 
-def strip_rtf(blob, encoding):
-    depth = 0
-    control = False
-    clear_text = []
-    control_word = []
-
-    # workaround for \tx bug: remove one pair of curly braces
-    # if \tx is encountered
-    match = RTF_STRIPPING_REGEX.search(blob)
-    if match:
-        # start and end indices of match are curly braces - filter them out
-        blob = ''.join([blob[i] for i in xrange(len(blob))
-            if i != match.start() and i !=match.end()])
-
-    for c in blob:
-        if control:
-            # for delimiters, set control to False
-            if c == '{':
-                if control_word:
-                    depth += 1
-                control = False
-            elif c == '}':
-                if control_word:
-                    depth -= 1
-                control = False
-            elif c == '\\':
-                new_control = bool(control_word)
-                control = False
-            elif c.isspace():
-                control = False
-            else:
-                control_word.append(c)
-                if len(control_word) == 3 and control_word[0] == '\'':
-                    control = False
-            if not control:
-                if not control_word:
-                    if c == '{' or c == '}' or c == '\\':
-                        clear_text.append(c)
-                else:
-                    control_str = ''.join(control_word)
-                    if control_str == 'par' or control_str == 'line':
-                        clear_text.append(u'\n')
-                    elif control_str == 'tab':
-                        clear_text.append(u'\t')
-                    # Prefer the encoding specified by the RTF data to that
-                    # specified by the Paradox table header
-                    # West European encoding
-                    elif control_str == 'fcharset0':
-                        encoding = u'cp1252'
-                    # Greek encoding
-                    elif control_str == 'fcharset161':
-                        encoding = u'cp1253'
-                    # Turkish encoding
-                    elif control_str == 'fcharset162':
-                        encoding = u'cp1254'
-                    # Vietnamese encoding
-                    elif control_str == 'fcharset163':
-                        encoding = u'cp1258'
-                    # Hebrew encoding
-                    elif control_str == 'fcharset177':
-                        encoding = u'cp1255'
-                    # Arabic encoding
-                    elif control_str == 'fcharset178':
-                        encoding = u'cp1256'
-                    # Baltic encoding
-                    elif control_str == 'fcharset186':
-                        encoding = u'cp1257'
-                    # Cyrillic encoding
-                    elif control_str == 'fcharset204':
-                        encoding = u'cp1251'
-                    # Thai encoding
-                    elif control_str == 'fcharset222':
-                        encoding = u'cp874'
-                    # Central+East European encoding
-                    elif control_str == 'fcharset238':
-                        encoding = u'cp1250'
-                    elif control_str[0] == '\'':
-                        s = chr(int(control_str[1:3], 16))
-                        clear_text.append(s.decode(encoding))
-                    del control_word[:]
-            if c == '\\' and new_control:
-                control = True
-        elif c == '{':
-            depth += 1
-        elif c == '}':
-            depth -= 1
-        elif depth > 2:
-            continue
-        elif c == '\n' or c == '\r':
-            continue
-        elif c == '\\':
-            control = True
-        else:
-            clear_text.append(c)
-    return u''.join(clear_text)
 
 class FieldDescEntry:
     def __init__(self, name, type, size):
@@ -154,6 +59,7 @@ class EasyWorshipSongImport(SongImport):
     """
     def __init__(self, manager, **kwargs):
         SongImport.__init__(self, manager, **kwargs)
+        self.rtf = StripRtf()
 
     def doImport(self):
         # Open the DB and MB files if they exist
@@ -273,7 +179,7 @@ class EasyWorshipSongImport(SongImport):
                         self.addAuthor(author_name.strip())
                 if words:
                     # Format the lyrics
-                    words = strip_rtf(words, self.encoding)
+                    words = self.rtf.strip_rtf(words, self.encoding)
                     verse_type = VerseType.Tags[VerseType.Verse]
                     for verse in SLIDE_BREAK_REGEX.split(words):
                         verse = verse.strip()
diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index eabf3d40f..ab37bd0d2 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -26,11 +26,11 @@
 ###############################################################################
 
 import logging
+import os
 import re
 
-from os.path import split
-
 from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding
+from openlp.plugins.songs.lib import StripRtf
 from openlp.plugins.songs.lib.songimport import SongImport
 
 log = logging.getLogger(__name__)
@@ -42,7 +42,7 @@ class SundayPlusImport(SongImport):
     The format examples can be found attached to bug report at
     <http://support.openlp.org/issues/395>
     """
-    hotkey_to_verse_type = {
+    hotkeyToVerseType = {
         u'1': u'v1',
         u'2': u'v2',
         u'3': u'v3',
@@ -61,6 +61,7 @@ class SundayPlusImport(SongImport):
         Initialise the class.
         """
         SongImport.__init__(self, manager, **kwargs)
+        self.rtf = StripRtf()
 
     def doImport(self):
         self.importWizard.progressBar.setMaximum(len(self.importSource))
@@ -81,32 +82,33 @@ class SundayPlusImport(SongImport):
             self.logError(file.name)
             return
         if self.title == '':
-            self.title = self.title_from_filename(file.name)
+            self.title = self.titleFromFilename(file.name)
         if not self.finish():
             self.logError(file.name)
 
     def parse(self, data, cell = False):
-        if data[0] != '[' and data[-1] != ']':
+        if len(data) == 0 or data[0:1] != '[' or data[-1] != ']':
             self.logError(u'File is malformed')
             return False
         i = 1
         verse_type = VerseType.Tags[VerseType.Verse]
         while i < len(data):
-            byte = data[i]
-            if byte == '#':
-                end = data.find(':', i+1)
-                name = data[i+1:end]
-                i = end + 1
-                while data[i] == ' ':
+            # Data is held as #name: value pairs inside groups marked as [].
+            # Now we are looking for name.
+            if data[i:i+1] == '#':
+                name_end = data.find(':', i+1)
+                name = data[i+1:name_end]
+                i = name_end + 1
+                while data[i:i+1] == ' ':
                     i += 1
-                if data[i] == '"':
+                if data[i:i+1] == '"':
                     end = data.find('"', i+1)
                     value = data[i+1:end]
-                elif data[i] == '[':
+                elif data[i:i+1] == '[':
                     j = i
                     inside_quotes = False
                     while j < len(data):
-                        char = data[j]
+                        char = data[j:j+1]
                         if char == '"':
                             inside_quotes = not inside_quotes
                         elif not inside_quotes and char == ']':
@@ -119,6 +121,7 @@ class SundayPlusImport(SongImport):
                     if data.find('(', i, end) != -1:
                         end = data.find(')', i) + 1
                     value = data[i:end]
+                # If we are in the main group.
                 if cell == False:
                     if name == 'title':
                         self.title = self.decode(self.unescape(value))
@@ -130,6 +133,7 @@ class SundayPlusImport(SongImport):
                         self.copyright = self.decode(self.unescape(value))
                     elif name[0:4] == 'CELL':
                         self.parse(value, cell = name[4:])
+                # We are in a verse group.
                 else:
                     if name == 'MARKER_NAME':
                         value = value.strip()
@@ -141,23 +145,27 @@ class SundayPlusImport(SongImport):
                                 verse_type = "%s%s" % (verse_type, value[-1])
                     elif name == 'Hotkey':
                         # Hotkey always appears after MARKER_NAME, so it
-                        # effectivetly overrides MARKER_NAME, if present.
+                        # effectively overrides MARKER_NAME, if present.
                         if len(value) and \
-                            value in self.hotkey_to_verse_type.keys():
-                            verse_type = self.hotkey_to_verse_type[value]
+                            value in self.hotkeyToVerseType.keys():
+                            verse_type = self.hotkeyToVerseType[value]
                     if name == 'rtf':
                         value = self.unescape(value)
-                        verse = self.strip_rtf(value, self.encoding).strip()
-                        lines = verse.split('\n')
+                        verse = self.rtf.strip_rtf(value, self.encoding)
+                        lines = verse.strip().split('\n')
+                        # If any line inside any verse contains CCLI or
+                        # only Public Domain, we treat this as special data:
+                        # we remove that line and add data to specific field.
                         for i in xrange(len(lines)):
                             lines[i] = lines[i].strip()
                             line = lines[i]
-                            if line[:4] in u'CCLI':
+                            if line[:4].lower() == u'ccli':
                                 m = re.search(r'[0-9]+', line)
                                 if m:
                                     self.ccliNumber = int(m.group(0))
                                     lines.pop(i)
                             elif line.lower() == u'public domain':
+                                self.copyright = u'Public Domain'
                                 lines.pop(i)
                         self.addVerse('\n'.join(lines).strip(), verse_type)
                 if end == -1:
@@ -166,13 +174,12 @@ class SundayPlusImport(SongImport):
             i += 1
         return True
 
-    def title_from_filename(self, filename):
-        filename = split(filename)[1]
-        if len(filename) > 4 and filename[-4:].lower() == u'.ptf':
-            title = filename[:-4]
-        else:
-            title = filename
-        if title[-3:] == '1-7':
+    def titleFromFilename(self, filename):
+        title = os.path.split(filename)[1]
+        if title.endswith(u'.ptf'):
+            title = title[:-4]
+        # For some strange reason all example files names ended with 1-7.
+        if title.endswith('1-7'):
             title = title[:-3]
         return title.replace(u'_', u' ')
 
@@ -190,190 +197,3 @@ class SundayPlusImport(SongImport):
         text = text.replace('^', '\'')
         return text.strip()
 
-    def strip_rtf(self, text, encoding):
-        # Thanks to Markus Jarderot (MizardX) for this code, used by permission
-        # <http://stackoverflow.com/questions/188545/regular-expression-for-
-        # extracting-text-from-an-rtf-string>
-        pattern = re.compile(r"\\([a-z]{1,32})(-?\d{1,10})?[ ]?|\\'"
-            r"([0-9a-f]{2})|\\([^a-z])|([{}])|[\r\n]+|(.)", re.I)
-        # Control words which specify a "destination" and we can ignore it.
-        destinations = frozenset((
-            'aftncn', 'aftnsep', 'aftnsepc', 'annotation', 'atnauthor', 
-            'atndate', 'atnicn', 'atnid', 'atnparent', 'atnref', 'atntime',
-            'atrfend', 'atrfstart', 'author', 'background', 'bkmkend',
-            'bkmkstart', 'blipuid', 'buptim', 'category', 'colorschememapping',
-            'colortbl', 'comment', 'company', 'creatim', 'datafield',
-            'datastore', 'defchp', 'defpap', 'do', 'doccomm', 'docvar',
-            'dptxbxtext', 'ebcend', 'ebcstart', 'factoidname', 'falt', 'fchars',
-            'ffdeftext', 'ffentrymcr', 'ffexitmcr', 'ffformat', 'ffhelptext',
-            'ffl', 'ffname', 'ffstattext', 'field', 'file', 'filetbl',
-            'fldinst', 'fldrslt', 'fldtype', 'fname', 'fontemb', 'fontfile', 
-            'footer', 'footerf', 'footerl', 'footerr', 'footnote',
-            'formfield', 'ftncn', 'ftnsep', 'ftnsepc', 'g', 'generator',
-            'gridtbl', 'header', 'headerf', 'headerl', 'headerr', 'hl', 'hlfr',
-            'hlinkbase', 'hlloc', 'hlsrc', 'hsv', 'htmltag', 'info', 'keycode',
-            'keywords', 'latentstyles', 'lchars', 'levelnumbers', 'leveltext',
-            'lfolevel', 'linkval', 'list', 'listlevel', 'listname',
-            'listoverride', 'listoverridetable', 'listpicture', 'liststylename',
-            'listtable', 'listtext', 'lsdlockedexcept', 'macc', 'maccPr', 
-            'mailmerge', 'maln', 'malnScr', 'manager', 'margPr', 'mbar',
-            'mbarPr', 'mbaseJc', 'mbegChr', 'mborderBox', 'mborderBoxPr',
-            'mbox', 'mboxPr', 'mchr', 'mcount', 'mctrlPr', 'md', 'mdeg', 
-            'mdegHide', 'mden', 'mdiff', 'mdPr', 'me', 'mendChr', 'meqArr',
-            'meqArrPr', 'mf', 'mfName', 'mfPr', 'mfunc', 'mfuncPr', 'mgroupChr',
-            'mgroupChrPr', 'mgrow', 'mhideBot', 'mhideLeft', 'mhideRight',
-            'mhideTop', 'mhtmltag', 'mlim', 'mlimloc', 'mlimlow', 'mlimlowPr',
-            'mlimupp', 'mlimuppPr', 'mm', 'mmaddfieldname', 'mmath',
-            'mmathPict', 'mmathPr', 'mmaxdist', 'mmc', 'mmcJc', 'mmconnectstr',
-            'mmconnectstrdata', 'mmcPr', 'mmcs', 'mmdatasource',
-            'mmheadersource', 'mmmailsubject', 'mmodso', 'mmodsofilter',
-            'mmodsofldmpdata', 'mmodsomappedname', 'mmodsoname',
-            'mmodsorecipdata', 'mmodsosort', 'mmodsosrc', 'mmodsotable',
-            'mmodsoudl', 'mmodsoudldata', 'mmodsouniquetag', 'mmPr', 'mmquery',
-            'mmr', 'mnary', 'mnaryPr', 'mnoBreak', 'mnum', 'mobjDist', 'moMath',
-            'moMathPara', 'moMathParaPr', 'mopEmu', 'mphant', 'mphantPr',
-            'mplcHide', 'mpos', 'mr', 'mrad', 'mradPr', 'mrPr', 'msepChr',
-            'mshow', 'mshp', 'msPre', 'msPrePr', 'msSub', 'msSubPr', 'msSubSup',
-            'msSubSupPr', 'msSup', 'msSupPr', 'mstrikeBLTR', 'mstrikeH',
-            'mstrikeTLBR', 'mstrikeV', 'msub', 'msubHide', 'msup', 'msupHide',
-            'mtransp', 'mtype', 'mvertJc', 'mvfmf', 'mvfml', 'mvtof', 'mvtol',
-            'mzeroAsc', 'mzeroDesc', 'mzeroWid', 'nesttableprops', 'nextfile',
-            'nonesttables', 'objalias', 'objclass', 'objdata', 'object',
-            'objname', 'objsect', 'objtime', 'oldcprops', 'oldpprops',
-            'oldsprops', 'oldtprops', 'oleclsid', 'operator', 'panose',
-            'password', 'passwordhash', 'pgp', 'pgptbl', 'picprop', 'pict',
-            'pn', 'pnseclvl', 'pntext', 'pntxta', 'pntxtb', 'printim',
-            'private', 'propname', 'protend', 'protstart', 'protusertbl', 'pxe',
-            'result', 'revtbl', 'revtim', 'rsidtbl', 'rxe', 'shp', 'shpgrp',
-            'shpinst', 'shppict', 'shprslt', 'shptxt', 'sn', 'sp', 'staticval',
-            'stylesheet', 'subject', 'sv', 'svb', 'tc', 'template', 'themedata',
-            'title', 'txe', 'ud', 'upr', 'userprops', 'wgrffmtfilter',
-            'windowcaption', 'writereservation', 'writereservhash', 'xe',
-            'xform', 'xmlattrname', 'xmlattrvalue', 'xmlclose', 'xmlname',
-            'xmlnstbl', 'xmlopen'))
-        # Translation of some special characters.
-        specialchars = {
-            u'par': u'\n',
-            u'sect': u'\n\n',
-            u'page': u'\n\n',
-            u'line': u'\n',
-            u'tab': u'\t',
-            u'emdash': u'\u2014',
-            u'endash': u'\u2013',
-            u'emspace': u'\u2003',
-            u'enspace': u'\u2002',
-            u'qmspace': u'\u2005',
-            u'bullet': u'\u2022',
-            u'lquote': u'\u2018',
-            u'rquote': u'\u2019',
-            u'ldblquote': u'\u201C',
-            u'rdblquote': u'\u201D'}
-        charset_mapping = {
-            # Thai encoding
-            'fcharset222': u'cp874',
-            'ansicpg874': u'cp874',
-            # Central+East European encoding
-            'fcharset238': u'cp1250',
-            'ansicpg1250': u'cp1250',
-            # Cyrillic encoding
-            'fcharset204': u'cp1251',
-            'ansicpg1251': u'cp1251',
-            # West European encoding
-            'fcharset0': u'cp1252',
-            'ansicpg1252': u'cp1252',
-            # Greek encoding
-            'fcharset161': u'cp1253',
-            'ansicpg1253': u'cp1253',
-            # Turkish encoding
-            'fcharset162': u'cp1254',
-            'ansicpg1254': u'cp1254',
-            # Hebrew encoding
-            'fcharset177': u'cp1255',
-            'ansicpg1255': u'cp1255',
-            # Arabic encoding
-            'fcharset178': u'cp1256',
-            'ansicpg1256': u'cp1256',
-            # Baltic encoding
-            'fcharset186': u'cp1257',
-            'ansicpg1257': u'cp1257',
-            # Vietnamese encoding
-            'fcharset163': u'cp1258',
-            'ansicpg1258': u'cp1258'}
-        charsets = charset_mapping.keys()
-        # Character encoding is defined together with fonts.
-        # font_table could contain eg '0': 'cp1252'
-        font_table = {}
-        stack = []
-        # Whether this group (and all inside it) are "ignorable".
-        ignorable = False
-        # Whether we are inside the font table.
-        inside_font_table = False
-        current_font = ''
-        # Number of ASCII characters to skip after an unicode character.
-        ucskip = 1
-        # Number of ASCII characters left to skip.
-        curskip = 0
-        # Output buffer.
-        out = []
-        for match in pattern.finditer(text):
-            word, arg, hex, char, brace, tchar = match.groups()
-            if brace:
-                curskip = 0
-                if brace == u'{':
-                    # Push state
-                    stack.append((ucskip, ignorable, inside_font_table))
-                elif brace == u'}':
-                    # Pop state
-                    ucskip, ignorable, inside_font_table = stack.pop()
-            # \x (not a letter)
-            elif char:
-                curskip = 0
-                if char == '~':
-                    if not ignorable:
-                        out.append(u'\xA0')
-                elif char in u'{}\\':
-                    if not ignorable:
-                        out.append(char)
-                elif char == u'*':
-                    ignorable = True
-            # \foo
-            elif word:
-                curskip = 0
-                if word in destinations:
-                    ignorable = True
-                elif word in specialchars:
-                    out.append(specialchars[word])
-                elif word == u'uc':
-                    ucskip = int(arg)
-                elif word == u'u':
-                    c = int(arg)
-                    if c < 0:
-                        c += 0x10000
-                    out.append(unichr(c))
-                    curskip = ucskip
-                elif word == 'fonttbl':
-                    inside_font_table = True
-                    ignorable = True
-                elif word == 'f':
-                    current_font = arg
-                    if not inside_font_table:
-                        encoding = font_table[arg]
-                elif word in ('ansicpg', 'fcharset'):
-                    if inside_font_table:
-                        font_table[current_font] = charset_mapping[word + arg]
-                    else:
-                        encoding = charset_mapping[word + arg]
-            # \'xx
-            elif hex:
-                if curskip > 0:
-                    curskip -= 1
-                elif not ignorable:
-                    c = int(hex, 16)
-                    out.append(chr(c).decode(encoding))
-            elif tchar:
-                if curskip > 0:
-                    curskip -= 1
-                elif not ignorable:
-                    out.append(tchar)
-        return ''.join(out)
-

From 75ae9065d00f6c336bbb21acfba205e10d38d508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Mon, 25 Jun 2012 01:59:28 +0300
Subject: [PATCH 15/51] Uppercase names for static variables.

---
 openlp/plugins/songs/lib/__init__.py         | 24 +++++++++-----------
 openlp/plugins/songs/lib/sundayplusimport.py |  6 ++---
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index c7f7ea6b7..400817aad 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -378,10 +378,10 @@ class StripRtf():
     Thanks to Markus Jarderot (MizardX) for this code, used by permission.
     http://stackoverflow.com/questions/188545
     """
-    pattern = re.compile(r"\\([a-z]{1,32})(-?\d{1,10})?[ ]?|\\'"
+    PATTERN = re.compile(r"\\([a-z]{1,32})(-?\d{1,10})?[ ]?|\\'"
         r"([0-9a-f]{2})|\\([^a-z])|([{}])|[\r\n]+|(.)", re.I)
     # Control words which specify a "destination" to be ignored.
-    destinations = frozenset((
+    DESTINATIONS = frozenset((
         u'aftncn', u'aftnsep', u'aftnsepc', u'annotation', u'atnauthor', 
         u'atndate', u'atnicn', u'atnid', u'atnparent', u'atnref', u'atntime',
         u'atrfend', u'atrfstart', u'author', u'background', u'bkmkend',
@@ -438,7 +438,7 @@ class StripRtf():
         u'writereservhash', u'xe', u'xform', u'xmlattrname', u'xmlattrvalue',
         u'xmlclose', u'xmlname', u'xmlnstbl', u'xmlopen'))
     # Translation of some special characters.
-    specialchars = {
+    SPECIALCHARS = {
         u'par': u'\n',
         u'sect': u'\n\n',
         u'page': u'\n\n',
@@ -454,7 +454,7 @@ class StripRtf():
         u'rquote': u'\u2019',
         u'ldblquote': u'\u201C',
         u'rdblquote': u'\u201D'}
-    charset_mapping = {
+    CHARSET_MAPPING = {
         u'fcharset0': u'cp1252',
         u'fcharset1': None,
         u'fcharset2': None,
@@ -492,7 +492,7 @@ class StripRtf():
         curskip = 0
         # Output buffer.
         out = []
-        for match in self.pattern.finditer(text):
+        for match in self.PATTERN.finditer(text):
             word, arg, hex, char, brace, tchar = match.groups()
             if brace:
                 curskip = 0
@@ -516,10 +516,10 @@ class StripRtf():
             # \command
             elif word:
                 curskip = 0
-                if word in self.destinations:
+                if word in self.DESTINATIONS:
                     ignorable = True
-                elif word in self.specialchars:
-                    out.append(self.specialchars[word])
+                elif word in self.SPECIALCHARS:
+                    out.append(self.SPECIALCHARS[word])
                 elif word == u'uc':
                     ucskip = int(arg)
                 elif word == u' ':
@@ -540,23 +540,21 @@ class StripRtf():
                             encoding = default_encoding
                 elif word == u'ansicpg':
                     if font == u'':
-                        print "JEEEPASOIDFIJAD"
                     if inside_font_table or font == u'':
                         font_table[font] = 'cp' + arg
                 elif word == u'fcharset':
                     charset_reference = word + arg
-                    if charset_reference in self.charset_mapping:
-                        charset = self.charset_mapping[charset_reference]
+                    if charset_reference in self.CHARSET_MAPPING:
+                        charset = self.CHARSET_MAPPING[charset_reference]
                         if not charset:
                             charset = default_encoding
                     else:
-                        log.error(u"Charset '%s' not in charset_mapping "
+                        log.error(u"Charset '%s' not in CHARSET_MAPPING "
                             u"dictionary in "
                             u"openlp/plugins/songs/lib/__init__.py"
                             % charset_reference)
                         charset = default_encoding
                     if font == u'':
-                        print "JEEEPASOIDFIadsfJAD"
                     if inside_font_table or font == u'':
                         font_table[font] = charset
             # \'xx
diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index ab37bd0d2..cc36896e9 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -42,7 +42,7 @@ class SundayPlusImport(SongImport):
     The format examples can be found attached to bug report at
     <http://support.openlp.org/issues/395>
     """
-    hotkeyToVerseType = {
+    HOTKEYTOVERSETYPE = {
         u'1': u'v1',
         u'2': u'v2',
         u'3': u'v3',
@@ -147,8 +147,8 @@ class SundayPlusImport(SongImport):
                         # Hotkey always appears after MARKER_NAME, so it
                         # effectively overrides MARKER_NAME, if present.
                         if len(value) and \
-                            value in self.hotkeyToVerseType.keys():
-                            verse_type = self.hotkeyToVerseType[value]
+                            value in self.HOTKEYTOVERSETYPE.keys():
+                            verse_type = self.HOTKEYTOVERSETYPE[value]
                     if name == 'rtf':
                         value = self.unescape(value)
                         verse = self.rtf.strip_rtf(value, self.encoding)

From 25dc4fe36c2c3272f18cc0bd13ebbb88a7aad091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Mon, 25 Jun 2012 09:44:11 +0300
Subject: [PATCH 16/51] Better handling of encodings. User is asked only once,
 if possible.

---
 openlp/plugins/songs/lib/__init__.py | 49 ++++++++++++++++------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 400817aad..152d2a79c 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -473,15 +473,16 @@ class StripRtf():
         u'fcharset204': u'cp1251',
         u'fcharset222': u'cp874',
         u'fcharset238': u'cp1250'}
+    # If user is asked for an encoding, it is used since then.
+    user_encoding = []
 
     def strip_rtf(self, text, default_encoding=None):
+        self.default_encoding = default_encoding
         # Current font is the font tag we last met.
         font = u''
         # Character encoding is defined inside fonttable.
         # font_table could contain eg u'0': u'cp1252'
         font_table = {u'': default_encoding}
-        # Whether we are inside the font table.
-        inside_font_table = False
         # Stack of things to keep track of when entering/leaving groups.
         stack = []
         # Whether this group (and all inside it) are "ignorable".
@@ -498,10 +499,10 @@ class StripRtf():
                 curskip = 0
                 if brace == u'{':
                     # Push state
-                    stack.append((ucskip, ignorable, font, inside_font_table))
+                    stack.append((ucskip, ignorable, font))
                 elif brace == u'}':
                     # Pop state
-                    ucskip, ignorable, font, inside_font_table = stack.pop()
+                    ucskip, ignorable, font = stack.pop()
             # \x (not a letter)
             elif char:
                 curskip = 0
@@ -533,29 +534,19 @@ class StripRtf():
                     ignorable = True
                 elif word == u'f':
                     font = arg
-                    if not inside_font_table:
-                        if arg in font_table.keys():
-                            encoding = font_table[arg]
-                        else:
-                            encoding = default_encoding
                 elif word == u'ansicpg':
-                    if font == u'':
-                    if inside_font_table or font == u'':
-                        font_table[font] = 'cp' + arg
+                    font_table[font] = 'cp' + arg
                 elif word == u'fcharset':
                     charset_reference = word + arg
                     if charset_reference in self.CHARSET_MAPPING:
                         charset = self.CHARSET_MAPPING[charset_reference]
-                        if not charset:
-                            charset = default_encoding
                     else:
+                        charset = None
                         log.error(u"Charset '%s' not in CHARSET_MAPPING "
                             u"dictionary in "
                             u"openlp/plugins/songs/lib/__init__.py"
                             % charset_reference)
-                        charset = default_encoding
-                    if font == u'':
-                    if inside_font_table or font == u'':
+                    if font not in font_table:
                         font_table[font] = charset
             # \'xx
             elif hex:
@@ -563,14 +554,13 @@ class StripRtf():
                     curskip -= 1
                 elif not ignorable:
                     charcode = int(hex, 16)
+                    encoding = self.get_encoding(font, font_table)
                     while True:
                         try:
                             out.append(chr(charcode).decode(encoding))
                         except UnicodeDecodeError:
-                            encoding = \
-                                retrieve_windows_encoding(default_encoding)
-                            if font:
-                                font_table[font] = encoding
+                            encoding = self.get_encoding(font, font_table,
+                                failed=True)
                         else:
                             break
             elif tchar:
@@ -580,6 +570,23 @@ class StripRtf():
                     out.append(tchar)
         return u''.join(out)
 
+    def get_encoding(self, font, font_table, failed=False):
+        encoding = None
+        if font in font_table:
+            encoding = font_table[font]
+        if not encoding and len(self.user_encoding):
+            encoding = self.user_encoding[-1]
+        if not encoding and self.default_encoding:
+            encoding = self.default_encoding
+        if not encoding or (failed and self.user_encoding == encoding):
+            encoding = retrieve_windows_encoding(self.default_encoding)
+            if encoding not in self.user_encoding:
+                self.user_encoding.append(encoding)
+        elif failed:
+            encoding = self.user_encoding
+        font_table[font] = encoding
+        return encoding
+
 from xml import OpenLyrics, SongXML
 from songstab import SongsTab
 from mediaitem import SongMediaItem

From bfeef67048475dd44ee8e5a16ac72477f35a3eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Mon, 25 Jun 2012 11:08:53 +0300
Subject: [PATCH 17/51] Handling for some extra characters.

---
 openlp/plugins/songs/lib/__init__.py | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 152d2a79c..a2230cc0a 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -441,7 +441,13 @@ class StripRtf():
     SPECIALCHARS = {
         u'par': u'\n',
         u'sect': u'\n\n',
+        # Required page and column break.
+        # Would be good if we could split verse into subverses here.
         u'page': u'\n\n',
+        u'column': u'\n\n',
+        # Soft breaks.
+        u'softpage': u'[---]',
+        u'softcol': u'[---]',
         u'line': u'\n',
         u'tab': u'\t',
         u'emdash': u'\u2014',
@@ -453,7 +459,11 @@ class StripRtf():
         u'lquote': u'\u2018',
         u'rquote': u'\u2019',
         u'ldblquote': u'\u201C',
-        u'rdblquote': u'\u201D'}
+        u'rdblquote': u'\u201D',
+        u'ltrmark': u'\u200E',
+        u'rtlmark': u'\u200F',
+        u'zwj': u'\u200D',
+        u'zwnj': u'\u200C'}
     CHARSET_MAPPING = {
         u'fcharset0': u'cp1252',
         u'fcharset1': None,
@@ -506,12 +516,14 @@ class StripRtf():
             # \x (not a letter)
             elif char:
                 curskip = 0
-                if char == u'~':
-                    if not ignorable:
-                        out.append(u'\xA0')
-                elif char in u'{}\\':
-                    if not ignorable:
-                        out.append(char)
+                if char == u'~' and not ignorable:
+                    out.append(u'\xA0')
+                elif char in u'{}\\' and not ignorable:
+                    out.append(char)
+                elif char == u'-' and not ignorable:
+                    out.append(u'\u00AD')
+                elif char == u'_' and not ignorable:
+                    out.append(u'\u2011')
                 elif char == u'*':
                     ignorable = True
             # \command
@@ -546,6 +558,7 @@ class StripRtf():
                             u"dictionary in "
                             u"openlp/plugins/songs/lib/__init__.py"
                             % charset_reference)
+                    # This makes ansicpg always override fcharset if present.
                     if font not in font_table:
                         font_table[font] = charset
             # \'xx

From 3b5bd4852f805b5f98e644f2dbabfe41a4e80e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Mon, 25 Jun 2012 13:31:31 +0300
Subject: [PATCH 18/51] Sorry for leftovers of a thought. Maybe some other
 time.

---
 openlp/plugins/songs/lib/__init__.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index a2230cc0a..07af491c6 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -197,7 +197,7 @@ class VerseType(object):
         return verse_index
 
 
-def retrieve_windows_encoding(recommendation=None, example_text=None):
+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
@@ -206,9 +206,6 @@ def retrieve_windows_encoding(recommendation=None, example_text=None):
     ``recommendation``
         A recommended encoding discovered programmatically for the user to
         confirm.
-
-    ``example_text``
-        Still not decoded text to show to users to help them decide.
     """
     # map chardet result to compatible windows standard code page
     codepage_mapping = {'IBM866': u'cp866', 'TIS-620': u'cp874',

From 4917831206698babdef46402af690b55255f4c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Mon, 25 Jun 2012 13:41:55 +0300
Subject: [PATCH 19/51] Simplify previous cruft.

---
 openlp/plugins/songs/lib/__init__.py | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 07af491c6..a9e360ceb 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -463,14 +463,6 @@ class StripRtf():
         u'zwnj': u'\u200C'}
     CHARSET_MAPPING = {
         u'fcharset0': u'cp1252',
-        u'fcharset1': None,
-        u'fcharset2': None,
-        u'fcharset77': None,
-        u'fcharset128': None,
-        u'fcharset129': None,
-        u'fcharset130': None,
-        u'fcharset134': None,
-        u'fcharset136': None,
         u'fcharset161': u'cp1253',
         u'fcharset162': u'cp1254',
         u'fcharset163': u'cp1258',
@@ -545,19 +537,10 @@ class StripRtf():
                     font = arg
                 elif word == u'ansicpg':
                     font_table[font] = 'cp' + arg
-                elif word == u'fcharset':
-                    charset_reference = word + arg
-                    if charset_reference in self.CHARSET_MAPPING:
-                        charset = self.CHARSET_MAPPING[charset_reference]
-                    else:
-                        charset = None
-                        log.error(u"Charset '%s' not in CHARSET_MAPPING "
-                            u"dictionary in "
-                            u"openlp/plugins/songs/lib/__init__.py"
-                            % charset_reference)
-                    # This makes ansicpg always override fcharset if present.
-                    if font not in font_table:
-                        font_table[font] = charset
+                elif word == u'fcharset' and font not in font_table and \
+                    word + arg in self.CHARSET_MAPPING:
+                    # \ansicpg overrides \fcharset, if present.
+                    font_table[font] = self.CHARSET_MAPPING[word + arg]
             # \'xx
             elif hex:
                 if curskip > 0:

From 556f28db3363310ae7e4c769305c76fad1d50ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Mon, 25 Jun 2012 17:49:33 +0300
Subject: [PATCH 20/51] Constant names' readability. Thanks, Samuel.

---
 openlp/plugins/songs/lib/__init__.py         | 6 +++---
 openlp/plugins/songs/lib/sundayplusimport.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index a9e360ceb..eb616d30d 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -435,7 +435,7 @@ class StripRtf():
         u'writereservhash', u'xe', u'xform', u'xmlattrname', u'xmlattrvalue',
         u'xmlclose', u'xmlname', u'xmlnstbl', u'xmlopen'))
     # Translation of some special characters.
-    SPECIALCHARS = {
+    SPECIAL_CHARS = {
         u'par': u'\n',
         u'sect': u'\n\n',
         # Required page and column break.
@@ -520,8 +520,8 @@ class StripRtf():
                 curskip = 0
                 if word in self.DESTINATIONS:
                     ignorable = True
-                elif word in self.SPECIALCHARS:
-                    out.append(self.SPECIALCHARS[word])
+                elif word in self.SPECIAL_CHARS:
+                    out.append(self.SPECIAL_CHARS[word])
                 elif word == u'uc':
                     ucskip = int(arg)
                 elif word == u' ':
diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index cc36896e9..b9b985e8f 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -42,7 +42,7 @@ class SundayPlusImport(SongImport):
     The format examples can be found attached to bug report at
     <http://support.openlp.org/issues/395>
     """
-    HOTKEYTOVERSETYPE = {
+    HOTKEY_TO_VERSE_TYPE = {
         u'1': u'v1',
         u'2': u'v2',
         u'3': u'v3',
@@ -147,8 +147,8 @@ class SundayPlusImport(SongImport):
                         # Hotkey always appears after MARKER_NAME, so it
                         # effectively overrides MARKER_NAME, if present.
                         if len(value) and \
-                            value in self.HOTKEYTOVERSETYPE.keys():
-                            verse_type = self.HOTKEYTOVERSETYPE[value]
+                            value in self.HOTKEY_TO_VERSE_TYPE.keys():
+                            verse_type = self.HOTKEY_TO_VERSE_TYPE[value]
                     if name == 'rtf':
                         value = self.unescape(value)
                         verse = self.rtf.strip_rtf(value, self.encoding)

From 4aa62141a052b7af4bd8222bff42fda5165e8907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Mon, 25 Jun 2012 23:30:24 +0300
Subject: [PATCH 21/51] Ensure it is asked only once for encoding.

---
 openlp/plugins/songs/lib/sundayplusimport.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index b9b985e8f..6260026b6 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -61,11 +61,11 @@ class SundayPlusImport(SongImport):
         Initialise the class.
         """
         SongImport.__init__(self, manager, **kwargs)
+        self.encoding = u'us-ascii'
         self.rtf = StripRtf()
 
     def doImport(self):
         self.importWizard.progressBar.setMaximum(len(self.importSource))
-        self.encoding = 'us-ascii'
         for filename in self.importSource:
             if self.stopImportFlag:
                 return
@@ -81,12 +81,12 @@ class SundayPlusImport(SongImport):
         if not self.parse(file.read()):
             self.logError(file.name)
             return
-        if self.title == '':
+        if not self.title:
             self.title = self.titleFromFilename(file.name)
         if not self.finish():
             self.logError(file.name)
 
-    def parse(self, data, cell = False):
+    def parse(self, data, cell=False):
         if len(data) == 0 or data[0:1] != '[' or data[-1] != ']':
             self.logError(u'File is malformed')
             return False
@@ -94,7 +94,7 @@ class SundayPlusImport(SongImport):
         verse_type = VerseType.Tags[VerseType.Verse]
         while i < len(data):
             # Data is held as #name: value pairs inside groups marked as [].
-            # Now we are looking for name.
+            # Now we are looking for the name.
             if data[i:i+1] == '#':
                 name_end = data.find(':', i+1)
                 name = data[i+1:name_end]
@@ -179,7 +179,7 @@ class SundayPlusImport(SongImport):
         if title.endswith(u'.ptf'):
             title = title[:-4]
         # For some strange reason all example files names ended with 1-7.
-        if title.endswith('1-7'):
+        if title.endswith(u'1-7'):
             title = title[:-3]
         return title.replace(u'_', u' ')
 
@@ -189,8 +189,13 @@ class SundayPlusImport(SongImport):
                 return unicode(blob, self.encoding)
             except:
                 # This is asked again every time the previously chosen
-                # encoding does not work.
-                self.encoding = retrieve_windows_encoding()
+                # encoding does not work. Integrated with StripRtf encoding.
+                if len(self.rtf.user_encoding) and \
+                    self.encoding != self.rtf.user_encoding[-1]:
+                    self.encoding = self.rtf.user_encoding[-1]
+                else:
+                    self.encoding = retrieve_windows_encoding()
+                    self.rtf.user_encoding.append(self.encoding)
 
     def unescape(self, text):
         text = text.replace('^^', '"')

From 2518a340ae4e8d8fd357a95d0ca2b978f096e139 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Mon, 25 Jun 2012 23:14:53 +0100
Subject: [PATCH 22/51] Well only creating the QWebView just the once fixes it.
 But I'm sure we used to do that and there was a good reason why we started
 recreating it for each render...

---
 openlp/core/lib/renderer.py    | 8 +++++---
 openlp/core/lib/serviceitem.py | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 9ccaf4cab..b781c0882 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -82,6 +82,7 @@ class Renderer(object):
         self._calculate_default()
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'theme_update_global'), self.set_global_theme)
+        self.web = None
 
     def update_display(self):
         """
@@ -397,6 +398,10 @@ class Renderer(object):
             The footer text block.
         """
         log.debug(u'_set_text_rectangle %s , %s' % (rect_main, rect_footer))
+        if not self.web:
+            self.web = QtWebKit.QWebView()
+            self.web.setVisible(False)
+            self.web_frame = self.web.page().mainFrame()
         self._rect = rect_main
         self._rect_footer = rect_footer
         self.page_width = self._rect.width()
@@ -404,10 +409,7 @@ class Renderer(object):
         if theme_data.font_main_shadow:
             self.page_width -= int(theme_data.font_main_shadow_size)
             self.page_height -= int(theme_data.font_main_shadow_size)
-        self.web = QtWebKit.QWebView()
-        self.web.setVisible(False)
         self.web.resize(self.page_width, self.page_height)
-        self.web_frame = self.web.page().mainFrame()
         # Adjust width and height to account for shadow. outline done in css.
         html = u"""<!DOCTYPE html><html><head><script>
             function show_text(newtext) {
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index c2b775344..b3e0761de 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -178,7 +178,7 @@ class ServiceItem(object):
             self.renderer.set_item_theme(self.theme)
             self.themedata, self.main, self.footer = self.renderer.pre_render()
         if self.service_item_type == ServiceItemType.Text:
-            log.debug(u'Formatting slides')
+            log.debug(u'Formatting slides: ' + self.title)
             for slide in self._raw_frames:
                 pages = self.renderer.format_slide(slide[u'raw_slide'], self)
                 for page in pages:

From 4e1fc4cb0df17ae03a7dd03d6c585267b97e84af Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Tue, 26 Jun 2012 05:40:07 +0100
Subject: [PATCH 23/51] Reload list on exit of Song import regardless of user
 action

Fixes: https://launchpad.net/bugs/1015528
---
 openlp/plugins/songs/lib/mediaitem.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 14c1ffb3a..47e9ba742 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -338,8 +338,9 @@ class SongMediaItem(MediaManagerItem):
     def onImportClick(self):
         if not hasattr(self, u'importWizard'):
             self.importWizard = SongImportForm(self, self.plugin)
-        if self.importWizard.exec_() == QtGui.QDialog.Accepted:
-            Receiver.send_message(u'songs_load_list')
+        self.importWizard.exec_()
+        # Run song load as list may have been cancelled but some songs loaded
+        Receiver.send_message(u'songs_load_list')
 
     def onExportClick(self):
         if not hasattr(self, u'exportWizard'):

From 0f8054c1fd29fc4a24d76d39bfc9b67c05e06d29 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Wed, 27 Jun 2012 19:00:02 +0200
Subject: [PATCH 24/51] removed fixmes

---
 openlp/core/ui/themeform.py    | 26 ++++++-------
 openlp/core/ui/thememanager.py | 68 ++++++++++++++--------------------
 2 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index 5d3526adb..f6bf28dbc 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -54,8 +54,6 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
             The QWidget-derived parent of the wizard.
         """
         QtGui.QWizard.__init__(self, parent)
-        #FIXME: remove self.thememanager and use self.parent() instead.
-        self.thememanager = parent
         self.setupUi(self)
         self.registerFields()
         self.updateThemeAllowed = True
@@ -196,7 +194,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         # Do not trigger on start up
         if self.currentPage != self.welcomePage:
             self.updateTheme()
-            self.thememanager.generateImage(self.theme, True)
+            self.parent().generateImage(self.theme, True)
 
     def updateLinesText(self, lines):
         """
@@ -228,13 +226,11 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         """
         Detects Page changes and updates as approprate.
         """
-        if self.page(pageId) == self.areaPositionPage:
-            self.setOption(QtGui.QWizard.HaveCustomButton1, True)
-        else:
-            self.setOption(QtGui.QWizard.HaveCustomButton1, False)
+        self.setOption(QtGui.QWizard.HaveCustomButton1,
+            self.page(pageId) == self.areaPositionPage)
         if self.page(pageId) == self.previewPage:
             self.updateTheme()
-            frame = self.thememanager.generateImage(self.theme)
+            frame = self.parent().generateImage(self.theme)
             self.previewBoxLabel.setPixmap(frame)
             self.displayAspectRatio = float(frame.width()) / frame.height()
             self.resizeEvent()
@@ -244,16 +240,16 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         Generate layout preview and display the form.
         """
         self.updateTheme()
-        width = self.thememanager.mainwindow.renderer.width
-        height = self.thememanager.mainwindow.renderer.height
+        width = self.parent().mainwindow.renderer.width
+        height = self.parent().mainwindow.renderer.height
         pixmap = QtGui.QPixmap(width, height)
         pixmap.fill(QtCore.Qt.white)
         paint = QtGui.QPainter(pixmap)
         paint.setPen(QtGui.QPen(QtCore.Qt.blue, 2))
-        paint.drawRect(self.thememanager.mainwindow.renderer.
+        paint.drawRect(self.parent().mainwindow.renderer.
             get_main_rectangle(self.theme))
         paint.setPen(QtGui.QPen(QtCore.Qt.red, 2))
-        paint.drawRect(self.thememanager.mainwindow.renderer.
+        paint.drawRect(self.parent().mainwindow.renderer.
             get_footer_rectangle(self.theme))
         paint.end()
         self.themeLayoutForm.exec_(pixmap)
@@ -623,10 +619,10 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
                 os.path.split(unicode(self.theme.background_filename))[1]
             saveTo = os.path.join(self.path, self.theme.theme_name, filename)
             saveFrom = self.theme.background_filename
-        if not self.edit_mode and \
-            not self.thememanager.checkIfThemeExists(self.theme.theme_name):
+        if not self.edit_mode and not \
+            self.parent().checkIfThemeExists(self.theme.theme_name):
             return
-        self.thememanager.saveTheme(self.theme, saveFrom, saveTo)
+        self.parent().saveTheme(self.theme, saveFrom, saveTo)
         return QtGui.QDialog.accept(self)
 
     def _colorButton(self, field):
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 2db482aa3..3088287b9 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -138,18 +138,14 @@ class ThemeManager(QtGui.QWidget):
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'config_updated'), self.configUpdated)
         # Variables
-        #FIXME: convert to camelCase.
-        self.theme_list = []
+        self.themeList = []
         self.path = AppLocation.get_section_data_path(self.settingsSection)
         check_directory_exists(self.path)
-        #FIXME: convert to camelCase.
-        self.thumb_path = os.path.join(self.path, u'thumbnails')
-        check_directory_exists(self.thumb_path)
+        self.thumbPath = os.path.join(self.path, u'thumbnails')
+        check_directory_exists(self.thumbPath)
         self.themeForm.path = self.path
-        #FIXME: convert to camelCase.
-        self.old_background_image = None
-        #FIXME: convert to camelCase.
-        self.bad_v1_name_chars = re.compile(r'[%+\[\]]')
+        self.oldBackgroundImage = None
+        self.badV1NameChars = re.compile(r'[%+\[\]]')
         # Last little bits of setting up
         self.configUpdated()
 
@@ -197,19 +193,10 @@ class ThemeManager(QtGui.QWidget):
             return
         real_theme_name = unicode(item.data(QtCore.Qt.UserRole).toString())
         theme_name = unicode(item.text())
-        # FIXME: Shorten code.
-#        visible = real_theme_name == theme_name:
-#        self.deleteAction.setVisible(visible)
-#        self.renameAction.setVisible(visible)
-#        self.globalAction.setVisible(visible)
-        self.deleteAction.setVisible(False)
-        self.renameAction.setVisible(False)
-        self.globalAction.setVisible(False)
-        # If default theme restrict actions
-        if real_theme_name == theme_name:
-            self.deleteAction.setVisible(True)
-            self.renameAction.setVisible(True)
-            self.globalAction.setVisible(True)
+        visible = real_theme_name == theme_name
+        self.deleteAction.setVisible(visible)
+        self.renameAction.setVisible(visible)
+        self.globalAction.setVisible(visible)
         self.menu.exec_(self.themeListWidget.mapToGlobal(point))
 
     def changeGlobalFromTab(self, theme_name):
@@ -338,11 +325,11 @@ class ThemeManager(QtGui.QWidget):
             theme = self.getThemeData(
                 unicode(item.data(QtCore.Qt.UserRole).toString()))
             if theme.background_type == u'image':
-                self.old_background_image = theme.background_filename
+                self.oldBackgroundImage = theme.background_filename
             self.themeForm.theme = theme
             self.themeForm.exec_(True)
             self.mainwindow.imageManager.deleteImage(theme.theme_name)
-            self.old_background_image = None
+            self.oldBackgroundImage = None
             self.mainwindow.renderer.update_theme(theme.theme_name)
 
     def onDeleteTheme(self):
@@ -370,10 +357,10 @@ class ThemeManager(QtGui.QWidget):
         ``theme``
             The theme to delete.
         """
-        self.theme_list.remove(theme)
+        self.themeList.remove(theme)
         thumb = u'%s.png' % theme
         delete_file(os.path.join(self.path, thumb))
-        delete_file(os.path.join(self.thumb_path, thumb))
+        delete_file(os.path.join(self.thumbPath, thumb))
         try:
             encoding = get_filesystem_encoding()
             shutil.rmtree(os.path.join(self.path, theme).encode(encoding))
@@ -451,7 +438,7 @@ class ThemeManager(QtGui.QWidget):
         The plugins will call back in to get the real list if they want it.
         """
         log.debug(u'Load themes from dir')
-        self.theme_list = []
+        self.themeList = []
         self.themeListWidget.clear()
         files = SettingsManager.get_files(self.settingsSection, u'.png')
         if firstTime:
@@ -482,7 +469,7 @@ class ThemeManager(QtGui.QWidget):
                         '%s (default)')) % text_name
                 else:
                     name = text_name
-                thumb = os.path.join(self.thumb_path, u'%s.png' % text_name)
+                thumb = os.path.join(self.thumbPath, u'%s.png' % text_name)
                 item_name = QtGui.QListWidgetItem(name)
                 if validate_thumb(theme, thumb):
                     icon = build_icon(thumb)
@@ -492,7 +479,7 @@ class ThemeManager(QtGui.QWidget):
                 item_name.setData(
                     QtCore.Qt.UserRole, QtCore.QVariant(text_name))
                 self.themeListWidget.addItem(item_name)
-                self.theme_list.append(text_name)
+                self.themeList.append(text_name)
         self._pushThemes()
 
     def _pushThemes(self):
@@ -505,7 +492,7 @@ class ThemeManager(QtGui.QWidget):
         """
         Return the list of loaded themes
         """
-        return self.theme_list
+        return self.themeList
 
     def getThemeData(self, theme_name):
         """
@@ -629,7 +616,7 @@ class ThemeManager(QtGui.QWidget):
         this method, please keep in mind, that some parameters are redundant.
         """
         theme_name = xml_tree.find(u'Name').text.strip()
-        theme_name = self.bad_v1_name_chars.sub(u'', theme_name)
+        theme_name = self.badV1NameChars.sub(u'', theme_name)
         theme_folder = os.path.join(dir, theme_name)
         theme_exists = os.path.exists(theme_folder)
         if theme_exists and not self.overWriteMessageBox(theme_name):
@@ -644,12 +631,12 @@ class ThemeManager(QtGui.QWidget):
         if background.text.strip() == u'2':
             image_name = xml_tree.find(u'BackgroundParameter1').text.strip()
             # image file has same extension and is in subfolder
-            imagefile = filter(lambda name: os.path.splitext(name)[1].lower()
+            image_file = filter(lambda name: os.path.splitext(name)[1].lower()
                 == os.path.splitext(image_name)[1].lower() and name.find(r'/'),
                 zip.namelist())
-            if len(imagefile) >= 1:
+            if len(image_file) >= 1:
                 out_file = open(os.path.join(themedir, image_name), u'wb')
-                out_file.write(zip.read(imagefile[0]))
+                out_file.write(zip.read(image_file[0]))
                 out_file.close()
             else:
                 log.exception(u'Theme file does not contain image file "%s"' %
@@ -697,9 +684,8 @@ class ThemeManager(QtGui.QWidget):
         theme_dir = os.path.join(self.path, name)
         check_directory_exists(theme_dir)
         theme_file = os.path.join(theme_dir, name + u'.xml')
-        if self.old_background_image and \
-            image_to != self.old_background_image:
-            delete_file(self.old_background_image)
+        if self.oldBackgroundImage and image_to != self.oldBackgroundImage:
+            delete_file(self.oldBackgroundImage)
         out_file = None
         try:
             out_file = open(theme_file, u'w')
@@ -726,7 +712,7 @@ class ThemeManager(QtGui.QWidget):
         if os.path.exists(sample_path_name):
             os.unlink(sample_path_name)
         frame.save(sample_path_name, u'png')
-        thumb = os.path.join(self.thumb_path, u'%s.png' % name)
+        thumb = os.path.join(self.thumbPath, u'%s.png' % name)
         create_thumb(sample_path_name, thumb, False)
         log.debug(u'Theme image written to %s', sample_path_name)
 
@@ -734,8 +720,8 @@ class ThemeManager(QtGui.QWidget):
         """
         Called to update the themes' preview images.
         """
-        self.mainwindow.displayProgressBar(len(self.theme_list))
-        for theme in self.theme_list:
+        self.mainwindow.displayProgressBar(len(self.themeList))
+        for theme in self.themeList:
             self.mainwindow.incrementProgressBar()
             self.generateAndSaveImage(
                 self.path, theme, self.getThemeData(theme))
@@ -831,7 +817,7 @@ class ThemeManager(QtGui.QWidget):
         """
         theme = Theme(xml_data)
         new_theme = ThemeXML()
-        new_theme.theme_name = self.bad_v1_name_chars.sub(u'', theme.Name)
+        new_theme.theme_name = self.badV1NameChars.sub(u'', theme.Name)
         if theme.BackgroundType == 0:
             new_theme.background_type = \
                 BackgroundType.to_string(BackgroundType.Solid)

From e33bf7254369b81537e4674171df270bec0cfed5 Mon Sep 17 00:00:00 2001
From: Martin Zibricky <mzibr.public@gmail.com>
Date: Wed, 27 Jun 2012 23:32:43 +0200
Subject: [PATCH 25/51] fixed 1018442 (-psn_XXX argument passed to OSX build)

---
 openlp.pyw | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/openlp.pyw b/openlp.pyw
index 3e5d18f16..c67d54e41 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -27,6 +27,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
+import sys
 from openlp.core import main
 
 
@@ -34,4 +35,10 @@ if __name__ == u'__main__':
     """
     Instantiate and run the application.
     """
+    # Mac OS X passes arguments like '-psn_XXXX' to gui application.
+    # This argument is process serial number. However, this causes
+    # conflict with other OpenLP arguments. Since we do not use this
+    # argument we can delete it to avoid any potential conflicts.
+    if sys.platform.startswith('darwin'):
+        sys.argv = filter(lambda x: not x.startswith('-psn'), sys.argv)
     main()

From c73a57afd3f02602f7007353d97a9acae0e135f9 Mon Sep 17 00:00:00 2001
From: Martin Barrett <martin.barrett@ntlworld.com>
Date: Fri, 29 Jun 2012 00:17:17 +0100
Subject: [PATCH 26/51] fixed bug #986688 'PrintService copy not separating
 verses

Fixes: https://launchpad.net/bugs/986688
---
 openlp/core/ui/printserviceform.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index 674aab1b9..ec0993a50 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -60,7 +60,7 @@ http://doc.trolltech.com/4.7/richtext-html-subset.html#css-properties
 }
 
 .itemText {
-   margin-top: 10px;
+   margin-top: 5px;
 }
 
 .itemFooter {
@@ -218,6 +218,7 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
                     if not verse_def or verse_def != slide[u'verseTag']:
                         text_div = self._addElement(u'div', parent=div,
                             classId=u'itemText')
+                        self._addElement(u'br', parent=text_div)
                     else:
                         self._addElement(u'br', parent=text_div)
                     self._addElement(u'span', slide[u'html'], text_div)

From 9da23266c6d39d0eb4dfcd42902be8b24f705908 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 30 Jun 2012 17:19:33 +0200
Subject: [PATCH 27/51] reworked image manager _cache to contain unique images
 (to be cleaned up)

---
 openlp/core/lib/imagemanager.py               | 61 ++++++++++---------
 openlp/core/lib/renderer.py                   |  9 ++-
 openlp/core/lib/serviceitem.py                |  8 +--
 openlp/core/ui/maindisplay.py                 | 44 ++++++-------
 openlp/core/ui/slidecontroller.py             | 14 +++--
 openlp/core/ui/thememanager.py                |  5 +-
 openlp/plugins/images/imageplugin.py          |  2 +-
 openlp/plugins/images/lib/mediaitem.py        |  3 +-
 .../presentations/lib/messagelistener.py      |  3 +-
 9 files changed, 77 insertions(+), 72 deletions(-)

diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py
index 9e9a882b2..265f3b3cd 100644
--- a/openlp/core/lib/imagemanager.py
+++ b/openlp/core/lib/imagemanager.py
@@ -96,6 +96,15 @@ class Priority(object):
     Urgent = 0
 
 
+class ImageSource(object):
+    """
+    This enumeration class represents different image sources. An image sources
+    states where an image is used.
+    """
+    ImagePlugin = 1
+    Theme = 2
+
+
 class Image(object):
     """
     This class represents an image. To mark an image as *dirty* call the
@@ -103,27 +112,22 @@ class Image(object):
     argument.
     """
     secondary_priority = 0
-    
-    def __init__(self, name, path, source, background):
+
+    def __init__(self, path, source, background):
         """
         Create an image for the :class:`ImageManager`'s cache.
-        
-        ``name``
-            The image name. This does not have to be part of the ``path``. It
-            can be of any value. It can be considered an ID.
-            
+
         ``path``
             The image's file path. This should be an existing file path.
-            
+
         ``source``
             The source describes the image's origin. Possible values are
             ``image`` and ``theme``.
-            
+
         ``background``
             A ``QtGui.QColor`` object specifying the colour to be used to fill
             the gabs if the image's ratio does not match with the display ratio.
         """
-        self.name = name
         self.path = path
         self.image = None
         self.image_bytes = None
@@ -192,6 +196,7 @@ class ImageManager(QtCore.QObject):
         self.imageThread = ImageThread(self)
         self._conversionQueue = PriorityQueue()
         self.stopManager = False
+        self.imageSource = ImageSource()
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'config_updated'), self.processUpdates)
 
@@ -220,14 +225,14 @@ class ImageManager(QtCore.QObject):
                 image.background = background
                 self._resetImage(image)
 
-    def updateImageBorder(self, name, source, background):
+    def updateImageBorder(self, path, source, background):
         """
         Border has changed so update the image affected.
         """
         log.debug(u'updateImage')
         # Mark the image as dirty for a rebuild by setting the image and byte
         # stream to None.
-        image = self._cache[name]
+        image = self._cache[(path, source)]
         if image.source == source:
             image.background = background
             self._resetImage(image)
@@ -249,13 +254,13 @@ class ImageManager(QtCore.QObject):
         if not self.imageThread.isRunning():
             self.imageThread.start()
 
-    def getImage(self, name):
+    def getImage(self, path, source):
         """
         Return the ``QImage`` from the cache. If not present wait for the
         background thread to process it.
         """
-        log.debug(u'getImage %s' % name)
-        image = self._cache[name]
+        log.debug(u'getImage %s' % path)
+        image = self._cache[(path, source)]
         if image.image is None:
             self._conversionQueue.modify_priority(image, Priority.High)
             # make sure we are running and if not give it a kick
@@ -271,13 +276,13 @@ class ImageManager(QtCore.QObject):
             self._conversionQueue.modify_priority(image, Priority.Low)
         return image.image
 
-    def getImageBytes(self, name):
+    def getImageBytes(self, path, source):
         """
         Returns the byte string for an image. If not present wait for the
         background thread to process it.
         """
-        log.debug(u'getImageBytes %s' % name)
-        image = self._cache[name]
+        log.debug(u'getImageBytes %s' % path)
+        image = self._cache[(path, source)]
         if image.image_bytes is None:
             self._conversionQueue.modify_priority(image, Priority.Urgent)
             # make sure we are running and if not give it a kick
@@ -287,24 +292,22 @@ class ImageManager(QtCore.QObject):
                 time.sleep(0.1)
         return image.image_bytes
 
-    def addImage(self, name, path, source, background):
+    def addImage(self, path, source, background):
         """
         Add image to cache if it is not already there.
         """
-        log.debug(u'addImage %s:%s' % (name, path))
-        if not name in self._cache:
-            image = Image(name, path, source, background)
-            self._cache[name] = image
+        log.debug(u'addImage %s' % path)
+        if not (path, source) in self._cache:
+            image = Image(path, source, background)
+            self._cache[(path, source)] = image
             self._conversionQueue.put(
                 (image.priority, image.secondary_priority, image))
-        else:
-            image = self._cache[name]
-            if os.path.isfile(path) and \
-                image.timestamp != os.stat(path).st_mtime:
-                image.path = path
+        # Check if the there are any images with the same path and check if the
+        # timestamp has changed.
+        for image in self._cache.values():
+            if image.path == path and image.timestamp != os.stat(path).st_mtime:
                 image.timestamp = os.stat(path).st_mtime
                 self._resetImage(image)
-            log.debug(u'Image in cache %s:%s' % (name, path))
         # We want only one thread.
         if not self.imageThread.isRunning():
             self.imageThread.start()
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 2646b3904..c7b697fb1 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -135,11 +135,10 @@ class Renderer(object):
         else:
             theme_data, main_rect, footer_rect = \
                 self._theme_dimensions[theme_name]
-        #FIXME: REMOVE deleteImage() call which will be added soon.
         # if No file do not update cache
         if theme_data.background_filename:
-            self.image_manager.addImage(theme_data.theme_name,
-                theme_data.background_filename, u'theme',
+            self.image_manager.addImage(theme_data.background_filename,
+                self.image_manager.imageSource.Theme,
                 QtGui.QColor(theme_data.background_border_color))
 
     def pre_render(self, override_theme_data=None):
@@ -243,8 +242,8 @@ class Renderer(object):
         serviceItem.raw_footer = FOOTER
         # if No file do not update cache
         if theme_data.background_filename:
-            self.image_manager.addImage(theme_data.theme_name,
-                theme_data.background_filename, u'theme',
+            self.image_manager.addImage(theme_data.background_filename,
+                self.image_manager.imageSource.Theme,
                 QtGui.QColor(theme_data.background_border_color))
         theme_data, main, footer = self.pre_render(theme_data)
         serviceItem.themedata = theme_data
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index c2b775344..d0622a130 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -217,7 +217,8 @@ class ServiceItem(object):
             self.image_border = background
         self.service_item_type = ServiceItemType.Image
         self._raw_frames.append({u'title': title, u'path': path})
-        self.renderer.image_manager.addImage(title, path, u'image',
+        self.renderer.image_manager.addImage(path,
+            self.renderer.image_manager.imageSource.ImagePlugin,
             self.image_border)
         self._new_item()
 
@@ -432,13 +433,12 @@ class ServiceItem(object):
 
     def get_rendered_frame(self, row):
         """
-        Returns the correct frame for a given list and
-        renders it if required.
+        Returns the correct frame for a given list and renders it if required.
         """
         if self.service_item_type == ServiceItemType.Text:
             return self._display_frames[row][u'html'].split(u'\n')[0]
         elif self.service_item_type == ServiceItemType.Image:
-            return self._raw_frames[row][u'title']
+            return self._raw_frames[row][u'path']
         else:
             return self._raw_frames[row][u'image']
 
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index cdb08b6a7..48f9aaa8e 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -274,31 +274,33 @@ class MainDisplay(Display):
                 self.setVisible(False)
                 self.setGeometry(self.screen[u'size'])
 
-    def directImage(self, name, path, background):
+    def directImage(self, path, background):
         """
         API for replacement backgrounds so Images are added directly to cache.
         """
-        self.imageManager.addImage(name, path, u'image', background)
-        if hasattr(self, u'serviceItem'):
-            self.override[u'image'] = name
-            self.override[u'theme'] = self.serviceItem.themedata.theme_name
-            self.image(name)
-            # Update the preview frame.
-            if self.isLive:
-                self.parent().updatePreview()
-            return True
-        return False
+        self.imageManager.addImage(path, self.imageManager.imageSource.ImagePlugin, background)
+        if not hasattr(self, u'serviceItem'):
+            return False
+        self.override[u'image'] = path
+        self.override[u'theme'] = self.serviceItem.themedata.background_filename
+        self.image(path)
+        # Update the preview frame.
+        if self.isLive:
+            self.parent().updatePreview()
+        return True
 
-    def image(self, name):
+    def image(self, path):
         """
         Add an image as the background. The image has already been added to the
         cache.
 
-        ``name``
-            The name of the image to be displayed.
+        ``path``
+            The path to the image to be displayed. **Note**, the path is only
+            passed to identify the image. If the image has changed it has to be
+            re-added to the image manager.
         """
         log.debug(u'image to display')
-        image = self.imageManager.getImageBytes(name)
+        image = self.imageManager.getImageBytes(path, self.imageManager.imageSource.ImagePlugin)
         self.controller.mediaController.video_reset(self.controller)
         self.displayImage(image)
 
@@ -360,7 +362,7 @@ class MainDisplay(Display):
                     self.setVisible(True)
         return QtGui.QPixmap.grabWidget(self)
 
-    def buildHtml(self, serviceItem, image=None):
+    def buildHtml(self, serviceItem, image_path=u''):
         """
         Store the serviceItem and build the new HTML from it. Add the
         HTML to the display
@@ -377,20 +379,20 @@ class MainDisplay(Display):
                 Receiver.send_message(u'video_background_replaced')
                 self.override = {}
             # We have a different theme.
-            elif self.override[u'theme'] != serviceItem.themedata.theme_name:
+            elif self.override[u'theme'] != serviceItem.themedata.background_filename:
                 Receiver.send_message(u'live_theme_changed')
                 self.override = {}
             else:
                 # replace the background
                 background = self.imageManager. \
-                    getImageBytes(self.override[u'image'])
+                    getImageBytes(self.override[u'image'], self.imageManager.imageSource.ImagePlugin)
         self.setTransparency(self.serviceItem.themedata.background_type ==
             BackgroundType.to_string(BackgroundType.Transparent))
         if self.serviceItem.themedata.background_filename:
             self.serviceItem.bg_image_bytes = self.imageManager. \
-                getImageBytes(self.serviceItem.themedata.theme_name)
-        if image:
-            image_bytes = self.imageManager.getImageBytes(image)
+                getImageBytes(self.serviceItem.themedata.background_filename,  self.imageManager.imageSource.Theme)
+        if image_path:
+            image_bytes = self.imageManager.getImageBytes(image_path, self.imageManager.imageSource.ImagePlugin)
         else:
             image_bytes = None
         html = build_html(self.serviceItem, self.screen, self.isLive,
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 2b919094d..1453bee1a 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -861,8 +861,10 @@ class SlideController(Controller):
                     # If current slide set background to image
                     if framenumber == slideno:
                         self.serviceItem.bg_image_bytes = \
-                            self.imageManager.getImageBytes(frame[u'title'])
-                    image = self.imageManager.getImage(frame[u'title'])
+                            self.imageManager.getImageBytes(frame[u'path'],
+                            self.imageManager.imageSource.ImagePlugin)
+                    image = self.imageManager.getImage(frame[u'path'],
+                        self.imageManager.imageSource.ImagePlugin)
                     label.setPixmap(QtGui.QPixmap.fromImage(image))
                 self.previewListWidget.setCellWidget(framenumber, 0, label)
                 slideHeight = width * (1 / self.ratio)
@@ -1092,14 +1094,14 @@ class SlideController(Controller):
                         u'%s_slide' % self.serviceItem.name.lower(),
                         [self.serviceItem, self.isLive, row])
             else:
-                toDisplay = self.serviceItem.get_rendered_frame(row)
+                to_display = self.serviceItem.get_rendered_frame(row)
                 if self.serviceItem.is_text():
-                    self.display.text(toDisplay)
+                    self.display.text(to_display)
                 else:
                     if start:
-                        self.display.buildHtml(self.serviceItem, toDisplay)
+                        self.display.buildHtml(self.serviceItem, to_display)
                     else:
-                        self.display.image(toDisplay)
+                        self.display.image(to_display)
                     # reset the store used to display first image
                     self.serviceItem.bg_image_bytes = None
             self.updatePreview()
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 4e9fa6c8f..8d202ee81 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -669,8 +669,9 @@ class ThemeManager(QtGui.QWidget):
         self._writeTheme(theme, image_from, image_to)
         if theme.background_type == \
             BackgroundType.to_string(BackgroundType.Image):
-            self.mainwindow.imageManager.updateImageBorder(theme.theme_name,
-                u'theme', QtGui.QColor(theme.background_border_color))
+            self.mainwindow.imageManager.updateImageBorder(
+                theme.background_filename,
+                self.mainwindow.imageManager.imageSource.Theme, QtGui.QColor(theme.background_border_color))
             self.mainwindow.imageManager.processUpdates()
         self.loadThemes()
 
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index fbd3916c6..b615d3078 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -99,4 +99,4 @@ class ImagePlugin(Plugin):
         background = QtGui.QColor(Settings().value(self.settingsSection
             + u'/background color', QtCore.QVariant(u'#000000')))
         self.liveController.imageManager.updateImagesBorder(
-            u'image', background)
+            self.liveController.imageManager.imageSource.ImagePlugin, background)
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 30ef9067a..0fdb1537c 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -229,8 +229,7 @@ class ImageMediaItem(MediaManagerItem):
             bitem = self.listView.item(item.row())
             filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
             if os.path.exists(filename):
-                name = os.path.split(filename)[1]
-                if self.plugin.liveController.display.directImage(name,
+                if self.plugin.liveController.display.directImage(
                     filename, background):
                     self.resetAction.setVisible(True)
                 else:
diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index 19ffa8a31..cb8f7b7b8 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -278,8 +278,7 @@ class MessageListener(object):
         item = message[0]
         log.debug(u'Startup called with message %s' % message)
         hide_mode = message[2]
-        file = os.path.join(item.get_frame_path(),
-            item.get_frame_title())
+        file = os.path.join(item.get_frame_path(), item.get_frame_title())
         self.handler = item.title
         if self.handler == self.mediaitem.Automatic:
             self.handler = self.mediaitem.findControllerByType(file)

From d86a94b3c02d7aa4f9972bd399076e13672afe0c Mon Sep 17 00:00:00 2001
From: Martin Barrett <martin.barrett@ntlworld.com>
Date: Sat, 30 Jun 2012 17:11:49 +0100
Subject: [PATCH 28/51] fixes bug #986699: Print Service not separating verses

---
 openlp/core/ui/printserviceform.py | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index ec0993a50..833b68801 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -60,7 +60,7 @@ http://doc.trolltech.com/4.7/richtext-html-subset.html#css-properties
 }
 
 .itemText {
-   margin-top: 5px;
+   margin-top: 10px;
 }
 
 .itemFooter {
@@ -218,7 +218,6 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
                     if not verse_def or verse_def != slide[u'verseTag']:
                         text_div = self._addElement(u'div', parent=div,
                             classId=u'itemText')
-                        self._addElement(u'br', parent=text_div)
                     else:
                         self._addElement(u'br', parent=text_div)
                     self._addElement(u'span', slide[u'html'], text_div)
@@ -331,7 +330,24 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
         Copies the display text to the clipboard as plain text
         """
         self.update_song_usage()
-        self.mainWindow.clipboard.setText(self.document.toPlainText())
+        cursor = QtGui.QTextCursor(self.document)
+        cursor.select(3)
+        clipboard_text = cursor.selectedText ()
+        # We now have the unprocessed unicode service text in the cursor
+        # So we replace u2029 with \n and u2029 with \n\n and a few others
+        clipboard_text = clipboard_text.replace(u'\u2028', u'\n')
+        clipboard_text = clipboard_text.replace(u'\u2029', u'\n\n')
+        clipboard_text = clipboard_text.replace(u'\u2018', u'\'')
+        clipboard_text = clipboard_text.replace(u'\u2019', u'\'')
+        clipboard_text = clipboard_text.replace(u'\u201c', u'"')
+        clipboard_text = clipboard_text.replace(u'\u201d', u'"')
+        clipboard_text = clipboard_text.replace(u'\u2026', u'...')
+        clipboard_text = clipboard_text.replace(u'\u2013', u'-')
+        clipboard_text = clipboard_text.replace(u'\u2014', u'-')
+        # remove the icon from the text
+        clipboard_text = clipboard_text.replace(u'\ufffc\xa0', u'')
+        # and put it all on the clipboard
+        self.mainWindow.clipboard.setText(clipboard_text)
 
     def copyHtmlText(self):
         """

From ac769b96f96135278a01b02b71a4cf60514500eb Mon Sep 17 00:00:00 2001
From: Martin Barrett <martin.barrett@ntlworld.com>
Date: Sat, 30 Jun 2012 17:15:42 +0100
Subject: [PATCH 29/51] fixes bug #986699: Print Service not separating verses

---
 openlp/core/ui/printserviceform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index 833b68801..4e96dc77d 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -334,7 +334,7 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
         cursor.select(3)
         clipboard_text = cursor.selectedText ()
         # We now have the unprocessed unicode service text in the cursor
-        # So we replace u2029 with \n and u2029 with \n\n and a few others
+        # So we replace u2028 with \n and u2029 with \n\n and a few others
         clipboard_text = clipboard_text.replace(u'\u2028', u'\n')
         clipboard_text = clipboard_text.replace(u'\u2029', u'\n\n')
         clipboard_text = clipboard_text.replace(u'\u2018', u'\'')

From 620b8d519b46e8cf80f2f5530db81039bb5879ab Mon Sep 17 00:00:00 2001
From: Martin Barrett <martin.barrett@ntlworld.com>
Date: Sat, 30 Jun 2012 18:16:26 +0100
Subject: [PATCH 30/51] fixes bug #986699: Print Service not separating verses

---
 openlp/core/ui/printserviceform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index 4e96dc77d..f1e46c4b9 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -347,7 +347,7 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
         # remove the icon from the text
         clipboard_text = clipboard_text.replace(u'\ufffc\xa0', u'')
         # and put it all on the clipboard
-        self.mainWindow.clipboard.setText(clipboard_text)
+        xrange.mainWindow.clipboard.setText(clipboard_text)
 
     def copyHtmlText(self):
         """

From d9037de8f244305e6c792dc13fe7dd439f06dbdd Mon Sep 17 00:00:00 2001
From: Martin Barrett <martin.barrett@ntlworld.com>
Date: Sat, 30 Jun 2012 18:16:44 +0100
Subject: [PATCH 31/51] fixes bug #986699: Print Service not separating verses

---
 openlp/core/ui/printserviceform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index f1e46c4b9..4e96dc77d 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -347,7 +347,7 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
         # remove the icon from the text
         clipboard_text = clipboard_text.replace(u'\ufffc\xa0', u'')
         # and put it all on the clipboard
-        xrange.mainWindow.clipboard.setText(clipboard_text)
+        self.mainWindow.clipboard.setText(clipboard_text)
 
     def copyHtmlText(self):
         """

From 30e760dbe3cc5060e96932d47aca2489feb75492 Mon Sep 17 00:00:00 2001
From: Martin Barrett <martin.barrett@ntlworld.com>
Date: Sat, 30 Jun 2012 18:25:49 +0100
Subject: [PATCH 32/51] fixes bug #986699: Print Service not separating verses

---
 openlp/core/ui/printserviceform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index 4e96dc77d..a6c32cbc1 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -332,7 +332,7 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
         self.update_song_usage()
         cursor = QtGui.QTextCursor(self.document)
         cursor.select(3)
-        clipboard_text = cursor.selectedText ()
+        clipboard_text = cursor.selectedText()
         # We now have the unprocessed unicode service text in the cursor
         # So we replace u2028 with \n and u2029 with \n\n and a few others
         clipboard_text = clipboard_text.replace(u'\u2028', u'\n')

From 3fc52181a5559f07963bd193584f56647ada6a29 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 30 Jun 2012 20:41:15 +0200
Subject: [PATCH 33/51] make code more readable

---
 openlp/core/ui/themeform.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index f6bf28dbc..eca449323 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -226,8 +226,8 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         """
         Detects Page changes and updates as approprate.
         """
-        self.setOption(QtGui.QWizard.HaveCustomButton1,
-            self.page(pageId) == self.areaPositionPage)
+        enabled = self.page(pageId) == self.areaPositionPage
+        self.setOption(QtGui.QWizard.HaveCustomButton1, enabled)
         if self.page(pageId) == self.previewPage:
             self.updateTheme()
             frame = self.parent().generateImage(self.theme)

From d2d129deb3500598665660135c8f95ad0f4d1919 Mon Sep 17 00:00:00 2001
From: Martin Barrett <martin.barrett@ntlworld.com>
Date: Sat, 30 Jun 2012 19:51:53 +0100
Subject: [PATCH 34/51] fixes bug #986699: Print Service not separating verses

---
 openlp/core/ui/printserviceform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index a6c32cbc1..78a84f3fb 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -331,7 +331,7 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
         """
         self.update_song_usage()
         cursor = QtGui.QTextCursor(self.document)
-        cursor.select(3)
+        cursor.select(QtGui.QTextCursor.Document)
         clipboard_text = cursor.selectedText()
         # We now have the unprocessed unicode service text in the cursor
         # So we replace u2028 with \n and u2029 with \n\n and a few others

From 65beb6ccda2402611960e3d24d35e0997c0cf2c4 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 30 Jun 2012 23:20:16 +0100
Subject: [PATCH 35/51] move webview to init and use %s

---
 openlp/core/lib/renderer.py    | 8 +++-----
 openlp/core/lib/serviceitem.py | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index b781c0882..0f89d218f 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -82,7 +82,9 @@ class Renderer(object):
         self._calculate_default()
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'theme_update_global'), self.set_global_theme)
-        self.web = None
+        self.web = QtWebKit.QWebView()
+        self.web.setVisible(False)
+        self.web_frame = self.web.page().mainFrame()
 
     def update_display(self):
         """
@@ -398,10 +400,6 @@ class Renderer(object):
             The footer text block.
         """
         log.debug(u'_set_text_rectangle %s , %s' % (rect_main, rect_footer))
-        if not self.web:
-            self.web = QtWebKit.QWebView()
-            self.web.setVisible(False)
-            self.web_frame = self.web.page().mainFrame()
         self._rect = rect_main
         self._rect_footer = rect_footer
         self.page_width = self._rect.width()
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index b3e0761de..d61440239 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -178,7 +178,7 @@ class ServiceItem(object):
             self.renderer.set_item_theme(self.theme)
             self.themedata, self.main, self.footer = self.renderer.pre_render()
         if self.service_item_type == ServiceItemType.Text:
-            log.debug(u'Formatting slides: ' + self.title)
+            log.debug(u'Formatting slides: %s' % self.title)
             for slide in self._raw_frames:
                 pages = self.renderer.format_slide(slide[u'raw_slide'], self)
                 for page in pages:

From 3f7efd32c9cf8c9f61744420cb7885d6cdc2451f Mon Sep 17 00:00:00 2001
From: Samuel Findlay <samuel.findlay@gmail.com>
Date: Sun, 1 Jul 2012 13:25:59 +1000
Subject: [PATCH 36/51] Updated Theme Wizard final page's subtitle to match
 behaviour that changed in r1176

---
 openlp/core/ui/themewizard.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py
index 6d14cac68..08d1718af 100644
--- a/openlp/core/ui/themewizard.py
+++ b/openlp/core/ui/themewizard.py
@@ -552,11 +552,9 @@ class Ui_ThemeWizard(object):
         themeWizard.setButtonText(QtGui.QWizard.CustomButton1,
             translate('OpenLP.ThemeWizard', 'Layout Preview'))
         self.previewPage.setTitle(
-            translate('OpenLP.ThemeWizard', 'Save and Preview'))
+            translate('OpenLP.ThemeWizard', 'Preview and Save'))
         self.previewPage.setSubTitle(
-            translate('OpenLP.ThemeWizard', 'View the theme and save it '
-                'replacing the current one or change the name to create a '
-                'new theme'))
+            translate('OpenLP.ThemeWizard', 'Preview the theme and save it.'))
         self.themeNameLabel.setText(
             translate('OpenLP.ThemeWizard', 'Theme name:'))
         # Align all QFormLayouts towards each other.

From f74c16b03b372eb5dfda635ace163d6d2d62a465 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 1 Jul 2012 19:58:58 +0200
Subject: [PATCH 37/51] reverted parent() change

---
 openlp/core/ui/themeform.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index eca449323..01738d65c 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -54,6 +54,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
             The QWidget-derived parent of the wizard.
         """
         QtGui.QWizard.__init__(self, parent)
+        self.thememanager = parent
         self.setupUi(self)
         self.registerFields()
         self.updateThemeAllowed = True
@@ -194,7 +195,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         # Do not trigger on start up
         if self.currentPage != self.welcomePage:
             self.updateTheme()
-            self.parent().generateImage(self.theme, True)
+            self.thememanager.generateImage(self.theme, True)
 
     def updateLinesText(self, lines):
         """
@@ -230,7 +231,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         self.setOption(QtGui.QWizard.HaveCustomButton1, enabled)
         if self.page(pageId) == self.previewPage:
             self.updateTheme()
-            frame = self.parent().generateImage(self.theme)
+            frame = self.thememanager.generateImage(self.theme)
             self.previewBoxLabel.setPixmap(frame)
             self.displayAspectRatio = float(frame.width()) / frame.height()
             self.resizeEvent()
@@ -240,16 +241,16 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         Generate layout preview and display the form.
         """
         self.updateTheme()
-        width = self.parent().mainwindow.renderer.width
-        height = self.parent().mainwindow.renderer.height
+        width = self.thememanager.mainwindow.renderer.width
+        height = self.thememanager.mainwindow.renderer.height
         pixmap = QtGui.QPixmap(width, height)
         pixmap.fill(QtCore.Qt.white)
         paint = QtGui.QPainter(pixmap)
         paint.setPen(QtGui.QPen(QtCore.Qt.blue, 2))
-        paint.drawRect(self.parent().mainwindow.renderer.
+        paint.drawRect(self.thememanager.mainwindow.renderer.
             get_main_rectangle(self.theme))
         paint.setPen(QtGui.QPen(QtCore.Qt.red, 2))
-        paint.drawRect(self.parent().mainwindow.renderer.
+        paint.drawRect(self.thememanager.mainwindow.renderer.
             get_footer_rectangle(self.theme))
         paint.end()
         self.themeLayoutForm.exec_(pixmap)
@@ -620,9 +621,9 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
             saveTo = os.path.join(self.path, self.theme.theme_name, filename)
             saveFrom = self.theme.background_filename
         if not self.edit_mode and not \
-            self.parent().checkIfThemeExists(self.theme.theme_name):
+            self.thememanager.checkIfThemeExists(self.theme.theme_name):
             return
-        self.parent().saveTheme(self.theme, saveFrom, saveTo)
+        self.thememanager.saveTheme(self.theme, saveFrom, saveTo)
         return QtGui.QDialog.accept(self)
 
     def _colorButton(self, field):

From bc3173966a5c9c904b51a12a7fbab9dc7201661b Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 1 Jul 2012 20:41:59 +0200
Subject: [PATCH 38/51] clean ups

---
 openlp/core/lib/__init__.py          | 11 ++++++++++-
 openlp/core/lib/imagemanager.py      | 12 +-----------
 openlp/core/lib/renderer.py          |  6 +++---
 openlp/core/lib/serviceitem.py       |  8 ++++----
 openlp/core/ui/maindisplay.py        | 21 ++++++++++++---------
 openlp/core/ui/slidecontroller.py    |  6 +++---
 openlp/core/ui/thememanager.py       |  4 ++--
 openlp/plugins/images/imageplugin.py |  4 ++--
 8 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index e0d185cd7..fa6458354 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -36,6 +36,16 @@ from PyQt4 import QtCore, QtGui, Qt
 
 log = logging.getLogger(__name__)
 
+
+class ImageSource(object):
+    """
+    This enumeration class represents different image sources. An image sources
+    states where an image is used.
+    """
+    ImagePlugin = 1
+    Theme = 2
+
+
 class MediaType(object):
     """
     An enumeration class for types of media.
@@ -265,7 +275,6 @@ def resize_image(image_path, width, height, background=u'#000000'):
     if image_ratio == resize_ratio:
         # We neither need to centre the image nor add "bars" to the image.
         return preview
-    #FIXME: change variables to real_width and real_height
     realw = preview.width()
     realh = preview.height()
     # and move it to the centre of the preview space
diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py
index 265f3b3cd..0028cc50b 100644
--- a/openlp/core/lib/imagemanager.py
+++ b/openlp/core/lib/imagemanager.py
@@ -96,15 +96,6 @@ class Priority(object):
     Urgent = 0
 
 
-class ImageSource(object):
-    """
-    This enumeration class represents different image sources. An image sources
-    states where an image is used.
-    """
-    ImagePlugin = 1
-    Theme = 2
-
-
 class Image(object):
     """
     This class represents an image. To mark an image as *dirty* call the
@@ -131,10 +122,10 @@ class Image(object):
         self.path = path
         self.image = None
         self.image_bytes = None
+        self.priority = Priority.Normal
         self.source = source
         self.background = background
         self.timestamp = os.stat(path).st_mtime
-        self.priority = Priority.Normal
         self.secondary_priority = Image.secondary_priority
         Image.secondary_priority += 1
 
@@ -196,7 +187,6 @@ class ImageManager(QtCore.QObject):
         self.imageThread = ImageThread(self)
         self._conversionQueue = PriorityQueue()
         self.stopManager = False
-        self.imageSource = ImageSource()
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'config_updated'), self.processUpdates)
 
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index c7b697fb1..ae9803a7f 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -32,7 +32,7 @@ from PyQt4 import QtGui, QtCore, QtWebKit
 
 from openlp.core.lib import ServiceItem, expand_tags, \
     build_lyrics_format_css, build_lyrics_outline_css, Receiver, \
-    ItemCapabilities, FormattingTags
+    ItemCapabilities, FormattingTags, ImageSource
 from openlp.core.lib.theme import ThemeLevel
 from openlp.core.ui import MainDisplay, ScreenList
 
@@ -138,7 +138,7 @@ class Renderer(object):
         # if No file do not update cache
         if theme_data.background_filename:
             self.image_manager.addImage(theme_data.background_filename,
-                self.image_manager.imageSource.Theme,
+                ImageSource.Theme,
                 QtGui.QColor(theme_data.background_border_color))
 
     def pre_render(self, override_theme_data=None):
@@ -243,7 +243,7 @@ class Renderer(object):
         # if No file do not update cache
         if theme_data.background_filename:
             self.image_manager.addImage(theme_data.background_filename,
-                self.image_manager.imageSource.Theme,
+                ImageSource.Theme,
                 QtGui.QColor(theme_data.background_border_color))
         theme_data, main, footer = self.pre_render(theme_data)
         serviceItem.themedata = theme_data
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index d0622a130..76b731307 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -36,7 +36,8 @@ import logging
 import os
 import uuid
 
-from openlp.core.lib import build_icon, clean_tags, expand_tags, translate
+from openlp.core.lib import build_icon, clean_tags, expand_tags, translate, \
+    ImageSource
 
 log = logging.getLogger(__name__)
 
@@ -217,9 +218,8 @@ class ServiceItem(object):
             self.image_border = background
         self.service_item_type = ServiceItemType.Image
         self._raw_frames.append({u'title': title, u'path': path})
-        self.renderer.image_manager.addImage(path,
-            self.renderer.image_manager.imageSource.ImagePlugin,
-            self.image_border)
+        self.renderer.image_manager.addImage(
+            path, ImageSource.ImagePlugin, self.image_border)
         self._new_item()
 
     def add_from_text(self, raw_slide, verse_tag=None):
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 48f9aaa8e..17a933a55 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -37,7 +37,7 @@ from PyQt4 import QtCore, QtGui, QtWebKit, QtOpenGL
 from PyQt4.phonon import Phonon
 
 from openlp.core.lib import Receiver, build_html, ServiceItem, image_to_byte, \
-    translate, PluginManager, expand_tags
+    translate, PluginManager, expand_tags, ImageSource
 from openlp.core.lib.theme import BackgroundType
 from openlp.core.lib.settings import Settings
 
@@ -278,7 +278,7 @@ class MainDisplay(Display):
         """
         API for replacement backgrounds so Images are added directly to cache.
         """
-        self.imageManager.addImage(path, self.imageManager.imageSource.ImagePlugin, background)
+        self.imageManager.addImage(path, ImageSource.ImagePlugin, background)
         if not hasattr(self, u'serviceItem'):
             return False
         self.override[u'image'] = path
@@ -300,7 +300,7 @@ class MainDisplay(Display):
             re-added to the image manager.
         """
         log.debug(u'image to display')
-        image = self.imageManager.getImageBytes(path, self.imageManager.imageSource.ImagePlugin)
+        image = self.imageManager.getImageBytes(path, ImageSource.ImagePlugin)
         self.controller.mediaController.video_reset(self.controller)
         self.displayImage(image)
 
@@ -379,20 +379,23 @@ class MainDisplay(Display):
                 Receiver.send_message(u'video_background_replaced')
                 self.override = {}
             # We have a different theme.
-            elif self.override[u'theme'] != serviceItem.themedata.background_filename:
+            elif self.override[u'theme'] != \
+                serviceItem.themedata.background_filename:
                 Receiver.send_message(u'live_theme_changed')
                 self.override = {}
             else:
                 # replace the background
-                background = self.imageManager. \
-                    getImageBytes(self.override[u'image'], self.imageManager.imageSource.ImagePlugin)
+                background = self.imageManager.getImageBytes(
+                    self.override[u'image'], ImageSource.ImagePlugin)
         self.setTransparency(self.serviceItem.themedata.background_type ==
             BackgroundType.to_string(BackgroundType.Transparent))
         if self.serviceItem.themedata.background_filename:
-            self.serviceItem.bg_image_bytes = self.imageManager. \
-                getImageBytes(self.serviceItem.themedata.background_filename,  self.imageManager.imageSource.Theme)
+            self.serviceItem.bg_image_bytes = self.imageManager.getImageBytes(
+                self.serviceItem.themedata.background_filename,
+                ImageSource.Theme)
         if image_path:
-            image_bytes = self.imageManager.getImageBytes(image_path, self.imageManager.imageSource.ImagePlugin)
+            image_bytes = self.imageManager.getImageBytes(
+                image_path, ImageSource.ImagePlugin)
         else:
             image_bytes = None
         html = build_html(self.serviceItem, self.screen, self.isLive,
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 1453bee1a..c59ea9afe 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -34,7 +34,7 @@ from collections import deque
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import OpenLPToolbar, Receiver, ItemCapabilities, \
-    translate, build_icon, build_html, PluginManager, ServiceItem
+    translate, build_icon, build_html, PluginManager, ServiceItem, ImageSource
 from openlp.core.lib.ui import UiStrings, create_action
 from openlp.core.lib.settings import Settings
 from openlp.core.lib import SlideLimits, ServiceItemAction
@@ -862,9 +862,9 @@ class SlideController(Controller):
                     if framenumber == slideno:
                         self.serviceItem.bg_image_bytes = \
                             self.imageManager.getImageBytes(frame[u'path'],
-                            self.imageManager.imageSource.ImagePlugin)
+                            ImageSource.ImagePlugin)
                     image = self.imageManager.getImage(frame[u'path'],
-                        self.imageManager.imageSource.ImagePlugin)
+                        ImageSource.ImagePlugin)
                     label.setPixmap(QtGui.QPixmap.fromImage(image))
                 self.previewListWidget.setCellWidget(framenumber, 0, label)
                 slideHeight = width * (1 / self.ratio)
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 8d202ee81..e63b9e615 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -38,7 +38,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import OpenLPToolbar, get_text_file_string, build_icon, \
     Receiver, SettingsManager, translate, check_item_selected, \
-    check_directory_exists, create_thumb, validate_thumb
+    check_directory_exists, create_thumb, validate_thumb, ImageSource
 from openlp.core.lib.theme import ThemeXML, BackgroundType, VerticalType, \
     BackgroundGradientType
 from openlp.core.lib.settings import Settings
@@ -671,7 +671,7 @@ class ThemeManager(QtGui.QWidget):
             BackgroundType.to_string(BackgroundType.Image):
             self.mainwindow.imageManager.updateImageBorder(
                 theme.background_filename,
-                self.mainwindow.imageManager.imageSource.Theme, QtGui.QColor(theme.background_border_color))
+                ImageSource.Theme, QtGui.QColor(theme.background_border_color))
             self.mainwindow.imageManager.processUpdates()
         self.loadThemes()
 
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index b615d3078..97ce850f4 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui
 import logging
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate, \
-    Receiver
+    Receiver, ImageSource
 from openlp.core.lib.settings import Settings
 from openlp.plugins.images.lib import ImageMediaItem, ImageTab
 
@@ -99,4 +99,4 @@ class ImagePlugin(Plugin):
         background = QtGui.QColor(Settings().value(self.settingsSection
             + u'/background color', QtCore.QVariant(u'#000000')))
         self.liveController.imageManager.updateImagesBorder(
-            self.liveController.imageManager.imageSource.ImagePlugin, background)
+            ImageSource.ImagePlugin, background)

From 6f353ab01d31cfb3593827f2e35dfd2920e6ae09 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 1 Jul 2012 20:45:14 +0200
Subject: [PATCH 39/51] fixed variable name

---
 openlp/core/lib/__init__.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 529cf1358..1669ade30 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -265,14 +265,15 @@ def resize_image(image_path, width, height, background=u'#000000'):
     if image_ratio == resize_ratio:
         # We neither need to centre the image nor add "bars" to the image.
         return preview
-    realw = preview.width()
-    realh = preview.height()
+    real_width = preview.width()
+    real_height = preview.height()
     # and move it to the centre of the preview space
     new_image = QtGui.QImage(width, height,
         QtGui.QImage.Format_ARGB32_Premultiplied)
     painter = QtGui.QPainter(new_image)
     painter.fillRect(new_image.rect(), QtGui.QColor(background))
-    painter.drawImage((width - realw) / 2, (height - realh) / 2, preview)
+    painter.drawImage(
+        (width - real_width) / 2, (height - real_height) / 2, preview)
     return new_image
 
 

From fb59eab8e7beb5514cf755c3efd97e6067dc9cf3 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 1 Jul 2012 20:45:51 +0200
Subject: [PATCH 40/51] removed fix because another branch fixes this
 differently

---
 openlp/core/ui/thememanager.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 3088287b9..57c7b5e7b 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -328,7 +328,6 @@ class ThemeManager(QtGui.QWidget):
                 self.oldBackgroundImage = theme.background_filename
             self.themeForm.theme = theme
             self.themeForm.exec_(True)
-            self.mainwindow.imageManager.deleteImage(theme.theme_name)
             self.oldBackgroundImage = None
             self.mainwindow.renderer.update_theme(theme.theme_name)
 

From 584aedb3085b4204840da271f3eb83d06fefd9ce Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 1 Jul 2012 21:22:10 +0200
Subject: [PATCH 41/51] fixed doc

---
 openlp/core/lib/imagemanager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py
index 0028cc50b..8ad388674 100644
--- a/openlp/core/lib/imagemanager.py
+++ b/openlp/core/lib/imagemanager.py
@@ -113,7 +113,7 @@ class Image(object):
 
         ``source``
             The source describes the image's origin. Possible values are
-            ``image`` and ``theme``.
+            described in the :class:`~openlp.core.lib.ImageSource` class.
 
         ``background``
             A ``QtGui.QColor`` object specifying the colour to be used to fill

From e31ac2cdde2c4c4a3962a1080f1b011db3ffec9d Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 1 Jul 2012 21:22:11 +0200
Subject: [PATCH 42/51] fixed variables

---
 openlp/core/lib/mediamanageritem.py | 51 ++++++++++++++---------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index e6c5b0599..ce0797240 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -352,24 +352,23 @@ class MediaManagerItem(QtGui.QWidget):
         ``files``
             The list of files to be loaded
         """
-        #FIXME: change local variables to words_separated_by_underscores.
-        newFiles = []
-        errorShown = False
+        new_files = []
+        error_shown = False
         for file in files:
             type = file.split(u'.')[-1]
             if type.lower() not in self.onNewFileMasks:
-                if not errorShown:
+                if not error_shown:
                     critical_error_message_box(
                         translate('OpenLP.MediaManagerItem',
                         'Invalid File Type'),
                         unicode(translate('OpenLP.MediaManagerItem',
                         'Invalid File %s.\nSuffix not supported'))
                         % file)
-                    errorShown = True
+                    error_shown = True
             else:
-                newFiles.append(file)
-        if files:
-            self.validateAndLoad(newFiles)
+                new_files.append(file)
+        if new_files:
+            self.validateAndLoad(new_files)
 
     def validateAndLoad(self, files):
         """
@@ -379,30 +378,29 @@ class MediaManagerItem(QtGui.QWidget):
         ``files``
             The files to be loaded.
         """
-        #FIXME: change local variables to words_separated_by_underscores.
         names = []
-        fullList = []
+        full_list = []
         for count in range(self.listView.count()):
             names.append(unicode(self.listView.item(count).text()))
-            fullList.append(unicode(self.listView.item(count).
+            full_list.append(unicode(self.listView.item(count).
                 data(QtCore.Qt.UserRole).toString()))
-        duplicatesFound = False
-        filesAdded = False
+        duplicates_found = False
+        files_added = False
         for file in files:
             filename = os.path.split(unicode(file))[1]
             if filename in names:
-                duplicatesFound = True
+                duplicates_found = True
             else:
-                filesAdded = True
-                fullList.append(file)
-        if fullList and filesAdded:
+                files_added = True
+                full_list.append(file)
+        if full_list and files_added:
             self.listView.clear()
-            self.loadList(fullList)
-            lastDir = os.path.split(unicode(files[0]))[0]
-            SettingsManager.set_last_dir(self.settingsSection, lastDir)
+            self.loadList(full_list)
+            last_dir = os.path.split(unicode(files[0]))[0]
+            SettingsManager.set_last_dir(self.settingsSection, last_dir)
             SettingsManager.set_list(self.settingsSection,
                 self.settingsSection, self.getFileList())
-        if duplicatesFound:
+        if duplicates_found:
             critical_error_message_box(
                 UiStrings().Duplicate,
                 unicode(translate('OpenLP.MediaManagerItem',
@@ -422,13 +420,13 @@ class MediaManagerItem(QtGui.QWidget):
         Return the current list of files
         """
         count = 0
-        filelist = []
+        file_list = []
         while count < self.listView.count():
             bitem = self.listView.item(count)
             filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
-            filelist.append(filename)
+            file_list.append(filename)
             count += 1
-        return filelist
+        return file_list
 
     def loadList(self, list):
         raise NotImplementedError(u'MediaManagerItem.loadList needs to be '
@@ -477,9 +475,8 @@ class MediaManagerItem(QtGui.QWidget):
         Allows the change of current item in the list to be actioned
         """
         if Settings().value(u'advanced/single click preview',
-            QtCore.QVariant(False)).toBool() and self.quickPreviewAllowed \
-            and self.listView.selectedIndexes() \
-            and self.autoSelectId == -1:
+            QtCore.QVariant(False)).toBool() and self.quickPreviewAllowed and \
+            self.listView.selectedIndexes() and self.autoSelectId == -1:
             self.onPreviewClick(True)
 
     def onPreviewClick(self, keepFocus=False):

From 6869ea41f6ebc801b59b0e8ffce98f33dd9b5a3a Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 1 Jul 2012 21:41:12 +0200
Subject: [PATCH 43/51] updated doc

---
 openlp/core/lib/__init__.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index fa6458354..0591d397c 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -40,7 +40,14 @@ log = logging.getLogger(__name__)
 class ImageSource(object):
     """
     This enumeration class represents different image sources. An image sources
-    states where an image is used.
+    states where an image is used. This enumeration class is need in the context
+    of the :class:~openlp.core.lib.imagemanager`.
+
+    ``ImagePlugin``
+        This states that an image is being used by the image plugin.
+
+    ``Theme``
+        This says, that the image is used by a theme.
     """
     ImagePlugin = 1
     Theme = 2

From b409bacca36bd5124b51a2526020d40d7421c592 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 1 Jul 2012 22:44:40 +0200
Subject: [PATCH 44/51] final fix for Trb143

---
 openlp/core/ui/themeform.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index 01738d65c..e44341530 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -620,8 +620,8 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
                 os.path.split(unicode(self.theme.background_filename))[1]
             saveTo = os.path.join(self.path, self.theme.theme_name, filename)
             saveFrom = self.theme.background_filename
-        if not self.edit_mode and not \
-            self.thememanager.checkIfThemeExists(self.theme.theme_name):
+        if not self.edit_mode and \
+            not self.thememanager.checkIfThemeExists(self.theme.theme_name):
             return
         self.thememanager.saveTheme(self.theme, saveFrom, saveTo)
         return QtGui.QDialog.accept(self)

From d604d6b07f6c697b8e062dadc4a2762057b8c365 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 2 Jul 2012 20:47:12 +0200
Subject: [PATCH 45/51] fixed spelling

---
 openlp/core/lib/imagemanager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py
index 8ad388674..c6891db33 100644
--- a/openlp/core/lib/imagemanager.py
+++ b/openlp/core/lib/imagemanager.py
@@ -229,7 +229,7 @@ class ImageManager(QtCore.QObject):
 
     def _resetImage(self, image):
         """
-        Mark the given :class:`Image` instance as dirt by setting its ``image``
+        Mark the given :class:`Image` instance as dirty by setting its ``image``
         and ``image_bytes`` attributes to None.
         """
         image.image = None

From aef1c550e03842095564e9b47e0686ded289af38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Wed, 4 Jul 2012 01:26:54 +0300
Subject: [PATCH 46/51] Make strip_rtf a function again.

---
 openlp/plugins/songs/lib/__init__.py         | 430 ++++++++++---------
 openlp/plugins/songs/lib/ewimport.py         |   5 +-
 openlp/plugins/songs/lib/sundayplusimport.py |  14 +-
 3 files changed, 227 insertions(+), 222 deletions(-)

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index eb616d30d..b6177c3d7 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -24,7 +24,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-import logging
 import re
 
 from PyQt4 import QtGui
@@ -34,10 +33,106 @@ from openlp.core.utils import CONTROL_CHARS
 from db import Author
 from ui import SongStrings
 
-log = logging.getLogger(__name__)
-
 WHITESPACE = re.compile(r'[\W_]+', re.UNICODE)
 APOSTROPHE = re.compile(u'[\'`’ʻ′]', re.UNICODE)
+PATTERN = re.compile(r"\\([a-z]{1,32})(-?\d{1,10})?[ ]?|\\'"
+    r"([0-9a-f]{2})|\\([^a-z])|([{}])|[\r\n]+|(.)", re.I)
+# RTF control words which specify a "destination" to be ignored.
+DESTINATIONS = frozenset((
+    u'aftncn', u'aftnsep', u'aftnsepc', u'annotation', u'atnauthor', 
+    u'atndate', u'atnicn', u'atnid', u'atnparent', u'atnref', u'atntime',
+    u'atrfend', u'atrfstart', u'author', u'background', u'bkmkend',
+    u'bkmkstart', u'blipuid', u'buptim', u'category',
+    u'colorschememapping', u'colortbl', u'comment', u'company', u'creatim',
+    u'datafield', u'datastore', u'defchp', u'defpap', u'do', u'doccomm',
+    u'docvar', u'dptxbxtext', u'ebcend', u'ebcstart', u'factoidname',
+    u'falt', u'fchars', u'ffdeftext', u'ffentrymcr', u'ffexitmcr',
+    u'ffformat', u'ffhelptext', u'ffl', u'ffname', u'ffstattext', u'field',
+    u'file', u'filetbl', u'fldinst', u'fldrslt', u'fldtype', u'fname',
+    u'fontemb', u'fontfile', u'footer', u'footerf', u'footerl', u'footerr',
+    u'footnote', u'formfield', u'ftncn', u'ftnsep', u'ftnsepc', u'g',
+    u'generator', u'gridtbl', u'header', u'headerf', u'headerl',
+    u'headerr', u'hl', u'hlfr', u'hlinkbase', u'hlloc', u'hlsrc', u'hsv',
+    u'htmltag', u'info', u'keycode', u'keywords', u'latentstyles',
+    u'lchars', u'levelnumbers', u'leveltext', u'lfolevel', u'linkval',
+    u'list', u'listlevel', u'listname', u'listoverride',
+    u'listoverridetable', u'listpicture', u'liststylename', u'listtable',
+    u'listtext', u'lsdlockedexcept', u'macc', u'maccPr', u'mailmerge',
+    u'maln', u'malnScr', u'manager', u'margPr', u'mbar', u'mbarPr',
+    u'mbaseJc', u'mbegChr', u'mborderBox', u'mborderBoxPr', u'mbox',
+    u'mboxPr', u'mchr', u'mcount', u'mctrlPr', u'md', u'mdeg', u'mdegHide',
+    u'mden', u'mdiff', u'mdPr', u'me', u'mendChr', u'meqArr', u'meqArrPr',
+    u'mf', u'mfName', u'mfPr', u'mfunc', u'mfuncPr', u'mgroupChr',
+    u'mgroupChrPr', u'mgrow', u'mhideBot', u'mhideLeft', u'mhideRight',
+    u'mhideTop', u'mhtmltag', u'mlim', u'mlimloc', u'mlimlow',
+    u'mlimlowPr', u'mlimupp', u'mlimuppPr', u'mm', u'mmaddfieldname',
+    u'mmath', u'mmathPict', u'mmathPr', u'mmaxdist', u'mmc', u'mmcJc',
+    u'mmconnectstr', u'mmconnectstrdata', u'mmcPr', u'mmcs',
+    u'mmdatasource', u'mmheadersource', u'mmmailsubject', u'mmodso',
+    u'mmodsofilter', u'mmodsofldmpdata', u'mmodsomappedname',
+    u'mmodsoname', u'mmodsorecipdata', u'mmodsosort', u'mmodsosrc',
+    u'mmodsotable', u'mmodsoudl', u'mmodsoudldata', u'mmodsouniquetag',
+    u'mmPr', u'mmquery', u'mmr', u'mnary', u'mnaryPr', u'mnoBreak',
+    u'mnum', u'mobjDist', u'moMath', u'moMathPara', u'moMathParaPr',
+    u'mopEmu', u'mphant', u'mphantPr', u'mplcHide', u'mpos', u'mr',
+    u'mrad', u'mradPr', u'mrPr', u'msepChr', u'mshow', u'mshp', u'msPre',
+    u'msPrePr', u'msSub', u'msSubPr', u'msSubSup', u'msSubSupPr', u'msSup',
+    u'msSupPr', u'mstrikeBLTR', u'mstrikeH', u'mstrikeTLBR', u'mstrikeV',
+    u'msub', u'msubHide', u'msup', u'msupHide', u'mtransp', u'mtype',
+    u'mvertJc', u'mvfmf', u'mvfml', u'mvtof', u'mvtol', u'mzeroAsc',
+    u'mzeroDesc', u'mzeroWid', u'nesttableprops', u'nextfile',
+    u'nonesttables', u'objalias', u'objclass', u'objdata', u'object',
+    u'objname', u'objsect', u'objtime', u'oldcprops', u'oldpprops',
+    u'oldsprops', u'oldtprops', u'oleclsid', u'operator', u'panose',
+    u'password', u'passwordhash', u'pgp', u'pgptbl', u'picprop', u'pict',
+    u'pn', u'pnseclvl', u'pntext', u'pntxta', u'pntxtb', u'printim',
+    u'private', u'propname', u'protend', u'protstart', u'protusertbl',
+    u'pxe', u'result', u'revtbl', u'revtim', u'rsidtbl', u'rxe', u'shp',
+    u'shpgrp', u'shpinst', u'shppict', u'shprslt', u'shptxt', u'sn', u'sp',
+    u'staticval', u'stylesheet', u'subject', u'sv', u'svb', u'tc',
+    u'template', u'themedata', u'title', u'txe', u'ud', u'upr',
+    u'userprops', u'wgrffmtfilter', u'windowcaption', u'writereservation',
+    u'writereservhash', u'xe', u'xform', u'xmlattrname', u'xmlattrvalue',
+    u'xmlclose', u'xmlname', u'xmlnstbl', u'xmlopen'))
+# Translation of some special characters.
+SPECIAL_CHARS = {
+    u'par': u'\n',
+    u'sect': u'\n\n',
+    # Required page and column break.
+    # Would be good if we could split verse into subverses here.
+    u'page': u'\n\n',
+    u'column': u'\n\n',
+    # Soft breaks.
+    u'softpage': u'[---]',
+    u'softcol': u'[---]',
+    u'line': u'\n',
+    u'tab': u'\t',
+    u'emdash': u'\u2014',
+    u'endash': u'\u2013',
+    u'emspace': u'\u2003',
+    u'enspace': u'\u2002',
+    u'qmspace': u'\u2005',
+    u'bullet': u'\u2022',
+    u'lquote': u'\u2018',
+    u'rquote': u'\u2019',
+    u'ldblquote': u'\u201C',
+    u'rdblquote': u'\u201D',
+    u'ltrmark': u'\u200E',
+    u'rtlmark': u'\u200F',
+    u'zwj': u'\u200D',
+    u'zwnj': u'\u200C'}
+CHARSET_MAPPING = {
+    u'fcharset0': u'cp1252',
+    u'fcharset161': u'cp1253',
+    u'fcharset162': u'cp1254',
+    u'fcharset163': u'cp1258',
+    u'fcharset177': u'cp1255',
+    u'fcharset178': u'cp1256',
+    u'fcharset186': u'cp1257',
+    u'fcharset204': u'cp1251',
+    u'fcharset222': u'cp874',
+    u'fcharset238': u'cp1250'}
+
 
 class VerseType(object):
     """
@@ -368,217 +463,136 @@ def clean_song(manager, song):
     if song.copyright:
         song.copyright = CONTROL_CHARS.sub(u'', song.copyright).strip()
 
-class StripRtf():
+
+def get_encoding(font, font_table, default_encoding, failed=False):
     """
-    This class strips RTF control structures and returns an unicode string.
+    Finds an encoding to use. Asks user, if necessary.
+
+    ``font``
+    The number of currently active font.
+
+    ``font_table``
+    Dictionary of fonts and respective encodings.
+
+    ``default_encoding``
+    The defaul encoding to use when font_table is empty or no font is used.
+
+    ``failed``
+    A boolean indicating whether the previous encoding didn't work.
+    """
+    encoding = None
+    if font in font_table:
+        encoding = font_table[font]
+    if not encoding and default_encoding:
+        encoding = default_encoding
+    if not encoding or failed:
+        encoding = retrieve_windows_encoding()
+        default_encoding = encoding
+    font_table[font] = encoding
+    return encoding, default_encoding
+
+
+def strip_rtf(text, default_encoding=None):
+    """
+    This function strips RTF control structures and returns an unicode string.
 
     Thanks to Markus Jarderot (MizardX) for this code, used by permission.
     http://stackoverflow.com/questions/188545
+
+    ``text``
+    RTF-encoded text, a string.
+
+    ``default_encoding``
+    Default encoding to use when no encoding is specified.
     """
-    PATTERN = re.compile(r"\\([a-z]{1,32})(-?\d{1,10})?[ ]?|\\'"
-        r"([0-9a-f]{2})|\\([^a-z])|([{}])|[\r\n]+|(.)", re.I)
-    # Control words which specify a "destination" to be ignored.
-    DESTINATIONS = frozenset((
-        u'aftncn', u'aftnsep', u'aftnsepc', u'annotation', u'atnauthor', 
-        u'atndate', u'atnicn', u'atnid', u'atnparent', u'atnref', u'atntime',
-        u'atrfend', u'atrfstart', u'author', u'background', u'bkmkend',
-        u'bkmkstart', u'blipuid', u'buptim', u'category',
-        u'colorschememapping', u'colortbl', u'comment', u'company', u'creatim',
-        u'datafield', u'datastore', u'defchp', u'defpap', u'do', u'doccomm',
-        u'docvar', u'dptxbxtext', u'ebcend', u'ebcstart', u'factoidname',
-        u'falt', u'fchars', u'ffdeftext', u'ffentrymcr', u'ffexitmcr',
-        u'ffformat', u'ffhelptext', u'ffl', u'ffname', u'ffstattext', u'field',
-        u'file', u'filetbl', u'fldinst', u'fldrslt', u'fldtype', u'fname',
-        u'fontemb', u'fontfile', u'footer', u'footerf', u'footerl', u'footerr',
-        u'footnote', u'formfield', u'ftncn', u'ftnsep', u'ftnsepc', u'g',
-        u'generator', u'gridtbl', u'header', u'headerf', u'headerl',
-        u'headerr', u'hl', u'hlfr', u'hlinkbase', u'hlloc', u'hlsrc', u'hsv',
-        u'htmltag', u'info', u'keycode', u'keywords', u'latentstyles',
-        u'lchars', u'levelnumbers', u'leveltext', u'lfolevel', u'linkval',
-        u'list', u'listlevel', u'listname', u'listoverride',
-        u'listoverridetable', u'listpicture', u'liststylename', u'listtable',
-        u'listtext', u'lsdlockedexcept', u'macc', u'maccPr', u'mailmerge',
-        u'maln', u'malnScr', u'manager', u'margPr', u'mbar', u'mbarPr',
-        u'mbaseJc', u'mbegChr', u'mborderBox', u'mborderBoxPr', u'mbox',
-        u'mboxPr', u'mchr', u'mcount', u'mctrlPr', u'md', u'mdeg', u'mdegHide',
-        u'mden', u'mdiff', u'mdPr', u'me', u'mendChr', u'meqArr', u'meqArrPr',
-        u'mf', u'mfName', u'mfPr', u'mfunc', u'mfuncPr', u'mgroupChr',
-        u'mgroupChrPr', u'mgrow', u'mhideBot', u'mhideLeft', u'mhideRight',
-        u'mhideTop', u'mhtmltag', u'mlim', u'mlimloc', u'mlimlow',
-        u'mlimlowPr', u'mlimupp', u'mlimuppPr', u'mm', u'mmaddfieldname',
-        u'mmath', u'mmathPict', u'mmathPr', u'mmaxdist', u'mmc', u'mmcJc',
-        u'mmconnectstr', u'mmconnectstrdata', u'mmcPr', u'mmcs',
-        u'mmdatasource', u'mmheadersource', u'mmmailsubject', u'mmodso',
-        u'mmodsofilter', u'mmodsofldmpdata', u'mmodsomappedname',
-        u'mmodsoname', u'mmodsorecipdata', u'mmodsosort', u'mmodsosrc',
-        u'mmodsotable', u'mmodsoudl', u'mmodsoudldata', u'mmodsouniquetag',
-        u'mmPr', u'mmquery', u'mmr', u'mnary', u'mnaryPr', u'mnoBreak',
-        u'mnum', u'mobjDist', u'moMath', u'moMathPara', u'moMathParaPr',
-        u'mopEmu', u'mphant', u'mphantPr', u'mplcHide', u'mpos', u'mr',
-        u'mrad', u'mradPr', u'mrPr', u'msepChr', u'mshow', u'mshp', u'msPre',
-        u'msPrePr', u'msSub', u'msSubPr', u'msSubSup', u'msSubSupPr', u'msSup',
-        u'msSupPr', u'mstrikeBLTR', u'mstrikeH', u'mstrikeTLBR', u'mstrikeV',
-        u'msub', u'msubHide', u'msup', u'msupHide', u'mtransp', u'mtype',
-        u'mvertJc', u'mvfmf', u'mvfml', u'mvtof', u'mvtol', u'mzeroAsc',
-        u'mzeroDesc', u'mzeroWid', u'nesttableprops', u'nextfile',
-        u'nonesttables', u'objalias', u'objclass', u'objdata', u'object',
-        u'objname', u'objsect', u'objtime', u'oldcprops', u'oldpprops',
-        u'oldsprops', u'oldtprops', u'oleclsid', u'operator', u'panose',
-        u'password', u'passwordhash', u'pgp', u'pgptbl', u'picprop', u'pict',
-        u'pn', u'pnseclvl', u'pntext', u'pntxta', u'pntxtb', u'printim',
-        u'private', u'propname', u'protend', u'protstart', u'protusertbl',
-        u'pxe', u'result', u'revtbl', u'revtim', u'rsidtbl', u'rxe', u'shp',
-        u'shpgrp', u'shpinst', u'shppict', u'shprslt', u'shptxt', u'sn', u'sp',
-        u'staticval', u'stylesheet', u'subject', u'sv', u'svb', u'tc',
-        u'template', u'themedata', u'title', u'txe', u'ud', u'upr',
-        u'userprops', u'wgrffmtfilter', u'windowcaption', u'writereservation',
-        u'writereservhash', u'xe', u'xform', u'xmlattrname', u'xmlattrvalue',
-        u'xmlclose', u'xmlname', u'xmlnstbl', u'xmlopen'))
-    # Translation of some special characters.
-    SPECIAL_CHARS = {
-        u'par': u'\n',
-        u'sect': u'\n\n',
-        # Required page and column break.
-        # Would be good if we could split verse into subverses here.
-        u'page': u'\n\n',
-        u'column': u'\n\n',
-        # Soft breaks.
-        u'softpage': u'[---]',
-        u'softcol': u'[---]',
-        u'line': u'\n',
-        u'tab': u'\t',
-        u'emdash': u'\u2014',
-        u'endash': u'\u2013',
-        u'emspace': u'\u2003',
-        u'enspace': u'\u2002',
-        u'qmspace': u'\u2005',
-        u'bullet': u'\u2022',
-        u'lquote': u'\u2018',
-        u'rquote': u'\u2019',
-        u'ldblquote': u'\u201C',
-        u'rdblquote': u'\u201D',
-        u'ltrmark': u'\u200E',
-        u'rtlmark': u'\u200F',
-        u'zwj': u'\u200D',
-        u'zwnj': u'\u200C'}
-    CHARSET_MAPPING = {
-        u'fcharset0': u'cp1252',
-        u'fcharset161': u'cp1253',
-        u'fcharset162': u'cp1254',
-        u'fcharset163': u'cp1258',
-        u'fcharset177': u'cp1255',
-        u'fcharset178': u'cp1256',
-        u'fcharset186': u'cp1257',
-        u'fcharset204': u'cp1251',
-        u'fcharset222': u'cp874',
-        u'fcharset238': u'cp1250'}
-    # If user is asked for an encoding, it is used since then.
-    user_encoding = []
+    # Current font is the font tag we last met.
+    font = u''
+    # Character encoding is defined inside fonttable.
+    # font_table could contain eg u'0': u'cp1252'
+    font_table = {u'': u''}
+    # Stack of things to keep track of when entering/leaving groups.
+    stack = []
+    # Whether this group (and all inside it) are "ignorable".
+    ignorable = False
+    # Number of ASCII characters to skip after an unicode character.
+    ucskip = 1
+    # Number of ASCII characters left to skip.
+    curskip = 0
+    # Output buffer.
+    out = []
+    for match in PATTERN.finditer(text):
+        word, arg, hex, char, brace, tchar = match.groups()
+        if brace:
+            curskip = 0
+            if brace == u'{':
+                # Push state
+                stack.append((ucskip, ignorable, font))
+            elif brace == u'}':
+                # Pop state
+                ucskip, ignorable, font = stack.pop()
+        # \x (not a letter)
+        elif char:
+            curskip = 0
+            if char == u'~' and not ignorable:
+                out.append(u'\xA0')
+            elif char in u'{}\\' and not ignorable:
+                out.append(char)
+            elif char == u'-' and not ignorable:
+                out.append(u'\u00AD')
+            elif char == u'_' and not ignorable:
+                out.append(u'\u2011')
+            elif char == u'*':
+                ignorable = True
+        # \command
+        elif word:
+            curskip = 0
+            if word in DESTINATIONS:
+                ignorable = True
+            elif word in SPECIAL_CHARS:
+                out.append(SPECIAL_CHARS[word])
+            elif word == u'uc':
+                ucskip = int(arg)
+            elif word == u' ':
+                c = int(arg)
+                if c < 0:
+                    c += 0x10000
+                out.append(unichr(c))
+                curskip = ucskip
+            elif word == u'fonttbl':
+                inside_font_table = True
+                ignorable = True
+            elif word == u'f':
+                font = arg
+            elif word == u'ansicpg':
+                font_table[font] = 'cp' + arg
+            elif word == u'fcharset' and font not in font_table and \
+                word + arg in CHARSET_MAPPING:
+                # \ansicpg overrides \fcharset, if present.
+                font_table[font] = CHARSET_MAPPING[word + arg]
+        # \'xx
+        elif hex:
+            if curskip > 0:
+                curskip -= 1
+            elif not ignorable:
+                charcode = int(hex, 16)
+                encoding, default_encoding = get_encoding(font, font_table,
+                    default_encoding)
+                while True:
+                    try:
+                        out.append(chr(charcode).decode(encoding))
+                    except UnicodeDecodeError:
+                        encoding, default_encoding = get_encoding(font,
+                            font_table, default_encoding, failed=True)
+                    else:
+                        break
+        elif tchar:
+            if curskip > 0:
+                curskip -= 1
+            elif not ignorable:
+                out.append(tchar)
+    text = u''.join(out)
+    return text, default_encoding
 
-    def strip_rtf(self, text, default_encoding=None):
-        self.default_encoding = default_encoding
-        # Current font is the font tag we last met.
-        font = u''
-        # Character encoding is defined inside fonttable.
-        # font_table could contain eg u'0': u'cp1252'
-        font_table = {u'': default_encoding}
-        # Stack of things to keep track of when entering/leaving groups.
-        stack = []
-        # Whether this group (and all inside it) are "ignorable".
-        ignorable = False
-        # Number of ASCII characters to skip after an unicode character.
-        ucskip = 1
-        # Number of ASCII characters left to skip.
-        curskip = 0
-        # Output buffer.
-        out = []
-        for match in self.PATTERN.finditer(text):
-            word, arg, hex, char, brace, tchar = match.groups()
-            if brace:
-                curskip = 0
-                if brace == u'{':
-                    # Push state
-                    stack.append((ucskip, ignorable, font))
-                elif brace == u'}':
-                    # Pop state
-                    ucskip, ignorable, font = stack.pop()
-            # \x (not a letter)
-            elif char:
-                curskip = 0
-                if char == u'~' and not ignorable:
-                    out.append(u'\xA0')
-                elif char in u'{}\\' and not ignorable:
-                    out.append(char)
-                elif char == u'-' and not ignorable:
-                    out.append(u'\u00AD')
-                elif char == u'_' and not ignorable:
-                    out.append(u'\u2011')
-                elif char == u'*':
-                    ignorable = True
-            # \command
-            elif word:
-                curskip = 0
-                if word in self.DESTINATIONS:
-                    ignorable = True
-                elif word in self.SPECIAL_CHARS:
-                    out.append(self.SPECIAL_CHARS[word])
-                elif word == u'uc':
-                    ucskip = int(arg)
-                elif word == u' ':
-                    c = int(arg)
-                    if c < 0:
-                        c += 0x10000
-                    out.append(unichr(c))
-                    curskip = ucskip
-                elif word == u'fonttbl':
-                    inside_font_table = True
-                    ignorable = True
-                elif word == u'f':
-                    font = arg
-                elif word == u'ansicpg':
-                    font_table[font] = 'cp' + arg
-                elif word == u'fcharset' and font not in font_table and \
-                    word + arg in self.CHARSET_MAPPING:
-                    # \ansicpg overrides \fcharset, if present.
-                    font_table[font] = self.CHARSET_MAPPING[word + arg]
-            # \'xx
-            elif hex:
-                if curskip > 0:
-                    curskip -= 1
-                elif not ignorable:
-                    charcode = int(hex, 16)
-                    encoding = self.get_encoding(font, font_table)
-                    while True:
-                        try:
-                            out.append(chr(charcode).decode(encoding))
-                        except UnicodeDecodeError:
-                            encoding = self.get_encoding(font, font_table,
-                                failed=True)
-                        else:
-                            break
-            elif tchar:
-                if curskip > 0:
-                    curskip -= 1
-                elif not ignorable:
-                    out.append(tchar)
-        return u''.join(out)
-
-    def get_encoding(self, font, font_table, failed=False):
-        encoding = None
-        if font in font_table:
-            encoding = font_table[font]
-        if not encoding and len(self.user_encoding):
-            encoding = self.user_encoding[-1]
-        if not encoding and self.default_encoding:
-            encoding = self.default_encoding
-        if not encoding or (failed and self.user_encoding == encoding):
-            encoding = retrieve_windows_encoding(self.default_encoding)
-            if encoding not in self.user_encoding:
-                self.user_encoding.append(encoding)
-        elif failed:
-            encoding = self.user_encoding
-        font_table[font] = encoding
-        return encoding
 
 from xml import OpenLyrics, SongXML
 from songstab import SongsTab
diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py
index 7ecabcdd6..adc4b4976 100644
--- a/openlp/plugins/songs/lib/ewimport.py
+++ b/openlp/plugins/songs/lib/ewimport.py
@@ -35,7 +35,7 @@ import re
 
 from openlp.core.lib import translate
 from openlp.plugins.songs.lib import VerseType
-from openlp.plugins.songs.lib import retrieve_windows_encoding, StripRtf
+from openlp.plugins.songs.lib import retrieve_windows_encoding, strip_rtf
 from songimport import SongImport
 
 RTF_STRIPPING_REGEX = re.compile(r'\{\\tx[^}]*\}')
@@ -59,7 +59,6 @@ class EasyWorshipSongImport(SongImport):
     """
     def __init__(self, manager, **kwargs):
         SongImport.__init__(self, manager, **kwargs)
-        self.rtf = StripRtf()
 
     def doImport(self):
         # Open the DB and MB files if they exist
@@ -179,7 +178,7 @@ class EasyWorshipSongImport(SongImport):
                         self.addAuthor(author_name.strip())
                 if words:
                     # Format the lyrics
-                    words = self.rtf.strip_rtf(words, self.encoding)
+                    words, self.encoding = strip_rtf(words, self.encoding)
                     verse_type = VerseType.Tags[VerseType.Verse]
                     for verse in SLIDE_BREAK_REGEX.split(words):
                         verse = verse.strip()
diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index 6260026b6..81579ca3a 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -30,7 +30,7 @@ import os
 import re
 
 from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding
-from openlp.plugins.songs.lib import StripRtf
+from openlp.plugins.songs.lib import strip_rtf
 from openlp.plugins.songs.lib.songimport import SongImport
 
 log = logging.getLogger(__name__)
@@ -62,7 +62,6 @@ class SundayPlusImport(SongImport):
         """
         SongImport.__init__(self, manager, **kwargs)
         self.encoding = u'us-ascii'
-        self.rtf = StripRtf()
 
     def doImport(self):
         self.importWizard.progressBar.setMaximum(len(self.importSource))
@@ -151,7 +150,7 @@ class SundayPlusImport(SongImport):
                             verse_type = self.HOTKEY_TO_VERSE_TYPE[value]
                     if name == 'rtf':
                         value = self.unescape(value)
-                        verse = self.rtf.strip_rtf(value, self.encoding)
+                        verse, self.encoding = strip_rtf(value, self.encoding)
                         lines = verse.strip().split('\n')
                         # If any line inside any verse contains CCLI or
                         # only Public Domain, we treat this as special data:
@@ -188,14 +187,7 @@ class SundayPlusImport(SongImport):
             try:
                 return unicode(blob, self.encoding)
             except:
-                # This is asked again every time the previously chosen
-                # encoding does not work. Integrated with StripRtf encoding.
-                if len(self.rtf.user_encoding) and \
-                    self.encoding != self.rtf.user_encoding[-1]:
-                    self.encoding = self.rtf.user_encoding[-1]
-                else:
-                    self.encoding = retrieve_windows_encoding()
-                    self.rtf.user_encoding.append(self.encoding)
+                self.encoding = retrieve_windows_encoding()
 
     def unescape(self, text):
         text = text.replace('^^', '"')

From 7871dfdf001d69773e80729dac04fe7029c09073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Wed, 4 Jul 2012 01:55:53 +0300
Subject: [PATCH 47/51] Cleanup.

---
 openlp/plugins/songs/lib/__init__.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index b6177c3d7..3f3d3ad7d 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -559,7 +559,6 @@ def strip_rtf(text, default_encoding=None):
                 out.append(unichr(c))
                 curskip = ucskip
             elif word == u'fonttbl':
-                inside_font_table = True
                 ignorable = True
             elif word == u'f':
                 font = arg
@@ -575,14 +574,14 @@ def strip_rtf(text, default_encoding=None):
                 curskip -= 1
             elif not ignorable:
                 charcode = int(hex, 16)
-                encoding, default_encoding = get_encoding(font, font_table,
-                    default_encoding)
+                failed = False
                 while True:
                     try:
+                        encoding, default_encoding = get_encoding(font, 
+                            font_table, default_encoding, failed=failed)
                         out.append(chr(charcode).decode(encoding))
                     except UnicodeDecodeError:
-                        encoding, default_encoding = get_encoding(font,
-                            font_table, default_encoding, failed=True)
+                        failed = True
                     else:
                         break
         elif tchar:

From 16186c39607cd1542a2e81130186361ec0a5ce72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Wed, 4 Jul 2012 08:31:27 +0300
Subject: [PATCH 48/51] Remove unnecessary import and move one more constant to
 module level. Thanks, Tim.

---
 openlp/plugins/songs/lib/sundayplusimport.py | 32 +++++++++-----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index 81579ca3a..58fa29511 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -25,7 +25,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import logging
 import os
 import re
 
@@ -33,7 +32,19 @@ from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding
 from openlp.plugins.songs.lib import strip_rtf
 from openlp.plugins.songs.lib.songimport import SongImport
 
-log = logging.getLogger(__name__)
+HOTKEY_TO_VERSE_TYPE = {
+    u'1': u'v1',
+    u'2': u'v2',
+    u'3': u'v3',
+    u'4': u'v4',
+    u'5': u'v5',
+    u'6': u'v6',
+    u'7': u'v7',
+    u'8': u'v8',
+    u'9': u'v9',
+    u'C': u'c',
+    u'+': u'b',
+    u'Z': u'o'}
 
 class SundayPlusImport(SongImport):
     """
@@ -42,19 +53,6 @@ class SundayPlusImport(SongImport):
     The format examples can be found attached to bug report at
     <http://support.openlp.org/issues/395>
     """
-    HOTKEY_TO_VERSE_TYPE = {
-        u'1': u'v1',
-        u'2': u'v2',
-        u'3': u'v3',
-        u'4': u'v4',
-        u'5': u'v5',
-        u'6': u'v6',
-        u'7': u'v7',
-        u'8': u'v8',
-        u'9': u'v9',
-        u'C': u'c',
-        u'+': u'b',
-        u'Z': u'o'}
 
     def __init__(self, manager, **kwargs):
         """
@@ -146,8 +144,8 @@ class SundayPlusImport(SongImport):
                         # Hotkey always appears after MARKER_NAME, so it
                         # effectively overrides MARKER_NAME, if present.
                         if len(value) and \
-                            value in self.HOTKEY_TO_VERSE_TYPE.keys():
-                            verse_type = self.HOTKEY_TO_VERSE_TYPE[value]
+                            value in HOTKEY_TO_VERSE_TYPE.keys():
+                            verse_type = HOTKEY_TO_VERSE_TYPE[value]
                     if name == 'rtf':
                         value = self.unescape(value)
                         verse, self.encoding = strip_rtf(value, self.encoding)

From f730280ce0dd4c6424475daf977a425c38f3c2b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Wed, 4 Jul 2012 12:48:29 +0300
Subject: [PATCH 49/51] Update copyright header.

---
 openlp/plugins/songs/lib/sundayplusimport.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index 58fa29511..81d452f55 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -6,10 +6,11 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2012 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan      #
-# Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan,      #
-# Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias     #
-# Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,    #
-# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund             #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
+# Meinert Jordan, Armin Köhler, Edwin Lunando, Joshua Miller, Stevan Pettit,  #
+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout,      #
+# Simon Scudder, Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon      #
+# Tibble, Dave Warnock, 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  #

From 5f04399d6c66c0ca826f6c509a59906fa75585c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Wed, 4 Jul 2012 23:08:04 +0300
Subject: [PATCH 50/51] Spacing around operator.

---
 openlp/plugins/songs/lib/sundayplusimport.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index 81d452f55..fcf324d41 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -93,20 +93,20 @@ class SundayPlusImport(SongImport):
         while i < len(data):
             # Data is held as #name: value pairs inside groups marked as [].
             # Now we are looking for the name.
-            if data[i:i+1] == '#':
-                name_end = data.find(':', i+1)
-                name = data[i+1:name_end]
+            if data[i:i + 1] == '#':
+                name_end = data.find(':', i + 1)
+                name = data[i + 1:name_end]
                 i = name_end + 1
-                while data[i:i+1] == ' ':
+                while data[i:i + 1] == ' ':
                     i += 1
-                if data[i:i+1] == '"':
-                    end = data.find('"', i+1)
-                    value = data[i+1:end]
-                elif data[i:i+1] == '[':
+                if data[i:i + 1] == '"':
+                    end = data.find('"', i + 1)
+                    value = data[i + 1:end]
+                elif data[i:i + 1] == '[':
                     j = i
                     inside_quotes = False
                     while j < len(data):
-                        char = data[j:j+1]
+                        char = data[j:j + 1]
                         if char == '"':
                             inside_quotes = not inside_quotes
                         elif not inside_quotes and char == ']':
@@ -115,7 +115,7 @@ class SundayPlusImport(SongImport):
                         j += 1
                     value = data[i:end]
                 else:
-                    end = data.find(',', i+1)
+                    end = data.find(',', i + 1)
                     if data.find('(', i, end) != -1:
                         end = data.find(')', i) + 1
                     value = data[i:end]

From 4b6769f9b2f2dcb6c516eaefa8ef44674cafea28 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Thu, 5 Jul 2012 17:25:23 +0200
Subject: [PATCH 51/51] fixed bug 1021272 (Exporting settings fails with
 traceback in Build 2014)

Fixes: https://launchpad.net/bugs/1021272
---
 openlp/core/ui/mainwindow.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 267897efe..b6c9ee8d5 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -48,7 +48,7 @@ from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
     ShortcutListForm, FormattingTagForm
 from openlp.core.ui.media import MediaController
 from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
-    get_application_version
+    get_application_version, get_filesystem_encoding
 from openlp.core.utils.actions import ActionList, CategoryOrder
 from openlp.core.ui.firsttimeform import FirstTimeForm
 from openlp.core.ui import ScreenList