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

Proper fix for breakage in LRF viewer caused by API change in QGraphicsItem in Qt 4.6

Browse Source
This commit is contained in:
Kovid Goyal 2010-02-13 22:26:07 -07:00
parent a2229b6e51
commit d21f3ffb52
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/lrf_renderer/document.py
View File

@ -79,6 +79,8 @@ class _Canvas(QGraphicsRectItem):
pen = QPen() pen = QPen()
pen.setStyle(Qt.NoPen) pen.setStyle(Qt.NoPen)
self.setPen(pen) self.setPen(pen)
if not hasattr(self, 'children'):
self.children = self.childItems
def layout_block(self, block, x, y): def layout_block(self, block, x, y):
if isinstance(block, TextBlock): if isinstance(block, TextBlock):

9
src/calibre/gui2/lrf_renderer/text.py
View File

@ -358,6 +358,8 @@ class Line(QGraphicsItem):
self.links = collections.deque() self.links = collections.deque()
self.current_link = None self.current_link = None
self.valign = None self.valign = None
if not hasattr(self, 'children'):
self.children = self.childItems
def start_link(self, refobj, slot): def start_link(self, refobj, slot):
self.current_link = [self.current_width, sys.maxint, refobj, slot] self.current_link = [self.current_width, sys.maxint, refobj, slot]
@ -481,10 +483,9 @@ class Line(QGraphicsItem):
painter.restore() painter.restore()
painter.save() painter.save()
painter.setPen(QPen(Qt.NoPen)) painter.setPen(QPen(Qt.NoPen))
if hasattr(self, 'children'): for c in self.children():
for c in self.children(): painter.setBrush(c.brush)
painter.setBrush(c.brush) painter.drawRect(c.boundingRect())
painter.drawRect(c.boundingRect())
painter.restore() painter.restore()
painter.save() painter.save()
for tok in self.tokens: for tok in self.tokens: