From 30e867e0206580e96e518120c9e51aafb14a3813 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sun, 15 Aug 2010 16:49:07 +0200
Subject: [PATCH 01/61] - rework - improved usage of different bibles

---
 openlp/plugins/bibles/lib/mediaitem.py | 102 +++++++++++++------------
 1 file changed, 54 insertions(+), 48 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 196329ca8..3afc403a3 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -501,61 +501,64 @@ class BibleMediaItem(MediaManagerItem):
                 #dual_permission = self._decodeQtObject(reference,
                 #    'dual_permission')
                 dual_text = self._decodeQtObject(reference, 'dual_text')
-            if self.parent.settings_tab.display_style == 1:
-                verse_text = self.formatVerse(old_chapter, chapter, verse,
-                    u'(', u')')
-            elif self.parent.settings_tab.display_style == 2:
-                verse_text = self.formatVerse(old_chapter, chapter, verse,
-                    u'{', u'}')
-            elif self.parent.settings_tab.display_style == 3:
-                verse_text = self.formatVerse(old_chapter, chapter, verse,
-                    u'[', u']')
-            else:
-                verse_text = self.formatVerse(old_chapter, chapter, verse,
-                    u'', u'')
+            verse_text = self.formatVerse(old_chapter, chapter, verse)
             old_chapter = chapter
+            # footer
             footer = u'%s (%s %s)' % (book, version, copyright)
-            # If not found add to footer
             if footer not in raw_footer:
                 raw_footer.append(footer)
             if dual_bible:
-                footer = u'%s (%s %s)' % (book, dual_version,
-                    dual_copyright)
-                # If not found add second version and copyright to footer.
+                footer = u'%s (%s %s)' % (book, dual_version, dual_copyright)
                 if footer not in raw_footer:
                     raw_footer.append(footer)
+                # If we were previously 'Verse Per Line' we have to add the old
+                # bible_text first, because it was not added till now.
+                if bible_text:
+                    raw_slides.append(bible_text)
+                    bible_text = u''
                 bible_text = u'%s %s \n\n %s %s' % (verse_text, text,
                     verse_text, dual_text)
                 raw_slides.append(bible_text)
                 bible_text = u''
-            else:
-                # If we are 'Verse Per Line' then force a new line.
-                if self.parent.settings_tab.layout_style == 1:
-                    text = text + u'\n\n'
-                bible_text = u'%s %s %s' % (bible_text, verse_text, text)
-                # If we are 'Verse Per Slide' then create a new slide.
-                if self.parent.settings_tab.layout_style == 0:
+            # If we are 'Verse Per Slide' then create a new slide.
+            elif self.parent.settings_tab.layout_style == 0:
+                bible_text = u'%s %s' % (verse_text, text)
+                raw_slides.append(bible_text)
+                bible_text = u''
+            # If we are 'Verse Per Line' then force a new line.
+            elif self.parent.settings_tab.layout_style == 1:
+                bible_text = u'%s %s %s \n\n' % (bible_text, verse_text, text)
+            # We have to be 'Continuous'.
+            elif item.row() < len(items) - 1:
+                #bitem = self.listView.item(item.row() + 1)
+                bitem = items[item.row() + 1]
+                reference = bitem.data(QtCore.Qt.UserRole)
+                if isinstance(reference, QtCore.QVariant):
+                    reference = reference.toPyObject()
+                #todo replace 'new' by 'next'
+                next_bible = self._decodeQtObject(reference, 'bible')
+                next_dual_bible = self._decodeQtObject(reference, 'dual_bible')
+                next_verse = self._decodeQtObject(reference, 'verse')
+                next_chapter = self._decodeQtObject(reference, 'chapter')
+                next_book = self._decodeQtObject(reference, 'book')
+                # If the next verse is a dual one, then we append 'bible_text'.
+                if next_dual_bible:
+                    bible_text = u'%s %s %s' % (bible_text, verse_text, text)
                     raw_slides.append(bible_text)
                     bible_text = u''
-                # If we are not 'Verse Per Slide' we have to make sure, that we
-                # add more verses.
+                # We add a line break if the next verse is not part of a series
+                # of verses, has a different book, bible or so on.
+                elif bible != next_bible or book != next_book or \
+                    int(verse) + 1 != int(next_verse) or \
+                    int(chapter) != int(next_chapter):
+                    bible_text = u'%s %s %s \n\n' % (bible_text, verse_text,
+                        text)
                 else:
-                    if item.row() < len(items) - 1:
-                        bitem = items[item.row() + 1]
-                        reference = bitem.data(QtCore.Qt.UserRole)
-                        if isinstance(reference, QtCore.QVariant):
-                            reference = reference.toPyObject()
-                        bible_new = self._decodeQtObject(reference, 'bible')
-                        dual_bible_new = self._decodeQtObject(reference, 'dual_bible')
-                        if dual_bible_new:
-                            raw_slides.append(bible_text)
-                            bible_text = u''
-                        elif bible != bible_new:
-                            raw_slides.append(bible_text)
-                            bible_text = u''
-                    else:
-                        raw_slides.append(bible_text)
-                        bible_text = u''
+                    bible_text = u'%s %s %s' % (bible_text, verse_text, text)
+        # If there are no more items we check whether we have to add bible_text.
+        if bible_text:
+            raw_slides.append(bible_text)
+            bible_text = u''
         # service item title
         if not service_item.title:
             if dual_bible:
@@ -581,14 +584,17 @@ class BibleMediaItem(MediaManagerItem):
             service_item.raw_footer = raw_footer
         return True
 
-    def formatVerse(self, old_chapter, chapter, verse, opening, closing):
-        verse_text = opening
-        if old_chapter != chapter:
-            verse_text += chapter + u':'
-        elif not self.parent.settings_tab.show_new_chapters:
-            verse_text += chapter + u':'
+    def formatVerse(self, old_chapter, chapter, verse):
+        if not self.parent.settings_tab.show_new_chapters or \
+            old_chapter != chapter:
+            verse_text = chapter + u':'
         verse_text += verse
-        verse_text += closing
+        if self.parent.settings_tab.display_style == 1:
+            verse_text = u'(' + verse_text + u')'
+        elif self.parent.settings_tab.display_style == 2:
+            verse_text = u'{' + verse_text + u'}'
+        elif self.parent.settings_tab.display_style == 3:
+            verse_text = u'[' + verse_text + u']'
         return verse_text
 
     def reloadBibles(self):

From 1b1261a1a454a21bcc7b3929d3f40bf1223d2181 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sun, 15 Aug 2010 17:35:20 +0200
Subject: [PATCH 02/61] - improved usage of different bibles and/or books in
 one service item

---
 openlp/plugins/bibles/lib/mediaitem.py | 41 ++++++++++----------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 3afc403a3..51b087931 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -471,6 +471,7 @@ class BibleMediaItem(MediaManagerItem):
         items = self.listView.selectedIndexes()
         if len(items) == 0:
             return False
+        first = True
         bible_text = u''
         old_chapter = u''
         raw_footer = []
@@ -502,7 +503,6 @@ class BibleMediaItem(MediaManagerItem):
                 #    'dual_permission')
                 dual_text = self._decodeQtObject(reference, 'dual_text')
             verse_text = self.formatVerse(old_chapter, chapter, verse)
-            old_chapter = chapter
             # footer
             footer = u'%s (%s %s)' % (book, version, copyright)
             if footer not in raw_footer:
@@ -512,11 +512,11 @@ class BibleMediaItem(MediaManagerItem):
                 if footer not in raw_footer:
                     raw_footer.append(footer)
                 # If we were previously 'Verse Per Line' we have to add the old
-                # bible_text first, because it was not added till now.
+                # bible_text, because it was not added until now.
                 if bible_text:
                     raw_slides.append(bible_text)
                     bible_text = u''
-                bible_text = u'%s %s \n\n %s %s' % (verse_text, text,
+                bible_text = u'%s %s\n\n%s %s' % (verse_text, text,
                     verse_text, dual_text)
                 raw_slides.append(bible_text)
                 bible_text = u''
@@ -527,34 +527,23 @@ class BibleMediaItem(MediaManagerItem):
                 bible_text = u''
             # If we are 'Verse Per Line' then force a new line.
             elif self.parent.settings_tab.layout_style == 1:
-                bible_text = u'%s %s %s \n\n' % (bible_text, verse_text, text)
+                bible_text = u'%s %s %s\n\n' % (bible_text, verse_text, text)
             # We have to be 'Continuous'.
-            elif item.row() < len(items) - 1:
-                #bitem = self.listView.item(item.row() + 1)
-                bitem = items[item.row() + 1]
-                reference = bitem.data(QtCore.Qt.UserRole)
-                if isinstance(reference, QtCore.QVariant):
-                    reference = reference.toPyObject()
-                #todo replace 'new' by 'next'
-                next_bible = self._decodeQtObject(reference, 'bible')
-                next_dual_bible = self._decodeQtObject(reference, 'dual_bible')
-                next_verse = self._decodeQtObject(reference, 'verse')
-                next_chapter = self._decodeQtObject(reference, 'chapter')
-                next_book = self._decodeQtObject(reference, 'book')
-                # If the next verse is a dual one, then we append 'bible_text'.
-                if next_dual_bible:
+            else:
+                # We add a line break if the previously verse has a different
+                # book or bible version.
+                if first:
                     bible_text = u'%s %s %s' % (bible_text, verse_text, text)
-                    raw_slides.append(bible_text)
-                    bible_text = u''
-                # We add a line break if the next verse is not part of a series
-                # of verses, has a different book, bible or so on.
-                elif bible != next_bible or book != next_book or \
-                    int(verse) + 1 != int(next_verse) or \
-                    int(chapter) != int(next_chapter):
-                    bible_text = u'%s %s %s \n\n' % (bible_text, verse_text,
+                elif bible != old_bible or book != old_book:
+                    bible_text = u'%s\n\n%s %s' % (bible_text, verse_text,
                         text)
                 else:
                     bible_text = u'%s %s %s' % (bible_text, verse_text, text)
+            if first:
+                first = False
+            old_chapter = chapter
+            old_book = book
+            old_bible = bible
         # If there are no more items we check whether we have to add bible_text.
         if bible_text:
             raw_slides.append(bible_text)

From 11366e9a138d5eb33174ebe0b0261755eb89c368 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sun, 15 Aug 2010 17:36:48 +0200
Subject: [PATCH 03/61] - improved usage of different bibles and/or books in
 one service item


From 5a22e673462ef70385a9787d3f8294b397ef2671 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Wed, 18 Aug 2010 17:04:16 +0200
Subject: [PATCH 04/61] clean up

---
 openlp/plugins/bibles/lib/mediaitem.py | 53 +++++++++++++-------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 51b087931..d5996b295 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -465,7 +465,8 @@ class BibleMediaItem(MediaManagerItem):
 
     def generateSlideData(self, service_item, item=None):
         '''
-        Generates and formats the slides for the service item.
+        Generates and formats the slides for the service item as well as the
+        service item's title.
         '''
         log.debug(u'generating slide data')
         items = self.listView.selectedIndexes()
@@ -628,10 +629,10 @@ class BibleMediaItem(MediaManagerItem):
         for i in range(int(range_from), int(range_to) + 1):
             combo.addItem(unicode(i))
 
-    def displayResults(self, bible, dual_bible=None):
+    def displayResults(self, bible, dual_bible=u''):
         '''
-        Displays the search results in the media manager. All data needed for further
-        action is saved for/in each row.
+        Displays the search results in the media manager. All data needed for
+        further action is saved for/in each row.
         '''
         version = self.parent.manager.get_meta_data(bible, u'Version')
         copyright = self.parent.manager.get_meta_data(bible, u'Copyright')
@@ -652,34 +653,34 @@ class BibleMediaItem(MediaManagerItem):
         for count, verse in enumerate(self.search_results):
             if dual_bible:
                 vdict = {
-                    'book':QtCore.QVariant(verse.book.name),
-                    'chapter':QtCore.QVariant(verse.chapter),
-                    'verse':QtCore.QVariant(verse.verse),
-                    'bible':QtCore.QVariant(bible),
-                    'version':QtCore.QVariant(version.value),
-                    'copyright':QtCore.QVariant(copyright.value),
-                    #'permission':QtCore.QVariant(permission.value),
-                    'text':QtCore.QVariant(verse.text),
-                    'dual_bible':QtCore.QVariant(dual_bible),
-                    'dual_version':QtCore.QVariant(dual_version.value),
-                    'dual_copyright':QtCore.QVariant(dual_copyright.value),
-                    #'dual_permission':QtCore.QVariant(dual_permission),
-                    'dual_text':QtCore.QVariant(
+                    'book': QtCore.QVariant(verse.book.name),
+                    'chapter': QtCore.QVariant(verse.chapter),
+                    'verse': QtCore.QVariant(verse.verse),
+                    'bible': QtCore.QVariant(bible),
+                    'version': QtCore.QVariant(version.value),
+                    'copyright': QtCore.QVariant(copyright.value),
+                    #'permission': QtCore.QVariant(permission.value),
+                    'text': QtCore.QVariant(verse.text),
+                    'dual_bible': QtCore.QVariant(dual_bible),
+                    'dual_version': QtCore.QVariant(dual_version.value),
+                    'dual_copyright': QtCore.QVariant(dual_copyright.value),
+                    #'dual_permission': QtCore.QVariant(dual_permission),
+                    'dual_text': QtCore.QVariant(
                         self.dual_search_results[count].text)
                 }
                 bible_text = u' %s %d:%d (%s, %s)' % (verse.book.name,
                     verse.chapter, verse.verse, version.value, dual_version.value)
             else:
                 vdict = {
-                    'book':QtCore.QVariant(verse.book.name),
-                    'chapter':QtCore.QVariant(verse.chapter),
-                    'verse':QtCore.QVariant(verse.verse),
-                    'bible':QtCore.QVariant(bible),
-                    'version':QtCore.QVariant(version.value),
-                    'copyright':QtCore.QVariant(copyright.value),
-                    #'permission':QtCore.QVariant(permission.value),
-                    'text':QtCore.QVariant(verse.text),
-                    'dual_bible':QtCore.QVariant(dual_bible)
+                    'book': QtCore.QVariant(verse.book.name),
+                    'chapter': QtCore.QVariant(verse.chapter),
+                    'verse': QtCore.QVariant(verse.verse),
+                    'bible': QtCore.QVariant(bible),
+                    'version': QtCore.QVariant(version.value),
+                    'copyright': QtCore.QVariant(copyright.value),
+                    #'permission': QtCore.QVariant(permission.value),
+                    'text': QtCore.QVariant(verse.text),
+                    'dual_bible': QtCore.QVariant(dual_bible)
                 }
                 bible_text = u' %s %d:%d (%s)' % (verse.book.name,
                     verse.chapter, verse.verse, version.value)

From 54736fdac0875905f512df2239afc1d6d3c70315 Mon Sep 17 00:00:00 2001
From: Derek Scotney <derekscotney@openlp.org>
Date: Sat, 21 Aug 2010 17:33:31 +0200
Subject: [PATCH 05/61] Implementation of SongSelect file import

---
 openlp/plugins/songs/lib/__init__.py |  1 +
 openlp/plugins/songs/songsplugin.py  | 31 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 mode change 100644 => 100755 openlp/plugins/songs/songsplugin.py

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index b8f4d9a05..0e5b0bfa8 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -144,6 +144,7 @@ from mediaitem import SongMediaItem
 from songimport import SongImport
 from opensongimport import OpenSongImport
 from olpimport import OpenLPSongImport
+from songselectfileimport import SongSelectFileImport
 try:
     from sofimport import SofImport
     from oooimport import OooImport
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
old mode 100644
new mode 100755
index c09e7a1bb..80a459a80
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -41,6 +41,8 @@ except ImportError:
 
 from openlp.plugins.songs.lib import OpenSongImport
 
+from openlp.plugins.songs.lib import SongSelectFileImport
+
 log = logging.getLogger(__name__)
 
 class SongsPlugin(Plugin):
@@ -169,6 +171,19 @@ class SongsPlugin(Plugin):
         import_menu.addAction(self.ImportOpenLPSongItem)
         QtCore.QObject.connect(self.ImportOpenLPSongItem,
             QtCore.SIGNAL(u'triggered()'), self.onImportOpenLPSongItemClick)
+        # SongSelect file import menu item
+        # an import wizard
+        self.ImportSongSelectSongItem = QtGui.QAction(import_menu)
+        self.ImportSongSelectSongItem.setObjectName(u'ImportSongSelectSongItem')
+        self.ImportSongSelectSongItem.setText(translate('SongsPlugin',
+            'SongSelect File (temporary)'))
+        self.ImportSongSelectSongItem.setToolTip(translate('SongsPlugin',
+            'Import a SongSelect song file'))
+        self.ImportSongSelectSongItem.setStatusTip(translate('SongsPlugin',
+            'Import a SongSelect song file'))
+        import_menu.addAction(self.ImportSongSelectSongItem)
+        QtCore.QObject.connect(self.ImportSongSelectSongItem,
+            QtCore.SIGNAL(u'triggered()'), self.onImportSongSelectSongItemClick)
 
     def addExportMenuItem(self, export_menu):
         """
@@ -248,6 +263,22 @@ class SongsPlugin(Plugin):
         oooimport.import_docs(filenames)
         Receiver.send_message(u'songs_load_list')
 
+    def onImportSongSelectSongItemClick(self):
+        filenames = QtGui.QFileDialog.getOpenFileNames(
+            None, translate('SongsPlugin',
+                'Open SongSelect file'),
+            u'', u'SongSelect files (*.usr *.txt)')
+        try:
+            for filename in filenames:
+                importer = SongSelectFileImport(self.manager)
+                importer.do_import(unicode(filename))
+        except:
+            log.exception('Could not import SongSelect file')
+            QtGui.QMessageBox.critical(None,
+                translate('SongsPlugin', 'Import Error'),
+                translate('SongsPlugin', 'Error importing SongSelect file'))
+        Receiver.send_message(u'songs_load_list')
+
     def about(self):
         about_text = translate('SongsPlugin', '<strong>Songs Plugin</strong>'
             '<br />The songs plugin provides the ability to display and '

From 8b79abdfe6981fbfbd97c55f80c7878b357a3bfc Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sun, 22 Aug 2010 23:36:11 +0100
Subject: [PATCH 06/61] sof wizard

---
 openlp/plugins/songs/lib/oooimport.py | 26 +++++++++++++++++++++-----
 openlp/plugins/songs/lib/sofimport.py | 24 ++++++++++++++++++------
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py
index 76b4b6c0d..7bc602f99 100644
--- a/openlp/plugins/songs/lib/oooimport.py
+++ b/openlp/plugins/songs/lib/oooimport.py
@@ -28,6 +28,7 @@ import os
 
 from PyQt4 import QtCore
 
+from openlp.core.lib import Receiver
 from songimport import SongImport
 
 if os.name == u'nt':
@@ -43,23 +44,30 @@ else:
     except ImportError:
         pass
 
-class OooImport(object):
+class OooImport(SongImport):
     """
     Import songs from Impress/Powerpoint docs using Impress 
     """
-    def __init__(self, songmanager):
+    def __init__(self, master_manager, **kwargs):
         """
         Initialise the class. Requires a songmanager class which is passed
         to SongImport for writing song to disk
         """
         self.song = None
-        self.manager = songmanager
+        self.master_manager = master_manager
         self.document = None
         self.process_started = False
+        self.filenames = kwargs[u'filenames']
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'openlp_stop_song_import'), self.stop_import)
 
-    def import_docs(self, filenames):
+    def do_import(self):
+        self.abort = False
         self.start_ooo()
-        for filename in filenames:
+        for filename in self.filenames:
+            if self.abort:
+                self.wizard.incrementProgressBar(u'Import cancelled')
+                return
             filename = unicode(filename)
             if os.path.isfile(filename):
                 self.open_ooo_file(filename)
@@ -73,6 +81,9 @@ class OooImport(object):
                     self.close_ooo_file()
         self.close_ooo()
 
+    def stop_import(self):
+        self.abort = True
+
     def start_ooo(self):
         """
         Start OpenOffice.org process
@@ -135,6 +146,8 @@ class OooImport(object):
                 "com.sun.star.presentation.PresentationDocument") and not \
                 self.document.supportsService("com.sun.star.text.TextDocument"):
                 self.close_ooo_file()
+            else:
+                self.wizard.incrementProgressBar(u'Processing file ' + filepath)
         except:
             pass
         return   
@@ -161,6 +174,9 @@ class OooImport(object):
         slides = doc.getDrawPages()
         text = u''
         for slide_no in range(slides.getCount()):
+            if self.abort:
+                self.wizard.incrementProgressBar(u'Import cancelled')
+                return
             slide = slides.getByIndex(slide_no)   
             slidetext = u''
             for idx in range(slide.getCount()):
diff --git a/openlp/plugins/songs/lib/sofimport.py b/openlp/plugins/songs/lib/sofimport.py
index 54cfd07ac..b2374d672 100644
--- a/openlp/plugins/songs/lib/sofimport.py
+++ b/openlp/plugins/songs/lib/sofimport.py
@@ -68,18 +68,26 @@ class SofImport(OooImport):
     It attempts to detect italiced verses, and treats these as choruses in
     the verse ordering. Again not perfect, but a start.
     """
-    def __init__(self, songmanager):
+    def __init__(self, master_manager, **kwargs):
         """
         Initialise the class. Requires a songmanager class which is passed
         to SongImport for writing song to disk
         """
-        OooImport.__init__(self, songmanager)
+        OooImport.__init__(self,master_manager, **kwargs)
 
-    def import_sof(self, filename):
+    def do_import(self):
+        self.abort = False
         self.start_ooo()
-        self.open_ooo_file(filename)
-        self.process_sof_file()
-        self.close_ooo_file()
+        for filename in self.filenames:
+            if self.abort:
+                self.wizard.incrementProgressBar(u'Import cancelled')
+                return
+            filename = unicode(filename)
+            if os.path.isfile(filename):
+                self.open_ooo_file(filename)
+                if self.document:
+                    self.process_sof_file()
+                    self.close_ooo_file()
         self.close_ooo()
 
     def process_sof_file(self):
@@ -90,6 +98,9 @@ class SofImport(OooImport):
         self.new_song()
         paragraphs = self.document.getText().createEnumeration()
         while paragraphs.hasMoreElements():
+            if self.abort:
+                self.wizard.incrementProgressBar(u'Import cancelled')
+                return
             paragraph = paragraphs.nextElement()
             if paragraph.supportsService("com.sun.star.text.Paragraph"):
                 self.process_paragraph(paragraph)
@@ -244,6 +255,7 @@ class SofImport(OooImport):
         if title.endswith(u','):
             title = title[:-1]
         self.song.title = title
+        self.wizard.incrementProgressBar(u'Processing song ' + title)
 
     def add_author(self, text):
         """

From 0f7fb002b47c7e8022ba83dc783281c60f0648d9 Mon Sep 17 00:00:00 2001
From: Derek Scotney <derekscotney@openlp.org>
Date: Mon, 23 Aug 2010 19:42:59 +0200
Subject: [PATCH 07/61] Added SongSelectFileImport to source control

---
 openlp/plugins/songs/.directory               |   3 +
 openlp/plugins/songs/lib/.directory           |   3 +
 .../plugins/songs/lib/songselectfileimport.py | 251 ++++++++++++++++++
 resources/songs/.directory                    |   3 +
 4 files changed, 260 insertions(+)
 create mode 100644 openlp/plugins/songs/.directory
 create mode 100644 openlp/plugins/songs/lib/.directory
 create mode 100755 openlp/plugins/songs/lib/songselectfileimport.py
 create mode 100644 resources/songs/.directory

diff --git a/openlp/plugins/songs/.directory b/openlp/plugins/songs/.directory
new file mode 100644
index 000000000..802164a81
--- /dev/null
+++ b/openlp/plugins/songs/.directory
@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2010,8,20,16,22,57
+ViewMode=1
diff --git a/openlp/plugins/songs/lib/.directory b/openlp/plugins/songs/lib/.directory
new file mode 100644
index 000000000..d9f9a4e00
--- /dev/null
+++ b/openlp/plugins/songs/lib/.directory
@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2010,8,21,15,53,23
+ViewMode=1
diff --git a/openlp/plugins/songs/lib/songselectfileimport.py b/openlp/plugins/songs/lib/songselectfileimport.py
new file mode 100755
index 000000000..de84b8a79
--- /dev/null
+++ b/openlp/plugins/songs/lib/songselectfileimport.py
@@ -0,0 +1,251 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Carsten Tinggaard, Frode Woldsund, Derek Scotney                            #
+# --------------------------------------------------------------------------- #
+# 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 os
+import chardet
+import codecs
+
+from songimport import SongImport
+
+log = logging.getLogger(__name__)
+
+class SongSelectFileImportError(Exception):
+    pass
+
+class SongSelectFileImport(object):
+    """
+    Import songs from CCLI SongSelect files in both .txt and .usr formats
+    http://www.ccli.com
+
+    The format of the .txt format is:
+    ==========
+    Song Title
+    <>
+    Description of following text (Verse/Chorus) and number
+    <verse/chorus lyrics>
+    <>
+    <>
+    Next text block description (etc)
+    <verse/chorus lyrics>
+    <>
+    <>
+    CCLI Number (e.g.CCLI-Liednummer: 2672885)
+    Copyright "|" delimited (e.g. © 1999 Integrity's Hosanna! Music | LenSongs Publishing)
+    Authors "|" delimited (e.g. Lenny LeBlanc | Paul Baloche)
+    Licencing info (e.g. For use solely with the SongSelect Terms of Use.  All rights Reserved.  www.ccli.com)
+    CCLI Licence number (e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14)
+    ==========
+
+    The format of the .usr format is:
+    ==========
+    [File]
+    Type=SongSelect Import File
+    Version=3.0
+    [S A2672885]
+    Title=Above All
+    Author=LeBlanc, Lenny | Baloche, Paul
+    Copyright=1999 Integrity's Hosanna! Music | LenSongs Publishing (Verwaltet von Gerth Medien Musikverlag) | (Verwaltet von Gerth Medien Musikverlag)
+    Admin=Gerth Medien Musikverlag
+    Themes=Cross/tKingship/tMajesty/tRedeemer
+    Keys=A
+    Fields=Vers 1/tVers 2/tChorus 1/tAndere 1
+    Words=Above all powers.... [/n = CR, /n/t = CRLF]
+    ==========
+
+    """
+    
+    def __init__(self, songmanager):
+        """
+        Initialise the class. Requires a songmanager class which
+        is passed to SongImport for writing song to disk
+        """
+        self.songmanager = songmanager
+        self.song = None
+
+    def do_import(self, filename, commit=True):
+        """
+        Import either a .usr or a .txt SongSelect file
+        If the commit parameter is set False,
+        the import will not be committed to the database
+        (useful for test scripts)
+        """
+        self.song_import = SongImport(self.songmanager)
+
+        lines = []
+        filename = unicode(filename)
+        if os.path.isfile(filename):
+            detect_file = open(filename, u'r')
+            details = chardet.detect(detect_file.read(2048))
+            detect_file.close()
+            infile = codecs.open(filename, u'r', details['encoding'])
+            lines = infile.readlines()
+
+            ext = os.path.splitext(filename)[1]
+            if ext.lower() == ".usr":
+                log.info('SongSelect .usr format file found %s', filename)
+                self.do_import_usr_file(lines)
+                if commit:
+                    self.finish()
+            elif ext.lower() == ".txt":
+                log.info('SongSelect .txt format file found %s', filename)
+                self.do_import_txt_file(lines)
+                if commit:
+                    self.finish()
+            else:
+                log.info(u'Extension %s is not valid', filename)
+                pass
+
+
+    def do_import_usr_file(self, textList):
+        """
+        Process the USR file - pass in a list of lines
+        """
+
+        n = 0 # line number
+        lyrics = []
+
+        for line in textList:
+            n += 1
+            if line.startswith(u'Title='):
+                sname = line[6:].strip()
+            elif line.startswith(u'Author='):
+                sauthor = line[7:].strip()
+            elif line.startswith(u'Copyright='):
+                scopyright = line[10:].strip()
+            elif line.startswith(u'[S A'):
+                sccli = line[4:-3].strip()
+            elif line.startswith(u'Fields='):
+            #Fields contain single line indicating verse, chorus, etc,
+            #/t delimited, same as with words field. store seperately
+            #and process at end.
+                sfields = line[7:].strip()
+            elif line.startswith(u'Words='):
+                swords = line[6:].strip()
+            #Unhandled usr keywords:Type, Version, Admin, Themes, Keys
+
+        #Process Fields and words sections
+        fieldlst = sfields.split(u'/t')
+        wordslst = swords.split(u'/t')
+        for i in range(0, len(fieldlst)):
+            if fieldlst[i].startswith(u'Ver'): #Verse
+                vtype = u'V'
+            elif fieldlst[i].startswith(u'Ch'): #Chorus
+                vtype = u'C'
+            elif fieldlst[i].startswith(u'Br'): #Bridge
+                vtype = u'B'
+            else: #Other
+                vtype = u'O'
+            vcontent = unicode(wordslst[i])
+            vcontent = vcontent.replace("/n",  "\n")
+            self.song_import.add_verse(vcontent, vtype);
+
+        #Handle multiple authors
+        lst = sauthor.split(u'/')
+        if len(lst) < 2:
+            lst = sauthor.split(u'|')
+        for author in lst:
+            seperated = author.split(u',')
+            self.song_import.add_author(seperated[1].strip() + " " + seperated[0].strip())
+
+        self.song_import.title = sname
+        self.song_import.copyright = scopyright
+        self.song_import.ccli_number = sccli
+
+
+    def do_import_txt_file(self, textList):
+        """
+        Process the TXT file - pass in a list of lines
+        """
+
+        n = 0
+        vcontent = u''
+        scomments = u''
+        scopyright = u'';
+        verse_start = False
+
+        for line in textList:
+            ln = line.strip()
+            if (len(ln)== 0):
+                if (n==0):
+                    continue
+                elif (verse_start == True):
+                    self.song_import.add_verse(vcontent, vtype)
+                    vcontent = ''
+                    verse_start = False
+            else:
+                if (n==0): #n=0, song title
+                    sname = ln
+                    n += 1
+                elif (n==1): #n=1, verses
+                    if ln.startswith(u'CCLI'): #n=1, ccli number, first line after verses
+                        n += 1
+                        cparts = ln.split(' ')
+                        sccli = cparts[len(cparts)-1]
+                    elif (verse_start == False):
+                        # We have the verse descriptor
+                        parts = ln.split(' ')
+                        if (len(parts) == 2):
+                            if parts[0].startswith(u'Ver'): #Verse
+                                vtype = u'V'
+                            elif parts[0].startswith(u'Ch'): #Chorus
+                                vtype = u'C'
+                            elif parts[0].startswith(u'Br'): #Bridge
+                                vtype = u'B'
+                            else:
+                                vtype = u'O'
+                            vnumber = parts[1]
+                        else:
+                            vtype = u'O'
+                            vnumber = 1
+                        verse_start = True
+                    else:
+                        # We have verse content or the start of the last part
+                        # Add l so as to keep the CRLF
+                        vcontent = vcontent + line
+                else:
+                    if (n==2): #n=2, copyright
+                        n += 1
+                        scopyright = ln
+                    elif (n==3): #n=3, authors
+                        n += 1
+                        sauthor = ln
+                    elif (n==4) and (not ln.startswith(u'CCL')): #n=4, comments lines before last line
+                        scomments = scomments + ln
+        # split on known separators
+        alist = sauthor.split(u'/')
+        if len(alist) < 2:
+            alist = sauthor.split(u'|')
+        self.song_import.authors = alist
+        self.song_import.title = sname
+        self.song_import.copyright = scopyright
+        self.song_import.ccli_number = sccli
+        self.song_import.comments = scomments
+
+
+    def finish(self):
+        """ Separate function, allows test suite to not pollute database"""
+        self.song_import.finish()
diff --git a/resources/songs/.directory b/resources/songs/.directory
new file mode 100644
index 000000000..077f3daf2
--- /dev/null
+++ b/resources/songs/.directory
@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2010,8,21,16,21,36
+ViewMode=1

From 0066edecbb091ce181d98cd320777b06d44be47c Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Tue, 24 Aug 2010 13:50:26 +0100
Subject: [PATCH 08/61] Remove comments

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

diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py
index da4bd6f3e..d07d50271 100644
--- a/openlp/plugins/songs/lib/oooimport.py
+++ b/openlp/plugins/songs/lib/oooimport.py
@@ -65,9 +65,6 @@ class OooImport(SongImport):
     def do_import(self):
         self.abort = False
         self.start_ooo()
-        # Note this doesn't work, because kwargs[u'filenames'] doesn't appear
-        # to be anything sensible like an array of strings. No idea what it is
-        # though, I'm meant to guess
         for filename in self.filenames:
             if self.abort:
                 self.wizard.incrementProgressBar(u'Import cancelled')

From f717dc10d4a0e29f20e5d9e40f87d69578d87b4e Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Thu, 26 Aug 2010 23:08:09 +0100
Subject: [PATCH 09/61] Bring up to date

---
 openlp/plugins/songs/lib/oooimport.py | 11 ++++++-----
 openlp/plugins/songs/lib/sofimport.py |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py
index 6c9141157..9a3be2843 100644
--- a/openlp/plugins/songs/lib/oooimport.py
+++ b/openlp/plugins/songs/lib/oooimport.py
@@ -59,16 +59,16 @@ class OooImport(SongImport):
         self.document = None
         self.process_started = False
         self.filenames = kwargs[u'filenames']
-        self.import_wizard.importProgressBar.setMaximum(0)
         QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'openlp_stop_song_import'), self.stop_import)
