forked from openlp/openlp
merge fixes
This commit is contained in:
parent
500ce5f720
commit
01a89abe52
@ -43,12 +43,11 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
|
|||||||
Class documentation goes here.
|
Class documentation goes here.
|
||||||
"""
|
"""
|
||||||
log.info(u'Custom Editor loaded')
|
log.info(u'Custom Editor loaded')
|
||||||
def __init__(self, plugin, manager):
|
def __init__(self, parent, manager):
|
||||||
"""
|
"""
|
||||||
Constructor
|
Constructor
|
||||||
"""
|
"""
|
||||||
self.plugin = plugin
|
QtGui.QDialog.__init__(self, parent)
|
||||||
QtGui.QDialog.__init__(self, self.plugin.formparent)
|
|
||||||
self.manager = manager
|
self.manager = manager
|
||||||
self.setupUi(self)
|
self.setupUi(self)
|
||||||
# Create other objects and forms.
|
# Create other objects and forms.
|
||||||
@ -137,7 +136,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
|
|||||||
self.customSlide.credits = unicode(self.creditEdit.text())
|
self.customSlide.credits = unicode(self.creditEdit.text())
|
||||||
self.customSlide.theme_name = unicode(self.themeComboBox.currentText())
|
self.customSlide.theme_name = unicode(self.themeComboBox.currentText())
|
||||||
success = self.manager.save_object(self.customSlide)
|
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
|
return success
|
||||||
|
|
||||||
def onUpButtonClicked(self):
|
def onUpButtonClicked(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user