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

minor clean ups; do not create qimage and then convert to qpixmap, instad create qpixmap directly

Browse Source
This commit is contained in:
Andreas Preikschat 2011-06-21 12:10:53 +02:00
parent 3616554a17
commit dbef87021c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -625,14 +625,14 @@ class SlideController(QtGui.QWidget):
label.setMargin(4) label.setMargin(4)
label.setScaledContents(True) label.setScaledContents(True)
if self.serviceItem.is_command(): if self.serviceItem.is_command():
image = QtGui.QImage(frame[u'image']) label.setPixmap(QtGui.QPixmap(frame[u'image']))
else: else:
# If current slide set background to image # If current slide set background to image
if framenumber == slideno: if framenumber == slideno:
self.serviceItem.bg_image_bytes = \ self.serviceItem.bg_image_bytes = \
self.imageManager.get_image_bytes(frame[u'title']) self.imageManager.get_image_bytes(frame[u'title'])
image = self.imageManager.get_image(frame[u'title']) image = self.imageManager.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().renderer.screen_ratio slideHeight = width * self.parent().renderer.screen_ratio
row += 1 row += 1

2
openlp/plugins/presentations/lib/mediaitem.py
View File

@ -191,7 +191,7 @@ class PresentationMediaItem(MediaManagerItem):
doc.load_presentation() doc.load_presentation()
preview = doc.get_thumbnail_path(1, True) preview = doc.get_thumbnail_path(1, True)
doc.close_presentation() doc.close_presentation()
if not os.path.exists(preview): if not (preview and os.path.exists(preview)):
icon = build_icon(u':/general/general_delete.png') icon = build_icon(u':/general/general_delete.png')
else: else:
if validate_thumb(preview, thumb): if validate_thumb(preview, thumb):

2
openlp/plugins/presentations/lib/presentationcontroller.py
View File

@ -149,7 +149,7 @@ class PresentationDocument(object):
the powerpoint file. the powerpoint file.
""" """
lastimage = self.get_thumbnail_path(self.get_slide_count(), True) lastimage = self.get_thumbnail_path(self.get_slide_count(), True)
if not os.path.isfile(lastimage): if not (lastimage and os.path.isfile(lastimage)):
return False return False
return validate_thumb(self.filepath, lastimage) return validate_thumb(self.filepath, lastimage)