forked from openlp/openlp
Cleanup from rendering changes
This commit is contained in:
parent
ae7f914aab
commit
6ebd1d9e60
@ -206,7 +206,7 @@ class RenderManager(object):
|
||||
footer.append(u'Public Domain')
|
||||
footer.append(u'CCLI 123456')
|
||||
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):
|
||||
"""
|
||||
|
@ -293,7 +293,7 @@ class ServiceItem(object):
|
||||
if self.service_item_type == ServiceItemType.Text:
|
||||
return self.render_individual(row)
|
||||
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):
|
||||
"""
|
||||
|
@ -198,7 +198,7 @@ class MainDisplay(DisplayWidget):
|
||||
self.displayAlert()
|
||||
elif not self.displayBlank:
|
||||
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.repaint()
|
||||
self.display.setPixmap(QtGui.QPixmap.fromImage(frame[u'trans']))
|
||||
|
Loading…
Reference in New Issue
Block a user