diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 194172a9e..f97575c5e 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -87,7 +87,7 @@ class Renderer(object): """ log.debug(u'set_text_rectangle %s , %s' % (rect_main, rect_footer)) self._rect = rect_main - self._rect_footer = rect_footer + self._rect_footer = rect_footer self.page_width = self._rect.width() self.page_height = self._rect.height() if self._theme.display_shadow: @@ -102,7 +102,7 @@ class Renderer(object): u'*{margin: 0; padding: 0; border: 0;} '\ u'#main {position:absolute; top:0px; %s %s}' \ u'
' % \ - (build_lyrics_format_css(self._theme, self.page_width, + (build_lyrics_format_css(self._theme, self.page_width, self.page_height), build_lyrics_outline_css(self._theme)) def set_frame_dest(self, frame_width, frame_height): @@ -125,7 +125,7 @@ class Renderer(object): self.frame.width(), self.frame.height()) if self._theme.background_type == u'image': self.bg_frame = QtGui.QImage(self.frame.width(), - self.frame.height(), + self.frame.height(), QtGui.QImage.Format_ARGB32_Premultiplied) painter = QtGui.QPainter() painter.begin(self.bg_frame) diff --git a/openlp/core/lib/spelltextedit.py b/openlp/core/lib/spelltextedit.py index 7d227079b..07e8ad728 100644 --- a/openlp/core/lib/spelltextedit.py +++ b/openlp/core/lib/spelltextedit.py @@ -28,6 +28,7 @@ import re import sys try: import enchant + from enchant import DictNotFoundError enchant_available = True except ImportError: enchant_available = False @@ -43,7 +44,10 @@ class SpellTextEdit(QtGui.QPlainTextEdit): QtGui.QPlainTextEdit.__init__(self, *args) # Default dictionary based on the current locale. if enchant_available: - self.dict = enchant.Dict() + try: + self.dict = enchant.Dict() + except DictNotFoundError: + self.dict = enchant.Dict(u'en_US') self.highlighter = Highlighter(self.document()) self.highlighter.setDict(self.dict) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index f1f566f5c..3e49aaf92 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -122,12 +122,12 @@ class MainDisplay(DisplayWidget): self.scene = QtGui.QGraphicsScene(self) self.setScene(self.scene) self.scene.addItem(self.webView) - self.webView.setGeometry(QtCore.QRectF(0, 0, + self.webView.setGeometry(QtCore.QRectF(0, 0, self.screen[u'size'].width(), self.screen[u'size'].height())) except AttributeError: # QGraphicsWebView a recent addition, so fall back to QWebView self.webView = QtWebKit.QWebView(self) - self.webView.setGeometry(0, 0, + self.webView.setGeometry(0, 0, self.screen[u'size'].width(), self.screen[u'size'].height()) self.page = self.webView.page() self.frame = self.page.mainFrame() @@ -164,7 +164,7 @@ class MainDisplay(DisplayWidget): - splash_image.height()) / 2, splash_image) serviceItem = ServiceItem() - serviceItem.bg_frame = initialFrame + serviceItem.bg_image_bytes = image_to_byte(initialFrame) self.webView.setHtml(build_html(serviceItem, self.screen, self.parent.alertTab, self.isLive)) self.initialFrame = True @@ -326,8 +326,12 @@ class MainDisplay(DisplayWidget): # Important otherwise first preview will miss the background ! while not self.loaded: Receiver.send_message(u'openlp_process_events') + # if was hidden keep it hidden if self.isLive: self.setVisible(True) + # if was hidden keep it hidden + if self.hide_mode and self.isLive: + self.hideDisplay(self.hide_mode) preview = QtGui.QImage(self.screen[u'size'].width(), self.screen[u'size'].height(), QtGui.QImage.Format_ARGB32_Premultiplied) @@ -335,7 +339,6 @@ class MainDisplay(DisplayWidget): painter.setRenderHint(QtGui.QPainter.Antialiasing) self.frame.render(painter) painter.end() - # Make display show up if in single screen mode return preview def buildHtml(self, serviceItem): diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 8db14956d..e6e2388df 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -383,20 +383,20 @@ class ServiceManager(QtGui.QWidget): serviceIterator = QtGui.QTreeWidgetItemIterator(self.serviceManagerList) tempItem = None setLastItem = False - while serviceIterator: - if serviceIterator.isSelected() and tempItem is None: + while serviceIterator.value(): + if serviceIterator.value().isSelected() and tempItem is None: setLastItem = True - serviceIterator.setSelected(False) - if serviceIterator.isSelected(): - #We are on the first record + serviceIterator.value().setSelected(False) + if serviceIterator.value().isSelected(): + # We are on the first record if tempItem: tempItem.setSelected(True) - serviceIterator.setSelected(False) + serviceIterator.value().setSelected(False) else: - tempItem = serviceIterator - lastItem = serviceIterator - ++serviceIterator - #Top Item was selected so set the last one + tempItem = serviceIterator.value() + lastItem = serviceIterator.value() + serviceIterator += 1 + # Top Item was selected so set the last one if setLastItem: lastItem.setSelected(True) @@ -406,16 +406,18 @@ class ServiceManager(QtGui.QWidget): Called by the down arrow """ serviceIterator = QtGui.QTreeWidgetItemIterator(self.serviceManagerList) - firstItem = serviceIterator + firstItem = None setSelected = False - while serviceIterator: + while serviceIterator.value(): + if not firstItem: + firstItem = serviceIterator.value() if setSelected: setSelected = False - serviceIterator.setSelected(True) - elif serviceIterator.isSelected(): - serviceIterator.setSelected(False) + serviceIterator.value().setSelected(True) + elif serviceIterator.value() and serviceIterator.value().isSelected(): + serviceIterator.value().setSelected(False) setSelected = True - ++serviceIterator + serviceIterator += 1 if setSelected: firstItem.setSelected(True) diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py index 9e1da2267..b8a829b37 100644 --- a/openlp/plugins/alerts/alertsplugin.py +++ b/openlp/plugins/alerts/alertsplugin.py @@ -40,7 +40,7 @@ class AlertsPlugin(Plugin): log.info(u'Alerts Plugin loaded') def __init__(self, plugin_helpers): - Plugin.__init__(self, u'Alerts', u'1.9.2', plugin_helpers) + Plugin.__init__(self, u'Alerts', u'1.9.3', plugin_helpers) self.weight = -3 self.icon = build_icon(u':/plugins/plugin_alerts.png') self.alertsmanager = AlertsManager(self) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index da542b23b..7f69c6ff0 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -37,7 +37,7 @@ class BiblePlugin(Plugin): log.info(u'Bible Plugin loaded') def __init__(self, plugin_helpers): - Plugin.__init__(self, u'Bibles', u'1.9.2', plugin_helpers) + Plugin.__init__(self, u'Bibles', u'1.9.3', plugin_helpers) self.weight = -9 self.icon_path = u':/plugins/plugin_bibles.png' self.icon = build_icon(self.icon_path) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index fa954d2a0..dcf7589d3 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -376,9 +376,6 @@ class BibleMediaItem(MediaManagerItem): def onSearchProgressShow(self): self.SearchProgress.setVisible(True) Receiver.send_message(u'openlp_process_events') - #self.SearchProgress.setMinimum(0) - #self.SearchProgress.setMaximum(2) - #self.SearchProgress.setValue(1) def onSearchProgressHide(self): self.SearchProgress.setVisible(False) diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py index 4e3819961..523ccb061 100644 --- a/openlp/plugins/custom/customplugin.py +++ b/openlp/plugins/custom/customplugin.py @@ -47,7 +47,7 @@ class CustomPlugin(Plugin): log.info(u'Custom Plugin loaded') def __init__(self, plugin_helpers): - Plugin.__init__(self, u'Custom', u'1.9.2', plugin_helpers) + Plugin.__init__(self, u'Custom', u'1.9.3', plugin_helpers) self.weight = -5 self.custommanager = Manager(u'custom', init_schema) self.edit_custom_form = EditCustomForm(self.custommanager) diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py index d34cd6a3c..7f910f395 100644 --- a/openlp/plugins/images/imageplugin.py +++ b/openlp/plugins/images/imageplugin.py @@ -35,7 +35,7 @@ class ImagePlugin(Plugin): log.info(u'Image Plugin loaded') def __init__(self, plugin_helpers): - Plugin.__init__(self, u'Images', u'1.9.2', plugin_helpers) + Plugin.__init__(self, u'Images', u'1.9.3', plugin_helpers) self.weight = -7 self.icon_path = u':/plugins/plugin_images.png' self.icon = build_icon(self.icon_path) diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py index db326f843..e50333eb2 100644 --- a/openlp/plugins/media/mediaplugin.py +++ b/openlp/plugins/media/mediaplugin.py @@ -37,7 +37,7 @@ class MediaPlugin(Plugin): log.info(u'%s MediaPlugin loaded', __name__) def __init__(self, plugin_helpers): - Plugin.__init__(self, u'Media', u'1.9.2', plugin_helpers) + Plugin.__init__(self, u'Media', u'1.9.3', plugin_helpers) self.weight = -6 self.icon_path = u':/plugins/plugin_media.png' self.icon = build_icon(self.icon_path) diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index e63063ffd..ada695625 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -51,7 +51,7 @@ class PresentationPlugin(Plugin): """ log.debug(u'Initialised') self.controllers = {} - Plugin.__init__(self, u'Presentations', u'1.9.2', plugin_helpers) + Plugin.__init__(self, u'Presentations', u'1.9.3', plugin_helpers) self.weight = -8 self.icon_path = u':/plugins/plugin_presentations.png' self.icon = build_icon(self.icon_path) diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py index 59ad9a99c..927a706a3 100644 --- a/openlp/plugins/remotes/remoteplugin.py +++ b/openlp/plugins/remotes/remoteplugin.py @@ -38,7 +38,7 @@ class RemotesPlugin(Plugin): """ remotes constructor """ - Plugin.__init__(self, u'Remotes', u'1.9.2', plugin_helpers) + Plugin.__init__(self, u'Remotes', u'1.9.3', plugin_helpers) self.icon = build_icon(u':/plugins/plugin_remote.png') self.weight = -1 self.server = None diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 0064be23a..c1fe3a91a 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -50,7 +50,7 @@ class SongsPlugin(Plugin): """ Create and set up the Songs plugin. """ - Plugin.__init__(self, u'Songs', u'1.9.2', plugin_helpers) + Plugin.__init__(self, u'Songs', u'1.9.3', plugin_helpers) self.weight = -10 self.manager = Manager(u'songs', init_schema) self.icon_path = u':/plugins/plugin_songs.png' diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index c8dfd06fc..f0eb1f73d 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -41,7 +41,7 @@ class SongUsagePlugin(Plugin): log.info(u'SongUsage Plugin loaded') def __init__(self, plugin_helpers): - Plugin.__init__(self, u'SongUsage', u'1.9.2', plugin_helpers) + Plugin.__init__(self, u'SongUsage', u'1.9.3', plugin_helpers) self.weight = -4 self.icon = build_icon(u':/plugins/plugin_songusage.png') self.songusagemanager = None