+            QtCore.SIGNAL(u'song_stop_import'), self.stop_import)
 
     def do_import(self):
         self.abort = False
+        self.import_wizard.importProgressBar.setMaximum(0)
         self.start_ooo()
         for filename in self.filenames:
             if self.abort:
-                self.import_wizard.incrementProgressBar(u'Import cancelled')
+                self.import_wizard.incrementProgressBar(u'Import cancelled', 0)
                 return
             filename = unicode(filename)
             if os.path.isfile(filename):
@@ -149,7 +149,8 @@ class OooImport(SongImport):
                 self.document.supportsService("com.sun.star.text.TextDocument"):
                 self.close_ooo_file()
             else:
-                self.import_wizard.incrementProgressBar(u'Processing file ' + filepath)
+                self.import_wizard.incrementProgressBar(
+                    u'Processing file ' + filepath, 0)
         except:
             pass
         return   
@@ -177,7 +178,7 @@ class OooImport(SongImport):
         text = u''
         for slide_no in range(slides.getCount()):
             if self.abort:
-                self.import_wizard.incrementProgressBar(u'Import cancelled')
+                self.import_wizard.incrementProgressBar(u'Import cancelled', 0)
                 return
             slide = slides.getByIndex(slide_no)   
             slidetext = u''
diff --git a/openlp/plugins/songs/lib/sofimport.py b/openlp/plugins/songs/lib/sofimport.py
index af968fafe..0d7c085de 100644
--- a/openlp/plugins/songs/lib/sofimport.py
+++ b/openlp/plugins/songs/lib/sofimport.py
@@ -80,7 +80,7 @@ class SofImport(OooImport):
         self.start_ooo()
         for filename in self.filenames:
             if self.abort:
-                self.import_wizard.incrementProgressBar(u'Import cancelled')
+                self.import_wizard.incrementProgressBar(u'Import cancelled', 0)
                 return
             filename = unicode(filename)
             if os.path.isfile(filename):
@@ -99,7 +99,7 @@ class SofImport(OooImport):
         paragraphs = self.document.getText().createEnumeration()
         while paragraphs.hasMoreElements():
             if self.abort:
-                self.import_wizard.incrementProgressBar(u'Import cancelled')
+                self.import_wizard.incrementProgressBar(u'Import cancelled', 0)
                 return
             paragraph = paragraphs.nextElement()
             if paragraph.supportsService("com.sun.star.text.Paragraph"):
@@ -255,7 +255,7 @@ class SofImport(OooImport):
         if title.endswith(u','):
             title = title[:-1]
         self.song.title = title
-        self.import_wizard.incrementProgressBar(u'Processing song ' + title)
+        self.import_wizard.incrementProgressBar(u'Processing song ' + title, 0)
 
     def add_author(self, text):
         """

From 676cc9305ce0fd2ca36c0e9d7a430e5026d1578a Mon Sep 17 00:00:00 2001
From: Derek Scotney <derekscotney@openlp.org>
Date: Sat, 28 Aug 2010 15:17:27 +0200
Subject: [PATCH 10/61] Changes to CCLI file importer to work with import
 wizard

---
 ...gselectfileimport.py => cclifileimport.py} | 118 ++++++++++--------
 1 file changed, 66 insertions(+), 52 deletions(-)
 rename openlp/plugins/songs/lib/{songselectfileimport.py => cclifileimport.py} (73%)

diff --git a/openlp/plugins/songs/lib/songselectfileimport.py b/openlp/plugins/songs/lib/cclifileimport.py
similarity index 73%
rename from openlp/plugins/songs/lib/songselectfileimport.py
rename to openlp/plugins/songs/lib/cclifileimport.py
index de84b8a79..d4314a7e0 100755
--- a/openlp/plugins/songs/lib/songselectfileimport.py
+++ b/openlp/plugins/songs/lib/cclifileimport.py
@@ -33,10 +33,10 @@ from songimport import SongImport
 
 log = logging.getLogger(__name__)
 
-class SongSelectFileImportError(Exception):
+class CCLIFileImportError(Exception):
     pass
 
-class SongSelectFileImport(object):
+class CCLIFileImport(SongImport):
     """
     Import songs from CCLI SongSelect files in both .txt and .usr formats
     http://www.ccli.com
@@ -77,47 +77,55 @@ class SongSelectFileImport(object):
     ==========
 
     """
-    
-    def __init__(self, songmanager):
+
+    def __init__(self, master_manager, **kwargs):
         """
         Initialise the class. Requires a songmanager class which
         is passed to SongImport for writing song to disk
         """
-        self.songmanager = songmanager
-        self.song = None
+        SongImport.__init__(self, master_manager)
+        self.master_manager = master_manager
+        if u'filenames' in kwargs:
+            self.filenames = kwargs[u'filenames']
+            log.debug(self.filenames)
 
-    def do_import(self, filename, commit=True):
+    def do_import(self):
         """
         Import either a .usr or a .txt SongSelect file
-        If the commit parameter is set False,
-        the import will not be committed to the database
-        (useful for test scripts)
         """
-        self.song_import = SongImport(self.songmanager)
+        
+        log.debug('Starting CCLI File Import')
+        song_total = len(self.filenames)
+        self.import_wizard.importProgressBar.setMaximum(song_total)
+        song_count = 1        
+        for filename in self.filenames:
+            self.import_wizard.incrementProgressBar(
+                u'Importing song %s of %s' % (song_count, song_total))            
+            filename = unicode(filename) 
+            log.debug('Importing CCLI File: %s', filename)
+            lines = []
+            if os.path.isfile(filename):
+                detect_file = open(filename, u'r')
+                details = chardet.detect(detect_file.read(2048))
+                detect_file.close()
+                infile = codecs.open(filename, u'r', details['encoding'])
+                lines = infile.readlines()
 
-        lines = []
-        filename = unicode(filename)
-        if os.path.isfile(filename):
-            detect_file = open(filename, u'r')
-            details = chardet.detect(detect_file.read(2048))
-            detect_file.close()
-            infile = codecs.open(filename, u'r', details['encoding'])
-            lines = infile.readlines()
-
-            ext = os.path.splitext(filename)[1]
-            if ext.lower() == ".usr":
-                log.info('SongSelect .usr format file found %s', filename)
-                self.do_import_usr_file(lines)
-                if commit:
-                    self.finish()
-            elif ext.lower() == ".txt":
-                log.info('SongSelect .txt format file found %s', filename)
-                self.do_import_txt_file(lines)
-                if commit:
-                    self.finish()
-            else:
-                log.info(u'Extension %s is not valid', filename)
-                pass
+                ext = os.path.splitext(filename)[1]
+                if ext.lower() == ".usr":
+                    log.info('SongSelect .usr format file found %s: ' ,  filename)
+                    self.do_import_usr_file(lines)
+                elif ext.lower() == ".txt":
+                    log.info('SongSelect .txt format file found %s: ', filename)
+                    self.do_import_txt_file(lines)
+                else:
+                    log.info(u'Extension %s is not valid', filename)
+                    pass
+                song_count += 1
+            if self.stop_import_flag:
+                return False  
+                
+        return True
 
 
     def do_import_usr_file(self, textList):
@@ -125,9 +133,13 @@ class SongSelectFileImport(object):
         Process the USR file - pass in a list of lines
         """
 
+        log.debug('USR file text: %s', textList)
+        
         n = 0 # line number
         lyrics = []
 
+        new_song = SongImport(self.master_manager)
+
         for line in textList:
             n += 1
             if line.startswith(u'Title='):
@@ -161,7 +173,8 @@ class SongSelectFileImport(object):
                 vtype = u'O'
             vcontent = unicode(wordslst[i])
             vcontent = vcontent.replace("/n",  "\n")
-            self.song_import.add_verse(vcontent, vtype);
+            if (len(vcontent) > 0):                
+                new_song.add_verse(vcontent, vtype);
 
         #Handle multiple authors
         lst = sauthor.split(u'/')
@@ -169,11 +182,12 @@ class SongSelectFileImport(object):
             lst = sauthor.split(u'|')
         for author in lst:
             seperated = author.split(u',')
-            self.song_import.add_author(seperated[1].strip() + " " + seperated[0].strip())
+            new_song.add_author(seperated[1].strip() + " " + seperated[0].strip())
 
-        self.song_import.title = sname
-        self.song_import.copyright = scopyright
-        self.song_import.ccli_number = sccli
+        new_song.title = sname
+        new_song.copyright = scopyright
+        new_song.ccli_number = sccli
+        new_song.finish()
 
 
     def do_import_txt_file(self, textList):
@@ -181,6 +195,9 @@ class SongSelectFileImport(object):
         Process the TXT file - pass in a list of lines
         """
 
+        log.debug('TXT file text: %s', textList)
+        
+        new_song = SongImport(self.master_manager)
         n = 0
         vcontent = u''
         scomments = u''
@@ -193,9 +210,10 @@ class SongSelectFileImport(object):
                 if (n==0):
                     continue
                 elif (verse_start == True):
-                    self.song_import.add_verse(vcontent, vtype)
-                    vcontent = ''
-                    verse_start = False
+                      if (len(vcontent) > 0):
+                        new_song.add_verse(vcontent, vtype)
+                        vcontent = ''
+                        verse_start = False
             else:
                 if (n==0): #n=0, song title
                     sname = ln
@@ -239,13 +257,9 @@ class SongSelectFileImport(object):
         alist = sauthor.split(u'/')
         if len(alist) < 2:
             alist = sauthor.split(u'|')
-        self.song_import.authors = alist
-        self.song_import.title = sname
-        self.song_import.copyright = scopyright
-        self.song_import.ccli_number = sccli
-        self.song_import.comments = scomments
-
-
-    def finish(self):
-        """ Separate function, allows test suite to not pollute database"""
-        self.song_import.finish()
+        new_song.authors = alist
+        new_song.title = sname
+        new_song.copyright = scopyright
+        new_song.ccli_number = sccli
+        new_song.comments = scomments
+        new_song.finish()

From 81b53ee21b8ec0dbc2a878f604b7bd12dd0d5785 Mon Sep 17 00:00:00 2001
From: Derek Scotney <derekscotney@openlp.org>
Date: Sat, 28 Aug 2010 15:27:17 +0200
Subject: [PATCH 11/61] Changs to comment formatting

---
 openlp/plugins/songs/lib/cclifileimport.py | 93 ++++++++++++----------
 1 file changed, 52 insertions(+), 41 deletions(-)

diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py
index d4314a7e0..46fab1863 100755
--- a/openlp/plugins/songs/lib/cclifileimport.py
+++ b/openlp/plugins/songs/lib/cclifileimport.py
@@ -38,50 +38,20 @@ class CCLIFileImportError(Exception):
 
 class CCLIFileImport(SongImport):
     """
-    Import songs from CCLI SongSelect files in both .txt and .usr formats
-    http://www.ccli.com
-
-    The format of the .txt format is:
-    ==========
-    Song Title
-    <>
-    Description of following text (Verse/Chorus) and number
-    <verse/chorus lyrics>
-    <>
-    <>
-    Next text block description (etc)
-    <verse/chorus lyrics>
-    <>
-    <>
-    CCLI Number (e.g.CCLI-Liednummer: 2672885)
-    Copyright "|" delimited (e.g. © 1999 Integrity's Hosanna! Music | LenSongs Publishing)
-    Authors "|" delimited (e.g. Lenny LeBlanc | Paul Baloche)
-    Licencing info (e.g. For use solely with the SongSelect Terms of Use.  All rights Reserved.  www.ccli.com)
-    CCLI Licence number (e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14)
-    ==========
-
-    The format of the .usr format is:
-    ==========
-    [File]
-    Type=SongSelect Import File
-    Version=3.0
-    [S A2672885]
-    Title=Above All
-    Author=LeBlanc, Lenny | Baloche, Paul
-    Copyright=1999 Integrity's Hosanna! Music | LenSongs Publishing (Verwaltet von Gerth Medien Musikverlag) | (Verwaltet von Gerth Medien Musikverlag)
-    Admin=Gerth Medien Musikverlag
-    Themes=Cross/tKingship/tMajesty/tRedeemer
-    Keys=A
-    Fields=Vers 1/tVers 2/tChorus 1/tAndere 1
-    Words=Above all powers.... [/n = CR, /n/t = CRLF]
-    ==========
-
+    The :class:`CCLIFileImport` class provides OpenLP with the ability to
+    import CCLI SongSelect song files in both .txt and .usr formats
+    see http://www.ccli.com
     """
 
     def __init__(self, master_manager, **kwargs):
         """
-        Initialise the class. Requires a songmanager class which
-        is passed to SongImport for writing song to disk
+        Initialise the import.
+
+        ``manager``
+            The song manager for the running OpenLP installation.
+``filenames``
+            The files to be imported.
+        
         """
         SongImport.__init__(self, master_manager)
         self.master_manager = master_manager
@@ -130,7 +100,26 @@ class CCLIFileImport(SongImport):
 
     def do_import_usr_file(self, textList):
         """
-        Process the USR file - pass in a list of lines
+        Process the USR file 
+        
+        ``textList``
+            An array of strings containing the usr file content.
+            
+        The format of the .usr format is:
+        ==========
+        [File]
+        Type=SongSelect Import File
+        Version=3.0
+        [S A2672885]
+        Title=Above All
+        Author=LeBlanc, Lenny | Baloche, Paul
+        Copyright=1999 Integrity's Hosanna! Music | LenSongs Publishing (Verwaltet von Gerth Medien Musikverlag) | (Verwaltet von Gerth Medien Musikverlag)
+        Admin=Gerth Medien Musikverlag
+        Themes=Cross/tKingship/tMajesty/tRedeemer
+        Keys=A
+        Fields=Vers 1/tVers 2/tChorus 1/tAndere 1
+        Words=Above all powers.... [/n = CR, /n/t = CRLF]
+        ==========            
         """
 
         log.debug('USR file text: %s', textList)
@@ -193,6 +182,28 @@ class CCLIFileImport(SongImport):
     def do_import_txt_file(self, textList):
         """
         Process the TXT file - pass in a list of lines
+                
+        ``textList``
+            An array of strings containing the txt file content. 
+     
+        The format of the .txt format is:
+        ==========
+        Song Title
+        <>
+        Description of following text (Verse/Chorus) and number
+        <verse/chorus lyrics>
+        <>
+        <>
+        Next text block description (etc)
+        <verse/chorus lyrics>
+        <>
+        <>
+        CCLI Number (e.g.CCLI-Liednummer: 2672885)
+        Copyright "|" delimited (e.g. © 1999 Integrity's Hosanna! Music | LenSongs Publishing)
+        Authors "|" delimited (e.g. Lenny LeBlanc | Paul Baloche)
+        Licencing info (e.g. For use solely with the SongSelect Terms of Use.  All rights Reserved.  www.ccli.com)
+        CCLI Licence number (e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14)
+        ==========     
         """
 
         log.debug('TXT file text: %s', textList)

From 88f5de47ba94e39cba5c7caf4a9a108f535f5cfb Mon Sep 17 00:00:00 2001
From: Derek Scotney <derekscotney@openlp.org>
Date: Sat, 28 Aug 2010 17:04:37 +0200
Subject: [PATCH 12/61] Changes to comment formatting


From 14dbfaa4b50034fb5b874032a85534a5bee671f1 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sat, 28 Aug 2010 19:10:14 +0200
Subject: [PATCH 13/61] fixed stuff messed up resolvesing the conflict

---
 openlp/plugins/bibles/lib/mediaitem.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 7cf45c238..7f518af71 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -518,8 +518,10 @@ class BibleMediaItem(MediaManagerItem):
                 # If we were previously 'Verse Per Line' we have to add the old
                 # bible_text, because it was not added until now.
                 if bible_text:
-                    bible_text = u'%s %s \n %s %s' % (verse_text, text,
-                        verse_text, dual_text)
+                    raw_slides.append(bible_text)
+                    bible_text = u''
+                bible_text = u'%s %s \n %s %s' % (verse_text, text,
+                    verse_text, dual_text)
                 raw_slides.append(bible_text)
                 bible_text = u''
             # If we are 'Verse Per Slide' then create a new slide.

From 36e2f2e33f49beb8628f39808cb024af533e85b4 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sat, 28 Aug 2010 19:32:44 +0200
Subject: [PATCH 14/61] fixed stuff messed up resolvesing the conflict

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

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 7f518af71..89baf091a 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -511,7 +511,6 @@ class BibleMediaItem(MediaManagerItem):
             if footer not in raw_footer:
                 raw_footer.append(footer)
             if dual_bible:
-                service_item.add_capability(ItemCapabilities.NoLineBreaks)
                 footer = u'%s (%s %s)' % (book, dual_version, dual_copyright)
                 if footer not in raw_footer:
                     raw_footer.append(footer)
@@ -520,7 +519,7 @@ class BibleMediaItem(MediaManagerItem):
                 if bible_text:
                     raw_slides.append(bible_text)
                     bible_text = u''
-                bible_text = u'%s %s \n %s %s' % (verse_text, text,
+                bible_text = u'%s %s\n\n%s %s' % (verse_text, text,
                     verse_text, dual_text)
                 raw_slides.append(bible_text)
                 bible_text = u''
@@ -531,16 +530,16 @@ class BibleMediaItem(MediaManagerItem):
                 bible_text = u''
             # If we are 'Verse Per Line' then force a new line.
             elif self.parent.settings_tab.layout_style == 1:
-                service_item.add_capability(ItemCapabilities.NoLineBreaks)
-                bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
+                bible_text = u'%s %s %s\n\n' % (bible_text, verse_text, text)
             # We have to be 'Continuous'.
             else:
                 # We add a line break if the previously verse has a different
                 # book or bible version.
                 if first:
                     bible_text = u'%s %s %s' % (bible_text, verse_text, text)
-                elif bible != old_bible or book != old_book:
+                    # split the line but do not replace line breaks in renderer
                     service_item.add_capability(ItemCapabilities.NoLineBreaks)
+                elif bible != old_bible or book != old_book:
                     bible_text = u'%s\n%s %s' % (bible_text, verse_text,
                         text)
                 else:

From 521b06ee8c0b86dcfe19da9a1268a9f449532fb6 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sat, 28 Aug 2010 20:56:46 +0200
Subject: [PATCH 15/61] clean up - not working

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

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 89baf091a..42e351627 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -533,12 +533,13 @@ class BibleMediaItem(MediaManagerItem):
                 bible_text = u'%s %s %s\n\n' % (bible_text, verse_text, text)
             # We have to be 'Continuous'.
             else:
-                # We add a line break if the previously verse has a different
-                # book or bible version.
+                # split the line but do not replace line breaks in renderer
+                service_item.add_capability(ItemCapabilities.NoLineBreaks)
+                #text = text + u'\n'
                 if first:
                     bible_text = u'%s %s %s' % (bible_text, verse_text, text)
-                    # split the line but do not replace line breaks in renderer
-                    service_item.add_capability(ItemCapabilities.NoLineBreaks)
+                # We add a line break if the previously verse has a different
+                # book or bible version.
                 elif bible != old_bible or book != old_book:
                     bible_text = u'%s\n%s %s' % (bible_text, verse_text,
                         text)

From de3659bc928aa1632475acbaf2f1f58f635e10db Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sat, 28 Aug 2010 21:17:52 +0200
Subject: [PATCH 16/61] commented everything out, which cannot work (currently)

---
 openlp/plugins/bibles/lib/mediaitem.py | 29 +++++++++++++-------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 42e351627..185052a49 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -473,7 +473,7 @@ class BibleMediaItem(MediaManagerItem):
         items = self.listView.selectedIndexes()
         if len(items) == 0:
             return False
-        first = True
+        #first = True
         bible_text = u''
         old_chapter = u''
         raw_footer = []
@@ -530,26 +530,27 @@ class BibleMediaItem(MediaManagerItem):
                 bible_text = u''
             # If we are 'Verse Per Line' then force a new line.
             elif self.parent.settings_tab.layout_style == 1:
-                bible_text = u'%s %s %s\n\n' % (bible_text, verse_text, text)
+                text = text + u'\n'
+                bible_text = u'%s %s %s' % (bible_text, verse_text, text)
             # We have to be 'Continuous'.
             else:
                 # split the line but do not replace line breaks in renderer
                 service_item.add_capability(ItemCapabilities.NoLineBreaks)
-                #text = text + u'\n'
-                if first:
-                    bible_text = u'%s %s %s' % (bible_text, verse_text, text)
+                bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
+                #if first:
+                #    bible_text = u'%s %s %s' % (bible_text, verse_text, text)
                 # We add a line break if the previously verse has a different
                 # book or bible version.
-                elif bible != old_bible or book != old_book:
-                    bible_text = u'%s\n%s %s' % (bible_text, verse_text,
-                        text)
-                else:
-                    bible_text = u'%s %s %s' % (bible_text, verse_text, text)
-            if first:
-                first = False
+                #elif bible != old_bible or book != old_book:
+                #    bible_text = u'%s\n%s %s' % (bible_text, verse_text,
+                #        text)
+                #else:
+                #    bible_text = u'%s %s %s' % (bible_text, verse_text, text)
+            #if first:
+            #    first = False
             old_chapter = chapter
-            old_book = book
-            old_bible = bible
+            #old_book = book
+            #old_bible = bible
         # If there are no more items we check whether we have to add bible_text.
         if bible_text:
             raw_slides.append(bible_text)

From 37b2b1bb9dfb30344b5483cfb265541bcd5b33f6 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sat, 28 Aug 2010 21:28:50 +0200
Subject: [PATCH 17/61] clean up

---
 openlp/plugins/bibles/lib/mediaitem.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 185052a49..0286b1b49 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -530,8 +530,7 @@ class BibleMediaItem(MediaManagerItem):
                 bible_text = u''
             # If we are 'Verse Per Line' then force a new line.
             elif self.parent.settings_tab.layout_style == 1:
-                text = text + u'\n'
-                bible_text = u'%s %s %s' % (bible_text, verse_text, text)
+                bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
             # We have to be 'Continuous'.
             else:
                 # split the line but do not replace line breaks in renderer

From beaac2d923c665a44d7f972c6f7a091f8a1aa8ec Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sat, 28 Aug 2010 21:41:06 +0200
Subject: [PATCH 18/61] removed everything which cannot work

---
 openlp/plugins/bibles/lib/mediaitem.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 0286b1b49..af189179b 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -473,7 +473,6 @@ class BibleMediaItem(MediaManagerItem):
         items = self.listView.selectedIndexes()
         if len(items) == 0:
             return False
-        #first = True
         bible_text = u''
         old_chapter = u''
         raw_footer = []
@@ -536,20 +535,7 @@ class BibleMediaItem(MediaManagerItem):
                 # split the line but do not replace line breaks in renderer
                 service_item.add_capability(ItemCapabilities.NoLineBreaks)
                 bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
-                #if first:
-                #    bible_text = u'%s %s %s' % (bible_text, verse_text, text)
-                # We add a line break if the previously verse has a different
-                # book or bible version.
-                #elif bible != old_bible or book != old_book:
-                #    bible_text = u'%s\n%s %s' % (bible_text, verse_text,
-                #        text)
-                #else:
-                #    bible_text = u'%s %s %s' % (bible_text, verse_text, text)
-            #if first:
-            #    first = False
             old_chapter = chapter
-            #old_book = book
-            #old_bible = bible
         # If there are no more items we check whether we have to add bible_text.
         if bible_text:
             raw_slides.append(bible_text)

From 87db3e98e6ea888ca65f5bfad5609f7657e7ba62 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sun, 29 Aug 2010 14:49:45 +0200
Subject: [PATCH 19/61] clean ups, tweaks, fixed 625997

---
 openlp/plugins/bibles/lib/mediaitem.py | 65 +++++++++++++++-----------
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index af189179b..e0cf030de 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -47,7 +47,6 @@ class BibleListView(BaseListWithDnD):
         self.parent().onListViewResize(event.size().width(),
             event.size().width())
 
-
 class BibleMediaItem(MediaManagerItem):
     """
     This is the custom media manager item for Bibles.
@@ -61,8 +60,7 @@ class BibleMediaItem(MediaManagerItem):
         self.ListViewWithDnD_class = BibleListView
         MediaManagerItem.__init__(self, parent, icon, title)
         # place to store the search results for both bibles
-        self.search_results = {}
-        self.dual_search_results = {}
+        self.search_results, self.dual_search_results = {}, {}
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'bibles_load_list'), self.reloadBibles)
 
