Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(web_viewer): switch from QtWebKit to QtWebEngine #186

Merged
merged 5 commits into from
Aug 1, 2024
Merged

fix(web_viewer): switch from QtWebKit to QtWebEngine #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3d5890
fix(web_viewer): switch from QtWebKit to QtWebEngine
lbartoletti Jul 31, 2024
ed97b37
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 31, 2024
01431c8
Update qtribu/logic/web_viewer.py
Guts Aug 1, 2024
6d9f8f9
fix(web_viewer): fix import order
Guts Aug 1, 2024
cef3659
change(imports): use absolute import instead of relative
Guts Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion qtribu/logic/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
from .custom_datatypes import RssItem # noqa: F401
from .rss_reader import RssMiniReader # noqa: F401
from .splash_changer import SplashChanger # noqa: F401
from .web_viewer import WebViewer # noqa: F401
9 changes: 4 additions & 5 deletions qtribu/logic/web_viewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@
# PyQGIS
from qgis.PyQt.QtCore import QCoreApplication, Qt
from qgis.PyQt.QtGui import QDesktopServices
from qgis.PyQt.QtWidgets import QVBoxLayout, QWidget

try:
from qgis.PyQt.QtWebKitWidgets import QWebView
except:
QCoreApplication.setAttribute(Qt.AA_ShareOpenGLContexts)
from PyQt.QtWebEngineWidgets import QWebEngineView as QWebView

from qgis.PyQt.QtWidgets import QVBoxLayout, QWidget
from qgis.PyQt.QtWebEngineWidgets import QWebEngineView as QWebView
except Exception:
from qgis.PyQt.QtWebKitWidgets import QWebView

# project
from qtribu.toolbelt import NetworkRequestsManager, PlgLogger, PlgOptionsManager
Expand Down
2 changes: 1 addition & 1 deletion qtribu/toolbelt/commons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from qgis.PyQt.QtCore import QUrl
from qgis.PyQt.QtGui import QDesktopServices

from qtribu.logic import WebViewer
from qtribu.logic.web_viewer import WebViewer

web_viewer = WebViewer()

Expand Down