From 30e867e0206580e96e518120c9e51aafb14a3813 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 15 Aug 2010 16:49:07 +0200 Subject: [PATCH 01/39] - 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 Date: Sun, 15 Aug 2010 17:35:20 +0200 Subject: [PATCH 02/39] - 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 Date: Sun, 15 Aug 2010 17:36:48 +0200 Subject: [PATCH 03/39] - improved usage of different bibles and/or books in one service item From 5a22e673462ef70385a9787d3f8294b397ef2671 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 18 Aug 2010 17:04:16 +0200 Subject: [PATCH 04/39] 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 Date: Sat, 21 Aug 2010 17:33:31 +0200 Subject: [PATCH 05/39] 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', 'Songs Plugin' '
The songs plugin provides the ability to display and ' From 0f7fb002b47c7e8022ba83dc783281c60f0648d9 Mon Sep 17 00:00:00 2001 From: Derek Scotney Date: Mon, 23 Aug 2010 19:42:59 +0200 Subject: [PATCH 06/39] 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 + + <> + <> + Next text block description (etc) + + <> + <> + 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 676cc9305ce0fd2ca36c0e9d7a430e5026d1578a Mon Sep 17 00:00:00 2001 From: Derek Scotney Date: Sat, 28 Aug 2010 15:17:27 +0200 Subject: [PATCH 07/39] 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 Date: Sat, 28 Aug 2010 15:27:17 +0200 Subject: [PATCH 08/39] 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 - - <> - <> - Next text block description (etc) - - <> - <> - 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 + + <> + <> + Next text block description (etc) + + <> + <> + 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 Date: Sat, 28 Aug 2010 17:04:37 +0200 Subject: [PATCH 09/39] Changes to comment formatting From 14dbfaa4b50034fb5b874032a85534a5bee671f1 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 28 Aug 2010 19:10:14 +0200 Subject: [PATCH 10/39] 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 Date: Sat, 28 Aug 2010 19:32:44 +0200 Subject: [PATCH 11/39] 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 Date: Sat, 28 Aug 2010 20:56:46 +0200 Subject: [PATCH 12/39] 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 Date: Sat, 28 Aug 2010 21:17:52 +0200 Subject: [PATCH 13/39] 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 Date: Sat, 28 Aug 2010 21:28:50 +0200 Subject: [PATCH 14/39] 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 Date: Sat, 28 Aug 2010 21:41:06 +0200 Subject: [PATCH 15/39] 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 Date: Sun, 29 Aug 2010 14:49:45 +0200 Subject: [PATCH 16/39] 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 Date: Sun, 29 Aug 2010 14:58:40 +0200 Subject: [PATCH 17/39] 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 Date: Sun, 29 Aug 2010 18:20:56 +0200 Subject: [PATCH 18/39] 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 Date: Sun, 29 Aug 2010 20:24:09 +0200 Subject: [PATCH 19/39] 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 - - <> - <> - Next text block description (etc) - - <> - <> - 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 + + + + ``Title of following verse/chorus and number`` + e.g. Verse 1, Chorus 1 + + ``Verse/Chorus lyrics`` + + + + + + ``Title of next verse/chorus (repeats)`` + + ``Verse/Chorus lyrics`` + + + + + + ``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 Date: Mon, 30 Aug 2010 20:32:00 +0200 Subject: [PATCH 20/39] 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 Date: Mon, 30 Aug 2010 22:42:07 +0200 Subject: [PATCH 21/39] 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 Date: Mon, 30 Aug 2010 21:57:59 +0100 Subject: [PATCH 22/39] 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 - @@ -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. --> - +
- +
- -
- - -
- - -
- - +
@@ -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 Date: Wed, 1 Sep 2010 19:27:38 +0200 Subject: [PATCH 27/39] 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 Date: Wed, 1 Sep 2010 19:54:10 +0200 Subject: [PATCH 28/39] 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 Date: Wed, 1 Sep 2010 20:20:40 +0100 Subject: [PATCH 29/39] 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 Date: Wed, 1 Sep 2010 21:22:55 +0200 Subject: [PATCH 30/39] 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 Date: Wed, 1 Sep 2010 21:27:45 +0200 Subject: [PATCH 31/39] 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 Date: Wed, 1 Sep 2010 21:31:16 +0200 Subject: [PATCH 32/39] 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 Date: Wed, 1 Sep 2010 22:36:02 +0100 Subject: [PATCH 33/39] 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 { - - -
- - -
- - -
+
+
+
+
+
+
+
+
+
@@ -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 Date: Thu, 2 Sep 2010 21:41:24 +0100 Subject: [PATCH 34/39] 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); } - -
-
-
-
-
-
-
-
-
- + + +%s - -
- +
+ """ @@ -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'
' \ + u'
' \ + u'
' + if webkitvers < 533.3: + lyrics += u'
' \ + u'
' \ + u'
' + lyrics += u'
' \ + u'
' + 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 Date: Thu, 2 Sep 2010 22:24:44 +0100 Subject: [PATCH 35/39] 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 Date: Fri, 3 Sep 2010 07:33:03 +0200 Subject: [PATCH 36/39] 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 Date: Fri, 3 Sep 2010 19:24:11 +0100 Subject: [PATCH 37/39] 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'
' + 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 Date: Fri, 3 Sep 2010 19:30:56 +0100 Subject: [PATCH 38/39] 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'', \ - u'end tag':u'{/r}', u'end html':u'', \ + u'start html':u'', \ + u'end tag':u'{/r}', u'end html':u'', \ u'protected':False}) html_expands.append({u'desc':u'Black', u'start tag':u'{b}', \ - u'start html':u'', \ - u'end tag':u'{/b}', u'end html':u'', \ + u'start html':u'', \ + u'end tag':u'{/b}', u'end html':u'', \ u'protected':False}) html_expands.append({u'desc':u'Blue', u'start tag':u'{bl}', \ - u'start html':u'', \ - u'end tag':u'{/bl}', u'end html':u'', \ + u'start html':u'', \ + u'end tag':u'{/bl}', u'end html':u'', \ u'protected':False}) html_expands.append({u'desc':u'Yellow', u'start tag':u'{y}', \ - u'start html':u'', \ - u'end tag':u'{/y}', u'end html':u'', \ + u'start html':u'', \ + u'end tag':u'{/y}', u'end html':u'', \ u'protected':False}) html_expands.append({u'desc':u'Green', u'start tag':u'{g}', \ - u'start html':u'', \ - u'end tag':u'{/g}', u'end html':u'', \ + u'start html':u'', \ + u'end tag':u'{/g}', u'end html':u'', \ u'protected':False}) html_expands.append({u'desc':u'Pink', u'start tag':u'{pk}', \ - u'start html':u'', \ - u'end tag':u'{/pk}', u'end html':u'', \ + u'start html':u'', \ + u'end tag':u'{/pk}', u'end html':u'', \ u'protected':False}) html_expands.append({u'desc':u'Orange', u'start tag':u'{o}', \ - u'start html':u'', \ - u'end tag':u'{/o}', u'end html':u'', \ + u'start html':u'', \ + u'end tag':u'{/o}', u'end html':u'', \ u'protected':False}) html_expands.append({u'desc':u'Purple', u'start tag':u'{pp}', \ - u'start html':u'', \ - u'end tag':u'{/pp}', u'end html':u'', \ + u'start html':u'', \ + u'end tag':u'{/pp}', u'end html':u'', \ u'protected':False}) html_expands.append({u'desc':u'White', u'start tag':u'{w}', \ - u'start html':u'', \ - u'end tag':u'{/w}', u'end html':u'', \ + u'start html':u'', \ + u'end tag':u'{/w}', u'end html':u'', \ u'protected':False}) html_expands.append({u'desc':u'Superscript', u'start tag':u'{su}', \ u'start html':u'', \ 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'
' \ - u'
' \ - u'
' + u'
' if webkitvers < 533.3: lyrics += u'
' \ - u'
' \ - u'
' + u'
' lyrics += u'
' \ - u'
' + u'
' return lyrics def build_footer_css(item): From 27dd493d407c5c7a2abdb3e40422bb1cf1f6261d Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 3 Sep 2010 19:33:55 +0100 Subject: [PATCH 39/39] 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'
' - 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):