@@ -408,13 +406,13 @@ class BibleMediaItem(MediaManagerItem):
         self.reloadBibles()
 
     def onAdvancedFromVerse(self):
-        frm = self.AdvancedFromVerse.currentText()
-        self.adjustComboBox(frm, self.verses, self.AdvancedToVerse)
+        from_ = self.AdvancedFromVerse.currentText()
+        self.adjustComboBox(from_, self.verses, self.AdvancedToVerse)
 
     def onAdvancedToChapter(self):
-        frm = unicode(self.AdvancedFromChapter.currentText())
+        from_ = unicode(self.AdvancedFromChapter.currentText())
         to = unicode(self.AdvancedToChapter.currentText())
-        if frm != to:
+        if from_ != to:
             bible = unicode(self.AdvancedVersionComboBox.currentText())
             book = unicode(self.AdvancedBookComboBox.currentText())
             # get the verse count for new chapter
@@ -473,13 +471,18 @@ class BibleMediaItem(MediaManagerItem):
         items = self.listView.selectedIndexes()
         if len(items) == 0:
             return False
-        bible_text = u''
-        old_chapter = u''
-        raw_footer = []
-        raw_slides = []
-        service_item.add_capability(ItemCapabilities.AllowsPreview)
-        service_item.add_capability(ItemCapabilities.AllowsLoop)
-        service_item.add_capability(ItemCapabilities.AllowsAdditions)
+        has_dual_bible = False
+        bible_text, old_chapter = u'', u''
+        raw_footer, raw_slides = [], []
+        for item in items:
+            bitem = self.listView.item(item.row())
+            reference = bitem.data(QtCore.Qt.UserRole)
+            if isinstance(reference, QtCore.QVariant):
+                reference = reference.toPyObject()
+            dual_bible = self._decodeQtObject(reference, 'dual_bible')
+            if dual_bible:
+                has_dual_bible = True
+                break
         # Let's loop through the main lot, and assemble our verses.
         for item in items:
             bitem = self.listView.item(item.row())
@@ -496,6 +499,7 @@ class BibleMediaItem(MediaManagerItem):
             text = self._decodeQtObject(reference, 'text')
             dual_bible = self._decodeQtObject(reference, 'dual_bible')
             if dual_bible:
+                has_dual_bible = True
                 dual_version = self._decodeQtObject(reference,
                     'dual_version')
                 dual_copyright = self._decodeQtObject(reference,
@@ -504,8 +508,6 @@ class BibleMediaItem(MediaManagerItem):
                 #    'dual_permission')
                 dual_text = self._decodeQtObject(reference, 'dual_text')
             verse_text = self.formatVerse(old_chapter, chapter, verse)
-            # footer
-            old_chapter = chapter
             footer = u'%s (%s %s)' % (book, version, copyright)
             if footer not in raw_footer:
                 raw_footer.append(footer)
@@ -513,8 +515,7 @@ class BibleMediaItem(MediaManagerItem):
                 footer = u'%s (%s %s)' % (book, dual_version, dual_copyright)
                 if footer not in raw_footer:
                     raw_footer.append(footer)
-                # If we were previously 'Verse Per Line' we have to add the old
-                # bible_text, because it was not added until now.
+                # If there is an old bible_text we have to add it.
                 if bible_text:
                     raw_slides.append(bible_text)
                     bible_text = u''
@@ -522,6 +523,13 @@ class BibleMediaItem(MediaManagerItem):
                     verse_text, dual_text)
                 raw_slides.append(bible_text)
                 bible_text = u''
+            elif has_dual_bible:
+                if self.parent.settings_tab.layout_style == 0:
+                    bible_text = u'%s %s' % (verse_text, text)
+                    raw_slides.append(bible_text)
+                    bible_text = u''
+                else:
+                    bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
             # If we are 'Verse Per Slide' then create a new slide.
             elif self.parent.settings_tab.layout_style == 0:
                 bible_text = u'%s %s' % (verse_text, text)
@@ -532,15 +540,20 @@ class BibleMediaItem(MediaManagerItem):
                 bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
             # We have to be 'Continuous'.
             else:
-                # split the line but do not replace line breaks in renderer
-                service_item.add_capability(ItemCapabilities.NoLineBreaks)
                 bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
             old_chapter = chapter
         # If there are no more items we check whether we have to add bible_text.
         if bible_text:
             raw_slides.append(bible_text)
             bible_text = u''
-        # service item title
+        # Service Item: Capabilities
+        if self.parent.settings_tab.layout_style == 2 and not has_dual_bible:
+            # split the line but do not replace line breaks in renderer
+            service_item.add_capability(ItemCapabilities.NoLineBreaks)
+        service_item.add_capability(ItemCapabilities.AllowsPreview)
+        service_item.add_capability(ItemCapabilities.AllowsLoop)
+        service_item.add_capability(ItemCapabilities.AllowsAdditions)
+        # Service Item: Title
         if not service_item.title:
             if dual_bible:
                 service_item.title = u'%s (%s, %s) %s' % (book, version,
@@ -551,7 +564,7 @@ class BibleMediaItem(MediaManagerItem):
             translate('BiblesPlugin.MediaItem', 'etc')) == -1:
             service_item.title = u'%s, %s' % (service_item.title,
                 translate('BiblesPlugin.MediaItem', 'etc'))
-        # item theme
+        # Service Item: Theme
         if len(self.parent.settings_tab.bible_theme) == 0:
             service_item.theme = None
         else:
@@ -568,8 +581,9 @@ class BibleMediaItem(MediaManagerItem):
     def formatVerse(self, old_chapter, chapter, verse):
         if not self.parent.settings_tab.show_new_chapters or \
             old_chapter != chapter:
-            verse_text = chapter + u':'
-        verse_text += verse
+            verse_text = chapter + u':' + verse
+        else:
+            verse_text = verse
         if self.parent.settings_tab.display_style == 1:
             verse_text = u'{su}(' + verse_text + u'){/su}'
         elif self.parent.settings_tab.display_style == 2:
@@ -686,5 +700,4 @@ class BibleMediaItem(MediaManagerItem):
             row = self.listView.setCurrentRow(count + start_count)
             if row:
                 row.setSelected(True)
-        self.search_results = {}
-        self.dual_search_results = {}
+        self.search_results, self.dual_search_results = {}, {}

From 9fc45065fcf3b91b1ba5d8618fda7dddf0d426b8 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sun, 29 Aug 2010 14:58:40 +0200
Subject: [PATCH 20/61] removed unnecessary line

---
 openlp/plugins/bibles/lib/mediaitem.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index e0cf030de..606842e8d 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -499,7 +499,6 @@ class BibleMediaItem(MediaManagerItem):
             text = self._decodeQtObject(reference, 'text')
             dual_bible = self._decodeQtObject(reference, 'dual_bible')
             if dual_bible:
-                has_dual_bible = True
                 dual_version = self._decodeQtObject(reference,
                     'dual_version')
                 dual_copyright = self._decodeQtObject(reference,

From 31aba2eadb21d043b581de3186ceecdfb233353b Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sun, 29 Aug 2010 18:20:56 +0200
Subject: [PATCH 21/61] removed commented lines, name change

---
 openlp/plugins/bibles/lib/mediaitem.py | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 606842e8d..6e46e5608 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -406,13 +406,13 @@ class BibleMediaItem(MediaManagerItem):
         self.reloadBibles()
 
     def onAdvancedFromVerse(self):
-        from_ = self.AdvancedFromVerse.currentText()
-        self.adjustComboBox(from_, self.verses, self.AdvancedToVerse)
+        frm = self.AdvancedFromVerse.currentText()
+        self.adjustComboBox(frm, self.verses, self.AdvancedToVerse)
 
     def onAdvancedToChapter(self):
-        from_ = unicode(self.AdvancedFromChapter.currentText())
+        frm = unicode(self.AdvancedFromChapter.currentText())
         to = unicode(self.AdvancedToChapter.currentText())
-        if from_ != to:
+        if frm != to:
             bible = unicode(self.AdvancedVersionComboBox.currentText())
             book = unicode(self.AdvancedBookComboBox.currentText())
             # get the verse count for new chapter
@@ -495,7 +495,6 @@ class BibleMediaItem(MediaManagerItem):
             bible = self._decodeQtObject(reference, 'bible')
             version = self._decodeQtObject(reference, 'version')
             copyright = self._decodeQtObject(reference, 'copyright')
-            #permission = self._decodeQtObject(reference, 'permission')
             text = self._decodeQtObject(reference, 'text')
             dual_bible = self._decodeQtObject(reference, 'dual_bible')
             if dual_bible:
@@ -503,8 +502,6 @@ class BibleMediaItem(MediaManagerItem):
                     'dual_version')
                 dual_copyright = self._decodeQtObject(reference,
                     'dual_copyright')
-                #dual_permission = self._decodeQtObject(reference,
-                #    'dual_permission')
                 dual_text = self._decodeQtObject(reference, 'dual_text')
             verse_text = self.formatVerse(old_chapter, chapter, verse)
             footer = u'%s (%s %s)' % (book, version, copyright)
@@ -642,18 +639,11 @@ class BibleMediaItem(MediaManagerItem):
         """
         version = self.parent.manager.get_meta_data(bible, u'Version')
         copyright = self.parent.manager.get_meta_data(bible, u'Copyright')
-        #permission = self.parent.manager.get_meta_data(bible, u'Permissions')
         if dual_bible:
             dual_version = self.parent.manager.get_meta_data(dual_bible,
                 u'Version')
             dual_copyright = self.parent.manager.get_meta_data(dual_bible,
                 u'Copyright')
-            #dual_permission = self.parent.manager.get_meta_data(dual_bible,
-            #    u'Permissions')
-            #if dual_permission:
-            #    dual_permission = dual_permission.value
-            #else:
-            #    dual_permission = u''
         # We count the number of rows which are maybe already present.
         start_count = self.listView.count()
         for count, verse in enumerate(self.search_results):
@@ -665,12 +655,10 @@ class BibleMediaItem(MediaManagerItem):
                     'bible': QtCore.QVariant(bible),
                     'version': QtCore.QVariant(version.value),
                     'copyright': QtCore.QVariant(copyright.value),
-                    #'permission': QtCore.QVariant(permission.value),
                     'text': QtCore.QVariant(verse.text),
                     'dual_bible': QtCore.QVariant(dual_bible),
                     'dual_version': QtCore.QVariant(dual_version.value),
                     'dual_copyright': QtCore.QVariant(dual_copyright.value),
-                    #'dual_permission': QtCore.QVariant(dual_permission),
                     'dual_text': QtCore.QVariant(
                         self.dual_search_results[count].text)
                 }
@@ -684,7 +672,6 @@ class BibleMediaItem(MediaManagerItem):
                     'bible': QtCore.QVariant(bible),
                     'version': QtCore.QVariant(version.value),
                     'copyright': QtCore.QVariant(copyright.value),
-                    #'permission': QtCore.QVariant(permission.value),
                     'text': QtCore.QVariant(verse.text),
                     'dual_bible': QtCore.QVariant(dual_bible)
                 }

From d3ee43965f048a4ebbfe87cd2a084665e41a5c5b Mon Sep 17 00:00:00 2001
From: Derek Scotney <derekscotney@openlp.org>
Date: Sun, 29 Aug 2010 20:24:09 +0200
Subject: [PATCH 22/61] Change comments to reStructuredText format

---
 openlp/plugins/songs/lib/cclifileimport.py | 111 ++++++++++++++-------
 1 file changed, 74 insertions(+), 37 deletions(-)

diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py
index 46fab1863..65de4bd9f 100755
--- a/openlp/plugins/songs/lib/cclifileimport.py
+++ b/openlp/plugins/songs/lib/cclifileimport.py
@@ -49,7 +49,7 @@ class CCLIFileImport(SongImport):
 
         ``manager``
             The song manager for the running OpenLP installation.
-``filenames``
+        ``filenames``
             The files to be imported.
         
         """
@@ -100,26 +100,46 @@ class CCLIFileImport(SongImport):
 
     def do_import_usr_file(self, textList):
         """
-        Process the USR file 
+        The :method:`do_import_usr_file` method provides OpenLP with the ability to
+        import CCLI SongSelect songs in *USR* file format   
         
         ``textList``
             An array of strings containing the usr file content.
             
-        The format of the .usr format is:
-        ==========
-        [File]
-        Type=SongSelect Import File
-        Version=3.0
-        [S A2672885]
-        Title=Above All
-        Author=LeBlanc, Lenny | Baloche, Paul
-        Copyright=1999 Integrity's Hosanna! Music | LenSongs Publishing (Verwaltet von Gerth Medien Musikverlag) | (Verwaltet von Gerth Medien Musikverlag)
-        Admin=Gerth Medien Musikverlag
-        Themes=Cross/tKingship/tMajesty/tRedeemer
-        Keys=A
-        Fields=Vers 1/tVers 2/tChorus 1/tAndere 1
-        Words=Above all powers.... [/n = CR, /n/t = CRLF]
-        ==========            
+        **SongSelect .usr file format**
+        ``[File]``
+            USR file format first line
+        ``Type=``
+            Indicates the file type 
+            e.g. *Type=SongSelect Import File*
+        ``Version=3.0``
+            File format version
+        ``[S A2672885]``
+            Contains the CCLI Song number e.g. *2672885*
+        ``Title=``
+            Contains the song title (e.g. *Title=Above All*)
+        ``Author=``
+            Contains a | delimited list of the  song authors 
+            e.g. *Author=LeBlanc, Lenny | Baloche, Paul*
+        ``Copyright=``
+            Contains a | delimited list of the song copyrights
+            e.g. Copyright=1999 Integrity's Hosanna! Music | LenSongs Publishing (Verwaltet von Gerth Medien Musikverlag) | (Verwaltet von Gerth Medien Musikverlag)
+        ``Admin=``
+            Contains the song administrator
+            e.g. *Admin=Gerth Medien Musikverlag*
+        ``Themes=``
+            Contains a /t delimited list of the song themes
+            e.g. *Themes=Cross/tKingship/tMajesty/tRedeemer*
+        ``Keys=``
+            Contains the keys in which the music is played??
+            e.g. *Keys=A*
+        ``Fields=``
+            Contains a list of the songs fields in order /t delimited
+            e.g. *Fields=Vers 1/tVers 2/tChorus 1/tAndere 1*
+        ``Words=``
+            Contains the songs various lyrics in order as shown by the 
+            *Fields* description
+            e.g. *Words=Above all powers....* [/n = CR, /n/t = CRLF]
         """
 
         log.debug('USR file text: %s', textList)
@@ -181,29 +201,46 @@ class CCLIFileImport(SongImport):
 
     def do_import_txt_file(self, textList):
         """
-        Process the TXT file - pass in a list of lines
+        The :method:`do_import_txt_file` method provides OpenLP with the ability to
+        import CCLI SongSelect songs in *TXT* file format   
                 
         ``textList``
             An array of strings containing the txt file content. 
-     
-        The format of the .txt format is:
-        ==========
-        Song Title
-        <>
-        Description of following text (Verse/Chorus) and number
-        <verse/chorus lyrics>
-        <>
-        <>
-        Next text block description (etc)
-        <verse/chorus lyrics>
-        <>
-        <>
-        CCLI Number (e.g.CCLI-Liednummer: 2672885)
-        Copyright "|" delimited (e.g. © 1999 Integrity's Hosanna! Music | LenSongs Publishing)
-        Authors "|" delimited (e.g. Lenny LeBlanc | Paul Baloche)
-        Licencing info (e.g. For use solely with the SongSelect Terms of Use.  All rights Reserved.  www.ccli.com)
-        CCLI Licence number (e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14)
-        ==========     
+
+        **SongSelect .txt file format**
+
+        ``Song Title``
+            Contains the song title
+
+        <Empty line>
+
+        ``Title of following verse/chorus and number``
+            e.g. Verse 1, Chorus 1
+
+        ``Verse/Chorus lyrics``
+
+        <Empty line>
+
+        <Empty line>
+
+        ``Title of next verse/chorus (repeats)``
+
+        ``Verse/Chorus lyrics``
+
+        <Empty line>
+
+        <Empty line>
+
+        ``Song CCLI Number``
+            e.g. CCLI Number (e.g.CCLI-Liednummer: 2672885)
+        ``Song Copyright``
+            e.g. © 1999 Integrity's Hosanna! Music | LenSongs Publishing
+        ``Song Authors``    
+            e.g. Lenny LeBlanc | Paul Baloche
+        ``Licencing info``
+            e.g. For use solely with the SongSelect Terms of Use.  All rights Reserved.  www.ccli.com
+        ``CCLI Licence number of user``    
+            e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14   
         """
 
         log.debug('TXT file text: %s', textList)

From 590aef4a87e3c87d28ef08121b7aa3232d4ecdf8 Mon Sep 17 00:00:00 2001
From: Derek Scotney <derekscotney@openlp.org>
Date: Mon, 30 Aug 2010 20:32:00 +0200
Subject: [PATCH 23/61] Corrected docstring lengths

---
 openlp/plugins/songs/.directory            |  3 ---
 openlp/plugins/songs/lib/cclifileimport.py | 14 ++++++++------
 resources/songs/.directory                 |  3 ---
 3 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 openlp/plugins/songs/.directory
 delete mode 100644 resources/songs/.directory

diff --git a/openlp/plugins/songs/.directory b/openlp/plugins/songs/.directory
deleted file mode 100644
index 802164a81..000000000
--- a/openlp/plugins/songs/.directory
+++ /dev/null
@@ -1,3 +0,0 @@
-[Dolphin]
-Timestamp=2010,8,20,16,22,57
-ViewMode=1
diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py
index 65de4bd9f..cd69c4a86 100755
--- a/openlp/plugins/songs/lib/cclifileimport.py
+++ b/openlp/plugins/songs/lib/cclifileimport.py
@@ -100,8 +100,8 @@ class CCLIFileImport(SongImport):
 
     def do_import_usr_file(self, textList):
         """
-        The :method:`do_import_usr_file` method provides OpenLP with the ability to
-        import CCLI SongSelect songs in *USR* file format   
+        The :method:`do_import_usr_file` method provides OpenLP with 
+        the ability to import CCLI SongSelect songs in *USR* file format   
         
         ``textList``
             An array of strings containing the usr file content.
@@ -123,7 +123,8 @@ class CCLIFileImport(SongImport):
             e.g. *Author=LeBlanc, Lenny | Baloche, Paul*
         ``Copyright=``
             Contains a | delimited list of the song copyrights
-            e.g. Copyright=1999 Integrity's Hosanna! Music | LenSongs Publishing (Verwaltet von Gerth Medien Musikverlag) | (Verwaltet von Gerth Medien Musikverlag)
+            e.g. Copyright=1999 Integrity's Hosanna! Music | LenSongs 
+            Publishing (Verwaltet von Gerth Medien Musikverlag)
         ``Admin=``
             Contains the song administrator
             e.g. *Admin=Gerth Medien Musikverlag*
@@ -201,8 +202,8 @@ class CCLIFileImport(SongImport):
 
     def do_import_txt_file(self, textList):
         """
-        The :method:`do_import_txt_file` method provides OpenLP with the ability to
-        import CCLI SongSelect songs in *TXT* file format   
+        The :method:`do_import_txt_file` method provides OpenLP with 
+        the ability to import CCLI SongSelect songs in *TXT* file format   
                 
         ``textList``
             An array of strings containing the txt file content. 
@@ -238,7 +239,8 @@ class CCLIFileImport(SongImport):
         ``Song Authors``    
             e.g. Lenny LeBlanc | Paul Baloche
         ``Licencing info``
-            e.g. For use solely with the SongSelect Terms of Use.  All rights Reserved.  www.ccli.com
+            e.g. For use solely with the SongSelect Terms of Use.  
+            All rights Reserved.  www.ccli.com
         ``CCLI Licence number of user``    
             e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14   
         """
diff --git a/resources/songs/.directory b/resources/songs/.directory
deleted file mode 100644
index 077f3daf2..000000000
--- a/resources/songs/.directory
+++ /dev/null
@@ -1,3 +0,0 @@
-[Dolphin]
-Timestamp=2010,8,21,16,21,36
-ViewMode=1

From 83c5ee34505286a7fd8baa3e84488599c0058285 Mon Sep 17 00:00:00 2001
From: Derek Scotney <derekscotney@openlp.org>
Date: Mon, 30 Aug 2010 22:42:07 +0200
Subject: [PATCH 24/61] Removed openlp/plugins/songs/lib/.directory

---
 openlp/plugins/songs/lib/.directory | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 openlp/plugins/songs/lib/.directory

diff --git a/openlp/plugins/songs/lib/.directory b/openlp/plugins/songs/lib/.directory
deleted file mode 100644
index d9f9a4e00..000000000
--- a/openlp/plugins/songs/lib/.directory
+++ /dev/null
@@ -1,3 +0,0 @@
-[Dolphin]
-Timestamp=2010,8,21,15,53,23
-ViewMode=1

From 305610ed8eb5a42f95754664c0ddcd69112056d1 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Mon, 30 Aug 2010 21:57:59 +0100
Subject: [PATCH 25/61] fixes

---
 openlp/core/lib/htmlbuilder.py | 54 +++++++++++++++-------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 07b9f46ad..0c4a6821c 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -58,20 +58,18 @@ body {
     position: absolute;
     left: 0px;
     top: 0px;
-    z-index:10;
-    %s
+    z-index:10;%s
 }
 #footer {
     position: absolute;
-    z-index:5;
-    %s
+    z-index:5;%s
 }
 /* lyric css */
 %s
-
 </style>
 <script language="javascript">
     var timer = null;
+    var cur_lyrics = '1';
 
     function show_video(state, path, volume, loop){
         var vid = document.getElementById('video');
@@ -183,14 +181,9 @@ body {
     }
 
     function show_text(newtext){
-        var textitem = document.getElementById('lyricsmain1');
-        if(window.getComputedStyle(textitem, '').opacity==1){
-            var item = '1';
-        } else {
-            var item = '2';
-        }
-        text_fade_all(item, true);
-        text_fade_all((item=='')?'2':'1', false, newtext);
+        text_fade_all(cur_lyrics, true);
+        cur_lyrics = (cur_lyrics=='1')?'2':'1';
+        text_fade_all(cur_lyrics, false, newtext);
     }
     function text_fade_all(item, fadeout, newtext){
         text_fade('lyricsmain' + item, fadeout, newtext);
@@ -207,9 +200,10 @@ body {
                 textitem.className = textitem.className.replace(' fadeout', '');
             }, 0);
         }
-    }
+    }    
+
     function show_text_complete(){
-       var item = document.getElementById('lyricsmain1');
+       var item = document.getElementById('lyricsmain' + cur_lyrics);
        return (window.getComputedStyle(item, '').opacity == 1);
     }
     
@@ -320,7 +314,7 @@ td.fadeout { opacity: 0; }
             item.main.y() + float(theme.display_shadow_size))
         align = u''
         if theme.display_slideTransition and islive:
-            transition = u'-webkit-transition: opacity 5s ease-in-out;'
+            transition = u'-webkit-transition: opacity 1s linear;'
         if theme.display_horizontalAlign == 2:
             align = u'text-align:center;'
         elif theme.display_horizontalAlign == 1:
@@ -359,14 +353,14 @@ def build_footer(item):
         Service Item to be processed.
     """
     style = """
-left: %spx;
-top: %spx;
-width: %spx;
-height: %spx;
-font-family: %s;
-font-size: %spt;
-color: %s;
-text-align: %s;
+    left: %spx;
+    top: %spx;
+    width: %spx;
+    height: %spx;
+    font-family: %s;
+    font-size: %spt;
+    color: %s;
+    text-align: %s;
     """
     theme = item.themedata
     if not theme:
@@ -390,12 +384,12 @@ def build_alert(alertTab, width):
         Details from the Alert tab for fonts etc
     """
     style = """
-width: %s;
-vertical-align: %s;
-font-family: %s;
-font-size: %spt;
-color: %s;
-background-color: %s;
+    width: %s;
+    vertical-align: %s;
+    font-family: %s;
+    font-size: %spt;
+    color: %s;
+    background-color: %s;
     """
     if not alertTab:
         return u''

From fbc048e878e42691e9a8d1276caba45d815103e5 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Tue, 31 Aug 2010 18:51:48 +0100
Subject: [PATCH 26/61] Renderer fixes

---
 openlp/core/lib/renderer.py      | 2 +-
 openlp/core/lib/rendermanager.py | 7 +++++++
 openlp/core/ui/servicemanager.py | 6 +++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 433018c23..5776874cc 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -159,7 +159,7 @@ class Renderer(object):
         doc = QtGui.QTextDocument()
         doc.setPageSize(QtCore.QSizeF(self._rect.width(), self._rect.height()))
         df = doc.defaultFont()
-        df.setPixelSize(self._theme.font_main_proportion)
+        df.setPointSize(self._theme.font_main_proportion)
         df.setFamily(self._theme.font_main_name)
         main_weight = 50
         if self._theme.font_main_weight == u'Bold':
diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py
index 9caabdc69..6be26bd82 100644
--- a/openlp/core/lib/rendermanager.py
+++ b/openlp/core/lib/rendermanager.py
@@ -93,6 +93,7 @@ class RenderManager(object):
         """
         self.global_theme = global_theme
         self.theme_level = theme_level
+        self.themedata = None
 
     def set_service_theme(self, service_theme):
         """
@@ -102,6 +103,7 @@ class RenderManager(object):
             The service-level theme to be set.
         """
         self.service_theme = service_theme
+        self.themedata = None
 
     def set_override_theme(self, theme, overrideLevels=False):
         """
@@ -111,6 +113,10 @@ class RenderManager(object):
         ``theme``
             The name of the song-level theme. None means the service
             item wants to use the given value.
+
+        ``overrideLevels``
+            Used to force the theme data passed in to be used.
+
         """
         log.debug(u'set override theme to %s', theme)
         theme_level = self.theme_level
@@ -137,6 +143,7 @@ class RenderManager(object):
         if self.theme != self.renderer.theme_name or self.themedata is None \
             or overrideLevels:
             log.debug(u'theme is now %s', self.theme)
+            # Force the theme to be the one passed in.
             if overrideLevels:
                 self.themedata = theme
             else:
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index f2961b717..c7d3c497f 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -574,7 +574,7 @@ class ServiceManager(QtGui.QWidget):
         * An osd which is a pickle of the service items
         * All image, presentation and video files needed to run the service.
         """
-        log.debug(u'onSaveService')
+        log.debug(u'onSaveService %s' % quick)
         if not quick or self.isNew:
             filename = QtGui.QFileDialog.getSaveFileName(self,
             translate('OpenLP.ServiceManager', 'Save Service'),
@@ -755,6 +755,7 @@ class ServiceManager(QtGui.QWidget):
         """
         Set the theme for the current service
         """
+        log.debug(u'onThemeComboBoxSelected')
         self.service_theme = unicode(self.themeComboBox.currentText())
         self.parent.RenderManager.set_service_theme(self.service_theme)
         QtCore.QSettings().setValue(
@@ -767,6 +768,7 @@ class ServiceManager(QtGui.QWidget):
         The theme may have changed in the settings dialog so make
         sure the theme combo box is in the correct state.
         """
+        log.debug(u'themeChange')
         if self.parent.RenderManager.theme_level == ThemeLevel.Global:
             self.toolbar.actions[u'ThemeLabel'].setVisible(False)
             self.toolbar.actions[u'ThemeWidget'].setVisible(False)
@@ -779,6 +781,7 @@ class ServiceManager(QtGui.QWidget):
         Rebuild the service list as things have changed and a
         repaint is the easiest way to do this.
         """
+        log.debug(u'regenerateServiceItems')
         # force reset of renderer as theme data has changed
         self.parent.RenderManager.themedata = None
         if self.serviceItems:
@@ -800,6 +803,7 @@ class ServiceManager(QtGui.QWidget):
         ``item``
             Service Item to be added
         """
