Removal of Plugin utils continues

bzr-revno: 424

openlp/plugins/bibles/bibleplugin.py

@@ -24,13 +24,13 @@ from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
 from openlp.core.resources import *
-from openlp.core.lib import Plugin, PluginUtils
+from openlp.core.lib import Plugin
 
 from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem
 from openlp.plugins.bibles.lib.tables import *
 from openlp.plugins.bibles.lib.classes import *
 
-class BiblePlugin(Plugin, PluginUtils):
+class BiblePlugin(Plugin):
     global log
     log=logging.getLogger(u'BiblePlugin')
     log.info(u'Bible Plugin loaded')

openlp/plugins/images/imageplugin.py

@@ -21,19 +21,19 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import Plugin, PluginUtils
+from openlp.core.lib import Plugin
 from openlp.core.resources import *
 
 from openlp.plugins.images.lib import ImageMediaItem, ImageServiceItem
 
-class ImagePlugin(Plugin, PluginUtils):
+class ImagePlugin(Plugin):
     global log
-    log=logging.getLogger("ImagePlugin")
-    log.info("Image Plugin loaded")
+    log=logging.getLogger(u'ImagePlugin')
+    log.info(u'Image Plugin loaded')
 
     def __init__(self, preview_controller, live_controller):
         # Call the parent constructor
-        Plugin.__init__(self, 'Images', '1.9.0', preview_controller, live_controller)
+        Plugin.__init__(self, u'Images', u'1.9.0', preview_controller, live_controller)
         self.weight = -7
         # Create the plugin icon
         self.icon = QtGui.QIcon()
@@ -45,11 +45,11 @@ class ImagePlugin(Plugin, PluginUtils):
 
     def get_media_manager_item(self):
         # Create the MediaManagerItem object
-        self.MediaManagerItem = ImageMediaItem(self, self.icon, 'Images')
+        self.MediaManagerItem = ImageMediaItem(self, self.icon, u'Images')
         return self.MediaManagerItem
 
     def initialise(self):
-        log.info("Plugin Initialising")
-        log.info("Done")
+        log.info(u'Plugin Initialising')
+        log.info(u'Done')
 
 

openlp/plugins/songs/songsplugin.py

@@ -3,7 +3,7 @@
 """
 OpenLP - Open Source Lyrics Projection
 Copyright (c) 2008 Raoul Snyman
-Portions copyright (c) 2008 Martin Thompson, Tim Bentley,
+Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley,
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -22,20 +22,20 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.resources import *
-from openlp.core.lib import Plugin, PluginUtils
+from openlp.core.lib import Plugin
 from openlp.plugins.songs.lib import SongManager, SongsTab, SongMediaItem
 from openlp.plugins.songs.forms import OpenLPImportForm, OpenSongExportForm, \
     OpenSongImportForm, OpenLPExportForm
 
-class SongsPlugin(Plugin, PluginUtils):
+class SongsPlugin(Plugin):
 
     global log
-    log=logging.getLogger("SongsPlugin")
-    log.info("Song Plugin loaded")
+    log=logging.getLogger(u'SongsPlugin')
+    log.info(u'Song Plugin loaded')
 
     def __init__(self):
         # Call the parent constructor
-        Plugin.__init__(self, 'Songs', '1.9.0')
+        Plugin.__init__(self, u'Songs', u'1.9.0')
         self.weight = -10
         self.songmanager = SongManager(self.config)
         self.openlp_import_form = OpenLPImportForm()