Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

manifestdialog: connect search actions

Changeset 3e144c972274…

Parent 0698dbd18443…

by Yuya Nishihara

Changes to one file · Browse files at 3e144c972274 Showing diff from parent 0698dbd18443 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
23
24
25
26
 
27
28
29
 
40
41
42
 
43
44
45
 
49
50
51
 
52
53
54
 
79
80
81
 
 
 
 
 
 
82
83
84
 
95
96
97
 
 
 
 
 
 
98
99
100
 
133
134
135
136
 
 
137
138
139
 
23
24
25
 
26
27
28
29
 
40
41
42
43
44
45
46
 
50
51
52
53
54
55
56
 
81
82
83
84
85
86
87
88
89
90
91
92
 
103
104
105
106
107
108
109
110
111
112
113
114
 
147
148
149
 
150
151
152
153
154
@@ -23,7 +23,7 @@
 from PyQt4.QtCore import *  from PyQt4.QtGui import *   -from tortoisehg.util import paths +from tortoisehg.util import paths, hglib    from tortoisehg.hgqt import qtlib, annotate, status, thgrepo  from tortoisehg.hgqt.i18n import _ @@ -40,6 +40,7 @@
    self._manifest_widget = ManifestWidget(ui, repo, rev)   self._manifest_widget.revchanged.connect(self._updatewindowtitle) + self._manifest_widget.grepRequested.connect(self._openSearchWidget)   self.setCentralWidget(self._manifest_widget)   self.addToolBar(self._manifest_widget.toolbar)   @@ -49,6 +50,7 @@
  self._searchbar.searchRequested.connect(   self._manifest_widget.searchText)   self.addToolBar(self._searchbar) + self._manifest_widget.searchRequested.connect(self._searchbar.search)     self.setStatusBar(QStatusBar())   self._manifest_widget.revisionHint.connect(self.statusBar().showMessage) @@ -79,6 +81,12 @@
  s.setValue('manifest/splitter',   self._manifest_widget._splitter.saveState())   + @pyqtSlot(unicode, dict) + def _openSearchWidget(self, pattern, opts): + opts = dict((str(k), str(v)) for k, v in opts.iteritems()) + from tortoisehg.hgqt import run + run.grep(self._repo.ui, hglib.fromunicode(pattern), **opts) +  class _NullView(QWidget):   """empty widget for content view"""   def __init__(self, parent=None): @@ -95,6 +103,12 @@
  revisionHint = pyqtSignal(unicode)   """Emitted when to show revision summary as a hint"""   + searchRequested = pyqtSignal(unicode) + """Emitted (pattern) when user request to search content""" + + grepRequested = pyqtSignal(unicode, dict) + """Emitted (pattern, opts) when user request to search changelog""" +   def __init__(self, ui, repo, rev=None, parent=None):   super(ManifestWidget, self).__init__(parent)   self._ui = ui @@ -133,7 +147,8 @@
  self._fileview = annotate.AnnotateView(self._repo)   self._contentview.addWidget(self._fileview)   self._fileview.revSelected.connect(lambda a: self.setSource(*a[:2])) - self._fileview.revisionHint.connect(self.revisionHint) + for name in ('revisionHint', 'searchRequested', 'grepRequested'): + getattr(self._fileview, name).connect(getattr(self, name))   self._contentview.currentChanged.connect(   lambda: self._fileselected(self._treeview.currentIndex()))