+        log.debug(u'addServiceItem')
         sitem = self.findServiceItem()[0]
         item.render()
         if replace:

From 60ced9e1845673fe803b2662c7c2fff1fa38eb6e Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Tue, 31 Aug 2010 20:28:21 +0200
Subject: [PATCH 27/61] moved some code

---
 openlp/plugins/bibles/lib/mediaitem.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 6e46e5608..00224f6e2 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -507,20 +507,21 @@ class BibleMediaItem(MediaManagerItem):
             footer = u'%s (%s %s)' % (book, version, copyright)
             if footer not in raw_footer:
                 raw_footer.append(footer)
-            if dual_bible:
-                footer = u'%s (%s %s)' % (book, dual_version, dual_copyright)
-                if footer not in raw_footer:
-                    raw_footer.append(footer)
-                # If there is an old bible_text we have to add it.
-                if bible_text:
+            if has_dual_bible:
+                if dual_bible:
+                    footer = u'%s (%s %s)' % (book, dual_version,
+                        dual_copyright)
+                    if footer not in raw_footer:
+                        raw_footer.append(footer)
+                    # If there is an old bible_text we have to add it.
+                    if bible_text:
+                        raw_slides.append(bible_text)
+                        bible_text = u''
+                    bible_text = u'%s %s\n\n%s %s' % (verse_text, text,
+                        verse_text, dual_text)
                     raw_slides.append(bible_text)
                     bible_text = u''
-                bible_text = u'%s %s\n\n%s %s' % (verse_text, text,
-                    verse_text, dual_text)
-                raw_slides.append(bible_text)
-                bible_text = u''
-            elif has_dual_bible:
-                if self.parent.settings_tab.layout_style == 0:
+                elif self.parent.settings_tab.layout_style == 0:
                     bible_text = u'%s %s' % (verse_text, text)
                     raw_slides.append(bible_text)
                     bible_text = u''

From 5734c3052a91ad84ec77e3708d602e59ff202a0b Mon Sep 17 00:00:00 2001
From: Derek Scotney <derekscotney@openlp.org>
Date: Tue, 31 Aug 2010 21:01:55 +0200
Subject: [PATCH 28/61] Code convention corrections

---
 openlp/plugins/songs/lib/cclifileimport.py | 135 ++++++++++-----------
 1 file changed, 64 insertions(+), 71 deletions(-)

diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py
index cd69c4a86..28cfbc595 100755
--- a/openlp/plugins/songs/lib/cclifileimport.py
+++ b/openlp/plugins/songs/lib/cclifileimport.py
@@ -38,12 +38,12 @@ class CCLIFileImportError(Exception):
 
 class CCLIFileImport(SongImport):
     """
-    The :class:`CCLIFileImport` class provides OpenLP with the ability to
-    import CCLI SongSelect song files in both .txt and .usr formats
-    see http://www.ccli.com
+    The :class:`CCLIFileImport` class provides OpenLP with the
+    ability to import CCLI SongSelect song files in both .txt and
+    .usr formats. See http://www.ccli.com
     """
 
-    def __init__(self, master_manager, **kwargs):
+    def __init__(self, manager, **kwargs):
         """
         Initialise the import.
 
@@ -51,20 +51,19 @@ class CCLIFileImport(SongImport):
             The song manager for the running OpenLP installation.
         ``filenames``
             The files to be imported.
-        
         """
-        SongImport.__init__(self, master_manager)
-        self.master_manager = master_manager
+        SongImport.__init__(self, manager)
         if u'filenames' in kwargs:
             self.filenames = kwargs[u'filenames']
             log.debug(self.filenames)
+        else:
+            raise KeyError(u'Keyword argument "filenames" not supplied.')            
 
     def do_import(self):
         """
         Import either a .usr or a .txt SongSelect file
         """
-        
-        log.debug('Starting CCLI File Import')
+        log.debug(u'Starting CCLI File Import')
         song_total = len(self.filenames)
         self.import_wizard.importProgressBar.setMaximum(song_total)
         song_count = 1        
@@ -72,7 +71,7 @@ class CCLIFileImport(SongImport):
             self.import_wizard.incrementProgressBar(
                 u'Importing song %s of %s' % (song_count, song_total))            
             filename = unicode(filename) 
-            log.debug('Importing CCLI File: %s', filename)
+            log.debug(u'Importing CCLI File: %s', filename)
             lines = []
             if os.path.isfile(filename):
                 detect_file = open(filename, u'r')
@@ -80,13 +79,12 @@ class CCLIFileImport(SongImport):
                 detect_file.close()
                 infile = codecs.open(filename, u'r', details['encoding'])
                 lines = infile.readlines()
-
                 ext = os.path.splitext(filename)[1]
                 if ext.lower() == ".usr":
-                    log.info('SongSelect .usr format file found %s: ' ,  filename)
+                    log.info(u'SongSelect .usr format file found %s: ' ,  filename)
                     self.do_import_usr_file(lines)
                 elif ext.lower() == ".txt":
-                    log.info('SongSelect .txt format file found %s: ', filename)
+                    log.info(u'SongSelect .txt format file found %s: ', filename)
                     self.do_import_txt_file(lines)
                 else:
                     log.info(u'Extension %s is not valid', filename)
@@ -94,14 +92,13 @@ class CCLIFileImport(SongImport):
                 song_count += 1
             if self.stop_import_flag:
                 return False  
-                
         return True
 
-
     def do_import_usr_file(self, textList):
         """
-        The :method:`do_import_usr_file` method provides OpenLP with 
-        the ability to import CCLI SongSelect songs in *USR* file format   
+        The :method:`do_import_usr_file` method provides OpenLP
+        with the ability to import CCLI SongSelect songs in
+        *USR* file format   
         
         ``textList``
             An array of strings containing the usr file content.
@@ -123,8 +120,9 @@ class CCLIFileImport(SongImport):
             e.g. *Author=LeBlanc, Lenny | Baloche, Paul*
         ``Copyright=``
             Contains a | delimited list of the song copyrights
-            e.g. Copyright=1999 Integrity's Hosanna! Music | LenSongs 
-            Publishing (Verwaltet von Gerth Medien Musikverlag)
+            e.g. Copyright=1999 Integrity's Hosanna! Music |
+            LenSongs Publishing (Verwaltet von Gerth Medien
+            Musikverlag)
         ``Admin=``
             Contains the song administrator
             e.g. *Admin=Gerth Medien Musikverlag*
@@ -142,16 +140,10 @@ class CCLIFileImport(SongImport):
             *Fields* description
             e.g. *Words=Above all powers....* [/n = CR, /n/t = CRLF]
         """
-
-        log.debug('USR file text: %s', textList)
-        
-        n = 0 # line number
+        log.debug(u'USR file text: %s', textList)
         lyrics = []
-
-        new_song = SongImport(self.master_manager)
-
+        new_song = SongImport(self.manager)
         for line in textList:
-            n += 1
             if line.startswith(u'Title='):
                 sname = line[6:].strip()
             elif line.startswith(u'Author='):
@@ -167,25 +159,23 @@ class CCLIFileImport(SongImport):
                 sfields = line[7:].strip()
             elif line.startswith(u'Words='):
                 swords = line[6:].strip()
-            #Unhandled usr keywords:Type, Version, Admin, Themes, Keys
-
+            #Unhandled usr keywords:Type,Version,Admin,Themes,Keys
         #Process Fields and words sections
         fieldlst = sfields.split(u'/t')
         wordslst = swords.split(u'/t')
-        for i in range(0, len(fieldlst)):
-            if fieldlst[i].startswith(u'Ver'): #Verse
+        for counter in range(0, len(fieldlst)):
+            if fieldlst[counter].startswith(u'Ver'):
                 vtype = u'V'
-            elif fieldlst[i].startswith(u'Ch'): #Chorus
+            elif fieldlst[counter].startswith(u'Ch'):
                 vtype = u'C'
-            elif fieldlst[i].startswith(u'Br'): #Bridge
+            elif fieldlst[counter].startswith(u'Br'):
                 vtype = u'B'
             else: #Other
                 vtype = u'O'
-            vcontent = unicode(wordslst[i])
+            vcontent = unicode(wordslst[counter])
             vcontent = vcontent.replace("/n",  "\n")
             if (len(vcontent) > 0):                
                 new_song.add_verse(vcontent, vtype);
-
         #Handle multiple authors
         lst = sauthor.split(u'/')
         if len(lst) < 2:
@@ -193,17 +183,16 @@ class CCLIFileImport(SongImport):
         for author in lst:
             seperated = author.split(u',')
             new_song.add_author(seperated[1].strip() + " " + seperated[0].strip())
-
         new_song.title = sname
         new_song.copyright = scopyright
         new_song.ccli_number = sccli
         new_song.finish()
 
-
     def do_import_txt_file(self, textList):
         """
-        The :method:`do_import_txt_file` method provides OpenLP with 
-        the ability to import CCLI SongSelect songs in *TXT* file format   
+        The :method:`do_import_txt_file` method provides OpenLP
+        with the ability to import CCLI SongSelect songs in
+        *TXT* file format   
                 
         ``textList``
             An array of strings containing the txt file content. 
@@ -244,44 +233,44 @@ class CCLIFileImport(SongImport):
         ``CCLI Licence number of user``    
             e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14   
         """
-
-        log.debug('TXT file text: %s', textList)
-        
-        new_song = SongImport(self.master_manager)
-        n = 0
+        log.debug(u'TXT file text: %s', textList)
+        new_song = SongImport(self.manager)
+        lnum = 0
         vcontent = u''
         scomments = u''
         scopyright = u'';
         verse_start = False
-
         for line in textList:
-            ln = line.strip()
-            if (len(ln)== 0):
-                if (n==0):
+            line = line.strip()
+            if not line:
+                if (lnum==0):
                     continue
-                elif (verse_start == True):
-                      if (len(vcontent) > 0):
+                elif verse_start:
+                      if vcontent:
                         new_song.add_verse(vcontent, vtype)
                         vcontent = ''
                         verse_start = False
             else:
-                if (n==0): #n=0, song title
-                    sname = ln
-                    n += 1
-                elif (n==1): #n=1, verses
-                    if ln.startswith(u'CCLI'): #n=1, ccli number, first line after verses
-                        n += 1
-                        cparts = ln.split(' ')
+                #lnum=0, song title
+                if (lnum==0):
+                    sname = line
+                    lnum += 1
+                #lnum=1, verses    
+                elif (lnum==1):
+                    #lnum=1, ccli number, first line after verses
+                    if line.startswith(u'CCLI'):
+                        lnum += 1
+                        cparts = line.split(' ')
                         sccli = cparts[len(cparts)-1]
                     elif (verse_start == False):
                         # We have the verse descriptor
-                        parts = ln.split(' ')
+                        parts = line.split(' ')
                         if (len(parts) == 2):
-                            if parts[0].startswith(u'Ver'): #Verse
+                            if parts[0].startswith(u'Ver'):
                                 vtype = u'V'
-                            elif parts[0].startswith(u'Ch'): #Chorus
+                            elif parts[0].startswith(u'Ch'):
                                 vtype = u'C'
-                            elif parts[0].startswith(u'Br'): #Bridge
+                            elif parts[0].startswith(u'Br'):
                                 vtype = u'B'
                             else:
                                 vtype = u'O'
@@ -291,18 +280,21 @@ class CCLIFileImport(SongImport):
                             vnumber = 1
                         verse_start = True
                     else:
-                        # We have verse content or the start of the last part
-                        # Add l so as to keep the CRLF
+                        # We have verse content or the start of the
+                        # last part. Add l so as to keep the CRLF
                         vcontent = vcontent + line
                 else:
-                    if (n==2): #n=2, copyright
-                        n += 1
-                        scopyright = ln
-                    elif (n==3): #n=3, authors
-                        n += 1
-                        sauthor = ln
-                    elif (n==4) and (not ln.startswith(u'CCL')): #n=4, comments lines before last line
-                        scomments = scomments + ln
+                    #lnum=2, copyright
+                    if (lnum==2):
+                        lnum += 1
+                        scopyright = line
+                    #n=3, authors    
+                    elif (lnum==3):
+                        lnum += 1
+                        sauthor = line
+                     #lnum=4, comments lines before last line    
+                    elif (lnum==4) and (not line.startswith(u'CCL')):
+                        scomments = scomments + line
         # split on known separators
         alist = sauthor.split(u'/')
         if len(alist) < 2:
@@ -313,3 +305,4 @@ class CCLIFileImport(SongImport):
         new_song.ccli_number = sccli
         new_song.comments = scomments
         new_song.finish()
+        

From 0c62215bb77625b2f265588b1d52874d40b2199c Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Tue, 31 Aug 2010 23:15:19 +0100
Subject: [PATCH 29/61] Less interesting, but hopefully slightly  faster
 transitions

---
 openlp/core/lib/htmlbuilder.py | 116 ++++++++++++++++-----------------
 1 file changed, 56 insertions(+), 60 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 0c4a6821c..db5b84efb 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -58,18 +58,21 @@ body {
     position: absolute;
     left: 0px;
     top: 0px;
-    z-index:10;%s
+    z-index:10;
+    %s
 }
 #footer {
     position: absolute;
-    z-index:5;%s
+    z-index:5;
+    %s
 }
 /* lyric css */
 %s
+
 </style>
 <script language="javascript">
     var timer = null;
-    var cur_lyrics = '1';
+    var transition = %s;
 
     function show_video(state, path, volume, loop){
         var vid = document.getElementById('video');
@@ -132,12 +135,9 @@ body {
                 break;
         }
         document.getElementById('black').style.display = black;
-        document.getElementById('lyricsmain1').style.visibility = lyrics;
-        document.getElementById('lyricsoutline1').style.visibility = lyrics;
-        document.getElementById('lyricsshadow1').style.visibility = lyrics;
-        document.getElementById('lyricsmain2').style.visibility = lyrics;
-        document.getElementById('lyricsoutline2').style.visibility = lyrics;
-        document.getElementById('lyricsshadow2').style.visibility = lyrics;
+        document.getElementById('lyricsmain').style.visibility = lyrics;
+        document.getElementById('lyricsoutline').style.visibility = lyrics;
+        document.getElementById('lyricsshadow').style.visibility = lyrics;
         document.getElementById('footer').style.visibility = lyrics;
         var vid = document.getElementById('video');
         if(vid.src != ''){
@@ -156,7 +156,7 @@ body {
             return 0;
         }
         if(position == ''){
-            position = window.getComputedStyle(text, '').verticalAlign;
+            position = getComputedStyle(text, '').verticalAlign;
         }
         switch(position)
         {
@@ -181,32 +181,40 @@ body {
     }
 
     function show_text(newtext){
-        text_fade_all(cur_lyrics, true);
-        cur_lyrics = (cur_lyrics=='1')?'2':'1';
-        text_fade_all(cur_lyrics, false, newtext);
+        if(timer != null)
+            clearTimeout(timer);
+        text_fade('lyricsmain', newtext);        
+        text_fade('lyricsoutline', newtext);
+        text_fade('lyricsshadow', newtext);
+        if(text_opacity()==1) return;
+        timer = setTimeout(function(){
+            show_text(newtext);
+        }, 100);
     }
-    function text_fade_all(item, fadeout, newtext){
-        text_fade('lyricsmain' + item, fadeout, newtext);
-        text_fade('lyricsoutline' + item, fadeout, newtext);
-        text_fade('lyricsshadow' + item, fadeout, newtext);
-    }
-    function text_fade(id, fadeout, newtext){
-        var textitem = document.getElementById(id);
-        if(fadeout) {
-            textitem.className += ' fadeout';
-        } else {
-            textitem.innerHTML = newtext;
-            window.setTimeout(function() {
-                textitem.className = textitem.className.replace(' fadeout', '');
-            }, 0);
-        }
-    }    
 
-    function show_text_complete(){
-       var item = document.getElementById('lyricsmain' + cur_lyrics);
-       return (window.getComputedStyle(item, '').opacity == 1);
+    function text_fade(id, newtext){
+        var text = document.getElementById(id);
+        if(!transition){
+             text.innerHTML = newtext;
+             return;
+        }
+        if(text.style.opacity=='') text.style.opacity = 1;
+        if(newtext==text.innerHTML){
+            text.style.opacity = parseFloat(text.style.opacity) + 0.3;
+        } else {
+            text.style.opacity -= 0.3;
+            if(text.style.opacity<=0.1)
+                text.innerHTML = newtext;
+        }
+    }
+
+    function text_opacity(){
+        var text = document.getElementById('lyricsmain');
+        return window.getComputedStyle(text, '').opacity;
+    }
+    function show_text_complete(){
+        return (text_opacity()==1);
     }
-    
 </script>
 </head>
 <body>
@@ -221,22 +229,13 @@ co-operating in qwebkit. https://bugs.webkit.org/show_bug.cgi?id=43187
 Therefore one table for text, one for outline and one for shadow.
 -->
 <table class="lyricstable lyricscommon">
-    <tr><td id="lyricsmain1" class="lyrics"></td></tr>
+    <tr><td id="lyricsmain" class="lyrics"></td></tr>
 </table>
 <table class="lyricsoutlinetable lyricscommon">
-    <tr><td id="lyricsoutline1" class="lyricsoutline lyrics"></td></tr>
+    <tr><td id="lyricsoutline" class="lyricsoutline lyrics"></td></tr>
 </table>
 <table class="lyricsshadowtable lyricscommon">
-    <tr><td id="lyricsshadow1" class="lyricsshadow lyrics"></td></tr>
-</table>
-<table class="lyricstable lyricscommon">
-    <tr><td id="lyricsmain2" class="lyrics"></td></tr>
-</table>
-<table class="lyricsoutlinetable lyricscommon">
-    <tr><td id="lyricsoutline2" class="lyricsoutline lyrics"></td></tr>
-</table>
-<table class="lyricsshadowtable lyricscommon">
-    <tr><td id="lyricsshadow2" class="lyricsshadow lyrics"></td></tr>
+    <tr><td id="lyricsshadow" class="lyricsshadow lyrics"></td></tr>
 </table>
 <div id="alert" style="visibility:hidden;"></div>
 <div id="footer" class="footer"></div>
@@ -268,11 +267,13 @@ def build_html(item, screen, alert, islive):
     html = HTMLSRC % (width, height,
         build_alert(alert, width),
         build_footer(item),
-        build_lyrics(item, islive),
+        build_lyrics(item),
+        u'true' if theme and theme.display_slideTransition and islive \
+            else u'false',
         image)
     return html
 
-def build_lyrics(item, islive):
+def build_lyrics(item):
     """
     Build the video display div
 
@@ -280,15 +281,13 @@ def build_lyrics(item, islive):
         Service Item containing theme and location information
     """
     style = """
-.lyricscommon { position: absolute;  %s }
-.lyricstable { z-index:4;  %s }
-.lyricsoutlinetable { z-index:3; %s }
-.lyricsshadowtable { z-index:2; %s }
-.lyrics { %s }
-.lyricsoutline { %s }
-.lyricsshadow { %s }
-td { opacity: 1; %s }
-td.fadeout { opacity: 0; }
+    .lyricscommon { position: absolute;  %s }
+    .lyricstable { z-index:4;  %s }
+    .lyricsoutlinetable { z-index:3; %s }
+    .lyricsshadowtable { z-index:2; %s }
+    .lyrics { %s }
+    .lyricsoutline { %s }
+    .lyricsshadow { %s }
      """
     theme = item.themedata
     lyricscommon = u''
@@ -298,7 +297,6 @@ td.fadeout { opacity: 0; }
     lyrics = u''
     outline = u'display: none;'
     shadow = u'display: none;'
-    transition = u''
     if theme:
         lyricscommon =  u'width: %spx; height: %spx; word-wrap: break-word;  ' \
             u'font-family: %s; font-size: %spt; color: %s; line-height: %d%%;' \
@@ -313,8 +311,6 @@ td.fadeout { opacity: 0; }
             (item.main.x() + float(theme.display_shadow_size),
             item.main.y() + float(theme.display_shadow_size))
         align = u''
-        if theme.display_slideTransition and islive:
-            transition = u'-webkit-transition: opacity 1s linear;'
         if theme.display_horizontalAlign == 2:
             align = u'text-align:center;'
         elif theme.display_horizontalAlign == 1:
@@ -342,7 +338,7 @@ td.fadeout { opacity: 0; }
             if theme.display_shadow:
                 shadow = u'color: %s;' % (theme.display_shadow_color)
     lyrics_html = style % (lyricscommon, lyricstable, outlinetable,
-        shadowtable, lyrics, outline, shadow, transition)
+        shadowtable, lyrics, outline, shadow)
     return lyrics_html
 
 def build_footer(item):

From 80851ddfc44df5dabf54b62b4b9041194359ccd2 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Wed, 1 Sep 2010 19:27:38 +0200
Subject: [PATCH 30/61] added permission, changed formattig

---
 openlp/plugins/bibles/lib/mediaitem.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 00224f6e2..37192da07 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -60,7 +60,8 @@ class BibleMediaItem(MediaManagerItem):
         self.ListViewWithDnD_class = BibleListView
         MediaManagerItem.__init__(self, parent, icon, title)
         # place to store the search results for both bibles
-        self.search_results, self.dual_search_results = {}, {}
+        self.search_results = {}
+        self.dual_search_results = {}
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'bibles_load_list'), self.reloadBibles)
 
@@ -472,8 +473,10 @@ class BibleMediaItem(MediaManagerItem):
         if len(items) == 0:
             return False
         has_dual_bible = False
-        bible_text, old_chapter = u'', u''
-        raw_footer, raw_slides = [], []
+        bible_text = u''
+        old_chapter = u''
+        raw_footer = []
+        raw_slides = []
         for item in items:
             bitem = self.listView.item(item.row())
             reference = bitem.data(QtCore.Qt.UserRole)
@@ -495,6 +498,7 @@ class BibleMediaItem(MediaManagerItem):
             bible = self._decodeQtObject(reference, 'bible')
             version = self._decodeQtObject(reference, 'version')
             copyright = self._decodeQtObject(reference, 'copyright')
+            permission = self._decodeQtObject(reference, 'permission')
             text = self._decodeQtObject(reference, 'text')
             dual_bible = self._decodeQtObject(reference, 'dual_bible')
             if dual_bible:
@@ -502,6 +506,8 @@ class BibleMediaItem(MediaManagerItem):
                     'dual_version')
                 dual_copyright = self._decodeQtObject(reference,
                     'dual_copyright')
+                dual_permission = self._decodeQtObject(reference,
+                    'dual_permission')
                 dual_text = self._decodeQtObject(reference, 'dual_text')
             verse_text = self.formatVerse(old_chapter, chapter, verse)
             footer = u'%s (%s %s)' % (book, version, copyright)
@@ -640,11 +646,16 @@ class BibleMediaItem(MediaManagerItem):
         """
         version = self.parent.manager.get_meta_data(bible, u'Version')
         copyright = self.parent.manager.get_meta_data(bible, u'Copyright')
+        permission = self.parent.manager.get_meta_data(bible, u'Permissions')
         if dual_bible:
             dual_version = self.parent.manager.get_meta_data(dual_bible,
                 u'Version')
             dual_copyright = self.parent.manager.get_meta_data(dual_bible,
                 u'Copyright')
+            dual_permission = self.parent.manager.get_meta_data(dual_bible,
+                u'Permissions')
+            if not dual_permission:
+                dual_permission = u''
         # We count the number of rows which are maybe already present.
         start_count = self.listView.count()
         for count, verse in enumerate(self.search_results):
@@ -656,10 +667,12 @@ class BibleMediaItem(MediaManagerItem):
                     'bible': QtCore.QVariant(bible),
                     'version': QtCore.QVariant(version.value),
                     'copyright': QtCore.QVariant(copyright.value),
+                    'permission': QtCore.QVariant(permission.value),
                     'text': QtCore.QVariant(verse.text),
                     'dual_bible': QtCore.QVariant(dual_bible),
                     'dual_version': QtCore.QVariant(dual_version.value),
                     'dual_copyright': QtCore.QVariant(dual_copyright.value),
+                    'dual_permission': QtCore.QVariant(dual_permission.value),
                     'dual_text': QtCore.QVariant(
                         self.dual_search_results[count].text)
                 }
@@ -673,6 +686,7 @@ class BibleMediaItem(MediaManagerItem):
                     'bible': QtCore.QVariant(bible),
                     'version': QtCore.QVariant(version.value),
                     'copyright': QtCore.QVariant(copyright.value),
+                    'permission': QtCore.QVariant(permission.value),
                     'text': QtCore.QVariant(verse.text),
                     'dual_bible': QtCore.QVariant(dual_bible)
                 }
@@ -687,4 +701,5 @@ class BibleMediaItem(MediaManagerItem):
             row = self.listView.setCurrentRow(count + start_count)
             if row:
                 row.setSelected(True)
-        self.search_results, self.dual_search_results = {}, {}
+        self.search_results = {}
+        self.dual_search_results = {}

From b21e164fd3055c08f0e828a2012d0c251e73012a Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Wed, 1 Sep 2010 19:54:10 +0200
Subject: [PATCH 31/61] added permission to footer

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

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 37192da07..8ac5641b1 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -510,13 +510,13 @@ class BibleMediaItem(MediaManagerItem):
                     'dual_permission')
                 dual_text = self._decodeQtObject(reference, 'dual_text')
             verse_text = self.formatVerse(old_chapter, chapter, verse)
-            footer = u'%s (%s %s)' % (book, version, copyright)
+            footer = u'%s (%s %s)' % (book, version, copyright, permission)
             if footer not in raw_footer:
                 raw_footer.append(footer)
             if has_dual_bible:
                 if dual_bible:
                     footer = u'%s (%s %s)' % (book, dual_version,
-                        dual_copyright)
+                        dual_copyright, dual_permission)
                     if footer not in raw_footer:
                         raw_footer.append(footer)
                     # If there is an old bible_text we have to add it.

From b24467d32c4d7dd61e3be3ad719a92f6b3bdf06c Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Wed, 1 Sep 2010 20:20:40 +0100
Subject: [PATCH 32/61] cleanup

---
 openlp/core/lib/renderer.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 5776874cc..aad686564 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -47,26 +47,13 @@ class Renderer(object):
         Initialise the renderer.
         """
         self._rect = None
-        self._debug = False
-        self._display_shadow_size_footer = 0
-        self._display_outline_size_footer = 0
         self.theme_name = None
         self._theme = None
         self._bg_image_filename = None
         self.frame = None
-        self.frame_opaque = None
         self.bg_frame = None
         self.bg_image = None
 
-    def set_debug(self, debug):
-        """
-        Set the debug mode of the renderer.
-
-        ``debug``
-            The debug mode.
-        """
-        self._debug = debug
-
     def set_theme(self, theme):
         """
         Set the theme to be used.

From cadfefe6160a868e63bb142f23165065a34f05e5 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Wed, 1 Sep 2010 21:22:55 +0200
Subject: [PATCH 33/61] opps.. forgot the %s

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

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 8ac5641b1..e7850c65c 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -510,12 +510,12 @@ class BibleMediaItem(MediaManagerItem):
                     'dual_permission')
                 dual_text = self._decodeQtObject(reference, 'dual_text')
             verse_text = self.formatVerse(old_chapter, chapter, verse)
-            footer = u'%s (%s %s)' % (book, version, copyright, permission)
+            footer = u'%s (%s %s %s)' % (book, version, copyright, permission)
             if footer not in raw_footer:
                 raw_footer.append(footer)
             if has_dual_bible:
                 if dual_bible:
-                    footer = u'%s (%s %s)' % (book, dual_version,
+                    footer = u'%s (%s %s %s)' % (book, dual_version,
                         dual_copyright, dual_permission)
                     if footer not in raw_footer:
                         raw_footer.append(footer)

From ce73d86e0a4c97914d93efdc05d1b53ecb4b71d1 Mon Sep 17 00:00:00 2001
From: Derek Scotney <derekscotney@openlp.org>
Date: Wed, 1 Sep 2010 21:27:45 +0200
Subject: [PATCH 34/61] More code convention corrections

---
 openlp/plugins/songs/lib/cclifileimport.py | 174 +++++++++++----------
 openlp/plugins/songs/lib/songimport.py     |  12 +-
 2 files changed, 96 insertions(+), 90 deletions(-)

diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py
index 28cfbc595..98f03d247 100755
--- a/openlp/plugins/songs/lib/cclifileimport.py
+++ b/openlp/plugins/songs/lib/cclifileimport.py
@@ -142,51 +142,52 @@ class CCLIFileImport(SongImport):
         """
         log.debug(u'USR file text: %s', textList)
         lyrics = []
