Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable repofilter: use asterisks if glyph is not available, trim trailing white-space

Changeset 167cdab90783

Parent b5f20f71fb5d

by Steve Borho

Changes to one file · Browse files at 167cdab90783 Showing diff from parent b5f20f71fb5d Diff from another changeset...

 
26
27
28
29
 
30
31
32
 
38
39
40
 
 
 
 
41
42
43
 
50
51
52
53
 
54
55
56
 
232
233
234
235
236
237
238
 
26
27
28
 
29
30
31
32
 
38
39
40
41
42
43
44
45
46
47
 
54
55
56
 
57
58
59
60
 
236
237
238
 
239
240
241
@@ -26,7 +26,7 @@
    branchChanged = pyqtSignal(unicode, bool)   """Emitted (branch, allparents) when branch selection changed""" - +   _allBranchesLabel = u'\u2605 ' + _('Show all') + u' \u2605'     def __init__(self, repo, parent): @@ -38,6 +38,10 @@
  self._repo = repo   self.filterEnabled = True   + #Check if the font contains the glyph needed by the model + if not QFontMetrics(self.font()).inFont(QString(u'\u2605').at(0)): + self._allBranchesLabel = u'*** %s ***' % _('Show all') +   self.entrydlg = revset.RevisionSetQuery(repo, self)   self.entrydlg.progress.connect(self.progress)   self.entrydlg.showMessage.connect(self.showMessage) @@ -50,7 +54,7 @@
  le = combo.lineEdit()   le.returnPressed.connect(self.returnPressed)   le.selectionChanged.connect(self.selectionChanged) - if hasattr(le, 'setPlaceholderText'): # Qt >= 4.7 + if hasattr(le, 'setPlaceholderText'): # Qt >= 4.7   le.setPlaceholderText(_('### revision set query ###'))   combo.activated.connect(self.comboSelectionActivated)   self.revsetle = le @@ -232,7 +236,6 @@
  curbranch = self._branchCombo.currentText()   if curbranch == self._allBranchesLabel:   curbranch = '' -   return unicode(curbranch)     @pyqtSlot()