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

ServiceItem cleanup - hide lists

This commit is contained in:
Tim Bentley 2009-11-14 09:02:30 +00:00
parent e618c3061c
commit ad6abb1e9c
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,13 +101,11 @@ class ServiceItem(object):
before = time.time() before = time.time()
formated = self.RenderManager.format_slide(slide[u'raw_slide']) formated = self.RenderManager.format_slide(slide[u'raw_slide'])
for format in formated: for format in formated:
frame = None
lines = u'' lines = u''
for line in format: for line in format:
lines += line + u'\n' lines += line + u'\n'
title = lines.split(u'\n')[0] title = lines.split(u'\n')[0]
self.display_frames.append({u'title': title, u'text': lines, self.display_frames.append({u'title': title, u'text': lines})
u'image': frame})
log.info(u'Formatting took %4s' % (time.time() - before)) log.info(u'Formatting took %4s' % (time.time() - before))
elif self.service_item_type == ServiceItemType.Command: elif self.service_item_type == ServiceItemType.Command:
self.display_frames = self.raw_frames self.display_frames = self.raw_frames
@ -115,7 +113,6 @@ class ServiceItem(object):
for slide in self.raw_frames: for slide in self.raw_frames:
slide[u'image'] = \ slide[u'image'] = \
self.RenderManager.resize_image(slide[u'image']) self.RenderManager.resize_image(slide[u'image'])
self.display_frames = self.raw_frames
else: else:
log.error(u'Invalid value renderer :%s' % self.service_item_type) log.error(u'Invalid value renderer :%s' % self.service_item_type)
@ -151,7 +148,7 @@ class ServiceItem(object):
self.service_item_type = ServiceItemType.Image self.service_item_type = ServiceItemType.Image
self.service_item_path = path self.service_item_path = path
self.raw_frames.append( self.raw_frames.append(
{u'title': title, u'text': None, u'image': image}) {u'title': title, u'image': image})
def add_from_text(self, title, raw_slide): def add_from_text(self, title, raw_slide):
""" """
@ -184,7 +181,7 @@ class ServiceItem(object):
self.service_item_type = ServiceItemType.Command self.service_item_type = ServiceItemType.Command
self.service_item_path = path self.service_item_path = path
self.raw_frames.append( self.raw_frames.append(
{u'title': file_name, u'command': None, u'text':None, u'image': image}) {u'title': file_name, u'image': image})
def get_service_repr(self): def get_service_repr(self):
""" """
@ -284,4 +281,13 @@ class ServiceItem(object):
return self.service_item_type == ServiceItemType.Text return self.service_item_type == ServiceItemType.Text
def getFrames(self): def getFrames(self):
return self.display_frames if self.service_item_type == ServiceItemType.Text:
return self.display_frames
else:
return self.raw_frames
def get_rendered_frame(self, row):
if self.service_item_type == ServiceItemType.Text:
return self.render_individual(row)
else:
return self.raw_frames[row][u'image']

13
openlp/core/ui/slidecontroller.py
View File

@ -364,7 +364,7 @@ class SlideController(QtGui.QWidget):
self.Songbar.setVisible(True) self.Songbar.setVisible(True)
elif item.isImage(): elif item.isImage():
#Not sensible to allow loops with 1 frame #Not sensible to allow loops with 1 frame
if len(item.frames) > 1: if len(item.getFrames()) > 1:
self.Toolbar.makeWidgetsVisible(self.image_list) self.Toolbar.makeWidgetsVisible(self.image_list)
elif item.isMedia(): elif item.isMedia():
self.Toolbar.setVisible(False) self.Toolbar.setVisible(False)
@ -463,7 +463,7 @@ class SlideController(QtGui.QWidget):
item = QtGui.QTableWidgetItem() item = QtGui.QTableWidgetItem()
slide_height = 0 slide_height = 0
#It is a Image #It is a Image
if frame[u'text'] is None: if not self.serviceitem.isText():
label = QtGui.QLabel() label = QtGui.QLabel()
label.setMargin(4) label.setMargin(4)
pixmap = self.parent.RenderManager.resize_image(frame[u'image']) pixmap = self.parent.RenderManager.resize_image(frame[u'image'])
@ -476,7 +476,7 @@ class SlideController(QtGui.QWidget):
self.PreviewListWidget.setItem(framenumber, 0, item) self.PreviewListWidget.setItem(framenumber, 0, item)
if slide_height != 0: if slide_height != 0:
self.PreviewListWidget.setRowHeight(framenumber, slide_height) self.PreviewListWidget.setRowHeight(framenumber, slide_height)
if self.serviceitem.getFrames()[0][u'text']: if self.serviceitem.isText():
self.PreviewListWidget.resizeRowsToContents() self.PreviewListWidget.resizeRowsToContents()
self.PreviewListWidget.setColumnWidth( self.PreviewListWidget.setColumnWidth(
0, self.PreviewListWidget.viewport().size().width()) 0, self.PreviewListWidget.viewport().size().width())
@ -528,10 +528,11 @@ class SlideController(QtGui.QWidget):
if self.isLive: if self.isLive:
self.updatePreview() self.updatePreview()
else: else:
frame = self.serviceitem.getFrames()[row][u'image'] #frame = self.serviceitem.getFrames()[row][u'image']
before = time.time() before = time.time()
if frame is None: #if frame is None:
frame = self.serviceitem.render_individual(row) #frame = self.serviceitem.render_individual(row)
frame = self.serviceitem.get_rendered_frame(row)
self.SlidePreview.setPixmap(QtGui.QPixmap.fromImage(frame)) self.SlidePreview.setPixmap(QtGui.QPixmap.fromImage(frame))
log.log(15, u'Slide Rendering took %4s' % (time.time() - before)) log.log(15, u'Slide Rendering took %4s' % (time.time() - before))
if self.isLive: if self.isLive: