diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 5e1d5bcc3..1a31efa32 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -521,7 +521,7 @@ class MediaManagerItem(QtGui.QWidget): if self.serviceItemIconName: service_item.add_icon(self.serviceItemIconName) else: - service_item.add_icon(self.parent.icon) + service_item.add_icon(self.parent.icon_path) if self.generateSlideData(service_item, item): return service_item else: diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 841a0424b..f58e01148 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -956,4 +956,5 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.recentFiles.removeAt(position) self.recentFiles.insert(0, QtCore.QString(filename)) while self.recentFiles.count() > recentFileCount: - self.recentFiles.removeLast() + # Don't care what API says takeLast works, removeLast doesn't! + self.recentFiles.takeLast() diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 994be196a..10a4c9551 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -38,7 +38,8 @@ class BiblePlugin(Plugin): def __init__(self, plugin_helpers): Plugin.__init__(self, u'Bibles', u'1.9.2', plugin_helpers) self.weight = -9 - self.icon = build_icon(u':/plugins/plugin_bibles.png') + self.icon_path = u':/plugins/plugin_bibles.png' + self.icon = build_icon(self.icon_path) #Register the bible Manager self.status = PluginStatus.Active self.manager = None diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py index ecbf1b440..8111841d9 100644 --- a/openlp/plugins/custom/customplugin.py +++ b/openlp/plugins/custom/customplugin.py @@ -50,7 +50,8 @@ class CustomPlugin(Plugin): self.weight = -5 self.custommanager = Manager(u'custom', init_schema) self.edit_custom_form = EditCustomForm(self.custommanager) - self.icon = build_icon(u':/plugins/plugin_custom.png') + self.icon_path = u':/plugins/plugin_custom.png' + self.icon = build_icon(self.icon_path) self.status = PluginStatus.Active def getSettingsTab(self): diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py index cfd0ec90e..adf8e401b 100644 --- a/openlp/plugins/images/imageplugin.py +++ b/openlp/plugins/images/imageplugin.py @@ -36,7 +36,8 @@ class ImagePlugin(Plugin): def __init__(self, plugin_helpers): Plugin.__init__(self, u'Images', u'1.9.2', plugin_helpers) self.weight = -7 - self.icon = build_icon(u':/plugins/plugin_images.png') + self.icon_path = u':/plugins/plugin_images.png' + self.icon = build_icon(self.icon_path) self.status = PluginStatus.Active def getSettingsTab(self): diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py index adc5f800f..4162c4d31 100644 --- a/openlp/plugins/media/mediaplugin.py +++ b/openlp/plugins/media/mediaplugin.py @@ -38,7 +38,8 @@ class MediaPlugin(Plugin): def __init__(self, plugin_helpers): Plugin.__init__(self, u'Media', u'1.9.2', plugin_helpers) self.weight = -6 - self.icon = build_icon(u':/plugins/plugin_media.png') + self.icon_path = u':/plugins/plugin_media.png' + self.icon = build_icon(self.icon_path) # passed with drag and drop messages self.dnd_id = u'Media' self.status = PluginStatus.Active diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index a905a3312..7bb256af7 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -40,7 +40,8 @@ class PresentationPlugin(Plugin): self.controllers = {} Plugin.__init__(self, u'Presentations', u'1.9.2', plugin_helpers) self.weight = -8 - self.icon = build_icon(u':/plugins/plugin_presentations.png') + self.icon_path = u':/plugins/plugin_presentations.png' + self.icon = build_icon(self.icon_path) self.status = PluginStatus.Active def getSettingsTab(self): diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 0d5cdbd87..f63454e51 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -58,7 +58,8 @@ class SongsPlugin(Plugin): Plugin.__init__(self, u'Songs', u'1.9.2', plugin_helpers) self.weight = -10 self.manager = Manager(u'songs', init_schema) - self.icon = build_icon(u':/plugins/plugin_songs.png') + self.icon_path = u':/plugins/plugin_songs.png' + self.icon = build_icon(self.icon_path) self.status = PluginStatus.Active def getSettingsTab(self):