Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset eaf56504c9fe…

Parents ac11ff946d81…

Parents fabcf89b8242…

by Steve Borho

Changes to 3 files · Browse files at eaf56504c9fe Showing diff from parent ac11ff946d81 fabcf89b8242 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​commit.py Stacked
 
384
385
386
387
 
388
389
390
 
384
385
386
 
387
388
389
390
@@ -384,7 +384,7 @@
    mbox = gtk.HBox()   self.connect('thg-accept', self.thgaccept) - self.branchbutton = gtk.Button() + self.branchbutton = gtk.Button(use_underline=False)   self.branchbutton.connect('clicked', self.branch_clicked)   mbox.pack_start(self.branchbutton, False, False, 2)   if self.is_merge():
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​gtklib.py Stacked
 
865
866
867
 
 
868
869
870
 
878
879
880
881
 
882
883
884
885
 
886
887
888
 
865
866
867
868
869
870
871
872
 
880
881
882
 
883
884
885
886
887
888
889
890
891
@@ -865,6 +865,8 @@
  check: toggle or selection state for check/radio menu item.   Default: False.   sensitive: sensitive state on init. Default: True. + use_underline: handle underline as accelerator key prefix. + Default: True.   args: an argument list for 'handler' parameter.   Default: [] (an empty list).   """ @@ -878,11 +880,12 @@
  menu = gtk.ImageMenuItem(label)   menu.set_image(get_icon_image(icon))   else: - menu = gtk.MenuItem(label, True) + menu = gtk.MenuItem(label)   if handler:   args = kargs.get('args', [])   menu.connect('activate', handler, *args)   menu.set_sensitive(kargs.get('sensitive', True)) + menu.set_use_underline(kargs.get('use_underline', True))   menu.set_border_width(1)   return menu  
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
285
286
287
288
 
 
289
290
291
 
292
293
294
 
300
301
302
303
 
 
304
305
306
 
285
286
287
 
288
289
290
291
 
292
293
294
295
 
301
302
303
 
304
305
306
307
308
@@ -285,10 +285,11 @@
  navi_b = []   for name in lb[:10]:   lname = hglib.fromutf(name) - navi_b.append(dict(text=name, func=navigate, args=[lname])) + navi_b.append(dict(text=name, func=navigate, args=[lname], + use_underline=False))   filter_b.append(dict(text=name, name='@' + name,   func=self.filter_handler, args=['branch', name], - asradio=True, rg='all')) + asradio=True, rg='all', use_underline=False))   if len(navi_b) > 0:   navi_menu.append(dict(text='----'))   navi_menu.append(dict(text=_('Branches'), subitems=navi_b, @@ -300,7 +301,8 @@
  navi_t = []   for tag in ft:   tname = hglib.toutf(tag) - navi_t.append(dict(text=tname, func=navigate, args=[tag])) + navi_t.append(dict(text=tname, func=navigate, args=[tag], + use_underline=False))   if len(navi_t) > 0:   if len(navi_menu) == 0:   navi_menu.append(dict(text='----'))