It turns out the previous patch was not sufficient, the same problem
occurs with "accept()". Attached is an updated patch.
Jeremy
--
http://www.jerryweb.org/ : JerryWeb.org
http://sailcut.sourceforge.net/ : Sailcut CAD
http://opensource.polytechnique.org/ : Polytechnique.org Free Software
diff -ur luma-2.2.1.orig/lib/luma/plugins/addressbook/ContactWizard.py
luma-2.2.1/lib/luma/plugins/addressbook/ContactWizard.py
--- luma-2.2.1.orig/lib/luma/plugins/addressbook/ContactWizard.py
2005-08-22 17:19:57.000000000 +0200
+++ luma-2.2.1/lib/luma/plugins/addressbook/ContactWizard.py 2005-10-22
11:01:23.000000000 +0200
@@ -42,7 +42,6 @@
layout.addWidget(self.browserWidget)
self.connect(self.browserWidget, PYSIGNAL("ldap_result"),
self.updateLocation)
- self.connect(self.finishButton(), SIGNAL("clicked()"),
self.saveContact)
self.locationServer = None
self.locationDN = None
@@ -52,11 +51,7 @@
self.setHelpEnabled(self.page(x), False)
self.setFinishEnabled(self.page(1), 1)
- self.disconnect(self.finishButton(), SIGNAL("clicked()"), self,
SLOT("accept()"))
- self.disconnect(self.nextButton(), SIGNAL("clicked()"), self,
SLOT("next()"))
- self.connect(self.nextButton(),SIGNAL("clicked()"), self.checkNext)
-
tmpWidget = self.page(1)
self.addressWidget = AddressbookWidget(self.contactFrame)
tmpLayout = QHBoxLayout(self.contactFrame)
@@ -75,7 +70,7 @@
###############################################################################
- def saveContact(self):
+ def accept(self):
self.addressWidget.updateValues()
dataObject = self.addressWidget.dataObject
@@ -100,7 +95,7 @@
connection.unbind()
if success:
- self.accept()
+ ContactWizardDesign.accept(self)
else:
dialog = LumaErrorDialog()
errorMsg = self.trUtf8("Could not add entry.<br><br>Reason: ")
@@ -133,7 +128,7 @@
###############################################################################
- def checkNext(self):
+ def next(self):
result = self.checkLocation()
if result == 0:
@@ -153,7 +148,7 @@
dataObject = SmartDataObject(('', {'objectClass':
self.getPossibleClasses()}), self.serverMeta)
self.addressWidget.initView(dataObject)
self.addressWidget.enableContactFields(allowedAttributes)
- self.next()
+ ContactWizardDesign.next(self)
###############################################################################
diff -ur luma-2.2.1.orig/lib/luma/plugins/usermanagement/AccountWizard.py
luma-2.2.1/lib/luma/plugins/usermanagement/AccountWizard.py
--- luma-2.2.1.orig/lib/luma/plugins/usermanagement/AccountWizard.py
2005-08-22 17:19:57.000000000 +0200
+++ luma-2.2.1/lib/luma/plugins/usermanagement/AccountWizard.py 2005-10-22
11:03:26.000000000 +0200
@@ -42,7 +42,6 @@
layout.addWidget(self.browserWidget)
self.connect(self.browserWidget, PYSIGNAL("ldap_result"),
self.updateLocation)
- self.connect(self.finishButton(), SIGNAL("clicked()"),
self.saveContact)
self.locationServer = None
self.locationDN = None
@@ -52,11 +51,6 @@
self.setHelpEnabled(self.page(x), 0)
self.setFinishEnabled(self.page(1), 1)
- self.disconnect(self.finishButton(), SIGNAL("clicked()"), self,
SLOT("accept()"))
- self.disconnect(self.nextButton(), SIGNAL("clicked()"), self,
SLOT("next()"))
-
- self.connect(self.nextButton(),SIGNAL("clicked()"), self.checkNext)
-
self.accountWidget = UsermanagementWidget(self.accountFrame)
tmpLayout = QHBoxLayout(self.accountFrame)
@@ -81,7 +75,7 @@
###############################################################################
- def saveContact(self):
+ def accept(self):
dataObject = self.accountWidget.dataObject
if not dataObject.hasAttribute('uid'):
@@ -190,7 +184,7 @@
# Start postprocessing of usercreation
addPostProcess(self.serverMeta, dataObject.getDN(),
dataObject.data, groupName)
- self.accept()
+ AccountWizardDesign.accept(self)
else:
dialog = LumaErrorDialog()
@@ -212,7 +206,7 @@
###############################################################################
- def checkNext(self):
+ def next(self):
result = self.checkLocation()
if result == 0:
@@ -235,7 +229,7 @@
self.accountWidget.initView(dataObject)
- self.next()
+ AccountWizardDesign.next(self)
###############################################################################
