GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 08:46:37 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

don't call toString() on registry results; don't cast QUrl.toString()

Browse source
This commit is contained in:
Damien Elmes 2011-04-27 20:56:14 +09:00
parent f0311d1ecb
commit 3a4443404b
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aqt/browser.py
View file

@ -1206,7 +1206,7 @@ select fm.id, fm.name from fieldmodels fm""")
self.deck.finishProgress() self.deck.finishProgress()
def dupeLinkClicked(self, link): def dupeLinkClicked(self, link):
self.form.searchEdit.setText(str(link.toString())) self.form.searchEdit.setText(link.toString())
self.onSearch() self.onSearch()
self.onFact() self.onFact()

4
aqt/editor.py
View file

@ -808,7 +808,7 @@ class EditorWebView(AnkiWebView):
if not oldmime.hasHtml() and oldmime.hasUrls(): if not oldmime.hasHtml() and oldmime.hasUrls():
# qt gives it to us twice # qt gives it to us twice
txt += '<img src="%s">' % os.path.basename( txt += '<img src="%s">' % os.path.basename(
unicode(oldmime.urls()[0].toString())) oldmime.urls()[0].toString())
mime.setHtml(txt) mime.setHtml(txt)
else: else:
mime.setHtml(oldmime.html()) mime.setHtml(oldmime.html())
@ -874,7 +874,7 @@ class EditorWebView(AnkiWebView):
def _processUrls(self, mime): def _processUrls(self, mime):
links = [] links = []
for url in mime.urls(): for url in mime.urls():
url = unicode(url.toString()) url = url.toString()
link = self._retrieveURL(url) link = self._retrieveURL(url)
if link: if link:
links.append(link) links.append(link)

5
aqt/main.py
View file

@ -992,8 +992,7 @@ sync will overwrite any remote changes. Continue?"""))
if isWin: if isWin:
s = QSettings(QSettings.UserScope, "Microsoft", "Windows") s = QSettings(QSettings.UserScope, "Microsoft", "Windows")
s.beginGroup("CurrentVersion/Explorer/Shell Folders") s.beginGroup("CurrentVersion/Explorer/Shell Folders")
p = os.path.join(unicode(s.value("Personal").toString()), p = os.path.join(s.value("Personal"), "My Dropbox")
"My Dropbox")
else: else:
p = os.path.expanduser("~/Dropbox") p = os.path.expanduser("~/Dropbox")
return p return p
@ -1168,7 +1167,7 @@ It can take a long time. Proceed?""")):
if isWin: if isWin:
s = QSettings(QSettings.UserScope, "Microsoft", "Windows") s = QSettings(QSettings.UserScope, "Microsoft", "Windows")
s.beginGroup("CurrentVersion/Explorer/Shell Folders") s.beginGroup("CurrentVersion/Explorer/Shell Folders")
d = unicode(s.value("Personal").toString()) d = s.value("Personal")
if os.path.exists(d): if os.path.exists(d):
d = os.path.join(d, "Anki") d = os.path.join(d, "Anki")
else: else:

2
aqt/webview.py
View file

@ -101,7 +101,7 @@ class AnkiWebView(QWebView):
def _jsErr(self, msg, line, srcID): def _jsErr(self, msg, line, srcID):
sys.stderr.write(_("JS error on line %d: %s") % (line, msg+"\n")) sys.stderr.write(_("JS error on line %d: %s") % (line, msg+"\n"))
def _linkHandler(self, url): def _linkHandler(self, url):
self.linkHandler(unicode(url.toString())) self.linkHandler(url.toString())
def _loadFinished(self): def _loadFinished(self):
self.page().mainFrame().addToJavaScriptWindowObject("py", self._bridge) self.page().mainFrame().addToJavaScriptWindowObject("py", self._bridge)
if self._loadFinishedCB: if self._loadFinishedCB: