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:35:41 +05:30
parent b53d0d5dab
commit e78c388315
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ from PyQt5.Qt import (
) )
from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler
from PyQt5.QtWebEngineWidgets import ( from PyQt5.QtWebEngineWidgets import (
QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView, QWebEngineSettings
) )
from threading import Thread from threading import Thread
@ -287,8 +287,8 @@ def create_profile():
ans.installUrlSchemeHandler(QByteArray(FAKE_PROTOCOL.encode('ascii')), url_handler) ans.installUrlSchemeHandler(QByteArray(FAKE_PROTOCOL.encode('ascii')), url_handler)
s = ans.settings() s = ans.settings()
s.setDefaultTextEncoding('utf-8') s.setDefaultTextEncoding('utf-8')
s.setAttribute(s.FullScreenSupportEnabled, False) s.setAttribute(QWebEngineSettings.WebAttribute.FullScreenSupportEnabled, False)
s.setAttribute(s.LinksIncludedInFocusChain, False) s.setAttribute(QWebEngineSettings.WebAttribute.LinksIncludedInFocusChain, False)
create_profile.ans = ans create_profile.ans = ans
return ans return ans

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

@ -13,7 +13,7 @@ from PyQt5.Qt import (
) )
from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler
from PyQt5.QtWebEngineWidgets import ( from PyQt5.QtWebEngineWidgets import (
QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView, QWebEngineSettings
) )
from calibre import as_unicode, prints from calibre import as_unicode, prints
@ -223,7 +223,7 @@ def create_profile():
ans.installUrlSchemeHandler(QByteArray(FAKE_PROTOCOL.encode('ascii')), url_handler) ans.installUrlSchemeHandler(QByteArray(FAKE_PROTOCOL.encode('ascii')), url_handler)
s = ans.settings() s = ans.settings()
s.setDefaultTextEncoding('utf-8') s.setDefaultTextEncoding('utf-8')
s.setAttribute(s.LinksIncludedInFocusChain, False) s.setAttribute(QWebEngineSettings.WebAttribute.LinksIncludedInFocusChain, False)
create_profile.ans = ans create_profile.ans = ans
return ans return ans

14
src/calibre/gui2/webengine.py
View File

@ -6,7 +6,7 @@
import json import json
from PyQt5.Qt import QObject, Qt, pyqtSignal from PyQt5.Qt import QObject, Qt, pyqtSignal
from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript, QWebEngineView from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript, QWebEngineView, QWebEngineSettings
from calibre import prints from calibre import prints
from calibre.utils.monotonic import monotonic from calibre.utils.monotonic import monotonic
@ -18,17 +18,17 @@ def secure_webengine(view_or_page_or_settings, for_viewer=False):
s = view_or_page_or_settings.settings() if hasattr( s = view_or_page_or_settings.settings() if hasattr(
view_or_page_or_settings, 'settings') else view_or_page_or_settings view_or_page_or_settings, 'settings') else view_or_page_or_settings
a = s.setAttribute a = s.setAttribute
a(s.PluginsEnabled, False) a(QWebEngineSettings.WebAttribute.PluginsEnabled, False)
if not for_viewer: if not for_viewer:
a(s.JavascriptEnabled, False) a(QWebEngineSettings.WebAttribute.JavascriptEnabled, False)
s.setUnknownUrlSchemePolicy(s.DisallowUnknownUrlSchemes) s.setUnknownUrlSchemePolicy(s.DisallowUnknownUrlSchemes)
if hasattr(view_or_page_or_settings, 'setAudioMuted'): if hasattr(view_or_page_or_settings, 'setAudioMuted'):
view_or_page_or_settings.setAudioMuted(True) view_or_page_or_settings.setAudioMuted(True)
a(s.JavascriptCanOpenWindows, False) a(QWebEngineSettings.WebAttribute.JavascriptCanOpenWindows, False)
a(s.JavascriptCanAccessClipboard, False) a(QWebEngineSettings.WebAttribute.JavascriptCanAccessClipboard, False)
# ensure javascript cannot read from local files # ensure javascript cannot read from local files
a(s.LocalContentCanAccessFileUrls, False) a(QWebEngineSettings.WebAttribute.LocalContentCanAccessFileUrls, False)
a(s.AllowWindowActivationFromJavaScript, False) a(QWebEngineSettings.WebAttribute.AllowWindowActivationFromJavaScript, False)
return s return s