# HG changeset patch
# User Adrian Buehlmann <adr...@cadifra.com>
# Date 1254853772 -7200
# Node ID 39a2f3febed2c8eb3d6413e6670470fbc1639b05
# Parent d609ba2504023812abb51a3db9af18f6717d50bd
gdialog: access toolbuttons by name, not UI text
diff --git a/tortoisehg/hgtk/gdialog.py b/tortoisehg/hgtk/gdialog.py
--- a/tortoisehg/hgtk/gdialog.py
+++ b/tortoisehg/hgtk/gdialog.py
@@ -306,7 +306,7 @@ class GDialog(gtk.Window):
def make_toolbutton(self, stock, label, handler, userdata=None,
- menu=None, tip=None, toggle=False, icon=None):
+ menu=None, tip=None, toggle=False, icon=None, name=None):
if menu:
tbutton = gtk.MenuToolButton(stock)
tbutton.set_menu(menu)
@@ -326,12 +326,12 @@ class GDialog(gtk.Window):
tbutton.set_use_underline(True)
tbutton.set_label(label)
tbutton.connect('clicked', handler, userdata)
- self.toolbuttons[label] = tbutton
+ if name:
+ self.toolbuttons[name] = tbutton
return tbutton
-
- def get_toolbutton(self, label):
- return self.toolbuttons[label]
+ def get_toolbutton(self, name):
+ return self.toolbuttons[name]
def get_menuitem(self, name, throw=True):
if throw:
diff --git a/tortoisehg/hgtk/history.py b/tortoisehg/hgtk/history.py
--- a/tortoisehg/hgtk/history.py
+++ b/tortoisehg/hgtk/history.py
@@ -77,19 +77,19 @@ class GLog(gdialog.GDialog):
tbar = [
self.make_toolbutton(gtk.STOCK_REFRESH,
_('Re_fresh'),
- self.refresh_clicked,
+ self.refresh_clicked, name='refresh',
tip=_('Reload revision history')),
gtk.SeparatorToolItem(),
self.make_toolbutton(gtk.STOCK_NETWORK,
_('Synchronize'),
- self.synch_clicked,
+ self.synch_clicked, name='synchronize',
tip=_('Launch synchronize tool')),
gtk.SeparatorToolItem(),
]
if 'mq' in self.exs:
self.mqtb = self.make_toolbutton(gtk.STOCK_DIRECTORY,
_('MQ'),
- self.mq_clicked,
+ self.mq_clicked, name='mq',
tip=_('Toggle MQ panel'),
toggle=True,
icon='menupatch.ico')
@@ -177,7 +177,7 @@ class GLog(gdialog.GDialog):
def synch_clicked(self, toolbutton, data):
def sync_closed(dialog):
- self.get_toolbutton(_('Synchronize')).set_sensitive(True)
+ self.get_toolbutton('synchronize').set_sensitive(True)
def synch_callback(parents):
self.repo.invalidate()
@@ -191,7 +191,7 @@ class GLog(gdialog.GDialog):
dlg.set_notify_func(synch_callback, parents)
dlg.connect('destroy', sync_closed)
dlg.show_all()
- self.get_toolbutton(_('Synchronize')).set_sensitive(False)
+ self.get_toolbutton('synchronize').set_sensitive(False)
def toggle_view_column(self, button, property):
active = button.get_active()
@@ -1049,8 +1049,8 @@ class GLog(gdialog.GDialog):
self.toolbar.insert(apply, 0)
disabled = []
- for label in (_('Re_fresh'), _('Synchronize'), _('MQ')):
- tb = self.get_toolbutton(label)
+ for cmd in ('refresh', 'synchronize', 'mq'):
+ tb = self.get_toolbutton(cmd)
if tb:
tb.set_sensitive(False)
disabled.append(tb)
diff --git a/tortoisehg/hgtk/status.py b/tortoisehg/hgtk/status.py
--- a/tortoisehg/hgtk/status.py
+++ b/tortoisehg/hgtk/status.py
@@ -156,22 +156,22 @@ class GStatus(gdialog.GDialog):
else:
tbuttons += [
self.make_toolbutton(gtk.STOCK_JUSTIFY_FILL, _('_Diff'),
- self.diff_clicked,
+ self.diff_clicked, name='diff',
tip=_('Visual diff checked files')),
self.make_toolbutton(gtk.STOCK_MEDIA_REWIND, _('Re_vert'),
- self.revert_clicked,
+ self.revert_clicked, name='revert',
tip=_('Revert checked files')),
self.make_toolbutton(gtk.STOCK_ADD, _('_Add'),
- self.add_clicked,
+ self.add_clicked, name='add',
tip=_('Add checked files')),
self.make_toolbutton(gtk.STOCK_JUMP_TO, _('Move'),
- self.move_clicked,
+ self.move_clicked, name='move',
tip=_('Move checked files to other directory')),
self.make_toolbutton(gtk.STOCK_DELETE, _('_Remove'),
- self.remove_clicked,
+ self.remove_clicked, name='remove',
tip=_('Remove or delete checked files')),
self.make_toolbutton(gtk.STOCK_CLEAR, _('_Forget'),
- self.forget_clicked,
+ self.forget_clicked, name='forget',
tip=_('Forget checked files on next commit')),
gtk.SeparatorToolItem(),
self.make_toolbutton(gtk.STOCK_REFRESH, _('Re_fresh'),
@@ -459,10 +459,8 @@ class GStatus(gdialog.GDialog):
if self.count_revs() == 2:
return
sensitive = check_count and not self.is_merge()
- for label in (_('_Diff'), _('Re_vert'), _('_Add'), _('_Remove'),
- _('Move'), _('_Forget')):
- self.get_toolbutton(label).set_sensitive(sensitive)
for cmd in ('diff', 'revert', 'add', 'remove', 'move', 'forget'):
+ self.get_toolbutton(cmd).set_sensitive(sensitive)
i = self.get_menuitem(cmd, throw=False)
if i:
i.set_sensitive(sensitive)
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
