codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #594 tray password dialog freeze in Windows 

Made the password dialog prettier
This commit is contained in:
Andrew Resch 2009-12-14 02:15:08 +00:00
parent 5b94861fc9
commit 68749a7ad5
2 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
deluge/data/pixmaps/lock48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

73
deluge/ui/gtkui/systemtray.py
View File

@ -278,8 +278,8 @@ class SystemTray(component.Component):
self.window.hide() self.window.hide()
else: else:
if self.config["lock_tray"]: if self.config["lock_tray"]:
if not self.unlock_tray(): self.unlock_tray()
return else:
self.window.present() self.window.present()
def on_tray_popup(self, status_icon, button, activate_time): def on_tray_popup(self, status_icon, button, activate_time):
@ -301,8 +301,8 @@ class SystemTray(component.Component):
log.debug("on_menuitem_show_deluge_activate") log.debug("on_menuitem_show_deluge_activate")
if menuitem.get_active() and not self.window.visible(): if menuitem.get_active() and not self.window.visible():
if self.config["lock_tray"]: if self.config["lock_tray"]:
if not self.unlock_tray(): self.unlock_tray()
return else:
self.window.present() self.window.present()
elif not menuitem.get_active() and self.window.visible(): elif not menuitem.get_active() and self.window.visible():
self.window.hide() self.window.hide()
@ -322,8 +322,7 @@ class SystemTray(component.Component):
def on_menuitem_quit_activate(self, menuitem): def on_menuitem_quit_activate(self, menuitem):
log.debug("on_menuitem_quit_activate") log.debug("on_menuitem_quit_activate")
if self.config["lock_tray"] and not self.window.visible(): if self.config["lock_tray"] and not self.window.visible():
if not self.unlock_tray(): self.unlock_tray()
return
if self.config["classic_mode"]: if self.config["classic_mode"]:
client.daemon.shutdown() client.daemon.shutdown()
@ -333,8 +332,7 @@ class SystemTray(component.Component):
def on_menuitem_quitdaemon_activate(self, menuitem): def on_menuitem_quitdaemon_activate(self, menuitem):
log.debug("on_menuitem_quitdaemon_activate") log.debug("on_menuitem_quitdaemon_activate")
if self.config["lock_tray"] and not self.window.visible(): if self.config["lock_tray"] and not self.window.visible():
if not self.unlock_tray(): self.unlock_tray()
return
client.daemon.shutdown() client.daemon.shutdown()
self.window.quit() self.window.quit()
@ -370,7 +368,6 @@ class SystemTray(component.Component):
from sha import new as sha_hash from sha import new as sha_hash
log.debug("Show tray lock dialog") log.debug("Show tray lock dialog")
result = False
if is_showing_dlg[0]: if is_showing_dlg[0]:
return return
@ -380,25 +377,47 @@ class SystemTray(component.Component):
entered_pass.set_activates_default(True) entered_pass.set_activates_default(True)
entered_pass.set_width_chars(25) entered_pass.set_width_chars(25)
entered_pass.set_visibility(False) entered_pass.set_visibility(False)
entered_pass.show()
tray_lock = gtk.Dialog(title=_("Deluge is locked"), parent=None, tray_lock = gtk.Dialog(title="", parent=self.window.window,
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OK,
gtk.RESPONSE_ACCEPT)) gtk.RESPONSE_OK))
label = gtk.Label(_("Deluge is password protected.\nTo show the Deluge \ tray_lock.set_default_response(gtk.RESPONSE_OK)
window, please enter your password")) 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) label.set_line_wrap(True)
label.set_justify(gtk.JUSTIFY_CENTER) vbox.pack_start(label, False)
tray_lock.set_position(gtk.WIN_POS_CENTER_ALWAYS)
tray_lock.set_size_request(400, 200) tlabel = gtk.Label(_("<i>Enter your password to continue</i>"))
tray_lock.set_default_response(gtk.RESPONSE_ACCEPT) tlabel.set_use_markup(True)
tray_lock.vbox.pack_start(label) tlabel.set_alignment(0.0, 0.5)
tray_lock.vbox.pack_start(entered_pass) tlabel.set_line_wrap(True)
tray_lock.show_all() vbox.pack_start(tlabel, False)
if tray_lock.run() == gtk.RESPONSE_ACCEPT:
if self.config["tray_password"] == sha_hash(\ vbox.pack_start(entered_pass)
entered_pass.get_text()).hexdigest():
result = True 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() tray_lock.destroy()
is_showing_dlg[0] = False is_showing_dlg[0] = False
return result tray_lock.connect("response", on_response)
tray_lock.show_all()