From e2e0b4e36228c4f6160723e3f771bd6ef5b0ad22 Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Sat, 15 Apr 2023 09:35:48 +0800 Subject: [PATCH] fix: remove the webplugin option this plugin is used mainly for flash plugins, which has been disabled in modern browser. There is no need to configure this option. --- config.cc | 8 -------- config.hh | 1 - preferences.cc | 2 -- preferences.ui | 12 ------------ src/ui/articleview.cpp | 4 ++-- 5 files changed, 2 insertions(+), 25 deletions(-) diff --git a/config.cc b/config.cc index 5a1ce677..2c9066c4 100644 --- a/config.cc +++ b/config.cc @@ -265,7 +265,6 @@ Preferences::Preferences(): internalPlayerBackend( InternalPlayerBackend::defaultBackend() ), checkForNewReleases( true ), disallowContentFromOtherSites( false ), - enableWebPlugins( false ), hideGoldenDictHeader( false ), maxNetworkCacheSize( 50 ), clearNetworkCacheOnExit( true ), @@ -991,9 +990,6 @@ Class load() if ( !preferences.namedItem( "disallowContentFromOtherSites" ).isNull() ) c.preferences.disallowContentFromOtherSites = ( preferences.namedItem( "disallowContentFromOtherSites" ).toElement().text() == "1" ); - if ( !preferences.namedItem( "enableWebPlugins" ).isNull() ) - c.preferences.enableWebPlugins = ( preferences.namedItem( "enableWebPlugins" ).toElement().text() == "1" ); - if ( !preferences.namedItem( "hideGoldenDictHeader" ).isNull() ) c.preferences.hideGoldenDictHeader = ( preferences.namedItem( "hideGoldenDictHeader" ).toElement().text() == "1" ); @@ -1986,10 +1982,6 @@ void save( Class const & c ) opt.appendChild( dd.createTextNode( c.preferences.disallowContentFromOtherSites ? "1" : "0" ) ); preferences.appendChild( opt ); - opt = dd.createElement( "enableWebPlugins" ); - opt.appendChild( dd.createTextNode( c.preferences.enableWebPlugins ? "1" : "0" ) ); - preferences.appendChild( opt ); - opt = dd.createElement( "hideGoldenDictHeader" ); opt.appendChild( dd.createTextNode( c.preferences.hideGoldenDictHeader ? "1" : "0" ) ); preferences.appendChild( opt ); diff --git a/config.hh b/config.hh index 2dd81d17..5f288dad 100644 --- a/config.hh +++ b/config.hh @@ -355,7 +355,6 @@ struct Preferences bool checkForNewReleases; bool disallowContentFromOtherSites; - bool enableWebPlugins; bool hideGoldenDictHeader; int maxNetworkCacheSize; bool clearNetworkCacheOnExit; diff --git a/preferences.cc b/preferences.cc index 43fcf6e2..94f49067 100644 --- a/preferences.cc +++ b/preferences.cc @@ -332,7 +332,6 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ): ui.checkForNewReleases->setChecked( p.checkForNewReleases ); ui.disallowContentFromOtherSites->setChecked( p.disallowContentFromOtherSites ); - ui.enableWebPlugins->setChecked( p.enableWebPlugins ); ui.hideGoldenDictHeader->setChecked( p.hideGoldenDictHeader ); ui.maxNetworkCacheSize->setValue( p.maxNetworkCacheSize ); ui.clearNetworkCacheOnExit->setChecked( p.clearNetworkCacheOnExit ); @@ -481,7 +480,6 @@ Config::Preferences Preferences::getPreferences() p.checkForNewReleases = ui.checkForNewReleases->isChecked(); p.disallowContentFromOtherSites = ui.disallowContentFromOtherSites->isChecked(); - p.enableWebPlugins = ui.enableWebPlugins->isChecked(); p.hideGoldenDictHeader = ui.hideGoldenDictHeader->isChecked(); p.maxNetworkCacheSize = ui.maxNetworkCacheSize->value(); p.clearNetworkCacheOnExit = ui.clearNetworkCacheOnExit->isChecked(); diff --git a/preferences.ui b/preferences.ui index 112cf249..ff238fb4 100644 --- a/preferences.ui +++ b/preferences.ui @@ -1167,18 +1167,6 @@ you are browsing. If some site breaks because of this, try disabling this. - - - - Enabling this would allow to listen to sound pronunciations from -online dictionaries that rely on Flash or other web plugins. -Plugin must be installed for this option to work. - - - Enable web plugins - - - diff --git a/src/ui/articleview.cpp b/src/ui/articleview.cpp index 71d422d3..67e4f90e 100644 --- a/src/ui/articleview.cpp +++ b/src/ui/articleview.cpp @@ -355,7 +355,7 @@ ArticleView::ArticleView( QWidget * parent, ArticleNetworkAccessManager & nm, Au settings->defaultSettings()->setAttribute( QWebEngineSettings::LocalContentCanAccessRemoteUrls, true ); settings->defaultSettings()->setAttribute( QWebEngineSettings::LocalContentCanAccessFileUrls, true ); settings->defaultSettings()->setAttribute( QWebEngineSettings::ErrorPageEnabled, false ); - settings->defaultSettings()->setAttribute( QWebEngineSettings::PluginsEnabled, cfg.preferences.enableWebPlugins ); + settings->defaultSettings()->setAttribute( QWebEngineSettings::PluginsEnabled, true ); settings->defaultSettings()->setAttribute( QWebEngineSettings::PlaybackRequiresUserGesture, false ); settings->defaultSettings()->setAttribute( QWebEngineSettings::JavascriptCanAccessClipboard, true ); settings->defaultSettings()->setAttribute( QWebEngineSettings::PrintElementBackgrounds, false ); @@ -363,7 +363,7 @@ ArticleView::ArticleView( QWidget * parent, ArticleNetworkAccessManager & nm, Au settings->setAttribute( QWebEngineSettings::LocalContentCanAccessRemoteUrls, true ); settings->setAttribute( QWebEngineSettings::LocalContentCanAccessFileUrls, true ); settings->setAttribute( QWebEngineSettings::ErrorPageEnabled, false ); - settings->setAttribute( QWebEngineSettings::PluginsEnabled, cfg.preferences.enableWebPlugins ); + settings->setAttribute( QWebEngineSettings::PluginsEnabled, true ); settings->setAttribute( QWebEngineSettings::PlaybackRequiresUserGesture, false ); settings->setAttribute( QWebEngineSettings::JavascriptCanAccessClipboard, true ); settings->setAttribute( QWebEngineSettings::PrintElementBackgrounds, false );