-        new_song = SongImport(self.manager)
+#        new_song = SongImport(self.manager)
+        self.set_defaults()
         for line in textList:
             if line.startswith(u'Title='):
-                sname = line[6:].strip()
+                song_name = line[6:].strip()
             elif line.startswith(u'Author='):
-                sauthor = line[7:].strip()
+                song_author = line[7:].strip()
             elif line.startswith(u'Copyright='):
-                scopyright = line[10:].strip()
+                song_copyright = line[10:].strip()
             elif line.startswith(u'[S A'):
-                sccli = line[4:-3].strip()
+                song_ccli = line[4:-3].strip()
             elif line.startswith(u'Fields='):
             #Fields contain single line indicating verse, chorus, etc,
             #/t delimited, same as with words field. store seperately
             #and process at end.
-                sfields = line[7:].strip()
+                song_fields = line[7:].strip()
             elif line.startswith(u'Words='):
-                swords = line[6:].strip()
+                song_words = line[6:].strip()
             #Unhandled usr keywords:Type,Version,Admin,Themes,Keys
         #Process Fields and words sections
-        fieldlst = sfields.split(u'/t')
-        wordslst = swords.split(u'/t')
-        for counter in range(0, len(fieldlst)):
-            if fieldlst[counter].startswith(u'Ver'):
-                vtype = u'V'
-            elif fieldlst[counter].startswith(u'Ch'):
-                vtype = u'C'
-            elif fieldlst[counter].startswith(u'Br'):
-                vtype = u'B'
+        field_list = song_fields.split(u'/t')
+        words_list = song_words.split(u'/t')
+        for counter in range(0, len(field_list)):
+            if field_list[counter].startswith(u'Ver'):
+                verse_type = u'V'
+            elif field_list[counter].startswith(u'Ch'):
+                verse_type = u'C'
+            elif field_list[counter].startswith(u'Br'):
+                verse_type = u'B'
             else: #Other
-                vtype = u'O'
-            vcontent = unicode(wordslst[counter])
-            vcontent = vcontent.replace("/n",  "\n")
-            if (len(vcontent) > 0):                
-                new_song.add_verse(vcontent, vtype);
+                verse_type = u'O'
+            verse_text = unicode(words_list[counter])
+            verse_text = verse_text.replace("/n",  "\n")
+            if len(verse_text) > 0:                
+                self.add_verse(verse_text, verse_type);
         #Handle multiple authors
-        lst = sauthor.split(u'/')
-        if len(lst) < 2:
-            lst = sauthor.split(u'|')
-        for author in lst:
+        author_list = song_author.split(u'/')
+        if len(author_list) < 2:
+            author_list = song_author.split(u'|')
+        for author in author_list:
             seperated = author.split(u',')
-            new_song.add_author(seperated[1].strip() + " " + seperated[0].strip())
-        new_song.title = sname
-        new_song.copyright = scopyright
-        new_song.ccli_number = sccli
-        new_song.finish()
+            self.add_author(seperated[1].strip() + " " + seperated[0].strip())
+        self.title = song_name
+        self.copyright = song_copyright
+        self.ccli_number = song_ccli
+        self.finish()
 
     def do_import_txt_file(self, textList):
         """
@@ -234,75 +235,78 @@ class CCLIFileImport(SongImport):
             e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14   
         """
         log.debug(u'TXT file text: %s', textList)
-        new_song = SongImport(self.manager)
-        lnum = 0
-        vcontent = u''
-        scomments = u''
-        scopyright = u'';
+#        new_song = SongImport(self.manager)
+        self.set_defaults()
+        line_number = 0
+        verse_text = u''
+        song_comments = u''
+        song_copyright = u'';
         verse_start = False
         for line in textList:
-            line = line.strip()
-            if not line:
-                if (lnum==0):
+            clean_line = line.strip()
+            if not clean_line:
+                if line_number==0:
                     continue
                 elif verse_start:
-                      if vcontent:
-                        new_song.add_verse(vcontent, vtype)
-                        vcontent = ''
+                      if verse_text:
+                        self.add_verse(verse_text, verse_type)
+                        verse_text = ''
                         verse_start = False
             else:
-                #lnum=0, song title
-                if (lnum==0):
-                    sname = line
-                    lnum += 1
-                #lnum=1, verses    
-                elif (lnum==1):
-                    #lnum=1, ccli number, first line after verses
-                    if line.startswith(u'CCLI'):
-                        lnum += 1
-                        cparts = line.split(' ')
-                        sccli = cparts[len(cparts)-1]
-                    elif (verse_start == False):
+                #line_number=0, song title
+                if line_number==0:
+                    song_name = clean_line
+                    line_number += 1
+                #line_number=1, verses    
+                elif line_number==1:
+                    #line_number=1, ccli number, first line after verses
+                    if clean_line.startswith(u'CCLI'):
+                        line_number += 1
+                        ccli_parts = clean_line.split(' ')
+                        song_ccli = ccli_parts[len(ccli_parts)-1]
+                    elif not verse_start:
                         # We have the verse descriptor
-                        parts = line.split(' ')
-                        if (len(parts) == 2):
-                            if parts[0].startswith(u'Ver'):
-                                vtype = u'V'
-                            elif parts[0].startswith(u'Ch'):
-                                vtype = u'C'
-                            elif parts[0].startswith(u'Br'):
-                                vtype = u'B'
+                        verse_desc_parts = clean_line.split(' ')
+                        if len(verse_desc_parts) == 2:
+                            if verse_desc_parts[0].startswith(u'Ver'):
+                                verse_type = u'V'
+                            elif verse_desc_parts[0].startswith(u'Ch'):
+                                verse_type = u'C'
+                            elif verse_desc_parts[0].startswith(u'Br'):
+                                verse_type = u'B'
                             else:
-                                vtype = u'O'
-                            vnumber = parts[1]
+                                verse_type = u'O'
+                            verse_number = verse_desc_parts[1]
                         else:
-                            vtype = u'O'
-                            vnumber = 1
+                            verse_type = u'O'
+                            verse_number = 1
                         verse_start = True
                     else:
                         # We have verse content or the start of the
                         # last part. Add l so as to keep the CRLF
-                        vcontent = vcontent + line
+                        verse_text = verse_text + line
                 else:
-                    #lnum=2, copyright
-                    if (lnum==2):
-                        lnum += 1
-                        scopyright = line
+                    #line_number=2, copyright
+                    if line_number==2:
+                        line_number += 1
+                        song_copyright = clean_line
                     #n=3, authors    
-                    elif (lnum==3):
-                        lnum += 1
-                        sauthor = line
-                     #lnum=4, comments lines before last line    
-                    elif (lnum==4) and (not line.startswith(u'CCL')):
-                        scomments = scomments + line
+                    elif line_number==3:
+                        line_number += 1
+                        song_author = clean_line
+                     #line_number=4, comments lines before last line    
+                    elif (line_number==4) and (not clean_line.startswith(u'CCL')):
+                        song_comments = song_comments + clean_line
         # split on known separators
-        alist = sauthor.split(u'/')
-        if len(alist) < 2:
-            alist = sauthor.split(u'|')
-        new_song.authors = alist
-        new_song.title = sname
-        new_song.copyright = scopyright
-        new_song.ccli_number = sccli
-        new_song.comments = scomments
-        new_song.finish()
+        author_list = song_author.split(u'/')
+        if len(author_list) < 2:
+            author_list = song_author.split(u'|')
+        #Clean spaces before and after author names
+        for author_name in author_list:
+            self.add_author(author_name.strip())
+        self.title = song_name
+        self.copyright = song_copyright
+        self.ccli_number = song_ccli
+        self.comments = song_comments
+        self.finish()
         
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index 2ffb0beda..60cdfd969 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -52,6 +52,11 @@ class SongImport(QtCore.QObject):
         """
         self.manager = manager
         self.stop_import_flag = False
+        self.set_defaults()
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'songs_stop_import'), self.stop_import)
+
+    def set_defaults(self):
         self.title = u''
         self.song_number = u''
         self.alternate_title = u''
@@ -71,8 +76,6 @@ class SongImport(QtCore.QObject):
             'SongsPlugin.SongImport', 'copyright'))
         self.copyright_symbol = unicode(translate(
             'SongsPlugin.SongImport', '\xa9'))
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'songs_stop_import'), self.stop_import)
 
     def stop_import(self):
         """
@@ -158,8 +161,7 @@ class SongImport(QtCore.QObject):
     def parse_author(self, text):
         """
         Add the author. OpenLP stores them individually so split by 'and', '&'
-        and comma.
-        However need to check for 'Mr and Mrs Smith' and turn it to
+        and comma. However need to check for 'Mr and Mrs Smith' and turn it to
         'Mr Smith' and 'Mrs Smith'.
         """
         for author in text.split(u','):
@@ -236,7 +238,7 @@ class SongImport(QtCore.QObject):
         """
         All fields have been set to this song. Write it away
         """
-        if len(self.authors) == 0:
+        if not self.authors:
             self.authors.append(u'Author unknown')
         self.commit_song()
 

From 9ed0df5023bac7cd1ea96082ea1c2e5b855fd18f Mon Sep 17 00:00:00 2001
From: Derek Scotney <derekscotney@openlp.org>
Date: Wed, 1 Sep 2010 21:31:16 +0200
Subject: [PATCH 35/61] Removed unnecessary commented out lines

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

diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py
index 98f03d247..08bccef79 100755
--- a/openlp/plugins/songs/lib/cclifileimport.py
+++ b/openlp/plugins/songs/lib/cclifileimport.py
@@ -142,7 +142,6 @@ class CCLIFileImport(SongImport):
         """
         log.debug(u'USR file text: %s', textList)
         lyrics = []
-#        new_song = SongImport(self.manager)
         self.set_defaults()
         for line in textList:
             if line.startswith(u'Title='):
@@ -235,7 +234,6 @@ class CCLIFileImport(SongImport):
             e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14   
         """
         log.debug(u'TXT file text: %s', textList)
-#        new_song = SongImport(self.manager)
         self.set_defaults()
         line_number = 0
         verse_text = u''

From a9281e4cb9447f71d208a5840ae186bd424cea76 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Wed, 1 Sep 2010 22:36:02 +0100
Subject: [PATCH 36/61] replace evil-tables(tm) with div's

