# HG changeset patch
# User Erik Grinaker <erikg@codepoet.no>
# Date 1089287652 0
# Node ID 1558109939775523da9cdb7fbb44960cf583cec7
# Parent  b33428fed2ead56c67fecf8138c7936c7d5fc95b
inactive ok button in password dialogs when missing data

diff -r b33428fed2ead56c67fecf8138c7936c7d5fc95b -r 1558109939775523da9cdb7fbb44960cf583cec7 ChangeLog
--- a/ChangeLog	Wed Jun 30 16:44:34 2004 +0000
+++ b/ChangeLog	Thu Jul 08 11:54:12 2004 +0000
@@ -2,6 +2,11 @@
 
 ---------------[ xxxx-xx-xx : 0.3.1 ]---------------
 
+2004-07-08  Erik Grinaker <erikg@codepoet.no>
+
+	* the OK button in the password dialogs is inactive when it's
+	missing input
+
 2004-06-30  Erik Grinaker <erikg@codepoet.no>
 
 	* file-selectors and the about dialog are set as transients
diff -r b33428fed2ead56c67fecf8138c7936c7d5fc95b -r 1558109939775523da9cdb7fbb44960cf583cec7 src/lib/dialog.py
--- a/src/lib/dialog.py	Wed Jun 30 16:44:34 2004 +0000
+++ b/src/lib/dialog.py	Thu Jul 08 11:54:12 2004 +0000
@@ -394,35 +394,49 @@
 			self.entry_password = revelation.widget.Entry()
 			self.entry_password.set_visibility(gtk.FALSE)
 			self.entry_password.set_max_length(pwlen)
+			self.entry_password.connect("changed", self.__cb_entry_changed)
 			section.add_inputrow("Password", self.entry_password)
 
 		if new == gtk.TRUE:
 			self.entry_new = revelation.widget.Entry()
 			self.entry_new.set_visibility(gtk.FALSE)
 			self.entry_new.set_max_length(pwlen)
+			self.entry_new.connect("changed", self.__cb_entry_changed)
 			section.add_inputrow("New password", self.entry_new)
 
 			self.entry_confirm = revelation.widget.Entry()
 			self.entry_confirm.set_visibility(gtk.FALSE)
 			self.entry_confirm.set_max_length(pwlen)
+			self.entry_confirm.connect("changed", self.__cb_entry_changed)
 			section.add_inputrow("Confirm new", self.entry_confirm)
 
+		self.get_button(0).set_sensitive(gtk.FALSE)
+
+
+	def __cb_entry_changed(self, widget, data = None):
+		if (
+			(self.entry_password is None or self.entry_password.get_text() != "")
+			and (self.entry_new is None or self.entry_new.get_text() != "")
+			and (self.entry_confirm is None or self.entry_confirm.get_text() != "")
+		):
+			self.get_button(0).set_sensitive(gtk.TRUE)
+		else:
+			self.get_button(0).set_sensitive(gtk.FALSE)
+
 
 	def run(self):
 		while 1:
 			self.show_all()
 
-			if self.entry_password != None:
+			if self.entry_password is not None:
 				self.entry_password.grab_focus()
-			elif self.entry_new != None:
+
+			elif self.entry_new is not None:
 				self.entry_new.grab_focus()
 
 			if Dialog.run(self) == gtk.RESPONSE_OK:
 
-				if self.entry_new != None and self.entry_new.get_text() == "":
-					Error(self, "New password not given", "You need to enter a new password.").run()
-
-				elif self.entry_new != None and self.entry_new.get_text() != self.entry_confirm.get_text():
+				if self.entry_new is not None and self.entry_new.get_text() != self.entry_confirm.get_text():
 					Error(self, "Passwords don't match", "The password and password confirmation you entered does not match.").run()
 
 				else: