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

stable history: replace 'Branch' filter label with default item of combobox

Changeset 49abd92a79da…

Parent c579cd27e474…

by Yuki KODAMA

Changes to one file · Browse files at 49abd92a79da Showing diff from parent c579cd27e474 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
417
418
419
 
420
421
422
 
1005
1006
1007
1008
 
1009
 
 
1010
1011
1012
1013
1014
 
1015
1016
 
1017
1018
1019
 
1436
1437
1438
1439
 
 
 
 
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
 
417
418
419
420
421
422
423
 
1006
1007
1008
 
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
 
1441
1442
1443
 
1444
1445
1446
1447
1448
1449
1450
1451
1452
 
 
 
1453
1454
1455
@@ -417,6 +417,7 @@
  return     if type == 'branch': + self.lastbranchrow = None   self.select_branch(self.branchcombo)   return   @@ -1005,15 +1006,19 @@
  filterbox.append_widget(hidemerges, padding=0)   self.hidemerges = hidemerges   - branches = gtk.RadioButton(all, _('Branch')) + branches = gtk.RadioButton(all)   branches.connect('toggled', self.filter_selected, 'branch') + branches.set_property('tooltip-text', _('Branch Filter')) + branches.set_property('has-tooltip', True)   branches.set_sensitive(False)   filterbox.append_widget(branches, padding=0)   self.branchbutton = branches     branchcombo = gtk.combo_box_new_text() + branchcombo.append_text(_('Branches...'))   for name in self.get_live_branches():   branchcombo.append_text(hglib.toutf(name)) + branchcombo.set_active(0)   branchcombo.connect('changed', self.select_branch)   self.lastbranchrow = None   filterbox.append_widget(branchcombo, padding=0) @@ -1436,15 +1441,15 @@
    def select_branch(self, combo):   row = combo.get_active() - if row >= 0 and row != self.lastbranchrow: + if row == 0: + if self.lastbranchrow: + combo.set_active(self.lastbranchrow) + elif row != self.lastbranchrow:   self.filter = 'branch'   self.lastbranchrow = row   self.branchbutton.set_active(True)   self.branchbutton.set_sensitive(True)   self.reload_log(branch=combo.get_model()[row][0]) - else: - self.lastbranchrow = None - self.branchbutton.set_sensitive(False)     def show_goto_dialog(self):   'Launch a modeless goto revision dialog'