-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
PR: Improve code and UX concerning Qt WebEngine #25733
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.
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
- Loading branch information
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,6 +40,9 @@ | |
| from spyder import requirements | ||
| requirements.check_qt() | ||
|
|
||
| # Local imports | ||
| from spyder.app.utils import HAVE_WEBENGINE | ||
|
|
||
| #============================================================================== | ||
| # Third-party imports | ||
| #============================================================================== | ||
|
|
@@ -748,7 +751,7 @@ def setup(self): | |
| # https://github.com/spyder-ide/spyder/pull/ | ||
| # 22196#issuecomment-2189377043 | ||
| if PluginClass.REQUIRE_WEB_WIDGETS and ( | ||
| not WEBENGINE or | ||
| not HAVE_WEBENGINE or | ||
| self._cli_options.no_web_widgets | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. With the fallback to plaintext implemented by this PR, the command line argument |
||
| ): | ||
| continue | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -50,7 +50,7 @@ class Help(SpyderDockablePlugin): | |
| CONF_FILE = False | ||
| LOG_PATH = get_conf_path(CONF_SECTION) | ||
| DISABLE_ACTIONS_WHEN_HIDDEN = False | ||
| REQUIRE_WEB_WIDGETS = True | ||
| REQUIRE_WEB_WIDGETS = False | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This PR implements a fallback to plain text when Qt WebEngine is not available. |
||
| CAN_HANDLE_SEARCH_ACTIONS = True | ||
|
|
||
| # Signals | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
qtpy.QtWebEngineWidgets.WEBENGINEand its usage in Spyder is confusing:qtpyused to define it to differentiate between Qt WebEngine and Qt WebKit. This is also the way it is used in most places in Spyder. With WebKit gone/not used by Spyder, the differentiation between WebEngine/WebKit can be removed. I can do this as part of this PR (when the PR is accepted).Concerning the usage in the sense "is WebEngine available", see the new
spyder.app.utils.HAVE_WEBENGINE.