On 16.03.2010 16:44, Wagner Bruna wrote:
> Adrian Buehlmann wrote:
>> On 15.03.2010 22:24, Greg Ward wrote:
>>> Yeah, yeah, I'm still stuck with CentOS 5, using GTK 2.10.4 with pygtk
>>> 2.10.1. This recent changeset breaks "hgtk log" for me:
>>>
>>> changeset: 6129:fabcf89b8242
>>> branch: stable
>>> parent: 6126:9c25484a5a67
>>> user: Yuya Nishihara <y...@tcha.org>
>>> date: 2010-03-11 23:33:05 +0900
>>> files:
>>> M tortoisehg/hgtk/commit.py
>>> M tortoisehg/hgtk/gtklib.py
>>> M tortoisehg/hgtk/history.py
>>> description:
>>> hggtk: show tag/branch name with underline correctly
>
> Could you test this ugly workaround? (seems to work here, on 2.12).
>
> ++t;
> Wagner
>
> # HG changeset patch
> # User Wagner Bruna <wbr...@softwareexpress.com.br>
> # Date 1268753911 10800
> # Branch stable
> # Node ID 6bbdfbcb598d201f04ca29b9f283d9150e6ed95b
> # Parent a601fded0309930ce0441bcfd667e8ba964b4bfa
> gtklib: workaround for gtk < 2.14
>
> fabcf89b8242 uses gtk.MenuItem.set_use_underline , not available on
> gtk < 2.14.
>
> fixes #1004 again
>
> diff --git a/tortoisehg/hgtk/gtklib.py b/tortoisehg/hgtk/gtklib.py
> --- a/tortoisehg/hgtk/gtklib.py
> +++ b/tortoisehg/hgtk/gtklib.py
> @@ -771,6 +771,10 @@
> args: an argument list for 'handler' parameter.
> Default: [] (an empty list).
> """
> + use_underline = kargs.get('use_underline', True)
> + if gtk.gtk_version < (2, 14, 0) and not use_underline:
> + # workaround (set_use_underline not available on gtk < 2.14)
> + label = label.replace('_', '__')
> if kargs.get('asradio') or kargs.get('ascheck'):
> if kargs.get('asradio'):
> menu = gtk.RadioMenuItem(kargs.get('group'), label)
> @@ -786,7 +790,8 @@
> 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))
> + if gtk.gtk_version >= (2, 14, 0):
> + menu.set_use_underline(use_underline)
> menu.set_border_width(1)
> return menu
Pushed as http://bitbucket.org/tortoisehg/stable/changeset/bb2aa283662f/
after having manually fixed the whitespace damage (please use
patchbomb/hgtk log email next time).
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
