openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Fix up presentations

This commit is contained in:
Tim Bentley 2010-10-24 07:26:07 +01:00
parent 68fa2c4791
commit 8e1a7334d3
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,7 +232,7 @@ class ServiceItem(object):
""" """
self.service_item_type = ServiceItemType.Command self.service_item_type = ServiceItemType.Command
self._raw_frames.append( self._raw_frames.append(
{u'title': file_name, u'image': image, u'path': path}) {u'title': file_name, u'image':image, u'path': path})
self._new_item() self._new_item()
def get_service_repr(self): def get_service_repr(self):
@ -378,8 +378,10 @@ class ServiceItem(object):
""" """
if self.service_item_type == ServiceItemType.Text: if self.service_item_type == ServiceItemType.Text:
return self._display_frames[row][u'html'].split(u'\n')[0] return self._display_frames[row][u'html'].split(u'\n')[0]
else: elif self.service_item_type == ServiceItemType.Image:
return self._raw_frames[row][u'title'] return self._raw_frames[row][u'title']
else:
return self._raw_frames[row][u'image']
def get_frame_title(self, row=0): def get_frame_title(self, row=0):
""" """

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

@ -227,7 +227,7 @@ class MainDisplay(DisplayWidget):
def directImage(self, name, path): def directImage(self, name, path):
""" """
API for replacement backgounds so Images are added directly to cache API for replacement backgrounds so Images are added directly to cache
""" """
image = self.imageManager.add_image(name, path) image = self.imageManager.add_image(name, path)
self.image(name) self.image(name)

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

@ -587,8 +587,13 @@ class SlideController(QtGui.QWidget):
label = QtGui.QLabel() label = QtGui.QLabel()
label.setMargin(4) label.setMargin(4)
label.setScaledContents(True) label.setScaledContents(True)
image = self.parent.RenderManager.image_manager. \ if self.serviceItem.is_command():
get_image(frame[u'title']) image = resize_image(frame[u'image'],
self.parent.RenderManager.width,
self.parent.RenderManager.height)
else:
image = self.parent.RenderManager.image_manager. \
get_image(frame[u'title'])
label.setPixmap(QtGui.QPixmap.fromImage(image)) label.setPixmap(QtGui.QPixmap.fromImage(image))
self.PreviewListWidget.setCellWidget(framenumber, 0, label) self.PreviewListWidget.setCellWidget(framenumber, 0, label)
slideHeight = width * self.parent.RenderManager.screen_ratio slideHeight = width * self.parent.RenderManager.screen_ratio