More corrections following revert

openlp/core/pluginmanager.py

@@ -103,8 +103,6 @@ class PluginManager(object):
             if media_manager_item is not None:
                 log.debug('Inserting media manager item from %s' % plugin.name)
                 mediatoolbox.addItem(media_manager_item, plugin.icon, media_manager_item.title)
-                # TODO: These shouldn't be called here...
-                #plugin.initialise()
 
     def hook_settings_tabs(self, settingsform=None):
         """

openlp/plugins/custom/customplugin.py

@@ -37,7 +37,7 @@ class CustomPlugin(Plugin):
         Plugin.__init__(self, u'Custom', u'1.9.0',  plugin_helpers)
         self.weight = -5
         self.custommanager = CustomManager(self.config)
-        self.edit_custom_form = EditCustomForm(self.custommanager)
+        self.edit_custom_form = EditCustomForm(self.custommanager, self)
         # Create the plugin icon
         self.icon = QtGui.QIcon()
         self.icon.addPixmap(QtGui.QPixmap(':/media/media_custom.png'),

openlp/plugins/custom/forms/editcustomform.py

@@ -32,6 +32,7 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
         Constructor
         """
         QtGui.QDialog.__init__(self, parent)
+        #self.parent = parent
         self.setupUi(self)
         # Connecting signals and slots
         QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), self.rejected)
@@ -52,8 +53,7 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
         # Create other objects and forms
         self.custommanager = custommanager
         self.initialise()
-        self.VerseListView.setAlternatingRowColors(True)
-        #self.savebutton = self.ButtonBox.button(QtGui.QDialogButtonBox.Save)
+        self.VerseListView.setAlternatingRowColors(True)        
         
     def initialise(self):
         self.valid = True
@@ -65,7 +65,9 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
         self.VerseTextEdit.clear()
         self.VerseListView.clear()
         #make sure we have a new item 
-        self.customSlide = CustomSlide()    
+        self.customSlide = CustomSlide()
+        self.ThemecomboBox.addItem(u'')
+        #self.theme_manager.getThemes()
 
     def loadCustom(self, id):
         self.customSlide = CustomSlide()

openlp/plugins/images/lib/__init__.py

@@ -17,6 +17,6 @@ You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 Place, Suite 330, Boston, MA 02111-1307 USA
 """
-from imageserviceitem import ImageServiceItem
 from listwithpreviews import ListWithPreviews
+from imageserviceitem import ImageServiceItem
 from mediaitem import ImageMediaItem