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

Fix #1315303 [[1.35] ebook-edit - syntax highlighting does not work on Mac OS X 10.9.2](https://bugs.launchpad.net/calibre/+bug/1315303)

Browse Source
This commit is contained in:
Kovid Goyal 2014-05-02 15:34:32 +05:30
parent 0c44e18748
commit f1f030d34e
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/gui2/tweak_book/editor/syntax/base.py
View File

@ -6,8 +6,6 @@ from __future__ import (unicode_literals, division, absolute_import,
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
import weakref
from PyQt4.Qt import ( from PyQt4.Qt import (
QTextCursor, pyqtSlot, QTextBlockUserData, QTextLayout) QTextCursor, pyqtSlot, QTextBlockUserData, QTextLayout)
@ -52,7 +50,7 @@ class SyntaxHighlighter(object):
user_data_factory = SimpleUserData user_data_factory = SimpleUserData
def __init__(self): def __init__(self):
self.document_ref = lambda : None self.doc = None
def apply_theme(self, theme): def apply_theme(self, theme):
self.theme = {k:highlight_to_char_format(v) for k, v in theme.iteritems()} self.theme = {k:highlight_to_char_format(v) for k, v in theme.iteritems()}
@ -63,7 +61,7 @@ class SyntaxHighlighter(object):
self.formats = self.create_formats_func() self.formats = self.create_formats_func()
def set_document(self, doc): def set_document(self, doc):
old_doc = self.document_ref() old_doc = self.doc
if old_doc is not None: if old_doc is not None:
old_doc.contentsChange.disconnect(self.reformat_blocks) old_doc.contentsChange.disconnect(self.reformat_blocks)
c = QTextCursor(old_doc) c = QTextCursor(old_doc)
@ -73,15 +71,14 @@ class SyntaxHighlighter(object):
blk.layout().clearAdditionalFormats() blk.layout().clearAdditionalFormats()
blk = blk.next() blk = blk.next()
c.endEditBlock() c.endEditBlock()
self.doc = None
if doc is not None: if doc is not None:
self.document_ref = weakref.ref(doc) self.doc = doc
doc.contentsChange.connect(self.reformat_blocks) doc.contentsChange.connect(self.reformat_blocks)
self.rehighlight() self.rehighlight()
else:
self.document_ref = lambda : None
def rehighlight(self): def rehighlight(self):
doc = self.document_ref() doc = self.doc
if doc is None: if doc is None:
return return
lb = doc.lastBlock() lb = doc.lastBlock()
@ -99,7 +96,7 @@ class SyntaxHighlighter(object):
@pyqtSlot(int, int, int) @pyqtSlot(int, int, int)
def reformat_blocks(self, position, removed, added): def reformat_blocks(self, position, removed, added):
doc = self.document_ref() doc = self.doc
if doc is None: if doc is None:
return return
last_block = doc.findBlock(position + added + (1 if removed > 0 else 0)) last_block = doc.findBlock(position + added + (1 if removed > 0 else 0))