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

stable grep: save search history when repowidget closes. check for thread activity

Changeset 468a93c3a1d9…

Parent 9143f1f4ae85…

by Steve Borho

Changes to 2 files · Browse files at 468a93c3a1d9 Showing diff from parent 9143f1f4ae85 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​grep.py Stacked
 
238
239
240
241
 
 
 
 
 
 
 
242
243
244
245
246
 
 
 
247
248
249
 
238
239
240
 
241
242
243
244
245
246
247
248
 
249
250
251
252
253
254
255
256
257
@@ -238,12 +238,20 @@
  else:   return super(SearchWidget, self).keyPressEvent(event)   - def closeEvent(self, event): + def canExit(self): + 'Repowidget is closing, can we quit?' + if self.thread and self.thread.isRunning(): + return False + return True + + def saveSettings(self, s):   repoid = str(self.repo[0]) - s = QSettings()   s.setValue('grep/search-'+repoid, self.searchhistory)   s.setValue('grep/paths-'+repoid, self.pathshistory)   + def closeEvent(self, event): + self.saveSettings(QSettings()) +   def searchActivated(self):   'User pressed [Return] in QLineEdit'   if self.thread and self.thread.isRunning():
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
725
726
727
 
 
 
728
729
730
 
739
740
741
 
742
743
744
 
725
726
727
728
729
730
731
732
733
 
742
743
744
745
746
747
748
@@ -725,6 +725,9 @@
  if not self.mqDemand.forward('canExit', default=True):   self.showMessage(_('MQ tab cannot exit'))   return False + if not self.grepDemand.forward('canExit', default=True): + self.showMessage(_('Search tab cannot exit')) + return False   return True     def closeRepoWidget(self): @@ -739,6 +742,7 @@
  self.revDetailsWidget.saveSettings(s)   self.commitDemand.forward('saveSettings', s, 'workbench')   self.manifestDemand.forward('saveSettings', s, 'workbench') + self.grepDemand.forward('saveSettings', s)   self.filterbar.saveSettings(s)   return True