mirror of
https://github.com/ankitects/anki.git
synced 2025-09-20 23:12:21 -04:00
Merge branch 'master' of https://github.com/sobjornstad/anki
This commit is contained in:
commit
03f9c76b9e
2 changed files with 2 additions and 4 deletions
|
@ -513,9 +513,6 @@ class Browser(QMainWindow):
|
||||||
self.onSearch)
|
self.onSearch)
|
||||||
self.form.searchEdit.setCompleter(None)
|
self.form.searchEdit.setCompleter(None)
|
||||||
self.form.searchEdit.addItems(self.mw.pm.profile['searchHistory'])
|
self.form.searchEdit.addItems(self.mw.pm.profile['searchHistory'])
|
||||||
self.connect(self.form.searchEdit.lineEdit(),
|
|
||||||
SIGNAL("returnPressed()"),
|
|
||||||
self.onSearch)
|
|
||||||
|
|
||||||
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."
|
||||||
|
|
|
@ -223,7 +223,8 @@ and no other programs are accessing your profile folders, then try again."""))
|
||||||
if os.path.exists(p):
|
if os.path.exists(p):
|
||||||
return p
|
return p
|
||||||
else:
|
else:
|
||||||
return os.path.expanduser("~/Documents/Anki")
|
loc = QDesktopServices.storageLocation(QDesktopServices.DocumentsLocation)
|
||||||
|
return os.path.join(loc, "Anki")
|
||||||
|
|
||||||
def _loadMeta(self):
|
def _loadMeta(self):
|
||||||
path = os.path.join(self.base, "prefs.db")
|
path = os.path.join(self.base, "prefs.db")
|
||||||
|
|
Loading…
Reference in a new issue