---
 openlp/core/lib/htmlbuilder.py | 44 ++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index db5b84efb..c5b5088c4 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -195,22 +195,23 @@ body {
     function text_fade(id, newtext){
         var text = document.getElementById(id);
         if(!transition){
-             text.innerHTML = newtext;
-             return;
+            text.innerHTML = newtext;
+            return;
         }
         if(text.style.opacity=='') text.style.opacity = 1;
         if(newtext==text.innerHTML){
             text.style.opacity = parseFloat(text.style.opacity) + 0.3;
         } else {
             text.style.opacity -= 0.3;
-            if(text.style.opacity<=0.1)
+            if(text.style.opacity<=0.1){
                 text.innerHTML = newtext;
+            }
         }
     }
 
     function text_opacity(){
         var text = document.getElementById('lyricsmain');
-        return window.getComputedStyle(text, '').opacity;
+        return getComputedStyle(text, '').opacity;
     }
     function show_text_complete(){
         return (text_opacity()==1);
@@ -219,24 +220,25 @@ body {
 </head>
 <body>
 <!--
-Using tables, rather than div's to make use of the vertical-align style that
-doesn't work on div's. This avoids the need to do positioning manually which
-could get messy when changing verses esp. with transitions
-
-Would prefer to use a single table and make use of -webkit-text-fill-color
+Would prefer to use a single div and make use of -webkit-text-fill-color
 -webkit-text-stroke and text-shadow styles, but they have problems working/
 co-operating in qwebkit. https://bugs.webkit.org/show_bug.cgi?id=43187
-Therefore one table for text, one for outline and one for shadow.
+Therefore one for text, one for outline and one for shadow.
+
+Note, the webkit fill problem is fixed in 433.3 and the shadow problem looks
+as though it'll be fixed in QtWebkit 2.1 (434.3)
+There is an alignment problem with fills in 433.3 however requiring a hack
+by setting letter spacing. This is also fixed in v434.3
 -->
-<table class="lyricstable lyricscommon">
-    <tr><td id="lyricsmain" class="lyrics"></td></tr>
-</table>
-<table class="lyricsoutlinetable lyricscommon">
-    <tr><td id="lyricsoutline" class="lyricsoutline lyrics"></td></tr>
-</table>
-<table class="lyricsshadowtable lyricscommon">
-    <tr><td id="lyricsshadow" class="lyricsshadow lyrics"></td></tr>
-</table>
+<div class="lyricstable lyricscommon">
+    <div id="lyricsmain" class="lyrics"></div>
+</div>
+<div class="lyricsoutlinetable lyricscommon">
+    <div id="lyricsoutline" class="lyricsoutline lyrics"></div>
+</div>
+<div class="lyricsshadowtable lyricscommon">
+    <div id="lyricsshadow" class="lyricsshadow lyrics"></div>
+</div>
 <div id="alert" style="visibility:hidden;"></div>
 <div id="footer" class="footer"></div>
 <video class="dim" id="video"></video>
@@ -298,7 +300,7 @@ def build_lyrics(item):
     outline = u'display: none;'
     shadow = u'display: none;'
     if theme:
-        lyricscommon =  u'width: %spx; height: %spx; word-wrap: break-word;  ' \
+        lyricscommon =  u'display: table; width: %spx; height: %spx; word-wrap: break-word;  ' \
             u'font-family: %s; font-size: %spt; color: %s; line-height: %d%%;' \
             % (item.main.width(), item.main.height(), theme.font_main_name,
             theme.font_main_proportion, theme.font_main_color,
@@ -323,7 +325,7 @@ def build_lyrics(item):
             valign = u'vertical-align:middle;'
         else:
             valign = u'vertical-align:top;'
-        lyrics = u'%s %s' % (align, valign)
+        lyrics = u'display:table-cell; %s %s' % (align, valign)
         if theme.display_outline:
             lyricscommon += u' letter-spacing: 1px;'
             outline = u'-webkit-text-stroke: %sem %s; ' % \

From 96737c0bc0f936daa2183c40db9dbba1d93d8ad1 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Thu, 2 Sep 2010 21:41:24 +0100
Subject: [PATCH 37/61] Use QtGraphicsWebview. Reduce div count where possible

---
 openlp/core/lib/htmlbuilder.py | 223 +++++++++++++++++++++------------
 openlp/core/ui/maindisplay.py  |   7 +-
 2 files changed, 150 insertions(+), 80 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index c5b5088c4..7d283ae8c 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -24,6 +24,8 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
+from PyQt4 import QtWebKit
+
 from openlp.core.lib import image_to_byte
 
 HTMLSRC = u"""
@@ -39,7 +41,7 @@ HTMLSRC = u"""
 body {
     background-color: black;
 }
-.dim {
+.size {
     position: absolute;
     left: 0px;
     top: 0px;
@@ -51,6 +53,9 @@ body {
     background-color: black;
     display: none;
 }
+#image {
+    z-index:1;
+}
 #video {
     z-index:2;
 }
@@ -136,8 +141,12 @@ body {
         }
         document.getElementById('black').style.display = black;
         document.getElementById('lyricsmain').style.visibility = lyrics;
-        document.getElementById('lyricsoutline').style.visibility = lyrics;
-        document.getElementById('lyricsshadow').style.visibility = lyrics;
+        outline = document.getElementById('lyricsoutline')
+        if(outline)
+            outline.style.visibility = lyrics;
+        shadow = document.getElementById('lyricsshadow')
+        if(shadow)
+            shadow.style.visibility = lyrics;
         document.getElementById('footer').style.visibility = lyrics;
         var vid = document.getElementById('video');
         if(vid.src != ''){
@@ -193,7 +202,17 @@ body {
     }
 
     function text_fade(id, newtext){
+        /*
+        Using -webkit-transition: opacity 1s linear; would have been preferred
+        but it isn't currently quick enough when animating multiple layers of
+        large areas of large text. Therefore do it manually as best we can.
+        Hopefully in the future we can revisit and do more interesting
+        transitions using -webkit-transition and -webkit-transform.
+        However we need to ensure interrupted transitions (quickly change 2
+        slides) still looks pretty and is zippy.
+        */
         var text = document.getElementById(id);
+        if(text==null) return;
         if(!transition){
             text.innerHTML = newtext;
             return;
@@ -213,37 +232,19 @@ body {
         var text = document.getElementById('lyricsmain');
         return getComputedStyle(text, '').opacity;
     }
+    
     function show_text_complete(){
         return (text_opacity()==1);
     }
 </script>
 </head>
 <body>
-<!--
-Would prefer to use a single div and make use of -webkit-text-fill-color
--webkit-text-stroke and text-shadow styles, but they have problems working/
-co-operating in qwebkit. https://bugs.webkit.org/show_bug.cgi?id=43187
-Therefore one for text, one for outline and one for shadow.
-
-Note, the webkit fill problem is fixed in 433.3 and the shadow problem looks
-as though it'll be fixed in QtWebkit 2.1 (434.3)
-There is an alignment problem with fills in 433.3 however requiring a hack
-by setting letter spacing. This is also fixed in v434.3
--->
-<div class="lyricstable lyricscommon">
-    <div id="lyricsmain" class="lyrics"></div>
-</div>
-<div class="lyricsoutlinetable lyricscommon">
-    <div id="lyricsoutline" class="lyricsoutline lyrics"></div>
-</div>
-<div class="lyricsshadowtable lyricscommon">
-    <div id="lyricsshadow" class="lyricsshadow lyrics"></div>
-</div>
-<div id="alert" style="visibility:hidden;"></div>
+<img id="image" class="size" src="%s" />
+<video id="video" class="size"></video>
+%s
 <div id="footer" class="footer"></div>
-<video class="dim" id="video"></video>
-<div class="dim" id="black"></div>
-<img class="dim" id="image" src="%s" />
+<div id="black" class="size"></div>
+<div id="alert" style="visibility:hidden;"></div>
 </body>
 </html>
     """
@@ -258,7 +259,13 @@ def build_html(item, screen, alert, islive):
         Current display information
     `alert`
         Alert display display information
+    `islive`
+        Item is going live, rather than preview/theme building
     """
+    try:
+        webkitvers = float(QtWebKit.qWebKitVersion())
+    except AttributeError:
+        webkitvers = 0
     width = screen[u'size'].width()
     height = screen[u'size'].height()
     theme = item.themedata
@@ -267,83 +274,143 @@ def build_html(item, screen, alert, islive):
     else:
         image = u''
     html = HTMLSRC % (width, height,
-        build_alert(alert, width),
-        build_footer(item),
-        build_lyrics(item),
+        build_alert_css(alert, width),
+        build_footer_css(item),
+        build_lyrics_css(item, webkitvers),
         u'true' if theme and theme.display_slideTransition and islive \
             else u'false',
-        image)
+        image, 
+        build_lyrics_html(item, webkitvers))
     return html
 
-def build_lyrics(item):
+def build_lyrics_css(item, webkitvers):
     """
-    Build the video display div
+    Build the video display css
 
     `item`
         Service Item containing theme and location information
+    
+    `webkitvers`
+        The version of qtwebkit we're using
+
     """
     style = """
-    .lyricscommon { position: absolute;  %s }
-    .lyricstable { z-index:4;  %s }
-    .lyricsoutlinetable { z-index:3; %s }
-    .lyricsshadowtable { z-index:2; %s }
-    .lyrics { %s }
-    .lyricsoutline { %s }
-    .lyricsshadow { %s }
+.lyricstable { 
+    z-index:4; 
+    position: absolute; 
+    display: table; 
+    %s 
+}
+.lyricscell { 
+    display:table-cell; 
+    word-wrap: break-word; 
+    %s
+}
+.lyricsmain { 
+%s 
+}
+.lyricsoutline { 
+%s 
+}
+.lyricsshadow { 
+%s 
+}
      """
     theme = item.themedata
-    lyricscommon = u''
     lyricstable = u''
-    outlinetable = u''
-    shadowtable = u''
     lyrics = u''
-    outline = u'display: none;'
-    shadow = u'display: none;'
+    lyricsmain = u''
+    outline = u''
+    shadow = u''
     if theme:
-        lyricscommon =  u'display: table; width: %spx; height: %spx; word-wrap: break-word;  ' \
-            u'font-family: %s; font-size: %spt; color: %s; line-height: %d%%;' \
-            % (item.main.width(), item.main.height(), theme.font_main_name,
-            theme.font_main_proportion, theme.font_main_color,
-            100 + int(theme.font_main_line_adjustment))
         lyricstable = u'left: %spx; top: %spx;' % \
             (item.main.x(), item.main.y())
-        outlinetable = u'left: %spx; top: %spx;' % \
-            (item.main.x(), item.main.y())
-        shadowtable = u'left: %spx; top: %spx;' % \
-            (item.main.x() + float(theme.display_shadow_size),
-            item.main.y() + float(theme.display_shadow_size))
-        align = u''
         if theme.display_horizontalAlign == 2:
-            align = u'text-align:center;'
+            align = u'center'
         elif theme.display_horizontalAlign == 1:
-            align = u'text-align:right;'
+            align = u'right'
         else:
-            align = u'text-align:left;'
+            align = u'left'
         if theme.display_verticalAlign == 2:
-            valign = u'vertical-align:bottom;'
+            valign = u'bottom'
         elif theme.display_verticalAlign == 1:
-            valign = u'vertical-align:middle;'
+            valign = u'middle'
         else:
-            valign = u'vertical-align:top;'
-        lyrics = u'display:table-cell; %s %s' % (align, valign)
+            valign = u'top'
+        lyrics = u'width: %spx; height: %spx; text-align: %s; ' \
+            'vertical-align: %s; font-family: %s; font-size: %spt; ' \
+            'color: %s; line-height: %d%%;' % \
+            (item.main.width(), item.main.height(), align, valign, 
+            theme.font_main_name, theme.font_main_proportion, 
+            theme.font_main_color, 100 + int(theme.font_main_line_adjustment))
+        # For performance reasons we want to show as few DIV's as possible,
+        # especially when animating/transitions. 
+        # However some bugs in older versions of qtwebkit mean we need to 
+        # perform workarounds and add extra divs. Only do these when needed.
+        #
+        # Before 533.3 the webkit-text-fill colour wasn't displayed, only the 
+        # stroke (outline) color. So put stroke layer underneath the main text.
+        #
+        # Before 534.4 the webkit-text-stroke was sometimes out of alignment 
+        # with the fill, or normal text. letter-spacing=1 is workaround
+        # https://bugs.webkit.org/show_bug.cgi?id=44403
+        #
+        # Before 534.4 the text-shadow didn't get displayed when 
+        # webkit-text-stroke was used. So use an offset text layer underneath. 
+        # https://bugs.webkit.org/show_bug.cgi?id=19728
         if theme.display_outline:
-            lyricscommon += u' letter-spacing: 1px;'
-            outline = u'-webkit-text-stroke: %sem %s; ' % \
+            if webkitvers < 534.3:
+                lyrics += u' letter-spacing: 1px;'
+            outline = u' -webkit-text-stroke: %sem %s; ' \
+                '-webkit-text-fill-color: %s; ' % \
                 (float(theme.display_outline_size) / 16,
-                theme.display_outline_color)
-            if theme.display_shadow:
+                theme.display_outline_color, theme.font_main_color)
+            if webkitvers >= 533.3:
+                lyricsmain += outline
+            if theme.display_shadow and webkitvers < 534.3:
                 shadow = u'-webkit-text-stroke: %sem %s; ' \
-                    u'-webkit-text-fill-color: %s; ' % \
+                    u'-webkit-text-fill-color: %s; ' \
+                    u' padding-left: %spx; padding-top: %spx' % \
                     (float(theme.display_outline_size) / 16,
-                    theme.display_shadow_color, theme.display_shadow_color)
-        else:
-            if theme.display_shadow:
-                shadow = u'color: %s;' % (theme.display_shadow_color)
-    lyrics_html = style % (lyricscommon, lyricstable, outlinetable,
-        shadowtable, lyrics, outline, shadow)
-    return lyrics_html
+                    theme.display_shadow_color, theme.display_shadow_color, 
+                    theme.display_shadow_size, theme.display_shadow_size)
+        if theme.display_shadow and \
+            (not theme.display_outline or webkitvers >= 534.3):
+            lyricsmain += u' text-shadow: %s %spx %spx;' % \
+                (theme.display_shadow_color, theme.display_shadow_size,
+                theme.display_shadow_size)
+    lyrics_css = style % (lyricstable, lyrics, lyricsmain, outline, shadow)
+    return lyrics_css
+    
+def build_lyrics_html(item, webkitvers):
+    """
+    Build the HTML required to show the lyrics
 
-def build_footer(item):
+    `item`
+        Service Item containing theme and location information
+    
+    `webkitvers`
+        The version of qtwebkit we're using
+    """
+    # Bugs in some versions of QtWebKit mean we sometimes need additional 
+    # divs for outline and shadow, since the CSS doesn't work.
+    # To support vertical alignment middle and bottom, nested div's using
+    # display:table/display:table-cell are required for each lyric block.
+    lyrics = u''
+    theme = item.themedata
+    if webkitvers < 534.4 and theme and theme.display_outline:
+        lyrics += u'<div class="lyricstable">' \
+            u'<div id="lyricsshadow" class="lyricscell lyricsshadow">' \
+            u'</div></div>'
+        if webkitvers < 533.3:
+            lyrics += u'<div class="lyricstable">' \
+                u'<div id="lyricsoutline" class="lyricscell lyricsoutline">' \
+                u'</div></div>'
+    lyrics += u'<div class="lyricstable">' \
+        u'<div id="lyricsmain" class="lyricscell lyricsmain"></div></div>'
+    return lyrics
+    
+def build_footer_css(item):
     """
     Build the display of the item footer
 
@@ -374,7 +441,7 @@ def build_footer(item):
         theme.font_footer_proportion, theme.font_footer_color, align)
     return lyrics_html
 
-def build_alert(alertTab, width):
+def build_alert_css(alertTab, width):
     """
     Build the display of the footer
 
@@ -382,7 +449,7 @@ def build_alert(alertTab, width):
         Details from the Alert tab for fonts etc
     """
     style = """
-    width: %s;
+    width: %spx;
     vertical-align: %s;
     font-family: %s;
     font-size: %spt;
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index c985434c1..4f2ea6df6 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -115,8 +115,11 @@ class MainDisplay(DisplayWidget):
         self.screen = self.screens.current
         self.setVisible(False)
         self.setGeometry(self.screen[u'size'])
-        self.webView = QtWebKit.QWebView(self)
-        self.webView.setGeometry(0, 0, self.screen[u'size'].width(), \
+        self.scene = QtGui.QGraphicsScene()
+        self.setScene(self.scene)
+        self.webView = QtWebKit.QGraphicsWebView()
+        self.scene.addItem(self.webView)
+        self.webView.resize(self.screen[u'size'].width(), \
             self.screen[u'size'].height())
         self.page = self.webView.page()
         self.frame = self.page.mainFrame()

From 8be66a0e6f1420613ece8c887835eec2a00f68fe Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Thu, 2 Sep 2010 22:24:44 +0100
Subject: [PATCH 38/61] A bit of python crept into the javascript

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

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 7d283ae8c..dffa5deec 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -142,10 +142,10 @@ body {
         document.getElementById('black').style.display = black;
         document.getElementById('lyricsmain').style.visibility = lyrics;
         outline = document.getElementById('lyricsoutline')
-        if(outline)
+        if(outline!=null)
             outline.style.visibility = lyrics;
         shadow = document.getElementById('lyricsshadow')
-        if(shadow)
+        if(shadow!=null)
             shadow.style.visibility = lyrics;
         document.getElementById('footer').style.visibility = lyrics;
         var vid = document.getElementById('video');

From a37fafa72287c222356ef65c1dfa6e15b45d791d Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Fri, 3 Sep 2010 07:33:03 +0200
Subject: [PATCH 39/61] Fix the name of the keyword argument.

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

diff --git a/openlp/plugins/bibles/lib/csvbible.py b/openlp/plugins/bibles/lib/csvbible.py
index 7c0ba6b2b..cc981059c 100644
--- a/openlp/plugins/bibles/lib/csvbible.py
+++ b/openlp/plugins/bibles/lib/csvbible.py
@@ -51,9 +51,9 @@ class CSVBible(BibleDB):
         if u'booksfile' not in kwargs:
             raise KeyError(u'You have to supply a file to import books from.')
         self.booksfile = kwargs[u'booksfile']
-        if u'versesfile' not in kwargs:
+        if u'versefile' not in kwargs:
             raise KeyError(u'You have to supply a file to import verses from.')
-        self.versesfile = kwargs[u'versesfile']
+        self.versesfile = kwargs[u'versefile']
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'bibles_stop_import'), self.stop_import)
 

From da8899054976e1e8b0a0a978e3ad6cd74b87d890 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 3 Sep 2010 19:24:11 +0100
Subject: [PATCH 40/61] Bug 625997

---
 openlp/core/lib/renderer.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index aad686564..9b6011c78 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -136,6 +136,7 @@ class Renderer(object):
         line_end = u''
         if line_break:
             line_end = u'<br>'
+        print words
         words = words.replace(u'\r\n', u'\n')
         verses_text = words.split(u'\n')
         text = []
@@ -175,10 +176,11 @@ class Renderer(object):
             # Text too long so gone to next mage
             if layout.pageCount() != 1:
                 formatted.append(shell % old_html_text)
-                temp_text = line
+                temp_text = line + line_end
             old_html_text = temp_text
         formatted.append(shell % old_html_text)
         log.debug(u'format_slide - End')
+        print formatted
         return formatted
 
     def _generate_background_frame(self):

From e292748b838c1cb44f2b14297cd152c7c65de8f5 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Fri, 3 Sep 2010 19:30:56 +0100
Subject: [PATCH 41/61] Colour and poss blank verse fix?

---
 openlp/core/lib/__init__.py    | 36 +++++++++++++++++-----------------
 openlp/core/lib/htmlbuilder.py | 16 ++++++++-------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index b76179c2c..721b6ae23 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -39,40 +39,40 @@ log = logging.getLogger(__name__)
 html_expands = []
 
 html_expands.append({u'desc':u'Red', u'start tag':u'{r}', \
-                          u'start html':u'<font color=red>', \
-                          u'end tag':u'{/r}', u'end html':u'</font>', \
+                          u'start html':u'<span style="-webkit-text-fill-color:red">', \
+                          u'end tag':u'{/r}', u'end html':u'</span>', \
                           u'protected':False})
 html_expands.append({u'desc':u'Black', u'start tag':u'{b}', \
-                          u'start html':u'<font color=black>', \
-                          u'end tag':u'{/b}', u'end html':u'</font>', \
+                          u'start html':u'<span style="-webkit-text-fill-color:black">', \
+                          u'end tag':u'{/b}', u'end html':u'</span>', \
                           u'protected':False})
 html_expands.append({u'desc':u'Blue', u'start tag':u'{bl}', \
-                          u'start html':u'<font color=blue>', \
-                          u'end tag':u'{/bl}', u'end html':u'</font>', \
+                          u'start html':u'<span style="-webkit-text-fill-color:blue">', \
+                          u'end tag':u'{/bl}', u'end html':u'</span>', \
                           u'protected':False})
 html_expands.append({u'desc':u'Yellow', u'start tag':u'{y}', \
-                          u'start html':u'<font color=yellow>', \
-                          u'end tag':u'{/y}', u'end html':u'</font>', \
+                          u'start html':u'<span style="-webkit-text-fill-color:yellow">', \
+                          u'end tag':u'{/y}', u'end html':u'</span>', \
                           u'protected':False})
 html_expands.append({u'desc':u'Green', u'start tag':u'{g}', \
-                          u'start html':u'<font color=green>', \
-                          u'end tag':u'{/g}', u'end html':u'</font>', \
+                          u'start html':u'<span style="-webkit-text-fill-color:green">', \
+                          u'end tag':u'{/g}', u'end html':u'</span>', \
                           u'protected':False})
 html_expands.append({u'desc':u'Pink', u'start tag':u'{pk}', \
-                          u'start html':u'<font color=#CC33CC>', \
-                          u'end tag':u'{/pk}', u'end html':u'</font>', \
+                          u'start html':u'<span style="-webkit-text-fill-color:#CC33CC">', \
+                          u'end tag':u'{/pk}', u'end html':u'</span>', \
                           u'protected':False})
 html_expands.append({u'desc':u'Orange', u'start tag':u'{o}', \
-                          u'start html':u'<font color=#CC0033>', \
-                          u'end tag':u'{/o}', u'end html':u'</font>', \
+                          u'start html':u'<span style="-webkit-text-fill-color:#CC0033">', \
+                          u'end tag':u'{/o}', u'end html':u'</span>', \
                           u'protected':False})
 html_expands.append({u'desc':u'Purple', u'start tag':u'{pp}', \
-                          u'start html':u'<font color=#9900FF>', \
-                          u'end tag':u'{/pp}', u'end html':u'</font>', \
+                          u'start html':u'<span style="-webkit-text-fill-color:#9900FF">', \
+                          u'end tag':u'{/pp}', u'end html':u'</span>', \
                           u'protected':False})
 html_expands.append({u'desc':u'White', u'start tag':u'{w}', \
-                          u'start html':u'<font color=white>', \
-                          u'end tag':u'{/w}', u'end html':u'</font>', \
+                          u'start html':u'<span style="-webkit-text-fill-color:white">', \
+                          u'end tag':u'{/w}', u'end html':u'</span>', \
                           u'protected':False})
 html_expands.append({u'desc':u'Superscript', u'start tag':u'{su}', \
                           u'start html':u'<sup>', \
diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index dffa5deec..d03b7f7cc 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -217,11 +217,12 @@ body {
             text.innerHTML = newtext;
             return;
         }
-        if(text.style.opacity=='') text.style.opacity = 1;
         if(newtext==text.innerHTML){
             text.style.opacity = parseFloat(text.style.opacity) + 0.3;
+            if(text.style.opacity>0.7)
+                text.style.opacity = 1;
         } else {
-            text.style.opacity -= 0.3;
+            text.style.opacity = parseFloat(text.style.opacity) - 0.3;
             if(text.style.opacity<=0.1){
                 text.innerHTML = newtext;
             }
@@ -400,14 +401,15 @@ def build_lyrics_html(item, webkitvers):
     theme = item.themedata
     if webkitvers < 534.4 and theme and theme.display_outline:
         lyrics += u'<div class="lyricstable">' \
-            u'<div id="lyricsshadow" class="lyricscell lyricsshadow">' \
-            u'</div></div>'
+            u'<div id="lyricsshadow" style="opacity:1" ' \
+            u'class="lyricscell lyricsshadow"></div></div>'
         if webkitvers < 533.3:
             lyrics += u'<div class="lyricstable">' \
-                u'<div id="lyricsoutline" class="lyricscell lyricsoutline">' \
-                u'</div></div>'
+                u'<div id="lyricsoutline" style="opacity:1" ' \
+                u'class="lyricscell lyricsoutline"></div></div>'
     lyrics += u'<div class="lyricstable">' \
-        u'<div id="lyricsmain" class="lyricscell lyricsmain"></div></div>'
+        u'<div id="lyricsmain" style="opacity:1" ' \
+        u'class="lyricscell lyricsmain"></div></div>'
     return lyrics
     
 def build_footer_css(item):

From 27dd493d407c5c7a2abdb3e40422bb1cf1f6261d Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 3 Sep 2010 19:33:55 +0100
Subject: [PATCH 42/61] debug cleanups

---
 openlp/core/lib/renderer.py   | 2 --
 openlp/core/ui/maindisplay.py | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 9b6011c78..41e547800 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -136,7 +136,6 @@ class Renderer(object):
         line_end = u''
         if line_break:
             line_end = u'<br>'
-        print words
         words = words.replace(u'\r\n', u'\n')
         verses_text = words.split(u'\n')
         text = []
@@ -180,7 +179,6 @@ class Renderer(object):
             old_html_text = temp_text
         formatted.append(shell % old_html_text)
         log.debug(u'format_slide - End')
-        print formatted
         return formatted
 
     def _generate_background_frame(self):
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index c985434c1..908e91d01 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -319,9 +319,6 @@ class MainDisplay(DisplayWidget):
         # Make display show up if in single screen mode
         if self.isLive:
             self.setVisible(True)
-        # save preview for debugging
-        if log.isEnabledFor(logging.DEBUG):
-            preview.save(u'temp.png', u'png')
         return preview
 
     def buildHtml(self, serviceItem):

From 1fca6ec81dc9263609cefce500980023d32d6c60 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Fri, 3 Sep 2010 23:03:54 +0100
Subject: [PATCH 43/61] Italics/Bold theme to CSS. Share css for both
 QTextDocument and QWebView

---
 openlp/core/lib/__init__.py    |  2 +-
 openlp/core/lib/htmlbuilder.py | 76 ++++++++++++++++++++++------------
 openlp/core/lib/renderer.py    | 41 +++++-------------
 openlp/core/lib/serviceitem.py |  4 +-
 4 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 721b6ae23..da1778d65 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -324,7 +324,7 @@ from settingstab import SettingsTab
 from serviceitem import ServiceItem
 from serviceitem import ServiceItemType
 from serviceitem import ItemCapabilities
-from htmlbuilder import build_html
+from htmlbuilder import build_html, build_lyrics_format_css
 from toolbar import OpenLPToolbar
 from dockwidget import OpenLPDockWidget
 from theme import ThemeLevel, ThemeXML
diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index d03b7f7cc..f65bfb1e3 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -263,13 +263,10 @@ def build_html(item, screen, alert, islive):
     `islive`
         Item is going live, rather than preview/theme building
     """
-    try:
-        webkitvers = float(QtWebKit.qWebKitVersion())
-    except AttributeError:
-        webkitvers = 0
     width = screen[u'size'].width()
     height = screen[u'size'].height()
     theme = item.themedata
+    webkitvers = webkit_version()
     if item.bg_frame:
         image = u'data:image/png;base64,%s' % image_to_byte(item.bg_frame)
     else:
@@ -284,9 +281,16 @@ def build_html(item, screen, alert, islive):
         build_lyrics_html(item, webkitvers))
     return html
 
+def webkit_version():
+    try:
+        webkitvers = float(QtWebKit.qWebKitVersion())
+    except AttributeError:
+        webkitvers = 0
+    return webkitvers
+
 def build_lyrics_css(item, webkitvers):
     """
-    Build the video display css
+    Build the lyrics display css
 
     `item`
         Service Item containing theme and location information
@@ -304,7 +308,6 @@ def build_lyrics_css(item, webkitvers):
 }
 .lyricscell { 
     display:table-cell; 
-    word-wrap: break-word; 
     %s
 }
 .lyricsmain { 
@@ -326,24 +329,9 @@ def build_lyrics_css(item, webkitvers):
     if theme:
         lyricstable = u'left: %spx; top: %spx;' % \
             (item.main.x(), item.main.y())
-        if theme.display_horizontalAlign == 2:
-            align = u'center'
-        elif theme.display_horizontalAlign == 1:
-            align = u'right'
-        else:
-            align = u'left'
-        if theme.display_verticalAlign == 2:
-            valign = u'bottom'
-        elif theme.display_verticalAlign == 1:
-            valign = u'middle'
-        else:
-            valign = u'top'
-        lyrics = u'width: %spx; height: %spx; text-align: %s; ' \
-            'vertical-align: %s; font-family: %s; font-size: %spt; ' \
-            'color: %s; line-height: %d%%;' % \
-            (item.main.width(), item.main.height(), align, valign, 
-            theme.font_main_name, theme.font_main_proportion, 
-            theme.font_main_color, 100 + int(theme.font_main_line_adjustment))
+        lyrics = build_lyrics_format_css(theme)
+        lyrics += u'width: %spx; height: %spx; ' % \
+            (item.main.width(), item.main.height())
         # For performance reasons we want to show as few DIV's as possible,
         # especially when animating/transitions. 
         # However some bugs in older versions of qtwebkit mean we need to 
@@ -360,8 +348,6 @@ def build_lyrics_css(item, webkitvers):
         # webkit-text-stroke was used. So use an offset text layer underneath. 
         # https://bugs.webkit.org/show_bug.cgi?id=19728
         if theme.display_outline:
-            if webkitvers < 534.3:
-                lyrics += u' letter-spacing: 1px;'
             outline = u' -webkit-text-stroke: %sem %s; ' \
                 '-webkit-text-fill-color: %s; ' % \
                 (float(theme.display_outline_size) / 16,
@@ -383,6 +369,44 @@ def build_lyrics_css(item, webkitvers):
     lyrics_css = style % (lyricstable, lyrics, lyricsmain, outline, shadow)
     return lyrics_css
     
+def build_lyrics_format_css(theme):
+    """
+    Build the css which controls the theme format
+    Also used by renderer for splitting verses
+
+    `item`
+        Service Item containing theme and location information
+    
+    `webkitvers`
+        The version of qtwebkit we're using
+
+    """
+    if theme.display_horizontalAlign == 2:
+        align = u'center'
+    elif theme.display_horizontalAlign == 1:
+        align = u'right'
+    else:
+        align = u'left'
+    if theme.display_verticalAlign == 2:
+        valign = u'bottom'
+    elif theme.display_verticalAlign == 1:
+        valign = u'middle'
+    else:
+        valign = u'top'
+    lyrics = u'word-wrap: break-word; ' \
+        'text-align: %s; vertical-align: %s; font-family: %s; ' \
+        'font-size: %spt; color: %s; line-height: %d%%;' % \
+        (align, valign, theme.font_main_name, theme.font_main_proportion, 
+        theme.font_main_color, 100 + int(theme.font_main_line_adjustment))
+    if theme.display_outline:
+        if webkit_version() < 534.3:
+            lyrics += u' letter-spacing: 1px;'
+    if theme.font_main_italics:
+        lyrics += ' font-style:italic; '
+    if theme.font_main_weight == u'Bold':
+        lyrics += ' font-weight:bold; '
+    return lyrics
+    
 def build_lyrics_html(item, webkitvers):
     """
     Build the HTML required to show the lyrics
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 41e547800..dae7c820a 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -31,7 +31,7 @@ import logging
 
 from PyQt4 import QtGui, QtCore
 
-from openlp.core.lib import resize_image, expand_tags
+from openlp.core.lib import resize_image, expand_tags, build_lyrics_format_css
 
 log = logging.getLogger(__name__)
 
@@ -145,39 +145,20 @@ class Renderer(object):
                 text.append(line)
         doc = QtGui.QTextDocument()
         doc.setPageSize(QtCore.QSizeF(self._rect.width(), self._rect.height()))
-        df = doc.defaultFont()
-        df.setPointSize(self._theme.font_main_proportion)
-        df.setFamily(self._theme.font_main_name)
-        main_weight = 50
-        if self._theme.font_main_weight == u'Bold':
-            main_weight = 75
-        df.setWeight(main_weight)
-        doc.setDefaultFont(df)
         layout = doc.documentLayout()
         formatted = []
-        if self._theme.font_main_weight == u'Bold' and \
-            self._theme.font_main_italics:
-            shell = u'{p}{st}{it}%s{/it}{/st}{/p}'
-        elif self._theme.font_main_weight == u'Bold' and \
-            not self._theme.font_main_italics:
-            shell = u'{p}{st}%s{/st}{/p}'
-        elif self._theme.font_main_italics:
-            shell = u'{p}{it}%s{/it}{/p}'
-        else:
-            shell = u'{p}%s{/p}'
-        temp_text = u''
-        old_html_text = u''
+        shell = u'<div style="%s">' % build_lyrics_format_css(self._theme)
+        html_text = u''
+        styled_text = shell
         for line in text:
-            # mark line ends
-            temp_text = temp_text + line + line_end
-            html_text = shell % expand_tags(temp_text)
-            doc.setHtml(html_text)
-            # Text too long so gone to next mage
+            styled_text += expand_tags(line) + line_end
+            doc.setHtml(styled_text + u'</div>')
+            # Text too long so go to next page
             if layout.pageCount() != 1:
-                formatted.append(shell % old_html_text)
-                temp_text = line + line_end
-            old_html_text = temp_text
-        formatted.append(shell % old_html_text)
+                formatted.append(html_text)
+                styled_text = shell
+            html_text += line + line_end
+        formatted.append(html_text)
         log.debug(u'format_slide - End')
         return formatted
 
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 134df0c42..0e8625ce7 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -160,9 +160,9 @@ class ServiceItem(object):
             self.themedata = self.render_manager.renderer._theme
             for slide in self._raw_frames:
                 before = time.time()
-                formated = self.render_manager \
+                formatted = self.render_manager \
                     .format_slide(slide[u'raw_slide'], line_break)
-                for page in formated:
+                for page in formatted:
                     self._display_frames.append(
                         {u'title': clean_tags(page),
                         u'text': clean_tags(page.rstrip()),

From e5b2ff9e069505441df57bb4d027faf5c301c04c Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 4 Sep 2010 08:48:58 +0100
Subject: [PATCH 44/61] Move backgrounds to css from images

---
 openlp/core/lib/htmlbuilder.py | 105 ++++++++++++++++++++++-----------
 openlp/core/lib/renderer.py    |  69 +++++++++++-----------
 openlp/core/ui/maindisplay.py  |   2 +-
 3 files changed, 108 insertions(+), 68 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index d03b7f7cc..ddee44c27 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -24,10 +24,13 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
+import logging
 from PyQt4 import QtWebKit
 
 from openlp.core.lib import image_to_byte
 
+log = logging.getLogger(__name__)
+
 HTMLSRC = u"""
 <html>
 <head>
@@ -39,7 +42,7 @@ HTMLSRC = u"""
     border: 0;
 }
 body {
-    background-color: black;
+    %s;
 }
 .size {
     position: absolute;
@@ -192,7 +195,7 @@ body {
     function show_text(newtext){
         if(timer != null)
             clearTimeout(timer);
-        text_fade('lyricsmain', newtext);        
+        text_fade('lyricsmain', newtext);
         text_fade('lyricsoutline', newtext);
         text_fade('lyricsshadow', newtext);
         if(text_opacity()==1) return;
@@ -233,7 +236,7 @@ body {
         var text = document.getElementById('lyricsmain');
         return getComputedStyle(text, '').opacity;
     }
-    
+
     function show_text_complete(){
         return (text_opacity()==1);
     }
@@ -265,6 +268,7 @@ def build_html(item, screen, alert, islive):
     """
     try:
         webkitvers = float(QtWebKit.qWebKitVersion())
+        log.debug(u'Webkit version = %s' % webkitvers)
     except AttributeError:
         webkitvers = 0
     width = screen[u'size'].width()
@@ -274,47 +278,80 @@ def build_html(item, screen, alert, islive):
         image = u'data:image/png;base64,%s' % image_to_byte(item.bg_frame)
     else:
         image = u''
-    html = HTMLSRC % (width, height,
+    html = HTMLSRC % (build_background_css(item, width, height),
+        width, height,
         build_alert_css(alert, width),
         build_footer_css(item),
         build_lyrics_css(item, webkitvers),
         u'true' if theme and theme.display_slideTransition and islive \
             else u'false',
-        image, 
+        image,
         build_lyrics_html(item, webkitvers))
     return html
 
+def build_background_css(item, width, height):
+    """
+    Build the background css
+
+    `item`
+        Service Item containing theme and location information
+
+    """
+    width = int(width) / 2
+    theme = item.themedata
+    background = u'background-color: black'
+    if theme:
+        if theme.background_type == u'solid':
+            background = u'background-color: %s' % theme.background_color
+        else:
+            if theme.background_direction == u'horizontal':
+                background = \
+                    u'background: -webkit-gradient(linear, left top, left bottom, ' \
+                    'from(%s), to(%s))' % (theme.background_startColor,
+                    theme.background_endColor)
+            elif theme.background_direction == u'vertical':
+                background = \
+                    u'background: -webkit-gradient(linear, left top, right top,' \
+                    'from(%s), to(%s))' % (theme.background_startColor,
+                    theme.background_endColor)
+            else:
+                background = \
+                    u'background: -webkit-gradient(radial, %s 50%%, 100, %s 50%%, %s,' \
+                    'from(%s), to(%s))' % (width, width, width, theme.background_startColor,
+                    theme.background_endColor)
+    return background
+
 def build_lyrics_css(item, webkitvers):
     """
     Build the video display css
 
     `item`
         Service Item containing theme and location information
-    
+
     `webkitvers`
         The version of qtwebkit we're using
 
     """
     style = """
-.lyricstable { 
-    z-index:4; 
-    position: absolute; 
-    display: table; 
-    %s 
-}
-.lyricscell { 
-    display:table-cell; 
-    word-wrap: break-word; 
+.lyricstable {
+    z-index:4;
+    position: absolute;
+    display: table;
     %s
 }
-.lyricsmain { 
-%s 
+.lyricscell {
+    display:table-cell;
+    word-wrap: break-word;
+    %s
 }
-.lyricsoutline { 
-%s 
+.lyricsmain {
+%s
 }
-.lyricsshadow { 
-%s 
+.lyricsoutline {
+%s
+}
+.lyricsshadow {
+%s
 }
      """
     theme = item.themedata
@@ -341,23 +378,23 @@ def build_lyrics_css(item, webkitvers):
         lyrics = u'width: %spx; height: %spx; text-align: %s; ' \
             'vertical-align: %s; font-family: %s; font-size: %spt; ' \
             'color: %s; line-height: %d%%;' % \
-            (item.main.width(), item.main.height(), align, valign, 
-            theme.font_main_name, theme.font_main_proportion, 
+            (item.main.width(), item.main.height(), align, valign,
+            theme.font_main_name, theme.font_main_proportion,
             theme.font_main_color, 100 + int(theme.font_main_line_adjustment))
         # For performance reasons we want to show as few DIV's as possible,
-        # especially when animating/transitions. 
-        # However some bugs in older versions of qtwebkit mean we need to 
+        # especially when animating/transitions.
+        # However some bugs in older versions of qtwebkit mean we need to
         # perform workarounds and add extra divs. Only do these when needed.
         #
-        # Before 533.3 the webkit-text-fill colour wasn't displayed, only the 
+        # Before 533.3 the webkit-text-fill colour wasn't displayed, only the
         # stroke (outline) color. So put stroke layer underneath the main text.
         #
-        # Before 534.4 the webkit-text-stroke was sometimes out of alignment 
+        # Before 534.4 the webkit-text-stroke was sometimes out of alignment
         # with the fill, or normal text. letter-spacing=1 is workaround
         # https://bugs.webkit.org/show_bug.cgi?id=44403
         #
-        # Before 534.4 the text-shadow didn't get displayed when 
-        # webkit-text-stroke was used. So use an offset text layer underneath. 
+        # Before 534.4 the text-shadow didn't get displayed when
+        # webkit-text-stroke was used. So use an offset text layer underneath.
         # https://bugs.webkit.org/show_bug.cgi?id=19728
         if theme.display_outline:
             if webkitvers < 534.3:
@@ -373,7 +410,7 @@ def build_lyrics_css(item, webkitvers):
                     u'-webkit-text-fill-color: %s; ' \
                     u' padding-left: %spx; padding-top: %spx' % \
                     (float(theme.display_outline_size) / 16,
-                    theme.display_shadow_color, theme.display_shadow_color, 
+                    theme.display_shadow_color, theme.display_shadow_color,
                     theme.display_shadow_size, theme.display_shadow_size)
         if theme.display_shadow and \
             (not theme.display_outline or webkitvers >= 534.3):
@@ -382,18 +419,18 @@ def build_lyrics_css(item, webkitvers):
                 theme.display_shadow_size)
     lyrics_css = style % (lyricstable, lyrics, lyricsmain, outline, shadow)
     return lyrics_css
-    
+
 def build_lyrics_html(item, webkitvers):
     """
     Build the HTML required to show the lyrics
 
     `item`
         Service Item containing theme and location information
-    
+
     `webkitvers`
         The version of qtwebkit we're using
     """
-    # Bugs in some versions of QtWebKit mean we sometimes need additional 
+    # Bugs in some versions of QtWebKit mean we sometimes need additional
     # divs for outline and shadow, since the CSS doesn't work.
     # To support vertical alignment middle and bottom, nested div's using
     # display:table/display:table-cell are required for each lyric block.
@@ -411,7 +448,7 @@ def build_lyrics_html(item, webkitvers):
         u'<div id="lyricsmain" style="opacity:1" ' \
         u'class="lyricscell lyricsmain"></div></div>'
     return lyrics
-    
+
 def build_footer_css(item):
     """
     Build the display of the item footer
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 41e547800..39eff80bd 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -190,44 +190,47 @@ class Renderer(object):
         self.bg_frame = QtGui.QImage(self.frame.width(),
             self.frame.height(), QtGui.QImage.Format_ARGB32_Premultiplied)
         log.debug(u'render background %s start', self._theme.background_type)
-        painter = QtGui.QPainter()
-        painter.begin(self.bg_frame)
         if self._theme.background_type == u'solid':
-            painter.fillRect(self.frame.rect(),
-                QtGui.QColor(self._theme.background_color))
+            self.bg_frame = None
+#            painter.fillRect(self.frame.rect(),
+#                QtGui.QColor(self._theme.background_color))
         elif self._theme.background_type == u'gradient':
+            self.bg_frame = None
             # gradient
-            gradient = None
-            if self._theme.background_direction == u'horizontal':
-                w = int(self.frame.width()) / 2
-                # vertical
-                gradient = QtGui.QLinearGradient(w, 0, w, self.frame.height())
-            elif self._theme.background_direction == u'vertical':
-                h = int(self.frame.height()) / 2
-                # Horizontal
-                gradient = QtGui.QLinearGradient(0, h, self.frame.width(), h)
-            else:
-                w = int(self.frame.width()) / 2
-                h = int(self.frame.height()) / 2
-                # Circular
-                gradient = QtGui.QRadialGradient(w, h, w)
-            gradient.setColorAt(0,
-                QtGui.QColor(self._theme.background_startColor))
-            gradient.setColorAt(1,
-                QtGui.QColor(self._theme.background_endColor))
-            painter.setBrush(QtGui.QBrush(gradient))
-            rect_path = QtGui.QPainterPath()
-            max_x = self.frame.width()
-            max_y = self.frame.height()
-            rect_path.moveTo(0, 0)
-            rect_path.lineTo(0, max_y)
-            rect_path.lineTo(max_x, max_y)
-            rect_path.lineTo(max_x, 0)
-            rect_path.closeSubpath()
-            painter.drawPath(rect_path)
+#            gradient = None
+#            if self._theme.background_direction == u'horizontal':
+#                w = int(self.frame.width()) / 2
+#                # vertical
+#                gradient = QtGui.QLinearGradient(w, 0, w, self.frame.height())
+#            elif self._theme.background_direction == u'vertical':
+#                h = int(self.frame.height()) / 2
+#                # Horizontal
+#                gradient = QtGui.QLinearGradient(0, h, self.frame.width(), h)
+#            else:
+#                w = int(self.frame.width()) / 2
+#                h = int(self.frame.height()) / 2
+#                # Circular
+#                gradient = QtGui.QRadialGradient(w, h, w)
+#            gradient.setColorAt(0,
+#                QtGui.QColor(self._theme.background_startColor))
+#            gradient.setColorAt(1,
+#                QtGui.QColor(self._theme.background_endColor))
+#            painter.setBrush(QtGui.QBrush(gradient))
+#            rect_path = QtGui.QPainterPath()
+#            max_x = self.frame.width()
+#            max_y = self.frame.height()
+#            rect_path.moveTo(0, 0)
+#            rect_path.lineTo(0, max_y)
+#            rect_path.lineTo(max_x, max_y)
+#            rect_path.lineTo(max_x, 0)
+#            rect_path.closeSubpath()
+#            painter.drawPath(rect_path)
+#            painter.end()
         elif self._theme.background_type == u'image':
             # image
+            painter = QtGui.QPainter()
+            painter.begin(self.bg_frame)
             painter.fillRect(self.frame.rect(), QtCore.Qt.black)
             if self.bg_image:
                 painter.drawImage(0, 0, self.bg_image)
-        painter.end()
+            painter.end()
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 868399f83..2c9472414 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -138,7 +138,7 @@ class MainDisplay(DisplayWidget):
             painter_image = QtGui.QPainter()
             painter_image.begin(self.black)
             painter_image.fillRect(self.black.rect(), QtCore.Qt.black)
-            #Build the initial frame.
+            # Build the initial frame.
             initialFrame = QtGui.QImage(
                 self.screens.current[u'size'].width(),
                 self.screens.current[u'size'].height(),

From 04cfa6a730978ae23a2744ca265a32fbc1270367 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 4 Sep 2010 09:12:54 +0100
Subject: [PATCH 45/61] Move spell and tag dialog to it"s own file

---
 openlp/core/lib/__init__.py                   |   1 +
 openlp/core/lib/spelltextedit.py              | 154 ++++++++++++++++++
 openlp/core/ui/__init__.py                    | 135 ---------------
 .../plugins/custom/forms/editcustomdialog.py  |   3 +-
 openlp/plugins/songs/forms/editversedialog.py |   3 +-
 5 files changed, 157 insertions(+), 139 deletions(-)
 create mode 100644 openlp/core/lib/spelltextedit.py

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 721b6ae23..c9858901e 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -316,6 +316,7 @@ def expand_tags(text):
         text = text.replace(tag[u'end tag'], tag[u'end html'])
     return text
 
+from spelltextedit import SpellTextEdit
 from eventreceiver import Receiver
 from settingsmanager import SettingsManager
 from plugin import PluginStatus, Plugin
diff --git a/openlp/core/lib/spelltextedit.py b/openlp/core/lib/spelltextedit.py
new file mode 100644
index 000000000..54279d8fd
--- /dev/null
+++ b/openlp/core/lib/spelltextedit.py
@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Carsten Tinggaard, Frode Woldsund                                           #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+import re
+import sys
+try:
+    import enchant
+    enchant_available = True
+except ImportError:
+    enchant_available = False
+
+# based on code from
+# http://john.nachtimwald.com/2009/08/22/qplaintextedit-with-in-line-spell-check/
+
+from PyQt4 import QtCore, QtGui
+from openlp.core.lib import html_expands, translate, context_menu_action
+
+class SpellTextEdit(QtGui.QPlainTextEdit):
+    def __init__(self, *args):
+        QtGui.QPlainTextEdit.__init__(self, *args)
+        # Default dictionary based on the current locale.
+        if enchant_available:
+            self.dict = enchant.Dict()
+            self.highlighter = Highlighter(self.document())
+            self.highlighter.setDict(self.dict)
+
+    def mousePressEvent(self, event):
+        if event.button() == QtCore.Qt.RightButton:
+            # Rewrite the mouse event to a left button event so the cursor is
+            # moved to the location of the pointer.
+            event = QtGui.QMouseEvent(QtCore.QEvent.MouseButtonPress,
+                event.pos(), QtCore.Qt.LeftButton, QtCore.Qt.LeftButton,
+                QtCore.Qt.NoModifier)
+        QtGui.QPlainTextEdit.mousePressEvent(self, event)
+
+    def contextMenuEvent(self, event):
+        popup_menu = self.createStandardContextMenu()
+        # Select the word under the cursor.
+        cursor = self.textCursor()
+        cursor.select(QtGui.QTextCursor.WordUnderCursor)
+        self.setTextCursor(cursor)
+        # Check if the selected word is misspelled and offer spelling
+        # suggestions if it is.
+        if enchant_available and self.textCursor().hasSelection():
+            text = unicode(self.textCursor().selectedText())
+            if not self.dict.check(text):
+                spell_menu = QtGui.QMenu(translate('OpenLP.SpellTextEdit',
+                    'Spelling Suggestions'))
+                for word in self.dict.suggest(text):
+                    action = SpellAction(word, spell_menu)
+                    action.correct.connect(self.correctWord)
+                    spell_menu.addAction(action)
+                # Only add the spelling suggests to the menu if there are
+                # suggestions.
+                if len(spell_menu.actions()) != 0:
+                    popup_menu.insertSeparator(popup_menu.actions()[0])
+                    popup_menu.insertMenu(popup_menu.actions()[0], spell_menu)
+        tag_menu = QtGui.QMenu(translate('OpenLP.SpellTextEdit',
+            'Formatting Tags'))
+        for html in html_expands:
+            action = SpellAction( html[u'desc'], tag_menu)
+            action.correct.connect(self.htmlTag)
+            tag_menu.addAction(action)
+        popup_menu.insertSeparator(popup_menu.actions()[0])
+        popup_menu.insertMenu(popup_menu.actions()[0], tag_menu)
+
+        popup_menu.exec_(event.globalPos())
+
+    def correctWord(self, word):
+        """
+        Replaces the selected text with word.
+        """
+        cursor = self.textCursor()
+        cursor.beginEditBlock()
+        cursor.removeSelectedText()
+        cursor.insertText(word)
+        cursor.endEditBlock()
+
+    def htmlTag(self, tag):
+        """
+        Replaces the selected text with word.
+        """
+        for html in html_expands:
+            if tag == html[u'desc']:
+                cursor = self.textCursor()
+                if self.textCursor().hasSelection():
+                    text = cursor.selectedText()
+                    cursor.beginEditBlock()
+                    cursor.removeSelectedText()
+                    cursor.insertText(html[u'start tag'])
+                    cursor.insertText(text)
+                    cursor.insertText(html[u'end tag'])
+                    cursor.endEditBlock()
+                else:
+                    cursor = self.textCursor()
+                    cursor.insertText(html[u'start tag'])
+                    cursor.insertText(html[u'end tag'])
+
+class Highlighter(QtGui.QSyntaxHighlighter):
+
+    WORDS = u'(?iu)[\w\']+'
+
+    def __init__(self, *args):
+        QtGui.QSyntaxHighlighter.__init__(self, *args)
+        self.dict = None
+
+    def setDict(self, dict):
+        self.dict = dict
+
+    def highlightBlock(self, text):
+        if not self.dict:
+            return
+        text = unicode(text)
+        format = QtGui.QTextCharFormat()
+        format.setUnderlineColor(QtCore.Qt.red)
+        format.setUnderlineStyle(QtGui.QTextCharFormat.SpellCheckUnderline)
+        for word_object in re.finditer(self.WORDS, text):
+            if not self.dict.check(word_object.group()):
+                self.setFormat(word_object.start(),
+                    word_object.end() - word_object.start(), format)
+
+class SpellAction(QtGui.QAction):
+    """
+    A special QAction that returns the text in a signal.
+    """
+    correct = QtCore.pyqtSignal(unicode)
+
+    def __init__(self, *args):
+        QtGui.QAction.__init__(self, *args)
+        self.triggered.connect(lambda x: self.correct.emit(
+            unicode(self.text())))
diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py
index dad79cb7b..33ba25046 100644
--- a/openlp/core/ui/__init__.py
+++ b/openlp/core/ui/__init__.py
@@ -27,141 +27,6 @@
 The :mod:`ui` module provides the core user interface for OpenLP
 """
 
-# http://john.nachtimwald.com/2009/08/22/qplaintextedit-with-in-line-spell-check/
-
-import re
-import sys
-try:
-    import enchant
-    enchant_available = True
-except ImportError:
-    enchant_available = False
-
-from PyQt4 import QtCore, QtGui
-from openlp.core.lib import html_expands, translate, context_menu_action
-
-class SpellTextEdit(QtGui.QPlainTextEdit):
-    def __init__(self, *args):
-        QtGui.QPlainTextEdit.__init__(self, *args)
-        # Default dictionary based on the current locale.
-        if enchant_available:
-            self.dict = enchant.Dict()
-            self.highlighter = Highlighter(self.document())
-            self.highlighter.setDict(self.dict)
-
-    def mousePressEvent(self, event):
-        if event.button() == QtCore.Qt.RightButton:
-            # Rewrite the mouse event to a left button event so the cursor is
-            # moved to the location of the pointer.
-            event = QtGui.QMouseEvent(QtCore.QEvent.MouseButtonPress,
-                event.pos(), QtCore.Qt.LeftButton, QtCore.Qt.LeftButton,
-                QtCore.Qt.NoModifier)
-        QtGui.QPlainTextEdit.mousePressEvent(self, event)
-
-    def contextMenuEvent(self, event):
-        popup_menu = self.createStandardContextMenu()
-        # Select the word under the cursor.
-        cursor = self.textCursor()
-        cursor.select(QtGui.QTextCursor.WordUnderCursor)
-        self.setTextCursor(cursor)
-        # Check if the selected word is misspelled and offer spelling
-        # suggestions if it is.
-        if enchant_available and self.textCursor().hasSelection():
-            text = unicode(self.textCursor().selectedText())
-            if not self.dict.check(text):
-                spell_menu = QtGui.QMenu(translate('OpenLP.SpellTextEdit',
-                    'Spelling Suggestions'))
-                for word in self.dict.suggest(text):
-                    action = SpellAction(word, spell_menu)
-                    action.correct.connect(self.correctWord)
-                    spell_menu.addAction(action)
-                # Only add the spelling suggests to the menu if there are
-                # suggestions.
-                if len(spell_menu.actions()) != 0:
-                    popup_menu.insertSeparator(popup_menu.actions()[0])
-                    popup_menu.insertMenu(popup_menu.actions()[0], spell_menu)
-        tag_menu = QtGui.QMenu(translate('OpenLP.SpellTextEdit',
-            'Formatting Tags'))
-        for html in html_expands:
-            action = SpellAction( html[u'desc'], tag_menu)
-            action.correct.connect(self.htmlTag)
-            tag_menu.addAction(action)
-        popup_menu.insertSeparator(popup_menu.actions()[0])
-        popup_menu.insertMenu(popup_menu.actions()[0], tag_menu)
-
-        popup_menu.exec_(event.globalPos())
-
-    def correctWord(self, word):
-        """
-        Replaces the selected text with word.
-        """
-        cursor = self.textCursor()
-        cursor.beginEditBlock()
-
-        cursor.removeSelectedText()
-        cursor.insertText(word)
-
-        cursor.endEditBlock()
-
-    def htmlTag(self, tag):
-        """
-        Replaces the selected text with word.
-        """
-        for html in html_expands:
-            if tag == html[u'desc']:
-                cursor = self.textCursor()
-                if self.textCursor().hasSelection():
-                    text = cursor.selectedText()
-                    cursor.beginEditBlock()
-                    cursor.removeSelectedText()
-                    cursor.insertText(html[u'start tag'])
-                    cursor.insertText(text)
-                    cursor.insertText(html[u'end tag'])
-                    cursor.endEditBlock()
-                else:
-                    cursor = self.textCursor()
-                    cursor.insertText(html[u'start tag'])
-                    cursor.insertText(html[u'end tag'])
-
-class Highlighter(QtGui.QSyntaxHighlighter):
-
-    WORDS = u'(?iu)[\w\']+'
-
-    def __init__(self, *args):
-        QtGui.QSyntaxHighlighter.__init__(self, *args)
-
-        self.dict = None
-
-    def setDict(self, dict):
-        self.dict = dict
-
-    def highlightBlock(self, text):
-        if not self.dict:
-            return
-
-        text = unicode(text)
-
-        format = QtGui.QTextCharFormat()
-        format.setUnderlineColor(QtCore.Qt.red)
-        format.setUnderlineStyle(QtGui.QTextCharFormat.SpellCheckUnderline)
-
-        for word_object in re.finditer(self.WORDS, text):
-            if not self.dict.check(word_object.group()):
-                self.setFormat(word_object.start(),
-                    word_object.end() - word_object.start(), format)
-
-class SpellAction(QtGui.QAction):
-    """
-    A special QAction that returns the text in a signal.
-    """
-    correct = QtCore.pyqtSignal(unicode)
-
-    def __init__(self, *args):
-        QtGui.QAction.__init__(self, *args)
-
-        self.triggered.connect(lambda x: self.correct.emit(
-            unicode(self.text())))
-
 class HideMode(object):
     """
     This is basically an enumeration class which specifies the mode of a Bible.
diff --git a/openlp/plugins/custom/forms/editcustomdialog.py b/openlp/plugins/custom/forms/editcustomdialog.py
index d8557b5e2..84a310cb9 100644
--- a/openlp/plugins/custom/forms/editcustomdialog.py
+++ b/openlp/plugins/custom/forms/editcustomdialog.py
@@ -26,8 +26,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import build_icon, translate
-from openlp.core.ui import SpellTextEdit
+from openlp.core.lib import build_icon, translate, SpellTextEdit
 
 class Ui_CustomEditDialog(object):
     def setupUi(self, customEditDialog):
diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py
index 64d56322f..43dc8b96d 100644
--- a/openlp/plugins/songs/forms/editversedialog.py
+++ b/openlp/plugins/songs/forms/editversedialog.py
@@ -26,8 +26,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import build_icon, translate
-from openlp.core.ui import SpellTextEdit
+from openlp.core.lib import build_icon, translate, SpellTextEdit
 from openlp.plugins.songs.lib import VerseType
 
 class Ui_EditVerseDialog(object):

From 26bceb84b9d65b1dd307240de8f49fb45dcf2365 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 4 Sep 2010 11:39:48 +0100
Subject: [PATCH 46/61] Sort out spelling highlighting

---
 openlp/core/lib/spelltextedit.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openlp/core/lib/spelltextedit.py b/openlp/core/lib/spelltextedit.py
index 54279d8fd..7d227079b 100644
--- a/openlp/core/lib/spelltextedit.py
+++ b/openlp/core/lib/spelltextedit.py
@@ -60,7 +60,9 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
         popup_menu = self.createStandardContextMenu()
         # Select the word under the cursor.
         cursor = self.textCursor()
-        cursor.select(QtGui.QTextCursor.WordUnderCursor)
+        # only select text if not already selected
+        if not cursor.hasSelection():
+            cursor.select(QtGui.QTextCursor.WordUnderCursor)
         self.setTextCursor(cursor)
         # Check if the selected word is misspelled and offer spelling
         # suggestions if it is.
@@ -86,7 +88,6 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
             tag_menu.addAction(action)
         popup_menu.insertSeparator(popup_menu.actions()[0])
         popup_menu.insertMenu(popup_menu.actions()[0], tag_menu)
-
         popup_menu.exec_(event.globalPos())
 
     def correctWord(self, word):

From 1899fc341566448c51a43ae4510c48a3fb9818fe Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 4 Sep 2010 14:06:06 +0100
Subject: [PATCH 47/61] css tidies, attempt to get paging correct, replacing
 qtextdoc with qwebview

---
 openlp/core/lib/__init__.py    |  3 +-
 openlp/core/lib/htmlbuilder.py | 67 ++++++++++++++++++++--------------
 openlp/core/lib/renderer.py    | 44 ++++++++++++++++------
 3 files changed, 74 insertions(+), 40 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index da1778d65..25f7630f9 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -324,7 +324,8 @@ from settingstab import SettingsTab
 from serviceitem import ServiceItem
 from serviceitem import ServiceItemType
 from serviceitem import ItemCapabilities
-from htmlbuilder import build_html, build_lyrics_format_css
+from htmlbuilder import build_html, build_lyrics_format_css, \
+    build_lyrics_outline_css
 from toolbar import OpenLPToolbar
 from dockwidget import OpenLPDockWidget
 from theme import ThemeLevel, ThemeXML
diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index f65bfb1e3..fff159415 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -329,9 +329,10 @@ def build_lyrics_css(item, webkitvers):
     if theme:
         lyricstable = u'left: %spx; top: %spx;' % \
             (item.main.x(), item.main.y())
-        lyrics = build_lyrics_format_css(theme)
-        lyrics += u'width: %spx; height: %spx; ' % \
-            (item.main.width(), item.main.height())
+        lyrics = build_lyrics_format_css(theme, item.main.width(), 
+            item.main.height())
+        #lyrics += u'width: %spx; height: %spx; ' % \
+        #    (item.main.width(), item.main.height())
         # For performance reasons we want to show as few DIV's as possible,
         # especially when animating/transitions. 
         # However some bugs in older versions of qtwebkit mean we need to 
@@ -347,29 +348,37 @@ def build_lyrics_css(item, webkitvers):
         # Before 534.4 the text-shadow didn't get displayed when 
         # webkit-text-stroke was used. So use an offset text layer underneath. 
         # https://bugs.webkit.org/show_bug.cgi?id=19728
-        if theme.display_outline:
-            outline = u' -webkit-text-stroke: %sem %s; ' \
-                '-webkit-text-fill-color: %s; ' % \
-                (float(theme.display_outline_size) / 16,
-                theme.display_outline_color, theme.font_main_color)
-            if webkitvers >= 533.3:
-                lyricsmain += outline
-            if theme.display_shadow and webkitvers < 534.3:
-                shadow = u'-webkit-text-stroke: %sem %s; ' \
-                    u'-webkit-text-fill-color: %s; ' \
-                    u' padding-left: %spx; padding-top: %spx' % \
-                    (float(theme.display_outline_size) / 16,
-                    theme.display_shadow_color, theme.display_shadow_color, 
-                    theme.display_shadow_size, theme.display_shadow_size)
-        if theme.display_shadow and \
-            (not theme.display_outline or webkitvers >= 534.3):
-            lyricsmain += u' text-shadow: %s %spx %spx;' % \
-                (theme.display_shadow_color, theme.display_shadow_size,
-                theme.display_shadow_size)
+        if webkitvers >= 533.3:
+            lyricsmain += build_lyrics_outline_css(theme)
+        else:
+            outline = build_lyrics_outline_css(theme) 
+        if theme.display_shadow:
+            if theme.display_outline and webkitvers < 534.3:
+                shadow = u'padding-left: %spx; padding-top: %spx ' % \
+                    (theme.display_shadow_size, theme.display_shadow_size)
+                shadow += build_lyrics_outline_css(theme, True)
+            else:
+                lyricsmain += u' text-shadow: %s %spx %spx;' % \
+                    (theme.display_shadow_color, theme.display_shadow_size,
+                    theme.display_shadow_size)
     lyrics_css = style % (lyricstable, lyrics, lyricsmain, outline, shadow)
     return lyrics_css
     
-def build_lyrics_format_css(theme):
+def build_lyrics_outline_css(theme, is_shadow=False):
+    if theme.display_outline:
+        size = float(theme.display_outline_size) / 16
+        if is_shadow:
+            fill_color = theme.display_shadow_color
+            outline_color = theme.display_shadow_color
+        else:
+            fill_color = theme.font_main_color
+            outline_color = theme.display_outline_color
+        return u' -webkit-text-stroke: %sem %s; ' \
+            u'-webkit-text-fill-color: %s; ' % (size, outline_color, fill_color)
+    else:
+        return u''
+
+def build_lyrics_format_css(theme, width, height):
     """
     Build the css which controls the theme format
     Also used by renderer for splitting verses
@@ -393,18 +402,20 @@ def build_lyrics_format_css(theme):
         valign = u'middle'
     else:
         valign = u'top'
-    lyrics = u'word-wrap: break-word; ' \
+    lyrics = u'white-space:pre-wrap; word-wrap: break-word; ' \
         'text-align: %s; vertical-align: %s; font-family: %s; ' \
-        'font-size: %spt; color: %s; line-height: %d%%;' % \
+        'font-size: %spt; color: %s; line-height: %d%%; ' \
+        'margin:0; padding:0; width: %spx; height: %spx; ' % \
         (align, valign, theme.font_main_name, theme.font_main_proportion, 
-        theme.font_main_color, 100 + int(theme.font_main_line_adjustment))
+        theme.font_main_color, 100 + int(theme.font_main_line_adjustment), 
+        width, height)
     if theme.display_outline:
         if webkit_version() < 534.3:
             lyrics += u' letter-spacing: 1px;'
     if theme.font_main_italics:
-        lyrics += ' font-style:italic; '
+        lyrics += u' font-style:italic; '
     if theme.font_main_weight == u'Bold':
-        lyrics += ' font-weight:bold; '
+        lyrics += u' font-weight:bold; '
     return lyrics
     
 def build_lyrics_html(item, webkitvers):
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index dae7c820a..260ce5e16 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -29,9 +29,10 @@ format it for the output display.
 """
 import logging
 
-from PyQt4 import QtGui, QtCore
+from PyQt4 import QtGui, QtCore, QtWebKit
 
-from openlp.core.lib import resize_image, expand_tags, build_lyrics_format_css
+from openlp.core.lib import resize_image, expand_tags, \
+    build_lyrics_format_css, build_lyrics_outline_css
 
 log = logging.getLogger(__name__)
 
@@ -143,20 +144,41 @@ class Renderer(object):
             lines = verse.split(u'\n')
             for line in lines:
                 text.append(line)
-        doc = QtGui.QTextDocument()
-        doc.setPageSize(QtCore.QSizeF(self._rect.width(), self._rect.height()))
-        layout = doc.documentLayout()
+                
+        web = QtWebKit.QWebView()
+        web.resize(self._rect.width(), self._rect.height())
+        web.setVisible(False)
+        frame = web.page().mainFrame()
+        # Adjust width and height to account for shadow. outline done in css
+        width = self._rect.width() + int(self._theme.display_shadow_size) 
+        height = self._rect.height() + int(self._theme.display_shadow_size) 
+        css = u'<html><head><style>#main {%s %s}</style><body>' \
+            u'<div id="main">' % \
+            (build_lyrics_format_css(self._theme, width, height),
+            build_lyrics_outline_css(self._theme))
+#        doc = QtGui.QTextDocument()
+#        doc.setPageSize(QtCore.QSizeF(self._rect.width(), self._rect.height()))
+#        doc.setDocumentMargin(0)
+#        css = u'* {%s}' % build_lyrics_format_css(self._theme)
+#        doc.setDefaultStyleSheet(css)
+        #layout = doc.documentLayout()
         formatted = []
-        shell = u'<div style="%s">' % build_lyrics_format_css(self._theme)
         html_text = u''
-        styled_text = shell
+        styled_text = u''
+        divheight = 'document.getElementById("main").scrollHeight'
         for line in text:
-            styled_text += expand_tags(line) + line_end
-            doc.setHtml(styled_text + u'</div>')
+            styled_line = expand_tags(line) + line_end
+            styled_text += styled_line
+            html = css + styled_text + u'</div></body></html>'
+            web.setHtml(html)
+#            doc.setHtml(styled_text)
             # Text too long so go to next page
-            if layout.pageCount() != 1:
+#            if doc.pageCount() != 1:
+            text_height = int(frame.evaluateJavaScript(divheight).toString())
+            if text_height > height:
                 formatted.append(html_text)
-                styled_text = shell
+                html_text = u''
+                styled_text = styled_line
             html_text += line + line_end
         formatted.append(html_text)
         log.debug(u'format_slide - End')

From a74af25265059a8ceeaa526a768e1d872972eeba Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 4 Sep 2010 14:09:47 +0100
Subject: [PATCH 48/61] tidy

---
 openlp/core/lib/htmlbuilder.py |  2 --
 openlp/core/lib/renderer.py    | 16 ++++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index fff159415..e6a7857ff 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -331,8 +331,6 @@ def build_lyrics_css(item, webkitvers):
             (item.main.x(), item.main.y())
         lyrics = build_lyrics_format_css(theme, item.main.width(), 
             item.main.height())
-        #lyrics += u'width: %spx; height: %spx; ' % \
-        #    (item.main.width(), item.main.height())
         # For performance reasons we want to show as few DIV's as possible,
         # especially when animating/transitions. 
         # However some bugs in older versions of qtwebkit mean we need to 
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 260ce5e16..46e0452ac 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -152,29 +152,21 @@ class Renderer(object):
         # Adjust width and height to account for shadow. outline done in css
         width = self._rect.width() + int(self._theme.display_shadow_size) 
         height = self._rect.height() + int(self._theme.display_shadow_size) 
-        css = u'<html><head><style>#main {%s %s}</style><body>' \
+        shell = u'<html><head><style>#main {%s %s}</style><body>' \
             u'<div id="main">' % \
             (build_lyrics_format_css(self._theme, width, height),
             build_lyrics_outline_css(self._theme))
-#        doc = QtGui.QTextDocument()
-#        doc.setPageSize(QtCore.QSizeF(self._rect.width(), self._rect.height()))
-#        doc.setDocumentMargin(0)
-#        css = u'* {%s}' % build_lyrics_format_css(self._theme)
-#        doc.setDefaultStyleSheet(css)
-        #layout = doc.documentLayout()
         formatted = []
         html_text = u''
         styled_text = u''
-        divheight = 'document.getElementById("main").scrollHeight'
+        js_height = 'document.getElementById("main").scrollHeight'
         for line in text:
             styled_line = expand_tags(line) + line_end
             styled_text += styled_line
-            html = css + styled_text + u'</div></body></html>'
+            html = shell + styled_text + u'</div></body></html>'
             web.setHtml(html)
-#            doc.setHtml(styled_text)
             # Text too long so go to next page
-#            if doc.pageCount() != 1:
-            text_height = int(frame.evaluateJavaScript(divheight).toString())
+            text_height = int(frame.evaluateJavaScript(js_height).toString())
             if text_height > height:
                 formatted.append(html_text)
                 html_text = u''

From 5dd5e1506053caa663022427f16fb671cd10b9ec Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 4 Sep 2010 15:23:20 +0100
Subject: [PATCH 49/61] Subtract shadow from width, not add it

---
 openlp/core/lib/htmlbuilder.py | 25 +++++++++++++++++++++----
 openlp/core/lib/renderer.py    |  7 +++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 2d9323a8b..a39c3dac5 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -286,6 +286,10 @@ def build_html(item, screen, alert, islive):
     return html
 
 def webkit_version():
+    """
+    Return the Webkit version in use.
+    Note method added relatively recently, so return 0 if prior to this
+    """
     try:
         webkitvers = float(QtWebKit.qWebKitVersion())
         log.debug(u'Webkit version = %s' % webkitvers)
@@ -402,6 +406,16 @@ def build_lyrics_css(item, webkitvers):
     return lyrics_css
     
 def build_lyrics_outline_css(theme, is_shadow=False):
+    """
+    Build the css which controls the theme outline
+    Also used by renderer for splitting verses
+
+    `theme`
+        Object containing theme information
+    
+    `is_shadow`
+        If true, use the shadow colors instead
+    """
     if theme.display_outline:
         size = float(theme.display_outline_size) / 16
         if is_shadow:
@@ -420,11 +434,14 @@ def build_lyrics_format_css(theme, width, height):
     Build the css which controls the theme format
     Also used by renderer for splitting verses
 
-    `item`
-        Service Item containing theme and location information
+    `theme`
+        Object containing theme information
     
-    `webkitvers`
-        The version of qtwebkit we're using
+    `width`
+        Width of the lyrics block
+
+    `height`
+        Height of the lyrics block
 
     """
     if theme.display_horizontalAlign == 2:
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 1b1605e00..330c434c5 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -143,15 +143,14 @@ class Renderer(object):
         for verse in verses_text:
             lines = verse.split(u'\n')
             for line in lines:
-                text.append(line)
-                
+                text.append(line)               
         web = QtWebKit.QWebView()
         web.resize(self._rect.width(), self._rect.height())
         web.setVisible(False)
         frame = web.page().mainFrame()
         # Adjust width and height to account for shadow. outline done in css
-        width = self._rect.width() + int(self._theme.display_shadow_size) 
-        height = self._rect.height() + int(self._theme.display_shadow_size) 
+        width = self._rect.width() - int(self._theme.display_shadow_size) 
+        height = self._rect.height() - int(self._theme.display_shadow_size) 
         shell = u'<html><head><style>#main {%s %s}</style><body>' \
             u'<div id="main">' % \
             (build_lyrics_format_css(self._theme, width, height),

From 163bf9d2f4384ef6399667bce389e2f277b7e812 Mon Sep 17 00:00:00 2001
From: Philip Ridout <phill.ridout@googlemail.com>
Date: Sat, 4 Sep 2010 15:26:04 +0100
Subject: [PATCH 50/61] Corrected one line that was missed (not by me :-p)

---
 openlp/plugins/songs/lib/songimport.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index bf5079c8c..63ef6a8ed 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -300,7 +300,7 @@ class SongImport(QtCore.QObject):
                 topic = Topic.populate(name=topictext)
             song.topics.append(topic)
         self.manager.save_object(song)
-        self.setDefaults()
+        self.set_defaults()
 
     def print_song(self):
         """

From 62a031982e9da73bfc70a336404cabf1fcf91f43 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 4 Sep 2010 16:51:18 +0100
Subject: [PATCH 51/61] Renderer cleanup

---
 openlp/core/lib/renderer.py | 93 +++++++------------------------------
 1 file changed, 17 insertions(+), 76 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 39eff80bd..e7689d012 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -69,21 +69,11 @@ class Renderer(object):
         self.theme_name = theme.theme_name
         if theme.background_type == u'image':
             if theme.background_filename:
-                self.set_bg_image(theme.background_filename)
-
-    def set_bg_image(self, filename):
-        """
-        Set a background image.
-
-        ``filename``
-            The name of the image file.
-        """
-        log.debug(u'set bg image %s', filename)
-        self._bg_image_filename = unicode(filename)
-        if self.frame:
-            self.bg_image = resize_image(self._bg_image_filename,
-                                         self.frame.width(),
-                                         self.frame.height())
+                self._bg_image_filename = unicode(filename)
+                if self.frame:
+                    self.bg_image = resize_image(self._bg_image_filename,
+                        self.frame.width(),
+                        self.frame.height())
 
     def set_text_rectangle(self, rect_main, rect_footer):
         """
@@ -99,7 +89,7 @@ class Renderer(object):
         self._rect = rect_main
         self._rect_footer = rect_footer
 
-    def set_frame_dest(self, frame_width, frame_height, preview=False):
+    def set_frame_dest(self, frame_width, frame_height):
         """
         Set the size of the slide.
 
@@ -109,11 +99,7 @@ class Renderer(object):
         ``frame_height``
             The height of the slide.
 
-        ``preview``
-            Defaults to *False*. Whether or not to generate a preview.
         """
-        if preview:
-            self.bg_frame = None
         log.debug(u'set frame dest (frame) w %d h %d', frame_width,
             frame_height)
         self.frame = QtGui.QImage(frame_width, frame_height,
@@ -121,8 +107,17 @@ class Renderer(object):
         if self._bg_image_filename and not self.bg_image:
             self.bg_image = resize_image(self._bg_image_filename,
                 self.frame.width(), self.frame.height())
-        if self.bg_frame is None:
-            self._generate_background_frame()
+        if self._theme.background_type == u'image':
+            self.bg_frame = QtGui.QImage(self.frame.width(),
+                self.frame.height(), QtGui.QImage.Format_ARGB32_Premultiplied)
+            painter = QtGui.QPainter()
+            painter.begin(self.bg_frame)
+            painter.fillRect(self.frame.rect(), QtCore.Qt.black)
+            if self.bg_image:
+                painter.drawImage(0, 0, self.bg_image)
+            painter.end()
+        else:
+            self.bg_frame = None
 
     def format_slide(self, words, line_break):
         """
@@ -180,57 +175,3 @@ class Renderer(object):
         formatted.append(shell % old_html_text)
         log.debug(u'format_slide - End')
         return formatted
-
-    def _generate_background_frame(self):
-        """
-        Generate a background frame to the same size as the frame to be used.
-        Results are cached for performance reasons.
-        """
-        assert(self._theme)
-        self.bg_frame = QtGui.QImage(self.frame.width(),
-            self.frame.height(), QtGui.QImage.Format_ARGB32_Premultiplied)
-        log.debug(u'render background %s start', self._theme.background_type)
-        if self._theme.background_type == u'solid':
-            self.bg_frame = None
-#            painter.fillRect(self.frame.rect(),
-#                QtGui.QColor(self._theme.background_color))
-        elif self._theme.background_type == u'gradient':
-            self.bg_frame = None
-            # gradient
-#            gradient = None
-#            if self._theme.background_direction == u'horizontal':
-#                w = int(self.frame.width()) / 2
-#                # vertical
-#                gradient = QtGui.QLinearGradient(w, 0, w, self.frame.height())
-#            elif self._theme.background_direction == u'vertical':
-#                h = int(self.frame.height()) / 2
-#                # Horizontal
-#                gradient = QtGui.QLinearGradient(0, h, self.frame.width(), h)
-#            else:
-#                w = int(self.frame.width()) / 2
-#                h = int(self.frame.height()) / 2
-#                # Circular
-#                gradient = QtGui.QRadialGradient(w, h, w)
-#            gradient.setColorAt(0,
-#                QtGui.QColor(self._theme.background_startColor))
-#            gradient.setColorAt(1,
-#                QtGui.QColor(self._theme.background_endColor))
-#            painter.setBrush(QtGui.QBrush(gradient))
-#            rect_path = QtGui.QPainterPath()
-#            max_x = self.frame.width()
-#            max_y = self.frame.height()
-#            rect_path.moveTo(0, 0)
-#            rect_path.lineTo(0, max_y)
-#            rect_path.lineTo(max_x, max_y)
-#            rect_path.lineTo(max_x, 0)
-#            rect_path.closeSubpath()
-#            painter.drawPath(rect_path)
-#            painter.end()
-        elif self._theme.background_type == u'image':
-            # image
-            painter = QtGui.QPainter()
-            painter.begin(self.bg_frame)
-            painter.fillRect(self.frame.rect(), QtCore.Qt.black)
-            if self.bg_image:
-                painter.drawImage(0, 0, self.bg_image)
-            painter.end()

From b9bb5b8c4fdc66d049985fdb5d09694cf8a71108 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 4 Sep 2010 17:14:56 +0100
Subject: [PATCH 52/61] Cleanups

---
 openlp/core/lib/renderer.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 5a98faaff..0cb92ad39 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -70,7 +70,7 @@ class Renderer(object):
         self.theme_name = theme.theme_name
         if theme.background_type == u'image':
             if theme.background_filename:
-                self._bg_image_filename = unicode(filename)
+                self._bg_image_filename = unicode(theme.background_filename)
                 if self.frame:
                     self.bg_image = resize_image(self._bg_image_filename,
                         self.frame.width(),
@@ -138,14 +138,14 @@ class Renderer(object):
         for verse in verses_text:
             lines = verse.split(u'\n')
             for line in lines:
-                text.append(line)               
+                text.append(line)
         web = QtWebKit.QWebView()
         web.resize(self._rect.width(), self._rect.height())
         web.setVisible(False)
         frame = web.page().mainFrame()
         # Adjust width and height to account for shadow. outline done in css
-        width = self._rect.width() - int(self._theme.display_shadow_size) 
-        height = self._rect.height() - int(self._theme.display_shadow_size) 
+        width = self._rect.width() - int(self._theme.display_shadow_size)
+        height = self._rect.height() - int(self._theme.display_shadow_size)
         shell = u'<html><head><style>#main {%s %s}</style><body>' \
             u'<div id="main">' % \
             (build_lyrics_format_css(self._theme, width, height),

From cd9a7d49515336e443dcde24846369afe97c123d Mon Sep 17 00:00:00 2001
From: Philip Ridout <phill.ridout@googlemail.com>
Date: Sat, 4 Sep 2010 17:36:07 +0100
Subject: [PATCH 53/61] Changed with and height arround on the general tab.
 This brings it in line with the standard way of specifing a screen res, as
 well as bring it in line with the x & y cords before the height and width!

---
 openlp/core/ui/generaltab.py | 50 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index bc050b6f9..0e18b249b 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -195,6 +195,19 @@ class GeneralTab(SettingsTab):
         self.currentYValueLabel.setObjectName(u'currentYValueLabel')
         self.currentYLayout.addWidget(self.currentYValueLabel)
         self.currentLayout.addLayout(self.currentYLayout)
+        self.currentWidthLayout = QtGui.QVBoxLayout()
+        self.currentWidthLayout.setSpacing(0)
+        self.currentWidthLayout.setMargin(0)
+        self.currentWidthLayout.setObjectName(u'currentWidthLayout')
+        self.currentWidthLabel = QtGui.QLabel(self.displayGroupBox)
+        self.currentWidthLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.currentWidthLabel.setObjectName(u'currentWidthLabel')
+        self.currentWidthLayout.addWidget(self.currentWidthLabel)
+        self.currentWidthValueLabel = QtGui.QLabel(self.displayGroupBox)
+        self.currentWidthValueLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.currentWidthValueLabel.setObjectName(u'currentWidthValueLabel')
+        self.currentWidthLayout.addWidget(self.currentWidthValueLabel)
+        self.currentLayout.addLayout(self.currentWidthLayout)
         self.currentHeightLayout = QtGui.QVBoxLayout()
         self.currentHeightLayout.setSpacing(0)
         self.currentHeightLayout.setMargin(0)
@@ -209,19 +222,6 @@ class GeneralTab(SettingsTab):
         self.currentHeightValueLabel.setObjectName(u'Height')
         self.currentHeightLayout.addWidget(self.currentHeightValueLabel)
         self.currentLayout.addLayout(self.currentHeightLayout)
-        self.currentWidthLayout = QtGui.QVBoxLayout()
-        self.currentWidthLayout.setSpacing(0)
-        self.currentWidthLayout.setMargin(0)
-        self.currentWidthLayout.setObjectName(u'currentWidthLayout')
-        self.currentWidthLabel = QtGui.QLabel(self.displayGroupBox)
-        self.currentWidthLabel.setAlignment(QtCore.Qt.AlignCenter)
-        self.currentWidthLabel.setObjectName(u'currentWidthLabel')
-        self.currentWidthLayout.addWidget(self.currentWidthLabel)
-        self.currentWidthValueLabel = QtGui.QLabel(self.displayGroupBox)
-        self.currentWidthValueLabel.setAlignment(QtCore.Qt.AlignCenter)
-        self.currentWidthValueLabel.setObjectName(u'currentWidthValueLabel')
-        self.currentWidthLayout.addWidget(self.currentWidthValueLabel)
-        self.currentLayout.addLayout(self.currentWidthLayout)
         self.displayLayout.addLayout(self.currentLayout)
         self.overrideCheckBox = QtGui.QCheckBox(self.displayGroupBox)
         self.overrideCheckBox.setObjectName(u'overrideCheckBox')
@@ -256,18 +256,6 @@ class GeneralTab(SettingsTab):
         self.customYValueEdit.setObjectName(u'customYValueEdit')
         self.customYLayout.addWidget(self.customYValueEdit)
         self.customLayout.addLayout(self.customYLayout)
-        self.customHeightLayout = QtGui.QVBoxLayout()
-        self.customHeightLayout.setSpacing(0)
-        self.customHeightLayout.setMargin(0)
-        self.customHeightLayout.setObjectName(u'customHeightLayout')
-        self.customHeightLabel = QtGui.QLabel(self.displayGroupBox)
-        self.customHeightLabel.setAlignment(QtCore.Qt.AlignCenter)
-        self.customHeightLabel.setObjectName(u'customHeightLabel')
-        self.customHeightLayout.addWidget(self.customHeightLabel)
-        self.customHeightValueEdit = QtGui.QLineEdit(self.displayGroupBox)
-        self.customHeightValueEdit.setObjectName(u'customHeightValueEdit')
-        self.customHeightLayout.addWidget(self.customHeightValueEdit)
-        self.customLayout.addLayout(self.customHeightLayout)
         self.customWidthLayout = QtGui.QVBoxLayout()
         self.customWidthLayout.setSpacing(0)
         self.customWidthLayout.setMargin(0)
@@ -281,6 +269,18 @@ class GeneralTab(SettingsTab):
         self.customWidthValueEdit.setObjectName(u'customWidthValueEdit')
         self.customWidthLayout.addWidget(self.customWidthValueEdit)
         self.customLayout.addLayout(self.customWidthLayout)
+        self.customHeightLayout = QtGui.QVBoxLayout()
+        self.customHeightLayout.setSpacing(0)
+        self.customHeightLayout.setMargin(0)
+        self.customHeightLayout.setObjectName(u'customHeightLayout')
+        self.customHeightLabel = QtGui.QLabel(self.displayGroupBox)
+        self.customHeightLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.customHeightLabel.setObjectName(u'customHeightLabel')
+        self.customHeightLayout.addWidget(self.customHeightLabel)
+        self.customHeightValueEdit = QtGui.QLineEdit(self.displayGroupBox)
+        self.customHeightValueEdit.setObjectName(u'customHeightValueEdit')
+        self.customHeightLayout.addWidget(self.customHeightValueEdit)
+        self.customLayout.addLayout(self.customHeightLayout)
         self.displayLayout.addLayout(self.customLayout)
         # Bottom spacer
         self.generalRightSpacer = QtGui.QSpacerItem(20, 40,

From 20844c8d289636d063b6569f44d0bb9bfce1aee8 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 4 Sep 2010 18:39:03 +0100
Subject: [PATCH 54/61] Fix CCLI for songs

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

diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 85ba1cf06..9f14698ee 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -359,16 +359,13 @@ class SongMediaItem(MediaManagerItem):
                 author_list = author_list + u', '
             author_list = author_list + unicode(author.display_name)
             author_audit.append(unicode(author.display_name))
-        if song.ccli_number is None or len(song.ccli_number) == 0:
-            ccli = QtCore.QSettings().value(u'general/ccli number',
-                QtCore.QVariant(u'')).toString()
-        else:
-            ccli = unicode(song.ccli_number)
         raw_footer.append(song.title)
         raw_footer.append(author_list)
         raw_footer.append(song.copyright )
         raw_footer.append(unicode(
-            translate('SongsPlugin.MediaItem', 'CCLI Licence: ') + ccli))
+            translate('SongsPlugin.MediaItem', 'CCLI Licence: ') +
+            QtCore.QSettings().value(u'general/ccli number',
+            QtCore.QVariant(u'')).toString()))
         service_item.raw_footer = raw_footer
         service_item.audit = [
             song.title, author_audit, song.copyright, unicode(song.ccli_number)

From 9c0391fe733cfd3b54cabf70cfcca2db4e87c4b8 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 4 Sep 2010 18:55:10 +0100
Subject: [PATCH 55/61] Screen size and scrollbar fix?

---
 openlp.pyw                     | 9 ++++++---
 openlp/core/lib/htmlbuilder.py | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/openlp.pyw b/openlp.pyw
index c4f062b87..7245541d7 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -129,11 +129,14 @@ class OpenLP(QtGui.QApplication):
         screens = ScreenList()
         # Decide how many screens we have and their size
         for screen in xrange(0, self.desktop().numScreens()):
+            if self.desktop().isVirtualDesktop():
+                size = self.desktop().availableGeometry(screen);
+            else:
+                size = self.desktop().screenGeometry(screen);
             screens.add_screen({u'number': screen,
-                u'size': self.desktop().availableGeometry(screen),
+                u'size': size,
                 u'primary': (self.desktop().primaryScreen() == screen)})
-            log.info(u'Screen %d found with resolution %s',
-                screen, self.desktop().availableGeometry(screen))
+            log.info(u'Screen %d found with resolution %s', screen, size)
         # start the main app window
         self.mainWindow = MainWindow(screens, app_version)
         self.mainWindow.show()
diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index a39c3dac5..9c696526e 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -40,6 +40,7 @@ HTMLSRC = u"""
     margin: 0;
     padding: 0;
     border: 0;
+    overflow: hidden;
 }
 body {
     %s;

From e54340d8f36f88877a567150e95e800ca5325e42 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 4 Sep 2010 20:13:26 +0100
Subject: [PATCH 56/61] scrollbar attempt 2

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

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 2c9472414..e682a3a0f 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -125,6 +125,8 @@ class MainDisplay(DisplayWidget):
         self.frame = self.page.mainFrame()
         QtCore.QObject.connect(self.webView,
             QtCore.SIGNAL(u'loadFinished(bool)'), self.isLoaded)
+        self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
         self.frame.setScrollBarPolicy(QtCore.Qt.Vertical,
             QtCore.Qt.ScrollBarAlwaysOff)
         self.frame.setScrollBarPolicy(QtCore.Qt.Horizontal,

From e2c117034a0471b1d3ae18e778561dc1097ecac2 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 4 Sep 2010 20:40:28 +0100
Subject: [PATCH 57/61] Fix up bug for bible settings of duel drop down

Fixes: https://launchpad.net/bugs/629848
---
 openlp/core/ui/generaltab.py           |  1 -
 openlp/core/ui/settingsform.py         |  3 +++
 openlp/plugins/bibles/lib/biblestab.py | 10 +++++-----
 openlp/plugins/bibles/lib/mediaitem.py |  3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index 0e18b249b..d8481e801 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -476,7 +476,6 @@ class GeneralTab(SettingsTab):
         # Order is important so be careful if you change
         if self.overrideChanged or postUpdate:
             Receiver.send_message(u'config_screen_changed')
-        Receiver.send_message(u'config_updated')
         self.overrideChanged = False
 
     def onOverrideCheckBoxToggled(self, checked):
diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py
index 97f2aebaf..37fe1f329 100644
--- a/openlp/core/ui/settingsform.py
+++ b/openlp/core/ui/settingsform.py
@@ -30,6 +30,7 @@ import logging
 
 from PyQt4 import QtGui
 
+from openlp.core.lib import Receiver
 from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab
 from settingsdialog import Ui_SettingsDialog
 
@@ -87,6 +88,8 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         """
         for tabIndex in range(0, self.settingsTabWidget.count()):
             self.settingsTabWidget.widget(tabIndex).save()
+        # Must go after all settings are save
+        Receiver.send_message(u'config_updated')
         return QtGui.QDialog.accept(self)
 
     def postSetUp(self):
diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py
index 8399ee1d4..0903c9625 100644
--- a/openlp/plugins/bibles/lib/biblestab.py
+++ b/openlp/plugins/bibles/lib/biblestab.py
@@ -196,10 +196,10 @@ class BiblesTab(SettingsTab):
             self.show_new_chapters = True
 
     def onBibleDualCheckBox(self, check_state):
-        self.duel_bibles = False
+        self.dual_bibles = False
         # we have a set value convert to True/False
         if check_state == QtCore.Qt.Checked:
-            self.duel_bibles = True
+            self.dual_bibles = True
 
     def load(self):
         settings = QtCore.QSettings()
@@ -212,12 +212,12 @@ class BiblesTab(SettingsTab):
             u'verse layout style', QtCore.QVariant(0)).toInt()[0]
         self.bible_theme = unicode(
             settings.value(u'bible theme', QtCore.QVariant(u'')).toString())
-        self.duel_bibles = settings.value(
+        self.dual_bibles = settings.value(
             u'dual bibles', QtCore.QVariant(True)).toBool()
         self.NewChaptersCheckBox.setChecked(self.show_new_chapters)
         self.DisplayStyleComboBox.setCurrentIndex(self.display_style)
         self.LayoutStyleComboBox.setCurrentIndex(self.layout_style)
-        self.BibleDualCheckBox.setChecked(self.duel_bibles)
+        self.BibleDualCheckBox.setChecked(self.dual_bibles)
         settings.endGroup()
 
     def save(self):
@@ -229,7 +229,7 @@ class BiblesTab(SettingsTab):
             QtCore.QVariant(self.display_style))
         settings.setValue(u'verse layout style',
             QtCore.QVariant(self.layout_style))
-        settings.setValue(u'dual bibles', QtCore.QVariant(self.duel_bibles))
+        settings.setValue(u'dual bibles', QtCore.QVariant(self.dual_bibles))
         settings.setValue(u'bible theme', QtCore.QVariant(self.bible_theme))
         settings.endGroup()
 
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index e7850c65c..57e70617a 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -275,8 +275,9 @@ class BibleMediaItem(MediaManagerItem):
         self.SearchProgress.setObjectName(u'SearchProgress')
 
     def configUpdated(self):
+        log.debug(u'configUpdated')
         if QtCore.QSettings().value(self.settingsSection + u'/dual bibles',
-            QtCore.QVariant(False)).toBool():
+            QtCore.QVariant(True)).toBool():
             self.AdvancedSecondBibleLabel.setVisible(True)
             self.AdvancedSecondBibleComboBox.setVisible(True)
             self.QuickSecondVersionLabel.setVisible(True)

From 277f5e13807f14ba97c65d9260ae3d7c4011c741 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 4 Sep 2010 21:08:36 +0100
Subject: [PATCH 58/61] Always use screenGeometry

---
 openlp.pyw | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/openlp.pyw b/openlp.pyw
index 7245541d7..dfe973ceb 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -129,10 +129,7 @@ class OpenLP(QtGui.QApplication):
         screens = ScreenList()
         # Decide how many screens we have and their size
         for screen in xrange(0, self.desktop().numScreens()):
-            if self.desktop().isVirtualDesktop():
-                size = self.desktop().availableGeometry(screen);
-            else:
-                size = self.desktop().screenGeometry(screen);
+            size = self.desktop().screenGeometry(screen);
             screens.add_screen({u'number': screen,
                 u'size': size,
                 u'primary': (self.desktop().primaryScreen() == screen)})

From aa0f4f7af0745702f570dbe4aad01c1f79c397bf Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sun, 5 Sep 2010 16:16:48 +0100
Subject: [PATCH 59/61] Finish wizard integration

---
 openlp/plugins/songs/lib/oooimport.py  | 3 +++
 openlp/plugins/songs/lib/sofimport.py  | 3 +++
 openlp/plugins/songs/lib/songimport.py | 8 ++++----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py
index 9a3be2843..e8c723c0e 100644
--- a/openlp/plugins/songs/lib/oooimport.py
+++ b/openlp/plugins/songs/lib/oooimport.py
@@ -82,6 +82,9 @@ class OooImport(SongImport):
                         self.process_doc()
                     self.close_ooo_file()
         self.close_ooo()
+        self.import_wizard.importProgressBar.setMaximum(1)
+        self.import_wizard.incrementProgressBar(u'', 1)
+        return True
 
     def stop_import(self):
         self.abort = True
diff --git a/openlp/plugins/songs/lib/sofimport.py b/openlp/plugins/songs/lib/sofimport.py
index 0d7c085de..ab91e1923 100644
--- a/openlp/plugins/songs/lib/sofimport.py
+++ b/openlp/plugins/songs/lib/sofimport.py
@@ -89,6 +89,9 @@ class SofImport(OooImport):
                     self.process_sof_file()
                     self.close_ooo_file()
         self.close_ooo()
+        self.import_wizard.importProgressBar.setMaximum(1)
+        self.import_wizard.incrementProgressBar(u'', 1)
+        return True
 
     def process_sof_file(self):
         """
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index 63ef6a8ed..17000a2ba 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -129,13 +129,13 @@ class SongImport(QtCore.QObject):
 
     def process_verse_text(self, text):
         lines = text.split(u'\n')
-        if text.lower().find(COPYRIGHT_STRING) >= 0 \
-            or text.lower().find(COPYRIGHT_SYMBOL) >= 0:
+        if text.lower().find(self.copyright_string) >= 0 \
+            or text.lower().find(self.copyright_symbol) >= 0:
             copyright_found = False
             for line in lines:
                 if (copyright_found or
-                    line.lower().find(COPYRIGHT_STRING) >= 0 or
-                    line.lower().find(COPYRIGHT_SYMBOL) >= 0):
+                    line.lower().find(self.copyright_string) >= 0 or
+                    line.lower().find(self.copyright_symbol) >= 0):
                     copyright_found = True
                     self.add_copyright(line)
                 else:

From a4d8e225c0f8c5ff1f6c662a9b763a55bc8544d6 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 5 Sep 2010 17:11:50 +0100
Subject: [PATCH 60/61] Allow images to blank to theme. As none defined cos
 it's an image use global

Fixes: https://launchpad.net/bugs/630254
---
 openlp/core/lib/htmlbuilder.py   | 23 ++++++++++++-----------
 openlp/core/lib/rendermanager.py |  2 ++
 openlp/core/lib/serviceitem.py   |  1 +
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 9c696526e..acf00bdeb 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -145,6 +145,7 @@ body {
         }
         document.getElementById('black').style.display = black;
         document.getElementById('lyricsmain').style.visibility = lyrics;
+        document.getElementById('image').style.visibility = lyrics;
         outline = document.getElementById('lyricsoutline')
         if(outline!=null)
             outline.style.visibility = lyrics;
@@ -327,7 +328,7 @@ def build_background_css(item, width, height):
             else:
                 background = \
                     u'background: -webkit-gradient(radial, %s 50%%, 100, %s ' \
-                    u'50%%, %s, from(%s), to(%s))' % (width, width, width, 
+                    u'50%%, %s, from(%s), to(%s))' % (width, width, width,
                     theme.background_startColor, theme.background_endColor)
     return background
 
@@ -370,10 +371,10 @@ def build_lyrics_css(item, webkitvers):
     lyricsmain = u''
     outline = u''
     shadow = u''
-    if theme:
+    if theme and item.main:
         lyricstable = u'left: %spx; top: %spx;' % \
             (item.main.x(), item.main.y())
-        lyrics = build_lyrics_format_css(theme, item.main.width(), 
+        lyrics = build_lyrics_format_css(theme, item.main.width(),
             item.main.height())
         # For performance reasons we want to show as few DIV's as possible,
         # especially when animating/transitions.
@@ -393,7 +394,7 @@ def build_lyrics_css(item, webkitvers):
         if webkitvers >= 533.3:
             lyricsmain += build_lyrics_outline_css(theme)
         else:
-            outline = build_lyrics_outline_css(theme) 
+            outline = build_lyrics_outline_css(theme)
         if theme.display_shadow:
             if theme.display_outline and webkitvers < 534.3:
                 shadow = u'padding-left: %spx; padding-top: %spx ' % \
@@ -405,7 +406,7 @@ def build_lyrics_css(item, webkitvers):
                     theme.display_shadow_size)
     lyrics_css = style % (lyricstable, lyrics, lyricsmain, outline, shadow)
     return lyrics_css
-    
+
 def build_lyrics_outline_css(theme, is_shadow=False):
     """
     Build the css which controls the theme outline
@@ -413,7 +414,7 @@ def build_lyrics_outline_css(theme, is_shadow=False):
 
     `theme`
         Object containing theme information
-    
+
     `is_shadow`
         If true, use the shadow colors instead
     """
@@ -437,7 +438,7 @@ def build_lyrics_format_css(theme, width, height):
 
     `theme`
         Object containing theme information
-    
+
     `width`
         Width of the lyrics block
 
@@ -461,8 +462,8 @@ def build_lyrics_format_css(theme, width, height):
         'text-align: %s; vertical-align: %s; font-family: %s; ' \
         'font-size: %spt; color: %s; line-height: %d%%; ' \
         'margin:0; padding:0; width: %spx; height: %spx; ' % \
-        (align, valign, theme.font_main_name, theme.font_main_proportion, 
-        theme.font_main_color, 100 + int(theme.font_main_line_adjustment), 
+        (align, valign, theme.font_main_name, theme.font_main_proportion,
+        theme.font_main_color, 100 + int(theme.font_main_line_adjustment),
         width, height)
     if theme.display_outline:
         if webkit_version() < 534.3:
@@ -472,7 +473,7 @@ def build_lyrics_format_css(theme, width, height):
     if theme.font_main_weight == u'Bold':
         lyrics += u' font-weight:bold; '
     return lyrics
-    
+
 def build_lyrics_html(item, webkitvers):
     """
     Build the HTML required to show the lyrics
@@ -520,7 +521,7 @@ def build_footer_css(item):
     text-align: %s;
     """
     theme = item.themedata
-    if not theme:
+    if not theme or not item.footer:
         return u''
     if theme.display_horizontalAlign == 2:
         align = u'center'
diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py
index 6be26bd82..a6e494b01 100644
--- a/openlp/core/lib/rendermanager.py
+++ b/openlp/core/lib/rendermanager.py
@@ -93,6 +93,8 @@ class RenderManager(object):
         """
         self.global_theme = global_theme
         self.theme_level = theme_level
+        self.global_theme_data = \
+            self.theme_manager.getThemeData(self.global_theme)
         self.themedata = None
 
     def set_service_theme(self, service_theme):
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 0e8625ce7..b0d453af5 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -170,6 +170,7 @@ class ServiceItem(object):
                         u'verseTag': slide[u'verseTag'] })
                 log.log(15, u'Formatting took %4s' % (time.time() - before))
         elif self.service_item_type == ServiceItemType.Image:
+            self.themedata = self.render_manager.global_theme_data
             for slide in self._raw_frames:
                 slide[u'image'] = resize_image(slide[u'image'],
                     self.render_manager.width, self.render_manager.height)

From 91eff095a55471d3acbd22b0760b1aeb424420dc Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 5 Sep 2010 20:52:49 +0100
Subject: [PATCH 61/61] Fix hiding of screen and adding items behind it and
 showing them.

Fixes: https://launchpad.net/bugs/630285
---
 openlp/core/ui/maindisplay.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index e682a3a0f..3e0b070b9 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -97,6 +97,7 @@ class MainDisplay(DisplayWidget):
         self.screens = screens
         self.isLive = live
         self.alertTab = None
+        self.hide_mode = None
         self.setWindowTitle(u'OpenLP Display')
         self.setWindowFlags(QtCore.Qt.FramelessWindowHint |
             QtCore.Qt.WindowStaysOnTopHint)
@@ -340,6 +341,9 @@ class MainDisplay(DisplayWidget):
         self.webView.setHtml(html)
         if serviceItem.foot_text and serviceItem.foot_text:
             self.footer(serviceItem.foot_text)
+        # if was hidden keep it hidden
+        if self.hide_mode and self.isLive:
+            self.hideDisplay(self.hide_mode)
 
     def footer(self, text):
         """
@@ -365,6 +369,7 @@ class MainDisplay(DisplayWidget):
             self.frame.evaluateJavaScript(u'show_blank("theme");')
         if mode != HideMode.Screen and self.isHidden():
             self.setVisible(True)
+        self.hide_mode = mode
 
     def showDisplay(self):
         """
@@ -378,6 +383,7 @@ class MainDisplay(DisplayWidget):
             self.setVisible(True)
         # Trigger actions when display is active again
         Receiver.send_message(u'maindisplay_active')
+        self.hide_mode = None
 
 class AudioPlayer(QtCore.QObject):
     """