From d0bcc06d35493e59719522e824e1f83775ca2681 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 22 May 2009 20:36:16 +0100 Subject: [PATCH] more changes and fixes --- openlp/core/lib/renderer.py | 4 ++++ openlp/plugins/bibles/lib/mediaitem.py | 4 ++-- openlp/plugins/images/lib/listwithpreviews.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index ac67fa3a3..fc9c5a785 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -202,6 +202,7 @@ class Renderer: bboxes = [] for line in lines: bboxes.append(self._render_single_line(line, footer)) + print line, bboxes numlines = len(lines) bottom = self._rect.bottom() @@ -214,6 +215,8 @@ class Renderer: by = 0 for (x, y) in bboxes[startline:endline]: by += y + print by + print by , bottom if by > bottom: good=0 break @@ -221,6 +224,7 @@ class Renderer: endline = startline+ratio # if good == 1: # break + print "---------" retval = [] numlines_per_page = ratio diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index e1d2c8a3a..21e9a5ede 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -54,7 +54,7 @@ class BibleMediaItem(MediaManagerItem): This is the custom media manager item for Bibles. """ global log - log=logging.getLogger(u'BibleMediaItem') + log = logging.getLogger(u'BibleMediaItem') log.info(u'Bible Media Item loaded') def __init__(self, parent, icon, title): @@ -204,7 +204,7 @@ class BibleMediaItem(MediaManagerItem): self.BibleListView.setAlternatingRowColors(True) self.BibleListData = TextListData() self.BibleListView.setModel(self.BibleListData) - self.BibleListView.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) + self.BibleListView.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection) self.BibleListView.setDragEnabled(True) self.PageLayout.addWidget(self.BibleListView) diff --git a/openlp/plugins/images/lib/listwithpreviews.py b/openlp/plugins/images/lib/listwithpreviews.py index 51acc394f..66004b77f 100644 --- a/openlp/plugins/images/lib/listwithpreviews.py +++ b/openlp/plugins/images/lib/listwithpreviews.py @@ -89,7 +89,7 @@ class ListWithPreviews(QtCore.QAbstractListModel): else: retval = QtCore.QVariant() if type(retval) is not type(QtCore.QVariant): - return QVariant(retval) + return QtCore.QVariant(retval) else: return retval