Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2014-10-29 20:53:56 +05:30
parent a1d3533d3f
commit 8229b8b1cb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/tweak_book/editor/text.py
View File

@ -14,7 +14,7 @@ import regex
from PyQt5.Qt import ( from PyQt5.Qt import (
QPlainTextEdit, QFontDatabase, QToolTip, QPalette, QFont, QKeySequence, QPlainTextEdit, QFontDatabase, QToolTip, QPalette, QFont, QKeySequence,
QTextEdit, QTextFormat, QWidget, QSize, QPainter, Qt, QRect, pyqtSlot, QTextEdit, QTextFormat, QWidget, QSize, QPainter, Qt, QRect, pyqtSlot,
QApplication, QMimeData, QColor, QColorDialog, QTimer, pyqtSignal) QApplication, QMimeData, QColor, QColorDialog, QTimer, pyqtSignal, QT_VERSION)
from calibre import prepare_string_for_xml, xml_entity_to_unicode from calibre import prepare_string_for_xml, xml_entity_to_unicode
from calibre.constants import isosx from calibre.constants import isosx
@ -739,7 +739,7 @@ class TextEdit(PlainTextEdit):
self.setOverwriteMode(self.overwriteMode() ^ True) self.setOverwriteMode(self.overwriteMode() ^ True)
ev.accept() ev.accept()
return return
if isosx and ev.modifiers() == Qt.ControlModifier and re.search(r'[a-zA-Z0-9]+', ev.text()) is not None: if isosx and QT_VERSION < 0x504000 and ev.modifiers() == Qt.ControlModifier and re.search(r'[a-zA-Z0-9]+', ev.text()) is not None:
# For some reason Qt 5 translates Cmd+key into text on OS X # For some reason Qt 5 translates Cmd+key into text on OS X
# https://bugreports.qt-project.org/browse/QTBUG-36281 # https://bugreports.qt-project.org/browse/QTBUG-36281
ev.setAccepted(False) ev.setAccepted(False)