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

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2020-05-27 18:57:25 +05:30
commit 308f163a03
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/comments_editor.py
View File

@ -28,7 +28,7 @@ from calibre.gui2.widgets import LineEditECM
from calibre.gui2.widgets2 import to_plain_text from calibre.gui2.widgets2 import to_plain_text
from calibre.utils.config import tweaks from calibre.utils.config import tweaks
from calibre.utils.imghdr import what from calibre.utils.imghdr import what
from polyglot.builtins import filter, iteritems, itervalues, unicode_type from polyglot.builtins import filter, iteritems, itervalues, unicode_type, as_bytes
# Cleanup Qt markup {{{ # Cleanup Qt markup {{{
@ -764,7 +764,12 @@ class EditorWidget(QTextEdit, LineEditECM): # {{{
with lopen(path, 'rb') as f: with lopen(path, 'rb') as f:
data = f.read() data = f.read()
except EnvironmentError: except EnvironmentError:
pass return QByteArray(bytearray.fromhex(
'89504e470d0a1a0a0000000d49484452'
'000000010000000108060000001f15c4'
'890000000a49444154789c6300010000'
'0500010d0a2db40000000049454e44ae'
'426082'))
else: else:
return QByteArray(data) return QByteArray(data)

19
src/calibre/gui2/widgets2.py
View File

@ -11,7 +11,7 @@ from PyQt5.Qt import (
QDialogButtonBox, QFont, QFontInfo, QFontMetrics, QIcon, QKeySequence, QLabel, QDialogButtonBox, QFont, QFontInfo, QFontMetrics, QIcon, QKeySequence, QLabel,
QLayout, QPalette, QPixmap, QPoint, QPushButton, QRect, QScrollArea, QSize, QLayout, QPalette, QPixmap, QPoint, QPushButton, QRect, QScrollArea, QSize,
QSizePolicy, QStyle, QStyledItemDelegate, Qt, QTabWidget, QTextBrowser, QSizePolicy, QStyle, QStyledItemDelegate, Qt, QTabWidget, QTextBrowser,
QToolButton, QUndoCommand, QUndoStack, QWidget, pyqtSignal QToolButton, QUndoCommand, QUndoStack, QWidget, pyqtSignal, QByteArray
) )
from calibre.ebooks.metadata import rating_to_stars from calibre.ebooks.metadata import rating_to_stars
@ -482,6 +482,23 @@ class HTMLDisplay(QTextBrowser):
return return
self.anchor_clicked.emit(qurl) self.anchor_clicked.emit(qurl)
def loadResource(self, rtype, qurl):
if qurl.isLocalFile():
path = qurl.toLocalFile()
try:
with lopen(path, 'rb') as f:
data = f.read()
except EnvironmentError:
return QByteArray(bytearray.fromhex(
'89504e470d0a1a0a0000000d49484452'
'000000010000000108060000001f15c4'
'890000000a49444154789c6300010000'
'0500010d0a2db40000000049454e44ae'
'426082'))
else:
return QByteArray(data)
else:
QTextBrowser.loadResource(self, rtype, qurl)
class ScrollingTabWidget(QTabWidget): class ScrollingTabWidget(QTabWidget):