diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 99b4a7e6f..f574ed6a8 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -543,7 +543,7 @@ class Renderer(object): else: pen = QtGui.QColor(color) x, y = tlcorner - if self._theme.display_outline and outline_size != 0: + if self._theme.display_outline and outline_size != 0 and not footer: path = QtGui.QPainterPath() path.addText(QtCore.QPointF(x, y + metrics.ascent()), font, line) self.painter.setBrush(self.painter.pen().brush()) @@ -554,7 +554,7 @@ class Renderer(object): self.painter.drawText(x, y + metrics.ascent(), line) if self._theme.display_slideTransition: # Print 2nd image with 70% weight - if self._theme.display_outline and outline_size != 0: + if self._theme.display_outline and outline_size != 0 and not footer: path = QtGui.QPainterPath() path.addText(QtCore.QPointF(x, y + metrics.ascent()), font, line) self.painter2.setBrush(self.painter2.pen().brush()) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 585ed99df..cf9896ce4 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -659,11 +659,17 @@ class ServiceManager(QtGui.QWidget): self.repaintServiceList(sitem + 1, 0) self.parent.LiveController.replaceServiceManagerItem(item) else: - #nothing selected or dnd + #nothing selected for dnd if self.droppos == 0: - self.serviceItems.append({u'service_item': item, - u'order': len(self.serviceItems) + 1, - u'expanded':expand}) + if isinstance(item, list): + for inditem in item: + self.serviceItems.append({u'service_item': inditem, + u'order': len(self.serviceItems) + 1, + u'expanded':expand}) + else: + self.serviceItems.append({u'service_item': item, + u'order': len(self.serviceItems) + 1, + u'expanded':expand}) self.repaintServiceList(len(self.serviceItems) + 1, 0) else: self.serviceItems.insert(self.droppos, {u'service_item': item,