Commit 31eced96 authored by Steve Borho's avatar Steve Borho
Browse files

revdetails: remove searchbar, fix layout comment

parent 1cc18a91e02a
...@@ -61,15 +61,13 @@ class RevDetailsWidget(QWidget): ...@@ -61,15 +61,13 @@ class RevDetailsWidget(QWidget):
# + revisiondetails_layout -----------------------------------------+ # + revisiondetails_layout -----------------------------------------+
# |+ filelist_splitter ........ | # |+ filelist_splitter ........ |
# | + tbarFileListFrame (vbox)| + cset_and_file_details_frame (vbox)| # | + tbarFileListFrame (vbox)| + cset_and_file_details_frame (vbox)|
# | + diffToolbar | + revpanel | # | + mergeToolbar | + revpanel |
# +---------------------------+-------------------------------------+ # +---------------------------+-------------------------------------+
# | + filelist | + message_splitter | # | + filelist | + message_splitter |
# | | :+ message | # | | :+ message |
# | | :----------------------------------+ # | | :----------------------------------+
# | | + fileview | # | | + fileview |
# +---------------------------+-------------------------------------+ # +---------------------------+-------------------------------------+
# |+ searchbar |
# +-----------------------------------------------------------------+
revisiondetails_layout = QVBoxLayout(self) revisiondetails_layout = QVBoxLayout(self)
revisiondetails_layout.setSpacing(0) revisiondetails_layout.setSpacing(0)
...@@ -167,12 +165,6 @@ class RevDetailsWidget(QWidget): ...@@ -167,12 +165,6 @@ class RevDetailsWidget(QWidget):
revisiondetails_layout.addWidget(self.filelist_splitter) revisiondetails_layout.addWidget(self.filelist_splitter)
self.searchbar = qscilib.SearchToolBar(hidable=True)
self.searchbar.hide()
self.searchbar.searchRequested.connect(self.fileview.find)
self.searchbar.conditionChanged.connect(self.fileview.highlightText)
revisiondetails_layout.addWidget(self.searchbar)
self.fileview.filled.connect(self._updateHighlightText)
self.filelist.fileRevSelected.connect(self._displayFile) self.filelist.fileRevSelected.connect(self._displayFile)
self.filelist.clearDisplay.connect(self.fileview.clearDisplay) self.filelist.clearDisplay.connect(self.fileview.clearDisplay)
...@@ -186,22 +178,6 @@ class RevDetailsWidget(QWidget): ...@@ -186,22 +178,6 @@ class RevDetailsWidget(QWidget):
self.actionActivateFileAlt.triggered.connect(fileActivated) self.actionActivateFileAlt.triggered.connect(fileActivated)
self.mergeToolBar.addAction(self.filelist.actionShowAllMerge) self.mergeToolBar.addAction(self.filelist.actionShowAllMerge)
@pyqtSlot()
def toggleSearchBar(self):
vis = self.searchbar.isVisible()
if vis:
self.searchbar.hide()
else:
self.searchbar.show()
self.searchbar.setFocus()
@pyqtSlot()
def _updateHighlightText(self):
if not self.searchbar.isVisible():
return
self.fileview.highlightText(self.searchbar.pattern(),
self.searchbar.caseInsensitive())
def create_models(self): def create_models(self):
self.filelistmodel = HgFileListModel(self.repo, self) self.filelistmodel = HgFileListModel(self.repo, self)
...@@ -212,7 +188,6 @@ class RevDetailsWidget(QWidget): ...@@ -212,7 +188,6 @@ class RevDetailsWidget(QWidget):
@pyqtSlot(object, object, object) @pyqtSlot(object, object, object)
def _displayFile(self, file, rev, status): def _displayFile(self, file, rev, status):
self.fileview.displayFile(file, rev, status) self.fileview.displayFile(file, rev, status)
self._updateHighlightText()
def revision_selected(self, rev): def revision_selected(self, rev):
self._last_rev = rev self._last_rev = rev
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment