langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add exception handling for filter modifications

Browse Source
This commit is contained in:
RumovZ 2021-01-06 20:25:13 +01:00
parent d9f7d2e70d
commit 539f701573
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
qt/aqt/browser.py
View File

@ -1219,23 +1219,27 @@ QTableView {{ gridline-color: {grid} }}
items.append(txt)
txt = ""
txt = " AND ".join(items)
if self.mw.app.keyboardModifiers() & Qt.AltModifier:
txt = self.col.backend.negate_search(txt)
cur = str(self.form.searchEdit.lineEdit().text())
if cur != self._searchPrompt:
mods = self.mw.app.keyboardModifiers()
if mods & Qt.ControlModifier and mods & Qt.ShiftModifier:
txt = self.col.backend.replace_search_term(search=cur, replacement=txt)
elif mods & Qt.ControlModifier:
txt = self.col.backend.concatenate_searches(
sep=pb.ConcatenateSearchesIn.Separator.AND, searches=[cur, txt]
)
elif mods & Qt.ShiftModifier:
txt = self.col.backend.concatenate_searches(
sep=pb.ConcatenateSearchesIn.Separator.OR, searches=[cur, txt]
)
self.form.searchEdit.lineEdit().setText(txt)
self.onSearchActivated()
try:
if self.mw.app.keyboardModifiers() & Qt.AltModifier:
txt = self.col.backend.negate_search(txt)
cur = str(self.form.searchEdit.lineEdit().text())
if cur != self._searchPrompt:
mods = self.mw.app.keyboardModifiers()
if mods & Qt.ControlModifier and mods & Qt.ShiftModifier:
txt = self.col.backend.replace_search_term(search=cur, replacement=txt)
elif mods & Qt.ControlModifier:
txt = self.col.backend.concatenate_searches(
sep=pb.ConcatenateSearchesIn.Separator.AND, searches=[cur, txt]
)
elif mods & Qt.ShiftModifier:
txt = self.col.backend.concatenate_searches(
sep=pb.ConcatenateSearchesIn.Separator.OR, searches=[cur, txt]
)
except InvalidInput as e:
showWarning(str(e))
else:
self.form.searchEdit.lineEdit().setText(txt)
self.onSearchActivated()
def _simpleFilters(self, items):
ml = MenuList()