Fix service saving (Bug #603798)

bzr-revno: 930

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:

openlp/core/lib/serviceitem.py

@@ -117,8 +117,7 @@ class ServiceItem(object):
         service item in the service manager.
 
         ``icon``
-            An instance of QIcon or a string to an icon in the resource or on
-            disk.
+            A string to an icon in the resources or on disk.
         """
         self.icon = icon
         self.iconic_representation = build_icon(icon)

openlp/core/ui/mainwindow.py

@@ -469,7 +469,8 @@ class Ui_MainWindow(object):
             '&Plugin List'))
         self.SettingsPluginListItem.setStatusTip(
             translate('MainWindow', 'List the Plugins'))
-        self.SettingsPluginListItem.setShortcut(translate('MainWindow', 'Alt+F7'))
+        self.SettingsPluginListItem.setShortcut(
+            translate('MainWindow', 'Alt+F7'))
         self.HelpDocumentationItem.setText(
             translate('MainWindow', '&User Guide'))
         self.HelpAboutItem.setText(translate('MainWindow', '&About'))
@@ -973,5 +974,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             if position != -1:
                 self.recentFiles.removeAt(position)
             self.recentFiles.insert(0, QtCore.QString(filename))
-            while self.recentFiles.count() > maxRecentFiles:
-                self.recentFiles.removeLast()
+            while self.recentFiles.count() > recentFileCount:
+                # Don't care what API says takeLast works, removeLast doesn't!
+                self.recentFiles.takeLast()

openlp/core/ui/settingsform.py

@@ -69,7 +69,7 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
         Add a tab to the form at a specific location
         """
         log.debug(u'Inserting %s tab' % tab.tabTitle)
-        #13 : There are 3 tables currently and locations starts at -10
+        # 14 : There are 3 tables currently and locations starts at -10
         self.SettingsTabWidget.insertTab(
             location + 14, tab, tab.tabTitleVisible)
 

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

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):

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):

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

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):

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):