From 45367eaab29e7a57d8c814bb9dc3a2bfba203771 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 3 Jan 2011 19:50:25 +0000 Subject: [PATCH 1/8] Update text and guard video backgrounds --- openlp/plugins/images/lib/mediaitem.py | 4 ++-- openlp/plugins/media/lib/mediaitem.py | 12 ++++++++++-- openlp/plugins/media/mediaplugin.py | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index ccc432931..be265d6a9 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -219,8 +219,8 @@ class ImageMediaItem(MediaManagerItem): self.parent.liveController.display.directImage(name, filename) else: QtGui.QMessageBox.critical(self, - translate('ImagePlugin.MediaItem', 'Live Background Could ' - 'Not Be Replaced'), + translate('ImagePlugin.MediaItem', 'Live background could ' + 'not be replaced.'), unicode(translate('ImagePlugin.MediaItem', 'The image %s no longer exists.')) % filename) self.resetButton.setVisible(True) diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 49b26446f..2aba21356 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -108,11 +108,19 @@ class MediaMediaItem(MediaManagerItem): def onReplaceClick(self): if check_item_selected(self.listView, - translate('ImagePlugin.MediaItem', + translate('MediaPlugin.MediaItem', 'You must select a media file to replace the background with.')): item = self.listView.currentItem() filename = unicode(item.data(QtCore.Qt.UserRole).toString()) - self.parent.liveController.display.video(filename, 0, True) + if os.path.exists(filename): + (path, name) = os.path.split(filename) + self.parent.liveController.display.video(filename, 0, True) + else: + QtGui.QMessageBox.critical(self, + translate('MediaPlugin.MediaItem', 'Live background could ' + 'not be replaced.'), + unicode(translate('ImagePlugin.MediaItem', + 'The media file %s no longer exists.')) % filename) self.resetButton.setVisible(True) def generateSlideData(self, service_item, item=None, xmlVersion=False): diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py index 64caaa0de..ad6087daf 100644 --- a/openlp/plugins/media/mediaplugin.py +++ b/openlp/plugins/media/mediaplugin.py @@ -79,7 +79,7 @@ class MediaPlugin(Plugin): return MediaTab(self.name) def getMediaManagerItem(self): - # Create the MediaManagerItem object + # Create the MediaManagerItem object. return MediaMediaItem(self, self, self.icon) def about(self): From 9763a43f552c06a6d73f2b4660fc8897695432b0 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 4 Jan 2011 16:51:11 +0100 Subject: [PATCH 2/8] removed not supported html tags --- openlp/plugins/songs/lib/songbeamerimport.py | 25 +++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/openlp/plugins/songs/lib/songbeamerimport.py b/openlp/plugins/songs/lib/songbeamerimport.py index f30c40a09..12ff53428 100644 --- a/openlp/plugins/songs/lib/songbeamerimport.py +++ b/openlp/plugins/songs/lib/songbeamerimport.py @@ -27,10 +27,11 @@ The :mod:`songbeamerimport` module provides the functionality for importing SongBeamer songs into the OpenLP database. """ -import logging -import os import chardet import codecs +import logging +import os +import re from openlp.core.lib import translate from openlp.plugins.songs.lib.songimport import SongImport @@ -151,23 +152,25 @@ class SongBeamerImport(SongImport): (u'', u'{/it}'), (u'', u'{u}'), (u'', u'{/u}'), - (u'
', u'{st}'), - (u'
', u'{st}'), - (u'', u'{st}'), (u'

', u'{p}'), (u'

', u'{/p}'), (u'', u'{su}'), (u'', u'{/su}'), (u'', u'{sb}'), (u'', u'{/sb}'), - (u'', u''), - (u'', u''), - (u'', u''), - (u'', u'') + (u'<[/]?br.*?>', u'{st}'), + (u'<[/]?wordwrap>', u''), + (u'<[/]?strike>', u''), + (u'<[/]?h.*?>', u''), + (u'<[/]?s.*?>', u''), + (u'<[/]?linespacing.*?>', u''), + (u'<[/]?c.*?>', u''), + (u'', u''), + (u'', u'') ] for pair in tag_pairs: - self.current_verse = self.current_verse.replace(pair[0], pair[1]) - # TODO: check for unsupported tags (see wiki) and remove them as well. + self.current_verse = re.compile(pair[0]).sub(pair[1], + self.current_verse) def parse_tags(self, line): """ From f9954fac80fb30d2cfffa0db40f78140dc42a371 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 4 Jan 2011 17:36:22 +0000 Subject: [PATCH 3/8] Add comment to force update --- openlp/plugins/images/lib/mediaitem.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index be265d6a9..5afb02f10 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -208,6 +208,9 @@ class ImageMediaItem(MediaManagerItem): self.parent.liveController.display.resetImage() def onReplaceClick(self): + """ + Called to replace Live backgound with the video selected + """ if check_item_selected(self.listView, translate('ImagePlugin.MediaItem', 'You must select an image to replace the background with.')): From 803d55c2ec289f540d2ea6aa18293c94afd0cf90 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 5 Jan 2011 07:07:19 +0000 Subject: [PATCH 4/8] Change message code --- openlp/plugins/media/lib/mediaitem.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 2aba21356..26bc6590c 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \ ItemCapabilities, SettingsManager, translate, check_item_selected, \ - context_menu_action + context_menu_action, Receiver log = logging.getLogger(__name__) @@ -116,11 +116,11 @@ class MediaMediaItem(MediaManagerItem): (path, name) = os.path.split(filename) self.parent.liveController.display.video(filename, 0, True) else: - QtGui.QMessageBox.critical(self, - translate('MediaPlugin.MediaItem', 'Live background could ' - 'not be replaced.'), - unicode(translate('ImagePlugin.MediaItem', - 'The media file %s no longer exists.')) % filename) + Receiver.send_message(u'openlp_error_message', { + u'title': translate('MediaPlugin.MediaItem', + 'Live background could not be replaced.'), + u'message': unicode(translate('ImagePlugin.MediaItem', + 'The media file %s no longer exists.')) % filename}) self.resetButton.setVisible(True) def generateSlideData(self, service_item, item=None, xmlVersion=False): From 38e72ca1379f534ee61b7117ad686ca17a1f7dbc Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 5 Jan 2011 07:18:12 +0000 Subject: [PATCH 5/8] Change message code --- openlp/plugins/images/lib/mediaitem.py | 12 ++++++------ openlp/plugins/media/lib/mediaitem.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 5afb02f10..d6537a37b 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \ context_menu_action, ItemCapabilities, SettingsManager, translate, \ - check_item_selected + check_item_selected, Receiver from openlp.core.utils import AppLocation, get_images_filter log = logging.getLogger(__name__) @@ -221,11 +221,11 @@ class ImageMediaItem(MediaManagerItem): (path, name) = os.path.split(filename) self.parent.liveController.display.directImage(name, filename) else: - QtGui.QMessageBox.critical(self, - translate('ImagePlugin.MediaItem', 'Live background could ' - 'not be replaced.'), - unicode(translate('ImagePlugin.MediaItem', - 'The image %s no longer exists.')) % filename) + Receiver.send_message(u'openlp_error_message', { + u'title': translate('ImagePlugin.MediaItem', + 'Live background could not be replaced.'), + u'message': unicode(translate('ImagePlugin.MediaItem', + 'The image file %s no longer exists.')) % filename}) self.resetButton.setVisible(True) def onPreviewClick(self): diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 26bc6590c..c65564c12 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -119,7 +119,7 @@ class MediaMediaItem(MediaManagerItem): Receiver.send_message(u'openlp_error_message', { u'title': translate('MediaPlugin.MediaItem', 'Live background could not be replaced.'), - u'message': unicode(translate('ImagePlugin.MediaItem', + u'message': unicode(translate('MediaPlugin.MediaItem', 'The media file %s no longer exists.')) % filename}) self.resetButton.setVisible(True) From 13732b5bd11ccdeede1e9363e79e5a5a8a1174d8 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 5 Jan 2011 16:06:56 +0000 Subject: [PATCH 6/8] Speed up theme load and stop display being set incorrectly for images Fixes: https://launchpad.net/bugs/697405 --- openlp/core/ui/themeform.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index 5c9517b0e..382ff3b99 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -435,8 +435,10 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): """ Background style Combo box has changed. """ - self.theme.background_type = BackgroundType.to_string(index) - self.setBackgroundPageValues() + # do not allow updates when screen is building for the first time. + if self.updateThemeAllowed: + self.theme.background_type = BackgroundType.to_string(index) + self.setBackgroundPageValues() def onGradientComboBoxCurrentIndexChanged(self, index): """ From d97414e4e9ad8938f68702b270c82ec33d4a28a5 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 5 Jan 2011 16:15:08 +0000 Subject: [PATCH 7/8] Fix title Camels --- openlp/plugins/images/lib/mediaitem.py | 2 +- openlp/plugins/media/lib/mediaitem.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index d6537a37b..ee1138f33 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -223,7 +223,7 @@ class ImageMediaItem(MediaManagerItem): else: Receiver.send_message(u'openlp_error_message', { u'title': translate('ImagePlugin.MediaItem', - 'Live background could not be replaced.'), + 'Live Background Could Not Be Replaced.'), u'message': unicode(translate('ImagePlugin.MediaItem', 'The image file %s no longer exists.')) % filename}) self.resetButton.setVisible(True) diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index c65564c12..397810cb6 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -118,7 +118,7 @@ class MediaMediaItem(MediaManagerItem): else: Receiver.send_message(u'openlp_error_message', { u'title': translate('MediaPlugin.MediaItem', - 'Live background could not be replaced.'), + 'Live Background Could Not Be Replaced.'), u'message': unicode(translate('MediaPlugin.MediaItem', 'The media file %s no longer exists.')) % filename}) self.resetButton.setVisible(True) From b36ff5107a16839d286bcb3387b19e67f5900d18 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 5 Jan 2011 18:27:39 +0000 Subject: [PATCH 8/8] Fix text yet again --- openlp/plugins/images/lib/mediaitem.py | 5 +++-- openlp/plugins/media/lib/mediaitem.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index ee1138f33..216f379ac 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -223,9 +223,10 @@ class ImageMediaItem(MediaManagerItem): else: Receiver.send_message(u'openlp_error_message', { u'title': translate('ImagePlugin.MediaItem', - 'Live Background Could Not Be Replaced.'), + 'Live Background Error'), u'message': unicode(translate('ImagePlugin.MediaItem', - 'The image file %s no longer exists.')) % filename}) + 'There was a problem replacing your background, ' + 'the image file %s no longer exists.')) % filename}) self.resetButton.setVisible(True) def onPreviewClick(self): diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 397810cb6..0eff0cc7f 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -118,9 +118,10 @@ class MediaMediaItem(MediaManagerItem): else: Receiver.send_message(u'openlp_error_message', { u'title': translate('MediaPlugin.MediaItem', - 'Live Background Could Not Be Replaced.'), + 'Live Background Error'), u'message': unicode(translate('MediaPlugin.MediaItem', - 'The media file %s no longer exists.')) % filename}) + 'There was a problem replacing your background, ' + 'the media file %s no longer exists.')) % filename}) self.resetButton.setVisible(True) def generateSlideData(self, service_item, item=None, xmlVersion=False):