From 7281f44603c2ca409ca373fc718a9e58c8d4adba Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 10 Jun 2012 15:39:45 +0200 Subject: [PATCH 1/5] removed argument --- openlp/core/lib/renderer.py | 4 ++-- openlp/core/lib/serviceitem.py | 7 ++----- openlp/plugins/bibles/lib/mediaitem.py | 4 ++-- openlp/plugins/custom/lib/mediaitem.py | 2 +- openlp/plugins/songs/lib/mediaitem.py | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 6ce51ab60..e35c78559 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -234,10 +234,10 @@ class Renderer(object): serviceItem = ServiceItem() if self.force_page: # make big page for theme edit dialog to get line count - serviceItem.add_from_text(u'', VERSE_FOR_LINE_COUNT) + serviceItem.add_from_text(VERSE_FOR_LINE_COUNT) else: self.image_manager.deleteImage(theme_data.theme_name) - serviceItem.add_from_text(u'', VERSE) + serviceItem.add_from_text(VERSE) serviceItem.renderer = self serviceItem.raw_footer = FOOTER # if No file do not update cache diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 5ee8e6167..1e9555eb9 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -220,20 +220,17 @@ class ServiceItem(object): self.image_border) self._new_item() - def add_from_text(self, title, raw_slide, verse_tag=None): + def add_from_text(self, raw_slide, verse_tag=None): """ Add a text slide to the service item. - ``frame_title`` - The title of the slide in the service item. - ``raw_slide`` The raw text of the slide. """ if verse_tag: verse_tag = verse_tag.upper() self.service_item_type = ServiceItemType.Text - title = title.split(u'\n')[0] + title = raw_slide[:30].split(u'\n')[0] self._raw_frames.append( {u'title': title, u'raw_slide': raw_slide, u'verseTag': verse_tag}) self._new_item() diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 288e0e2de..73c1a0cdc 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -417,7 +417,7 @@ class BibleMediaItem(MediaManagerItem): ``bible`` The bible to initialise (unicode). - + ``last_book_id`` The "book reference id" of the book which is choosen at the moment. (int) @@ -975,7 +975,7 @@ class BibleMediaItem(MediaManagerItem): else: service_item.theme = self.settings.bible_theme for slide in raw_slides: - service_item.add_from_text(slide[:30], slide) + service_item.add_from_text(slide) return True def formatTitle(self, start_bitem, old_bitem): diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index d36cb6400..4916652d4 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -214,7 +214,7 @@ class CustomMediaItem(MediaManagerItem): raw_slides = [verse[1] for verse in verseList] service_item.title = title for slide in raw_slides: - service_item.add_from_text(slide[:30], slide) + service_item.add_from_text(slide) if QtCore.QSettings().value(self.settingsSection + u'/display footer', QtCore.QVariant(True)).toBool() or credit: service_item.raw_footer.append(u' '.join([title, credit])) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 51158a954..4ebc3a747 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -485,8 +485,7 @@ class SongMediaItem(MediaManagerItem): verse_index = VerseType.from_tag(verse_tag) verse_tag = VerseType.TranslatedTags[verse_index].upper() verse_def = u'%s%s' % (verse_tag, verse[0][u'label']) - service_item.add_from_text( - verse[1][:30], unicode(verse[1]), verse_def) + service_item.add_from_text(unicode(verse[1]), verse_def) else: # Loop through the verse list and expand the song accordingly. for order in song.verse_order.lower().split(): @@ -505,12 +504,11 @@ class SongMediaItem(MediaManagerItem): verse_tag = VerseType.TranslatedTags[verse_index] verse_def = u'%s%s' % (verse_tag, verse[0][u'label']) - service_item.add_from_text( - verse[1][:30], verse[1], verse_def) + service_item.add_from_text(verse[1], verse_def) else: verses = song.lyrics.split(u'\n\n') for slide in verses: - service_item.add_from_text(slide[:30], unicode(slide)) + service_item.add_from_text(unicode(slide)) service_item.title = song.title author_list = [unicode(author.display_name) for author in song.authors] service_item.raw_footer.append(song.title) From 999af73d1463bd15fb686e6575f625b1161eada2 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 16 Jun 2012 17:51:04 +0200 Subject: [PATCH 2/5] variable naming conventions, converted dict to list --- openlp/plugins/bibles/bibleplugin.py | 3 +-- openlp/plugins/bibles/lib/db.py | 1 + openlp/plugins/custom/lib/mediaitem.py | 4 ++-- openlp/plugins/songs/forms/editsongform.py | 27 +++++++++++----------- openlp/plugins/songs/lib/__init__.py | 4 ++++ openlp/plugins/songs/lib/mediaitem.py | 8 +++---- 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index e1209514c..422e2deff 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -63,8 +63,7 @@ class BiblePlugin(Plugin): # unicode(UiStrings().Export)) # Set to invisible until we can export bibles self.exportBibleItem.setVisible(False) - if self.manager.old_bible_databases: - self.toolsUpgradeItem.setVisible(True) + self.toolsUpgradeItem.setVisible(bool(self.manager.old_bible_databases)) def finalise(self): """ diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py index 84a9f81e2..11edd4228 100644 --- a/openlp/plugins/bibles/lib/db.py +++ b/openlp/plugins/bibles/lib/db.py @@ -63,6 +63,7 @@ class Verse(BaseModel): """ pass + def init_schema(url): """ Setup a bible database connection and initialise the database schema. diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index 0beb5a2ed..7b24c0a16 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -211,8 +211,8 @@ class CustomMediaItem(MediaManagerItem): if theme: service_item.theme = theme customXML = CustomXMLParser(customSlide.text) - verseList = customXML.get_verses() - raw_slides = [verse[1] for verse in verseList] + verse_list = customXML.get_verses() + raw_slides = [verse[1] for verse in verse_list] service_item.title = title for slide in raw_slides: service_item.add_from_text(slide) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 226d8baa1..35e287026 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -256,8 +256,8 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): verse_tags_translated = False if self.song.lyrics.startswith(u' Date: Sat, 16 Jun 2012 17:58:38 +0200 Subject: [PATCH 3/5] removed not needed variable --- openlp/plugins/songs/forms/authorsform.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py index 758f76ca8..de82b4dd7 100644 --- a/openlp/plugins/songs/forms/authorsform.py +++ b/openlp/plugins/songs/forms/authorsform.py @@ -57,19 +57,17 @@ class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog): self.firstNameEdit.setFocus() return QtGui.QDialog.exec_(self) - def onFirstNameEditTextEdited(self, text): + def onFirstNameEditTextEdited(self, display_name): if not self._autoDisplayName: return - display_name = text - if self.lastNameEdit.text() != u'': + if not self.lastNameEdit.text(): display_name = display_name + u' ' + self.lastNameEdit.text() self.displayEdit.setText(display_name) - def onLastNameEditTextEdited(self, text): + def onLastNameEditTextEdited(self, display_name): if not self._autoDisplayName: return - display_name = text - if self.firstNameEdit.text() != u'': + if not self.firstNameEdit.text(): display_name = self.firstNameEdit.text() + u' ' + display_name self.displayEdit.setText(display_name) From 49e1713226992c9f00f4c67442439089e4010e67 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 16 Jun 2012 18:02:22 +0200 Subject: [PATCH 4/5] variable fix --- openlp/plugins/custom/lib/mediaitem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index 7b24c0a16..3e25fb6c5 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -210,8 +210,8 @@ class CustomMediaItem(MediaManagerItem): theme = customSlide.theme_name if theme: service_item.theme = theme - customXML = CustomXMLParser(customSlide.text) - verse_list = customXML.get_verses() + custom_xml = CustomXMLParser(customSlide.text) + verse_list = custom_xml.get_verses() raw_slides = [verse[1] for verse in verse_list] service_item.title = title for slide in raw_slides: From 631535acfd326a169f5911875a0a9e5750d7302b Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 16 Jun 2012 18:12:54 +0200 Subject: [PATCH 5/5] another variable fix --- openlp/plugins/songs/forms/editsongform.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 35e287026..81f9006ea 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -480,8 +480,8 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): item = self.verseListWidget.currentItem() if item: temp_text = item.text() - verseId = unicode(item.data(QtCore.Qt.UserRole).toString()) - self.verseForm.setVerse(temp_text, True, verseId) + verse_id = unicode(item.data(QtCore.Qt.UserRole).toString()) + self.verseForm.setVerse(temp_text, True, verse_id) if self.verseForm.exec_(): after_text, verse_tag, verse_num = self.verseForm.getVerse() verse_def = u'%s%s' % (verse_tag, verse_num) @@ -922,9 +922,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): multiple = [] for i in range(self.verseListWidget.rowCount()): item = self.verseListWidget.item(i, 0) - verseId = unicode(item.data(QtCore.Qt.UserRole).toString()) - verse_tag = verseId[0] - verse_num = verseId[1:] + verse_id = unicode(item.data(QtCore.Qt.UserRole).toString()) + verse_tag = verse_id[0] + verse_num = verse_id[1:] sxml.add_verse_to_lyrics(verse_tag, verse_num, unicode(item.text())) if verse_num > u'1' and verse_tag not in multiple: