raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup from rendering changes

Browse Source
This commit is contained in:
Tim Bentley 2009-12-01 17:02:18 +00:00
parent ae7f914aab
commit 6ebd1d9e60
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/rendermanager.py
View File

@ -206,7 +206,7 @@ class RenderManager(object):
footer.append(u'Public Domain') footer.append(u'Public Domain')
footer.append(u'CCLI 123456') footer.append(u'CCLI 123456')
formatted = self.renderer.format_slide(verse, False) formatted = self.renderer.format_slide(verse, False)
return self.renderer.generate_frame_from_lines(formatted[0], footer) return self.renderer.generate_frame_from_lines(formatted[0], footer)[u'main']
def format_slide(self, words): def format_slide(self, words):
""" """

2
openlp/core/lib/serviceitem.py
View File

@ -293,7 +293,7 @@ class ServiceItem(object):
if self.service_item_type == ServiceItemType.Text: if self.service_item_type == ServiceItemType.Text:
return self.render_individual(row) return self.render_individual(row)
else: else:
return self._raw_frames[row][u'image'] return {u'main':self._raw_frames[row][u'image'], u'trans':None}
def get_frame_title(self, row=0): def get_frame_title(self, row=0):
""" """

2
openlp/core/ui/maindisplay.py
View File

@ -198,7 +198,7 @@ class MainDisplay(DisplayWidget):
self.displayAlert() self.displayAlert()
elif not self.displayBlank: elif not self.displayBlank:
if transition: if transition:
if self.hasTransition: if self.hasTransition and self.frame[u'trans'] is not None:
self.display.setPixmap(QtGui.QPixmap.fromImage(self.frame[u'trans'])) self.display.setPixmap(QtGui.QPixmap.fromImage(self.frame[u'trans']))
self.repaint() self.repaint()
self.display.setPixmap(QtGui.QPixmap.fromImage(frame[u'trans'])) self.display.setPixmap(QtGui.QPixmap.fromImage(frame[u'trans']))