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

stable hggtk: show tag/branch name with underline correctly

Fixed the following widgets:

* Menu of repository explorer (hgtk log)
* Branch button of commit dialog (hgtk commit)

fixes #1004

Changeset fabcf89b8242

Parent 9c25484a5a67

by Yuya Nishihara

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

 
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():
 
766
767
768
 
 
769
770
771
 
779
780
781
782
 
783
784
785
786
 
787
788
789
 
766
767
768
769
770
771
772
773
 
781
782
783
 
784
785
786
787
788
789
790
791
792
@@ -766,6 +766,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).   """ @@ -779,11 +781,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  
 
274
275
276
277
 
 
278
279
280
 
281
282
283
 
289
290
291
292
 
 
293
294
295
 
274
275
276
 
277
278
279
280
 
281
282
283
284
 
290
291
292
 
293
294
295
296
297
@@ -274,10 +274,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, @@ -289,7 +290,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='----'))