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

More stupid PyQt enums

Browse Source
This commit is contained in:
Kovid Goyal 2020-12-20 11:45:02 +05:30
parent 8a380d3496
commit 2bb1f38fd6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/tweak_book/preview.py
View File

@ -12,7 +12,7 @@ from PyQt5.Qt import (
QApplication, QByteArray, QHBoxLayout, QIcon, QLabel, QMenu, QSize, QSizePolicy, QApplication, QByteArray, QHBoxLayout, QIcon, QLabel, QMenu, QSize, QSizePolicy,
QStackedLayout, Qt, QTimer, QToolBar, QUrl, QVBoxLayout, QWidget, pyqtSignal QStackedLayout, Qt, QTimer, QToolBar, QUrl, QVBoxLayout, QWidget, pyqtSignal
) )
from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler, QWebEngineUrlRequestJob from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler, QWebEngineUrlRequestJob, QWebEngineUrlRequestInfo
from PyQt5.QtWebEngineWidgets import ( from PyQt5.QtWebEngineWidgets import (
QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView, QWebEngineSettings QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView, QWebEngineSettings
) )
@ -316,7 +316,7 @@ class WebPage(QWebEnginePage):
prints('%s:%s: %s' % (source_id, linenumber, msg)) prints('%s:%s: %s' % (source_id, linenumber, msg))
def acceptNavigationRequest(self, url, req_type, is_main_frame): def acceptNavigationRequest(self, url, req_type, is_main_frame):
if req_type == self.NavigationTypeReload: if req_type == QWebEngineUrlRequestInfo.NavigationType.NavigationTypeReload:
return True return True
if url.scheme() in (FAKE_PROTOCOL, 'data'): if url.scheme() in (FAKE_PROTOCOL, 'data'):
return True return True

6
src/calibre/gui2/viewer/web_view.py
View File

@ -11,7 +11,7 @@ from PyQt5.Qt import (
QT_VERSION, QApplication, QBuffer, QByteArray, QFontDatabase, QFontInfo, QPalette, QEvent, QT_VERSION, QApplication, QBuffer, QByteArray, QFontDatabase, QFontInfo, QPalette, QEvent,
QHBoxLayout, QMimeData, QSize, Qt, QTimer, QUrl, QWidget, pyqtSignal, QIODevice, QLocale QHBoxLayout, QMimeData, QSize, Qt, QTimer, QUrl, QWidget, pyqtSignal, QIODevice, QLocale
) )
from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler, QWebEngineUrlRequestJob from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler, QWebEngineUrlRequestJob, QWebEngineUrlRequestInfo
from PyQt5.QtWebEngineWidgets import ( from PyQt5.QtWebEngineWidgets import (
QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView, QWebEngineSettings QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView, QWebEngineSettings
) )
@ -366,9 +366,9 @@ class WebPage(QWebEnginePage):
pass pass
def acceptNavigationRequest(self, url, req_type, is_main_frame): def acceptNavigationRequest(self, url, req_type, is_main_frame):
if req_type == self.NavigationTypeReload: if req_type == QWebEngineUrlRequestInfo.NavigationType.NavigationTypeReload:
return True return True
if req_type == self.NavigationTypeBackForward: if req_type == QWebEngineUrlRequestInfo.NavigationType.NavigationTypeBackForward:
return True return True
if url.scheme() in (FAKE_PROTOCOL, 'data'): if url.scheme() in (FAKE_PROTOCOL, 'data'):
return True return True