openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Fix silly bug and stupid fallout (Bug #603798)
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/29622
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2010-07-08 09:14:00 +0000
+++ openlp/core/lib/mediamanageritem.py	2010-07-10 01:23:44 +0000
@@ -521,7 +521,7 @@
         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:

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2010-07-02 18:21:45 +0000
+++ openlp/core/lib/serviceitem.py	2010-07-10 01:23:44 +0000
@@ -117,8 +117,7 @@
         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)

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2010-07-07 14:44:22 +0000
+++ openlp/core/ui/mainwindow.py	2010-07-10 01:23:44 +0000
@@ -956,4 +956,5 @@
                 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()

=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py	2010-07-08 12:19:22 +0000
+++ openlp/plugins/bibles/bibleplugin.py	2010-07-10 01:23:44 +0000
@@ -38,7 +38,8 @@
     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

=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py	2010-07-05 16:00:48 +0000
+++ openlp/plugins/custom/customplugin.py	2010-07-10 01:23:44 +0000
@@ -50,7 +50,8 @@
         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):

=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py	2010-07-05 16:00:48 +0000
+++ openlp/plugins/images/imageplugin.py	2010-07-10 01:23:44 +0000
@@ -36,7 +36,8 @@
     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):

=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py	2010-07-05 16:33:45 +0000
+++ openlp/plugins/media/mediaplugin.py	2010-07-10 01:23:44 +0000
@@ -38,7 +38,8 @@
     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

=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py	2010-07-05 16:00:48 +0000
+++ openlp/plugins/presentations/presentationplugin.py	2010-07-10 01:23:44 +0000
@@ -40,7 +40,8 @@
         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):

=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py	2010-07-08 12:19:22 +0000
+++ openlp/plugins/songs/songsplugin.py	2010-07-10 01:23:44 +0000
@@ -58,7 +58,8 @@
         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):