Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.5, 2.1, and 2.1.1

stable repofilter: more explicit control over clear button

Placing all the logic in repowidget.clearRevisionSet was a bad idea.

Changeset 5bca3163dfc3…

Parent b2669fcd6319…

by Steve Borho

Changes to 2 files · Browse files at 5bca3163dfc3 Showing diff from parent b2669fcd6319 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repofilter.py Stacked
 
63
64
65
66
67
 
68
69
70
 
99
100
101
 
 
 
 
 
 
 
102
103
104
 
63
64
65
 
 
66
67
68
69
 
98
99
100
101
102
103
104
105
106
107
108
109
110
@@ -63,8 +63,7 @@
  self.clearBtn = QToolButton(self)   self.clearBtn.setIcon(qtlib.geticon('filedelete'))   self.clearBtn.setToolTip(_('Clear current query and query text')) - self.clearBtn.clicked.connect(le.clear) - self.clearBtn.clicked.connect(self.clearRevisionSet) + self.clearBtn.clicked.connect(self.onClearButtonClicked)   self.addWidget(self.clearBtn)   self.addWidget(combo)   @@ -99,6 +98,13 @@
  self._initbranchfilter()   self.refresh()   + def onClearButtonClicked(self): + if self.revsetcombo.lineEdit().text(): + self.revsetcombo.lineEdit().clear() + else: + self.hide() + self.clearRevisionSet.emit() +   def setEnableFilter(self, enabled):   'Enable/disable the changing of the current filter'   self.revsetcombo.setEnabled(enabled)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
346
347
348
349
350
351
352
353
 
 
354
355
356
 
346
347
348
 
 
 
 
 
349
350
351
352
353
@@ -346,11 +346,8 @@
  self.reload()     def clearRevisionSet(self): - if not self.filterbar.revsetle.text(): - self.filterbar.hide() - self.toolbarVisibilityChanged.emit() - return - elif not self.revset: + self.toolbarVisibilityChanged.emit() + if not self.revset:   return   self.revset = []   if self.revsetfilter: