From e27c38ca6745e85720b5f3dad5bea333fa139215 Mon Sep 17 00:00:00 2001
From: Andrew Resch <andrewresch@gmail.com>
Date: Mon, 14 Dec 2009 02:15:08 +0000
Subject: [PATCH] Fix #594 tray password dialog freeze in Windows Made the
 password dialog prettier

---
 ChangeLog                      |   2 +
 deluge/data/pixmaps/lock48.png | Bin 0 -> 2978 bytes
 deluge/ui/gtkui/systemtray.py  |  83 ++++++++++++++++++++-------------
 3 files changed, 53 insertions(+), 32 deletions(-)
 create mode 100644 deluge/data/pixmaps/lock48.png

diff --git a/ChangeLog b/ChangeLog
index 780db7cba..e5845aba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@
 	* Add #891 remove torrents by pressing the Delete key
 	* Fix issue where stoping a daemon that you aren't connected to causes the
 	  gtkui to shutdown the currently connected daemon.
+	* Fix #594 tray password dialog freeze in Windows
+	* Made the password dialog prettier
 
 ==== Console ====
 	* Fix using the console in Windows, but only in command-line mode
diff --git a/deluge/data/pixmaps/lock48.png b/deluge/data/pixmaps/lock48.png
new file mode 100644
index 0000000000000000000000000000000000000000..f24ae3a60a17564088ac4aebbf1b40b0bb3cdb23
GIT binary patch
literal 2978
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

literal 0
HcmV?d00001

diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py
index 4c0be9564..ae0ac607d 100644
--- a/deluge/ui/gtkui/systemtray.py
+++ b/deluge/ui/gtkui/systemtray.py
@@ -278,9 +278,9 @@ class SystemTray(component.Component):
             self.window.hide()
         else:
             if self.config["lock_tray"]:
-                if not self.unlock_tray():
-                    return
-            self.window.present()
+                self.unlock_tray()
+            else:
+                self.window.present()
 
     def on_tray_popup(self, status_icon, button, activate_time):
         """Called when the tray icon is right clicked."""
@@ -301,9 +301,9 @@ class SystemTray(component.Component):
         log.debug("on_menuitem_show_deluge_activate")
         if menuitem.get_active() and not self.window.visible():
             if self.config["lock_tray"]:
-                if not self.unlock_tray():
-                    return
-            self.window.present()
+                self.unlock_tray()
+            else:
+                self.window.present()
         elif not menuitem.get_active() and self.window.visible():
             self.window.hide()
 
@@ -322,8 +322,7 @@ class SystemTray(component.Component):
     def on_menuitem_quit_activate(self, menuitem):
         log.debug("on_menuitem_quit_activate")
         if self.config["lock_tray"] and not self.window.visible():
-            if not self.unlock_tray():
-                return
+            self.unlock_tray()
 
         if self.config["classic_mode"]:
             client.daemon.shutdown()
@@ -333,8 +332,7 @@ class SystemTray(component.Component):
     def on_menuitem_quitdaemon_activate(self, menuitem):
         log.debug("on_menuitem_quitdaemon_activate")
         if self.config["lock_tray"] and not self.window.visible():
-            if not self.unlock_tray():
-                return
+            self.unlock_tray()
 
         client.daemon.shutdown()
         self.window.quit()
@@ -370,7 +368,6 @@ class SystemTray(component.Component):
             from sha import new as sha_hash
 
         log.debug("Show tray lock dialog")
-        result = False
 
         if is_showing_dlg[0]:
             return
@@ -380,25 +377,47 @@ class SystemTray(component.Component):
         entered_pass.set_activates_default(True)
         entered_pass.set_width_chars(25)
         entered_pass.set_visibility(False)
-        entered_pass.show()
-        tray_lock = gtk.Dialog(title=_("Deluge is locked"), parent=None,
-            buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK,
-            gtk.RESPONSE_ACCEPT))
-        label = gtk.Label(_("Deluge is password protected.\nTo show the Deluge \
-window, please enter your password"))
-        label.set_line_wrap(True)
-        label.set_justify(gtk.JUSTIFY_CENTER)
-        tray_lock.set_position(gtk.WIN_POS_CENTER_ALWAYS)
-        tray_lock.set_size_request(400, 200)
-        tray_lock.set_default_response(gtk.RESPONSE_ACCEPT)
-        tray_lock.vbox.pack_start(label)
-        tray_lock.vbox.pack_start(entered_pass)
-        tray_lock.show_all()
-        if tray_lock.run() == gtk.RESPONSE_ACCEPT:
-            if self.config["tray_password"] == sha_hash(\
-                entered_pass.get_text()).hexdigest():
-                result = True
-        tray_lock.destroy()
-        is_showing_dlg[0] = False
 
-        return result
+        tray_lock = gtk.Dialog(title="", parent=self.window.window,
+            buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OK,
+            gtk.RESPONSE_OK))
+        tray_lock.set_default_response(gtk.RESPONSE_OK)
+        tray_lock.set_has_separator(False)
+
+        tray_lock.set_border_width(5)
+
+        hbox = gtk.HBox(spacing=5)
+
+        image = gtk.image_new_from_file(deluge.common.get_pixmap("lock48.png"))
+        image.set_alignment(0.5, 0.0)
+        hbox.pack_start(image, False)
+
+        vbox = gtk.VBox(spacing=5)
+        hbox.pack_start(vbox, False)
+
+        label = gtk.Label(_("<b><big>Deluge is password protected!</big></b>"))
+        label.set_use_markup(True)
+        label.set_alignment(0.0, 0.5)
+        label.set_line_wrap(True)
+        vbox.pack_start(label, False)
+
+        tlabel = gtk.Label(_("<i>Enter your password to continue</i>"))
+        tlabel.set_use_markup(True)
+        tlabel.set_alignment(0.0, 0.5)
+        tlabel.set_line_wrap(True)
+        vbox.pack_start(tlabel, False)
+
+        vbox.pack_start(entered_pass)
+
+        tray_lock.vbox.pack_start(hbox)
+
+        def on_response(dialog, response_id):
+            if response_id == gtk.RESPONSE_OK:
+                if self.config["tray_password"] == sha_hash(entered_pass.get_text()).hexdigest():
+                    self.window.present()
+
+            tray_lock.destroy()
+            is_showing_dlg[0] = False
+
+        tray_lock.connect("response", on_response)
+        tray_lock.show_all()