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

Merge with Adrian

Changeset 01ff7e926a36…

Parents ceed308cf262…

Parents 80eb1ee9ba36…

by Steve Borho

Changes to 2 files · Browse files at 01ff7e926a36 Showing diff from parent ceed308cf262 80eb1ee9ba36 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​gdialog.py Stacked
 
344
345
346
 
 
 
 
 
 
 
 
347
348
349
 
344
345
346
347
348
349
350
351
352
353
354
355
356
357
@@ -344,6 +344,14 @@
  if w:   w.set_sensitive(enable)   + def cmd_set_active(self, name, active): + ws = [] + ws.append(self.toolbuttons.get(name)) + ws.append(self.menuitems.get(name)) + for w in ws: + if w: + w.set_active(active) +   def get_reponame(self):   return hglib.get_reponame(self.repo)  
Change 1 of 7 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
89
90
91
92
 
93
94
 
95
96
97
 
136
137
138
139
 
 
 
 
 
 
 
 
 
 
 
 
 
140
141
 
142
143
144
 
226
227
228
229
230
 
 
231
232
233
 
249
250
251
252
253
 
 
254
255
256
 
543
544
545
546
547
 
 
548
549
550
 
774
775
776
777
778
779
780
 
 
 
 
 
 
781
782
783
 
784
785
786
 
1711
1712
1713
1714
 
1715
1716
1717
1718
1719
 
 
1720
1721
1722
 
89
90
91
 
92
93
 
94
95
96
97
 
136
137
138
 
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
 
239
240
241
 
 
242
243
244
245
246
 
262
263
264
 
 
265
266
267
268
269
 
556
557
558
 
 
559
560
561
562
563
 
787
788
789
 
 
 
 
790
791
792
793
794
795
796
797
 
798
799
800
801
 
1726
1727
1728
 
1729
1730
1731
1732
 
 
1733
1734
1735
1736
1737
@@ -89,9 +89,9 @@
  ]   if 'mq' in self.exs:   self.mqtb = self.make_toolbutton(gtk.STOCK_DIRECTORY, - _('MQ'), + _('Patch Queue'),   self.mq_clicked, name='mq', - tip=_('Toggle MQ panel'), + tip=_('Show/Hide Patch Queue'),   toggle=True,   icon='menupatch.ico')   tbar += [self.mqtb, gtk.SeparatorToolItem()] @@ -136,9 +136,22 @@
  sync_bar_item = [dict(text=_('Sync Bar'), ascheck=True,   func=self.toggle_show_syncbar, check=self.show_syncbar)]   - return [(_('_View'), sync_bar_item + [ + if 'mq' in self.exs: + mq_item = [dict(text=_('Patch Queue'), name='mq', ascheck=True, + func=self.mq_clicked, check=self.mqtb.get_active()) ] + else: + mq_item = [] + + return [(_('_View'), [ + dict(text=_('Load more Revisions'), name='load-more', + func=self.more_clicked, icon=gtk.STOCK_GO_DOWN), + dict(text=_('Load all Revisions'), name='load-all', + func=self.load_all_clicked, icon=gtk.STOCK_GOTO_BOTTOM), + dict(text='----') + ] + sync_bar_item + [   dict(text=_('Filter Bar'), ascheck=True,   func=self.toggle_show_filterbar, check=self.show_filterbar), + ] + mq_item + [   dict(text='----'),   dict(text=_('Choose Details...'), func=self.details_clicked),   dict(text='----'), @@ -226,8 +239,8 @@
    def load_all_clicked(self, button, data=None):   self.graphview.load_all_revisions() - self.loadnextbutton.set_sensitive(False) - self.loadallbutton.set_sensitive(False) + self.enable_cmd('load-more', False) + self.enable_cmd('load-all', False)     def selection_changed(self, graphview):   'Graphview reports a new row selected' @@ -249,8 +262,8 @@
  if not graphview.graphdata:   self.changeview._buffer.set_text('')   self.changeview._filelist.clear() - self.loadnextbutton.set_sensitive(False) - self.loadallbutton.set_sensitive(False) + self.enable_cmd('load-more', False) + self.enable_cmd('load-all', False)     def details_clicked(self, toolbutton, data=None):   self.show_details_dialog() @@ -543,8 +556,8 @@
  opts['npreviews'] = self.npreviews   opts['no_merges'] = self.no_merges   - self.loadnextbutton.set_sensitive(True) - self.loadallbutton.set_sensitive(True) + self.enable_cmd('load-more', True) + self.enable_cmd('load-all', True)   self.ancestrybutton.set_sensitive(False)   pats = opts.get('pats', [])   self.changeview.pats = pats @@ -774,13 +787,15 @@
  sep = gtk.SeparatorToolItem()   sep.set_expand(True)   sep.set_draw(False) - self.loadnextbutton = self.make_toolbutton(gtk.STOCK_GO_DOWN, - _('Load more'), self.more_clicked, tip=_('load more revisions')) - self.loadallbutton = self.make_toolbutton(gtk.STOCK_GOTO_BOTTOM, - _('Load all'), self.load_all_clicked, tip=_('load all revisions')) + loadnext = self.make_toolbutton(gtk.STOCK_GO_DOWN, + _('Load more'), self.more_clicked, tip=_('load more revisions'), + name='load-more') + loadall = self.make_toolbutton(gtk.STOCK_GOTO_BOTTOM, + _('Load all'), self.load_all_clicked, tip=_('load all revisions'), + name='load-all')     tbar = self.changeview.get_tbbuttons() - tbar += [sep, self.loadnextbutton, self.loadallbutton] + tbar += [sep, loadnext, loadall]   for tbutton in tbar:   self.toolbar.insert(tbutton, -1)   @@ -1711,12 +1726,12 @@
  # set the state of MQ toolbutton   if hasattr(self, 'mqtb'):   self.mqtb.handler_block_by_func(self.mq_clicked) - self.mqtb.set_active(enable) + self.cmd_set_active('mq', enable)   self.mqtb.handler_unblock_by_func(self.mq_clicked)   self.enable_cmd('mq', self.mqwidget.has_mq())   - def mq_clicked(self, toolbutton, data=None): - self.enable_mqpanel(self.mqtb.get_active()) + def mq_clicked(self, widget, data=None): + self.enable_mqpanel(widget.get_active())     def tree_button_press(self, tree, event):   if event.button == 3 and not (event.state & (gtk.gdk.SHIFT_MASK |