Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

gdialog: access toolbuttons by name, not UI text

Changeset 39a2f3febed2…

Parent d609ba250402…

by Adrian Buehlmann

Changes to 3 files · Browse files at 39a2f3febed2 Showing diff from parent d609ba250402 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​gdialog.py Stacked
 
306
307
308
309
 
310
311
312
 
326
327
328
329
 
 
330
331
332
333
334
 
 
335
336
337
 
306
307
308
 
309
310
311
312
 
326
327
328
 
329
330
331
332
 
 
 
333
334
335
336
337
@@ -306,7 +306,7 @@
      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 @@
  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:
Change 1 of 4 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
77
78
79
80
 
81
82
83
84
85
 
86
87
88
89
90
91
92
 
93
94
95
 
177
178
179
180
 
181
182
183
 
191
192
193
194
 
195
196
197
 
1049
1050
1051
1052
1053
 
 
1054
1055
1056
 
77
78
79
 
80
81
82
83
84
 
85
86
87
88
89
90
91
 
92
93
94
95
 
177
178
179
 
180
181
182
183
 
191
192
193
 
194
195
196
197
 
1049
1050
1051
 
 
1052
1053
1054
1055
1056
@@ -77,19 +77,19 @@
  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 @@
    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 @@
  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 @@
  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)
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​status.py Stacked
 
156
157
158
159
 
160
161
162
 
163
164
165
 
166
167
168
 
169
170
171
 
172
173
174
 
175
176
177
 
459
460
461
462
463
464
465
 
466
467
468
 
156
157
158
 
159
160
161
 
162
163
164
 
165
166
167
 
168
169
170
 
171
172
173
 
174
175
176
177
 
459
460
461
 
 
 
462
463
464
465
466
@@ -156,22 +156,22 @@
  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 @@
  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)