From fbc048e878e42691e9a8d1276caba45d815103e5 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 31 Aug 2010 18:51:48 +0100 Subject: [PATCH 1/4] Renderer fixes --- openlp/core/lib/renderer.py | 2 +- openlp/core/lib/rendermanager.py | 7 +++++++ openlp/core/ui/servicemanager.py | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 433018c23..5776874cc 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -159,7 +159,7 @@ class Renderer(object): doc = QtGui.QTextDocument() doc.setPageSize(QtCore.QSizeF(self._rect.width(), self._rect.height())) df = doc.defaultFont() - df.setPixelSize(self._theme.font_main_proportion) + df.setPointSize(self._theme.font_main_proportion) df.setFamily(self._theme.font_main_name) main_weight = 50 if self._theme.font_main_weight == u'Bold': diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py index 9caabdc69..6be26bd82 100644 --- a/openlp/core/lib/rendermanager.py +++ b/openlp/core/lib/rendermanager.py @@ -93,6 +93,7 @@ class RenderManager(object): """ self.global_theme = global_theme self.theme_level = theme_level + self.themedata = None def set_service_theme(self, service_theme): """ @@ -102,6 +103,7 @@ class RenderManager(object): The service-level theme to be set. """ self.service_theme = service_theme + self.themedata = None def set_override_theme(self, theme, overrideLevels=False): """ @@ -111,6 +113,10 @@ class RenderManager(object): ``theme`` The name of the song-level theme. None means the service item wants to use the given value. + + ``overrideLevels`` + Used to force the theme data passed in to be used. + """ log.debug(u'set override theme to %s', theme) theme_level = self.theme_level @@ -137,6 +143,7 @@ class RenderManager(object): if self.theme != self.renderer.theme_name or self.themedata is None \ or overrideLevels: log.debug(u'theme is now %s', self.theme) + # Force the theme to be the one passed in. if overrideLevels: self.themedata = theme else: diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index f2961b717..c7d3c497f 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -574,7 +574,7 @@ class ServiceManager(QtGui.QWidget): * An osd which is a pickle of the service items * All image, presentation and video files needed to run the service. """ - log.debug(u'onSaveService') + log.debug(u'onSaveService %s' % quick) if not quick or self.isNew: filename = QtGui.QFileDialog.getSaveFileName(self, translate('OpenLP.ServiceManager', 'Save Service'), @@ -755,6 +755,7 @@ class ServiceManager(QtGui.QWidget): """ Set the theme for the current service """ + log.debug(u'onThemeComboBoxSelected') self.service_theme = unicode(self.themeComboBox.currentText()) self.parent.RenderManager.set_service_theme(self.service_theme) QtCore.QSettings().setValue( @@ -767,6 +768,7 @@ class ServiceManager(QtGui.QWidget): The theme may have changed in the settings dialog so make sure the theme combo box is in the correct state. """ + log.debug(u'themeChange') if self.parent.RenderManager.theme_level == ThemeLevel.Global: self.toolbar.actions[u'ThemeLabel'].setVisible(False) self.toolbar.actions[u'ThemeWidget'].setVisible(False) @@ -779,6 +781,7 @@ class ServiceManager(QtGui.QWidget): Rebuild the service list as things have changed and a repaint is the easiest way to do this. """ + log.debug(u'regenerateServiceItems') # force reset of renderer as theme data has changed self.parent.RenderManager.themedata = None if self.serviceItems: @@ -800,6 +803,7 @@ class ServiceManager(QtGui.QWidget): ``item`` Service Item to be added """ + log.debug(u'addServiceItem') sitem = self.findServiceItem()[0] item.render() if replace: From b24467d32c4d7dd61e3be3ad719a92f6b3bdf06c Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 1 Sep 2010 20:20:40 +0100 Subject: [PATCH 2/4] 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 da8899054976e1e8b0a0a978e3ad6cd74b87d890 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 3 Sep 2010 19:24:11 +0100 Subject: [PATCH 3/4] 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 27dd493d407c5c7a2abdb3e40422bb1cf1f6261d Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 3 Sep 2010 19:33:55 +0100 Subject: [PATCH 4/4] 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):