# HG changeset patch
# User Erik Grinaker <erikg@codepoet.no>
# Date 1111518455 0
# Node ID 5411d685ecc636c1a01215a4ad44fbb7e26f4eaf
# Parent  c649040647c5e71a0e8726d79f98fa1c0cd74d59
added quit button to unlock file dialog

diff -r c649040647c5e71a0e8726d79f98fa1c0cd74d59 -r 5411d685ecc636c1a01215a4ad44fbb7e26f4eaf ChangeLog
--- a/ChangeLog	Tue Mar 22 12:27:22 2005 +0000
+++ b/ChangeLog	Tue Mar 22 19:07:35 2005 +0000
@@ -1,5 +1,12 @@
 Revelation changelog
 
+---------------[ xxxx-xx-xx : 0.4.3 ]---------------
+
+2005-03-22  Erik Grinaker <erikg@codepoet.no>
+
+	* added quit button to unlock file dialog
+
+
 ---------------[ 2005-03-22 : 0.4.2 ]---------------
 
 2005-03-22  Erik Grinaker <erikg@codepoet.no>
diff -r c649040647c5e71a0e8726d79f98fa1c0cd74d59 -r 5411d685ecc636c1a01215a4ad44fbb7e26f4eaf NEWS
--- a/NEWS	Tue Mar 22 12:27:22 2005 +0000
+++ b/NEWS	Tue Mar 22 19:07:35 2005 +0000
@@ -1,3 +1,10 @@
+xxxx-xx-xx: Revelation 0.4.3
+============================
+
+New features:
+- added quit button to unlock file dialog
+
+
 2005-03-22: Revelation 0.4.2
 ============================
 
diff -r c649040647c5e71a0e8726d79f98fa1c0cd74d59 -r 5411d685ecc636c1a01215a4ad44fbb7e26f4eaf TODO
--- a/TODO	Tue Mar 22 12:27:22 2005 +0000
+++ b/TODO	Tue Mar 22 19:07:35 2005 +0000
@@ -1,14 +1,16 @@
 0.4.x:
-- string cleanups
 - add import/export of PasswordSafe files
 - add import/export of GPasMan files
 - add import/export of zsafe files
-- add import/export of gnukeyring
+- add import/export of gnukeyring files
+- add import/export of web confidential files
 - sorting of the tree
+- string cleanups
 - gnome panel applets (account lookup, password generator etc)
   - show complete account tree as a popup-submenu of the applet
   - make library modules more independent, so only a few are imported
 - run unit tests on built libraries instead of installed ones
+- remove the small "holes" on the sides of the file icon
 
 0.5.x:
 - ensure complete UTF-8 support
diff -r c649040647c5e71a0e8726d79f98fa1c0cd74d59 -r 5411d685ecc636c1a01215a4ad44fbb7e26f4eaf src/lib/dialog.py
--- a/src/lib/dialog.py	Tue Mar 22 12:27:22 2005 +0000
+++ b/src/lib/dialog.py	Tue Mar 22 19:07:35 2005 +0000
@@ -622,7 +622,7 @@
 			ui.STOCK_UNLOCK
 		)
 
-		self.get_button(1).destroy()
+		self.get_button(1).set_label(gtk.STOCK_QUIT)
 
 		self.password = password
 		self.entry_password = self.add_entry("Password")
@@ -633,7 +633,12 @@
 
 		while 1:
 			try:
-				if Password.run(self) != gtk.RESPONSE_OK:
+				response = Password.run(self)
+
+				if response == gtk.RESPONSE_CANCEL:
+					raise CancelError
+
+				elif response != gtk.RESPONSE_OK:
 					continue
 
 				elif self.entry_password.get_text() == self.password:
@@ -643,7 +648,12 @@
 					Error(self, "Incorrect password", "The password you entered was not correct, please try again.").run()
 
 			except CancelError:
-				continue
+				if self.get_button(1).get_property("sensitive") == True:
+					self.destroy()
+					raise
+
+				else:
+					continue
 
 		self.destroy()
 
diff -r c649040647c5e71a0e8726d79f98fa1c0cd74d59 -r 5411d685ecc636c1a01215a4ad44fbb7e26f4eaf src/revelation.in
--- a/src/revelation.in	Tue Mar 22 12:27:22 2005 +0000
+++ b/src/revelation.in	Tue Mar 22 19:07:35 2005 +0000
@@ -1206,7 +1206,16 @@
 			window.hide()
 
 		# lock file
-		dialog.PasswordLock(self, password).run()
+		try:
+			d = dialog.PasswordLock(self, password)
+
+			if self.entrystore.changed == True:
+				d.get_button(1).set_sensitive(False)
+
+			d.run()
+
+		except dialog.CancelError:
+			self.quit()
 
 		# unlock the file and restore state
 		self.tree.set_model(self.entrystore)