Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

hgcmd: use gtklib.set_tortoise_keys() for CmdLogDialog's accelerators

Changeset 685424a36325…

Parent 144d6d6fcfb9…

by Yuki KODAMA

Changes to 2 files · Browse files at 685424a36325 Showing diff from parent 144d6d6fcfb9 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​gtklib.py Stacked
 
68
69
70
 
 
71
72
73
 
68
69
70
71
72
73
74
75
@@ -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)
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​hgcmd.py Stacked
 
596
597
598
 
599
600
601
 
602
603
604
605
606
607
608
609
610
611
612
 
 
 
 
 
613
614
615
 
648
649
650
651
 
652
653
654
 
596
597
598
599
600
601
 
602
603
604
 
 
 
 
 
 
 
 
 
605
606
607
608
609
610
611
612
 
645
646
647
 
648
649
650
651
@@ -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()