From 44f3e02a5c8a4bbca12ce930ca08d078f119e955 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 26 Mar 2010 08:49:26 +0000 Subject: [PATCH 1/2] Fix outline rendering bug --- openlp/core/lib/renderer.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 41b25df0a..39fcf9aa7 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -505,7 +505,7 @@ class Renderer(object): self.mainFont.setPixelSize(self._theme.font_main_proportion) def _get_extent_and_render(self, line, footer, tlcorner=(0, 0), draw=False, - color=None, outline_size=None, outline_color=None): + color=None, outline_size=0, outline_color=None): """ Find bounding box of text - as render_single_line. If draw is set, actually draw the text to the current DC as well return width and @@ -544,21 +544,23 @@ class Renderer(object): else: pen = QtGui.QColor(color) x, y = tlcorner - if outline_size: + if self._theme.display_outline: path = QtGui.QPainterPath() path.addText(QtCore.QPointF(x, y + metrics.ascent()), font, line) self.painter.setBrush(self.painter.pen().brush()) - self.painter.setPen(QtGui.QPen(QtGui.QColor(outline_color), outline_size)) + self.painter.setPen(QtGui.QPen( + QtGui.QColor(self._theme.display_outline_color), outline_size)) self.painter.drawPath(path) self.painter.setPen(pen) self.painter.drawText(x, y + metrics.ascent(), line) if self._theme.display_slideTransition: # Print 2nd image with 70% weight - if outline_size: + if self._theme.display_outline: path = QtGui.QPainterPath() path.addText(QtCore.QPointF(x, y + metrics.ascent()), font, line) self.painter2.setBrush(self.painter2.pen().brush()) - self.painter2.setPen(QtGui.QPen(QtGui.QColor(outline_color), outline_size)) + self.painter2.setPen(QtGui.QPen( + QtGui.QColor(self._theme.display_outline_color), outline_size)) self.painter2.drawPath(path) self.painter2.setFont(font) self.painter2.setPen(pen) From d4717c4809e72aff174d3f9ed65c8b276b274b22 Mon Sep 17 00:00:00 2001 From: Michael Gorven Date: Fri, 26 Mar 2010 17:14:52 +0200 Subject: [PATCH 2/2] Correct .desktop file syntax so that rpmbuild doesn't fail. --- resources/openlp.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/openlp.desktop b/resources/openlp.desktop index 8791c2d8f..0c843bd69 100644 --- a/resources/openlp.desktop +++ b/resources/openlp.desktop @@ -5,6 +5,6 @@ GenericName=Church lyrics projection Exec=openlp Icon=openlp StartupNotify=true -Terminal=False +Terminal=false Type=Application -Categories=AudioVideo +Categories=AudioVideo;