GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-13 08:07:11 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

switch to a combobox for the search, at least for now

Browse source
This commit is contained in:
Damien Elmes 2012-04-06 14:08:33 +09:00
parent 3fd1cf0158
commit f793b8a695
2 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
aqt/browser.py
View file

@ -326,8 +326,8 @@ class Browser(QMainWindow):
self.onUndoState(self.mw.form.actionUndo.isEnabled()) self.onUndoState(self.mw.form.actionUndo.isEnabled())
self.form.searchEdit.setFocus() self.form.searchEdit.setFocus()
self.show() self.show()
self.form.searchEdit.setText("deck:current is:recent") self.form.searchEdit.lineEdit().setText("deck:current is:recent")
self.form.searchEdit.selectAll() self.form.searchEdit.lineEdit().selectAll()
self.onSearch() self.onSearch()
def setupToolbar(self): def setupToolbar(self):
@ -418,25 +418,27 @@ class Browser(QMainWindow):
self.connect(self.form.searchButton, self.connect(self.form.searchButton,
SIGNAL("clicked()"), SIGNAL("clicked()"),
self.onSearch) self.onSearch)
self.connect(self.form.searchEdit, self.connect(self.form.searchEdit.lineEdit(),
SIGNAL("returnPressed()"), SIGNAL("returnPressed()"),
self.onSearch) self.onSearch)
self.setTabOrder(self.form.searchEdit, self.form.tableView) self.setTabOrder(self.form.searchEdit, self.form.tableView)
self.compModel = QStringListModel() # self.compModel = QStringListModel()
self.compModel.setStringList(self.mw.pm.profile['searchHistory']) self.form.searchEdit.addItems(self.mw.pm.profile['searchHistory'])
self.searchComp = QCompleter(self.compModel, self.form.searchEdit) #self.compModel.setStringList(self.mw.pm.profile['searchHistory'])
self.searchComp.setCompletionMode(QCompleter.UnfilteredPopupCompletion) #self.searchComp = QCompleter(self.compModel, self.form.searchEdit)
self.searchComp.setCaseSensitivity(Qt.CaseInsensitive) #self.searchComp.setCompletionMode(QCompleter.UnfilteredPopupCompletion)
self.form.searchEdit.setCompleter(self.searchComp) #self.searchComp.setCaseSensitivity(Qt.CaseInsensitive)
#self.form.searchEdit.setCompleter(self.searchComp)
def onSearch(self, reset=True): def onSearch(self, reset=True):
"Careful: if reset is true, the current note is saved." "Careful: if reset is true, the current note is saved."
txt = unicode(self.form.searchEdit.text()).strip() txt = unicode(self.form.searchEdit.lineEdit().text()).strip()
sh = self.mw.pm.profile['searchHistory'] sh = self.mw.pm.profile['searchHistory']
if txt not in sh: if txt not in sh:
sh.insert(0, txt) sh.insert(0, txt)
sh = sh[:30] sh = sh[:30]
self.compModel.setStringList(sh) self.form.searchEdit.clear()
self.form.searchEdit.addItems(sh)
self.mw.pm.profile['searchHistory'] = sh self.mw.pm.profile['searchHistory'] = sh
self.model.search(txt, reset) self.model.search(txt, reset)
if not self.model.cards: if not self.model.cards:
@ -648,7 +650,7 @@ class Browser(QMainWindow):
cur = unicode(self.form.searchEdit.text()) cur = unicode(self.form.searchEdit.text())
if cur: if cur:
txt = cur + " " + txt txt = cur + " " + txt
self.form.searchEdit.setText(txt) self.form.searchEdit.lineEdit().setText(txt)
self.onSearch() self.onSearch()
def _systemTagTree(self, root): def _systemTagTree(self, root):
@ -1032,7 +1034,7 @@ update cards set usn=?, mod=?, did=? where odid=0 and id in """ + ids2str(
def selectNotes(self): def selectNotes(self):
nids = self.selectedNotes() nids = self.selectedNotes()
self.form.searchEdit.setText("nid:"+",".join([str(x) for x in nids])) self.form.searchEdit.lineEdit().setText("nid:"+",".join([str(x) for x in nids]))
# clear the selection so we don't waste energy preserving it # clear the selection so we don't waste energy preserving it
tv = self.form.tableView tv = self.form.tableView
tv.selectionModel().clear() tv.selectionModel().clear()
@ -1212,7 +1214,7 @@ select fm.id, fm.name from fieldmodels fm""")
self.col.finishProgress() self.col.finishProgress()
def dupeLinkClicked(self, link): def dupeLinkClicked(self, link):
self.form.searchEdit.setText(link.toString()) self.form.searchEdit.lineEdit().setText(link.toString())
self.onSearch() self.onSearch()
self.onNote() self.onNote()
@ -1238,7 +1240,7 @@ select fm.id, fm.name from fieldmodels fm""")
def onFind(self): def onFind(self):
self.form.searchEdit.setFocus() self.form.searchEdit.setFocus()
self.form.searchEdit.selectAll() self.form.searchEdit.lineEdit().selectAll()
def onNote(self): def onNote(self):
self.editor.focus() self.editor.focus()

23
designer/browser.ui
View file

@ -96,13 +96,6 @@
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0">
<widget class="QLineEdit" name="searchEdit">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QPushButton" name="searchButton"> <widget class="QPushButton" name="searchButton">
<property name="text"> <property name="text">
@ -110,6 +103,22 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QComboBox" name="searchEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>true</bool>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>