From cf56b143832a6706f2ecb0e1b10ab943ef7047bc Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 5 Aug 2009 18:59:37 +0100 Subject: [PATCH] Fix errors in Italic handling Add delay to get screen refresh workig --- openlp/core/lib/renderer.py | 4 ++-- openlp/core/lib/themexmlhandler.py | 2 +- openlp/plugins/bibles/lib/mediaitem.py | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 87c8dd141..c24ee07b4 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -167,7 +167,7 @@ class Renderer(object): #take the width work out approx how many characters and add 50% line_width = self._rect.width() - self._right_margin #number of lines on a page - adjust for rounding up. - print self._rect.height() , metrics.height(), int(self._rect.height() / metrics.height()) + #print self._rect.height() , metrics.height(), int(self._rect.height() / metrics.height()) page_length = int(self._rect.height() / metrics.height()) - 1 ave_line_width = line_width / metrics.averageCharWidth() # print "A", ave_line_width @@ -212,7 +212,7 @@ class Renderer(object): else: split_lines.append(line) line = u'' - print "I", split_lines, page_length + #print "I", split_lines, page_length for line in split_lines: page.append(line) if len(page) == page_length: diff --git a/openlp/core/lib/themexmlhandler.py b/openlp/core/lib/themexmlhandler.py index c5ba6ff99..accd9cf53 100644 --- a/openlp/core/lib/themexmlhandler.py +++ b/openlp/core/lib/themexmlhandler.py @@ -161,7 +161,7 @@ class ThemeXML(object): #Create Filename element self.child_element(background, u'filename', filename) - def add_font(self, name, color, proportion, override, fonttype=u'main', weight=u'Bold', italics=False, + def add_font(self, name, color, proportion, override, fonttype=u'main', weight=u'Normal', italics=u'False', xpos=0, ypos=0, width=0, height=0): """ Add a Font. diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 34c166854..ea335494e 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -20,6 +20,7 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ import logging +import time from PyQt4 import QtCore, QtGui @@ -268,6 +269,8 @@ class BibleMediaItem(MediaManagerItem): def setQuickMsg2(self, text): self.QuickMsg2.setText(translate(u'BibleMediaItem', unicode(text))) Receiver().send_message(u'openlpprocessevents') + #minor delay to get the events processed + time.sleep(0.5) def loadBibles(self): log.debug(u'Loading Bibles')