From 6d77eb73a26390d21d38850341247cedded18b9b Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 27 May 2009 01:38:58 +0900 Subject: [PATCH] work around qt bug based on version --- ankiqt/ui/facteditor.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ankiqt/ui/facteditor.py b/ankiqt/ui/facteditor.py index e11df1fd3..9016bca2c 100644 --- a/ankiqt/ui/facteditor.py +++ b/ankiqt/ui/facteditor.py @@ -15,6 +15,8 @@ import ankiqt from ankiqt.ui.utils import mungeQA, saveGeom, restoreGeom, getBase from anki.hooks import addHook, removeHook, runHook from sqlalchemy.exceptions import InvalidRequestError +from PyQt4 import pyqtconfig +QtConfig = pyqtconfig.Configuration() clozeColour = "#0000ff" @@ -683,6 +685,13 @@ class FactEditor(object): runHook("colourChanged") self.setForeground(w) + def _needExtraWord(self): + ver = QtConfig.qt_version >> 8 + if ver == 0x404: + # qt4.4 behaviour is wrong + return False + return True + def insertLatex(self): w = self.focusedEdit() if w: @@ -690,7 +699,7 @@ class FactEditor(object): self.deck.mediaDir(create=True) w.insertHtml("[latex]%s[/latex]" % selected) w.moveCursor(QTextCursor.PreviousWord) - if sys.platform.startswith("win32"): + if self._needExtraWord(): w.moveCursor(QTextCursor.PreviousWord) w.moveCursor(QTextCursor.PreviousCharacter) w.moveCursor(QTextCursor.PreviousCharacter) @@ -702,7 +711,7 @@ class FactEditor(object): self.deck.mediaDir(create=True) w.insertHtml("[$]%s[/$]" % selected) w.moveCursor(QTextCursor.PreviousWord) - if sys.platform.startswith("win32"): + if self._needExtraWord(): w.moveCursor(QTextCursor.PreviousWord) w.moveCursor(QTextCursor.PreviousCharacter) w.moveCursor(QTextCursor.PreviousCharacter) @@ -714,7 +723,7 @@ class FactEditor(object): self.deck.mediaDir(create=True) w.insertHtml("[$$]%s[/$$]" % selected) w.moveCursor(QTextCursor.PreviousWord) - if sys.platform.startswith("win32"): + if self._needExtraWord(): w.moveCursor(QTextCursor.PreviousWord) w.moveCursor(QTextCursor.PreviousCharacter) w.moveCursor(QTextCursor.PreviousCharacter)