diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index d4cd8e168..9ca0ed6cb 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -232,7 +232,7 @@ class ServiceItem(object): """ self.service_item_type = ServiceItemType.Command 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() def get_service_repr(self): @@ -378,8 +378,10 @@ class ServiceItem(object): """ if self.service_item_type == ServiceItemType.Text: 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'] + else: + return self._raw_frames[row][u'image'] def get_frame_title(self, row=0): """ diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index c8ff6a114..2da71e6ef 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -227,7 +227,7 @@ class MainDisplay(DisplayWidget): 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) self.image(name) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 836ceb15f..4aaa1a5ca 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -587,8 +587,13 @@ class SlideController(QtGui.QWidget): label = QtGui.QLabel() label.setMargin(4) label.setScaledContents(True) - image = self.parent.RenderManager.image_manager. \ - get_image(frame[u'title']) + if self.serviceItem.is_command(): + 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)) self.PreviewListWidget.setCellWidget(framenumber, 0, label) slideHeight = width * self.parent.RenderManager.screen_ratio