# HG changeset patch # User Yuki KODAMA <endflow....@gmail.com> # Date 1259568214 -32400 # Node ID 685424a363257301731fb388212c83131def367d # Parent 144d6d6fcfb9495b8eb37d0250b1d93a84842fb3 hgcmd: use gtklib.set_tortoise_keys() for CmdLogDialog's accelerators
diff --git a/tortoisehg/hgtk/gtklib.py b/tortoisehg/hgtk/gtklib.py
--- a/tortoisehg/hgtk/gtklib.py
+++ b/tortoisehg/hgtk/gtklib.py
@@ -68,6 +68,8 @@
window.connect('thg-close', thgclose)
window.connect('thg-exit', thgexit)
+ return accelgroup, mod
+
def thgexit(window):
if thgclose(window):
gobject.idle_add(hgtk.thgexit, window)
diff --git a/tortoisehg/hgtk/hgcmd.py b/tortoisehg/hgtk/hgcmd.py
--- a/tortoisehg/hgtk/hgcmd.py
+++ b/tortoisehg/hgtk/hgcmd.py
@@ -596,20 +596,17 @@
def __init__(self, title=_('Command Log')):
gtk.Window.__init__(self, type=gtk.WINDOW_TOPLEVEL)
gtklib.set_tortoise_icon(self, 'hg.ico')
+ accelgroup, mod = gtklib.set_tortoise_keys(self)
self.set_title(title)
self.set_default_size(320, 240)
- self.connect('delete-event', self.delete_event)
+ self.connect('delete-event', self.should_live)
# accelerators
- accelgroup = gtk.AccelGroup()
- self.add_accel_group(accelgroup)
- mod = gtklib.get_thg_modifier()
- for key, modifier in (gtk.accelerator_parse(mod+'w'),
- gtk.accelerator_parse(mod+'q'),
- gtk.accelerator_parse('Escape')):
- self.add_accelerator('thg-close', accelgroup, key,
- modifier, gtk.ACCEL_VISIBLE)
- self.connect('thg-close', self.delete_event)
+ key, modifier = gtk.accelerator_parse('Escape')
+ self.add_accelerator('thg-close', accelgroup, key, modifier,
+ gtk.ACCEL_VISIBLE)
+ self.connect('thg-close', self.should_live)
+ self.connect('thg-exit', self.should_live)
# log viewer
self.log = CmdLogWidget()
@@ -648,7 +645,7 @@
### signal handlers ###
- def delete_event(self, *args):
+ def should_live(self, *args):
if hasattr(self, 'close_hook'):
if self.close_hook(self):
self.hide()
thg-kuy_rev5052.patch
Description: Binary data
------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
