From 01a89abe523f5866fff2f69a3b3ae77c425b9d6b Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Sat, 28 May 2011 11:15:10 +0100 Subject: [PATCH] merge fixes --- openlp/plugins/custom/forms/editcustomform.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py index 1aa283311..26a25e12a 100644 --- a/openlp/plugins/custom/forms/editcustomform.py +++ b/openlp/plugins/custom/forms/editcustomform.py @@ -43,12 +43,11 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog): Class documentation goes here. """ log.info(u'Custom Editor loaded') - def __init__(self, plugin, manager): + def __init__(self, parent, manager): """ Constructor """ - self.plugin = plugin - QtGui.QDialog.__init__(self, self.plugin.formparent) + QtGui.QDialog.__init__(self, parent) self.manager = manager self.setupUi(self) # Create other objects and forms. @@ -137,7 +136,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog): self.customSlide.credits = unicode(self.creditEdit.text()) self.customSlide.theme_name = unicode(self.themeComboBox.currentText()) success = self.manager.save_object(self.customSlide) - self.parent.auto_select_id = self.customSlide.id + self.parent().auto_select_id = self.customSlide.id return success def onUpButtonClicked(self):