From edc46f2967755d6b5879e116cf86e196d63d0235 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 9 Feb 2010 16:09:57 +0000 Subject: [PATCH 1/3] Fix songs so tagging can work > 10 verses. Tested with 100! --- openlp/core/ui/slidecontroller.py | 2 +- openlp/plugins/songs/forms/editsongform.py | 2 +- openlp/plugins/songs/lib/mediaitem.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 8a4aebd8c..e88699b71 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -444,7 +444,7 @@ class SlideController(QtGui.QWidget): tag = None #If verse handle verse number else tag only if bits[0] == self.trUtf8('Verse'): - tag = u'%s%s' % (bits[0][0], bits[1][0] ) + tag = u'%s%s' % (bits[0][0], bits[1][0:] ) else: tag = bits[0] try: diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index e06551631..477910108 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -410,7 +410,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.AuthorsListView.setFocus() #split the verse list by space and mark lower case for testing for verse in unicode(self.VerseOrderEdit.text()).lower().split(u' '): - if len(verse) == 2: + if len(verse) > 1: if verse[0:1] == u'v' and verse[1:].isdigit(): pass else: diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index f5fe0686b..7398fe18d 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -310,7 +310,7 @@ class SongMediaItem(MediaManagerItem): for verse in verseList: if verse[1]: if verse[0][u'type'] == "Verse": - if verse[0][u'label'][0] == order[1:]: + if verse[0][u'label'] == order[1:]: verseTag = u'%s:%s' % \ (verse[0][u'type'], verse[0][u'label']) service_item.add_from_text\ From fef898655057d982973103bb19df2cebfe70cb67 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 16 Feb 2010 17:40:41 +0000 Subject: [PATCH 2/3] Fix theme import bug --- openlp/core/ui/alertstab.py | 2 +- openlp/core/ui/thememanager.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/alertstab.py b/openlp/core/ui/alertstab.py index d2e38e048..7efd6acfc 100644 --- a/openlp/core/ui/alertstab.py +++ b/openlp/core/ui/alertstab.py @@ -209,4 +209,4 @@ class AlertsTab(SettingsTab): font.setPointSize(16) self.FontPreview.setFont(font) self.FontPreview.setStyleSheet(u'background-color: %s; color: %s' % \ - (self.bg_color, self.font_color)) \ No newline at end of file + (self.bg_color, self.font_color)) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 0bf005891..8ece41ac2 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -236,7 +236,7 @@ class ThemeManager(QtGui.QWidget): log.info(u'New Themes %s', unicode(files)) if len(files) > 0: for file in files: - self.config.set_last_dir(filename) + self.config.set_last_dir(unicode(file)) self.unzipTheme(file, self.path) self.loadThemes() @@ -343,7 +343,7 @@ class ThemeManager(QtGui.QWidget): self, self.trUtf8('Error'), self.trUtf8('File is not a valid theme!'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) - log.exception(u'Importing theme from zip file failed') + log.exception(u'Importing theme from zip file failed %s' % filename) finally: if zip: zip.close() @@ -400,7 +400,7 @@ class ThemeManager(QtGui.QWidget): newtheme.add_display(unicode(shadow), unicode(theme.ShadowColor.name()), unicode(outline), unicode(theme.OutlineColor.name()), unicode(theme.HorizontalAlign), unicode(theme.VerticalAlign), - unicode(theme.WrapStyle), 0) + unicode(theme.WrapStyle), unicode(0)) return newtheme.extract_xml() def saveTheme(self, name, theme_xml, theme_pretty_xml, image_from, From 959c2469a5c751b4c81169cb4e32d88ad491997f Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Tue, 16 Feb 2010 22:28:35 +0000 Subject: [PATCH 3/3] Fix PowerPoint and PowerPoint viewer screen lookup --- openlp/plugins/presentations/lib/powerpointcontroller.py | 2 +- openlp/plugins/presentations/lib/pptviewcontroller.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index 18b644112..a9775e086 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -208,7 +208,7 @@ class PowerpointController(PresentationController): self.presentation.SlideShowSettings.Run() self.presentation.SlideShowWindow.View.GotoSlide(1) rendermanager = self.plugin.render_manager - rect = rendermanager.screen_list[rendermanager.current_display][u'size'] + rect = rendermanager.screens.current[u'size'] self.presentation.SlideShowWindow.Top = rect.y() * 72 / dpi self.presentation.SlideShowWindow.Height = rect.height() * 72 / dpi self.presentation.SlideShowWindow.Left = rect.x() * 72 / dpi diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py index 0cf2405f1..2ed457fc0 100644 --- a/openlp/plugins/presentations/lib/pptviewcontroller.py +++ b/openlp/plugins/presentations/lib/pptviewcontroller.py @@ -108,7 +108,7 @@ class PptviewController(PresentationController): if self.pptid >= 0: self.close_presentation() rendermanager = self.plugin.render_manager - rect = rendermanager.screen_list[rendermanager.current_display][u'size'] + rect = rendermanager.screens.current[u'size'] rect = RECT(rect.x(), rect.y(), rect.right(), rect.bottom()) filepath = str(presentation.replace(u'/', u'\\')); try: