rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add search-highlight-all option

Browse Source
This commit is contained in:
Florian Bruhin 2014-06-26 10:08:26 +02:00
parent eeef9aa930
commit 8812672d7d
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/commands/managers.py
View File

@ -66,13 +66,18 @@ class SearchManager(QObject):
do_search: If a search should be started.
"""
if self._text is not None and self._text != text:
self.do_search.emit('', 0)
flags = 0
if config.get('general', 'search-highlight-all'):
flags |= QWebPage.HighlightAllOccurrences
self.do_search.emit('', flags)
self._text = text
self._flags = 0
if not config.get('general', 'ignore-case'):
self._flags |= QWebPage.FindCaseSensitively
if config.get('general', 'wrap-search'):
self._flags |= QWebPage.FindWrapsAroundDocument
if config.get('general', 'search-highlight-all'):
self._flags |= QWebPage.HighlightAllOccurrences
if rev:
self._flags |= QWebPage.FindBackward
self.do_search.emit(self._text, self._flags)
@ -105,6 +110,9 @@ class SearchManager(QObject):
Emit:
do_search: If a search should be started.
"""
if config.get('general', 'search-highlight-all'):
raise CommandError("search-next doesn't work when "
"search-highlight-all is enabled!")
if self._text is not None:
for _ in range(count):
self.do_search.emit(self._text, self._flags)
@ -119,6 +127,9 @@ class SearchManager(QObject):
Emit:
do_search: If a search should be started.
"""
if config.get('general', 'search-highlight-all'):
raise CommandError("search-prev doesn't work when "
"search-highlight-all is enabled!")
if self._text is None:
return
# The int() here serves as a QFlags constructor to create a copy of the

4
qutebrowser/config/configdata.py
View File

@ -175,6 +175,10 @@ DATA = OrderedDict([
SettingValue(types.Bool(), 'true'),
"Whether to wrap search to the top when arriving at the end."),
('search-highlight-all',
SettingValue(types.Bool(), 'true'),
"Whether to highlight all search matches."),
('startpage',
SettingValue(types.List(), 'http://www.duckduckgo.com'),
"The default page(s) to open at the start, separated by commas."),