Add initial Qt WebEngine support

README.md

@@ -94,6 +94,18 @@ If you have problem building with Qt5 Multimedia or experience GStreamer run-tim
 
     qmake "CONFIG+=no_qtmultimedia_player"
 
+### Building with Qt WebEngine instead of Qt WebKit
+
+The Qt WebEngine-based version of GoldenDict is fresh and has not been comprehensively tested. Some aspects work better than
+in the Qt WebKit-based version, but there are downsides and not yet implemented features documented in the description of
+[this pull request](https://github.com/goldendict/goldendict/pull/1542).
+
+Make sure your Qt version is 5.15.2 or later, replace `libqt5webkit5-dev` with `qtwebengine5-dev` in the dependency list
+of the [Installing External Deps on Ubuntu Linux for Qt5](#installing-external-deps-on-ubuntu-linux-for-qt5) section
+and pass `"CONFIG+=use_qtwebengine"` to `qmake` in order to build this version:
+
+    qmake "CONFIG+=use_qtwebengine"
+
 <b>NB:</b> All additional settings for `qmake` that you need must be combined in one `qmake` launch, for example:
 
     qmake "CONFIG+=zim_support" "CONFIG+=no_extra_tiff_handler" "CONFIG+=no_ffmpeg_player"
@@ -113,7 +125,8 @@ To build GoldenDict with Visual Studio take one of next library packs and unpack
 
 To create project files for Visual Studio you can pass `"-tp vc"` option to `qmake`.
 
-Note: In Qt 5.6.0 and later the `Webkit` module was removed from official release builds. You should build it from sources to compile GoldenDict.
+Note: In Qt 5.6.0 and later the `Webkit` module was removed from official release builds.
+You should build it from sources to compile the Qt WebKit version of GoldenDict.
 
 
 ## Installation

about.cc

@@ -33,10 +33,16 @@ About::About( QWidget * parent ): QDialog( parent )
   QString compilerVersion = QLatin1String( "GCC " ) + QLatin1String( __VERSION__ );
 #endif
 
-  ui.qtVersion->setText( tr( "Based on Qt %1 (%2, %3 bit)" ).arg(
+  QString qtVersionText = tr( "Based on Qt %1 (%2, %3 bit)" ).arg(
                            QLatin1String( qVersion() ),
                            compilerVersion,
-                           QString::number( QSysInfo::WordSize ) ) );
+                           QString::number( QSysInfo::WordSize ) );
+#ifdef USE_QTWEBKIT
+  qtVersionText += QLatin1String( ", Qt WebKit" );
+#else
+  qtVersionText += QLatin1String( ", Qt WebEngine" );
+#endif
+  ui.qtVersion->setText( qtVersionText );
 
   QFile creditsFile( ":/CREDITS.txt" );
 

article-style-expand-optional-parts.css

@@ -0,0 +1,14 @@
+:root
+{
+  --gd-page-background-color: ;
+}
+
+.dsl_opt
+{
+  display: inline;
+}
+
+.hidden_expand_opt
+{
+  display: none !important;
+}

article-style-st-babylon.css

@@ -1,3 +1,8 @@
+:root
+{
+  --gd-page-background-color: white;
+}
+
 html
 {
   background-color: white;
@@ -74,19 +79,19 @@ h3 {
 }
 
 .gdexpandicon {
-    background-image: url('qrcx://localhost/icons/expand_article.png');
+    background-image: url('qrc:///icons/expand_article.png');
 }
 
 .gdexpandicon:hover {
-    background-image: url('qrcx://localhost/icons/expand_article_hovered.png');
+    background-image: url('qrc:///icons/expand_article_hovered.png');
 }
 
 .gdcollapseicon {
-    background-image: url('qrcx://localhost/icons/collapse_article.png');
+    background-image: url('qrc:///icons/collapse_article.png');
 }
 
 .gdcollapseicon:hover {
-    background-image: url('qrcx://localhost/icons/collapse_article_hovered.png');
+    background-image: url('qrc:///icons/collapse_article_hovered.png');
 }
 
 .bglpos { color: black; font-weight: bold; font-size: 11px; background: #F0EDED; display: inline; }

article-style-st-lingoes-blue.css

@@ -1,3 +1,8 @@
+:root
+{
+  --gd-page-background-color: #EAF0F8;
+}
+
 body {
 	background: #EAF0F8;
 	margin: 0.3em;
@@ -109,19 +114,19 @@ a:hover {
 }
 
 .gdexpandicon {
-    background-image: url('qrcx://localhost/icons/expand_article.png');
+    background-image: url('qrc:///icons/expand_article.png');
 }
 
 .gdexpandicon:hover {
-    background-image: url('qrcx://localhost/icons/expand_article_hovered.png');
+    background-image: url('qrc:///icons/expand_article_hovered.png');
 }
 
 .gdcollapseicon {
-    background-image: url('qrcx://localhost/icons/collapse_article.png');
+    background-image: url('qrc:///icons/collapse_article.png');
 }
 
 .gdcollapseicon:hover {
-    background-image: url('qrcx://localhost/icons/collapse_article_hovered.png');
+    background-image: url('qrc:///icons/collapse_article_hovered.png');
 }
 
 .gdarticleseparator {
@@ -366,4 +371,4 @@ h3 {
 	border-width:1px;
 	background-color:#eeeeee;
 	padding: 8px 8px 8px 8px;
-} 
+}

article-style-st-lingoes.css

@@ -1,3 +1,8 @@
+:root
+{
+  --gd-page-background-color: #fffef2;
+}
+
 a 
 {
   color: #2233bb;
@@ -78,19 +83,19 @@ body
 
 
 .gdexpandicon {
-  background-image: url('qrcx://localhost/icons/expand_article.png');
+  background-image: url('qrc:///icons/expand_article.png');
 }
 
 .gdexpandicon:hover {
-  background-image: url('qrcx://localhost/icons/expand_article_hovered.png');
+  background-image: url('qrc:///icons/expand_article_hovered.png');
 }
 
 .gdcollapseicon {
-  background-image: url('qrcx://localhost/icons/collapse_article.png');
+  background-image: url('qrc:///icons/collapse_article.png');
 }
 
 .gdcollapseicon:hover {
-  background-image: url('qrcx://localhost/icons/collapse_article_hovered.png');
+  background-image: url('qrc:///icons/collapse_article_hovered.png');
 }
 
 .gddictnamebodyseparator

article-style-st-lingvo.css

@@ -1,3 +1,8 @@
+:root
+{
+  --gd-page-background-color: white;
+}
+
 html
 {
   background-color: white;

article-style-st-modern.css

@@ -1,3 +1,8 @@
+:root
+{
+  --gd-page-background-color: white;
+}
+
 html
 {
   background-color: white;
@@ -137,19 +142,19 @@ a:hover
 }
 
 .gdexpandicon {
-    background-image: url('qrcx://localhost/icons/expand_article.png');
+    background-image: url('qrc:///icons/expand_article.png');
 }
 
 .gdexpandicon:hover {
-    background-image: url('qrcx://localhost/icons/expand_article_hovered.png');
+    background-image: url('qrc:///icons/expand_article_hovered.png');
 }
 
 .gdcollapseicon {
-    background-image: url('qrcx://localhost/icons/collapse_article.png');
+    background-image: url('qrc:///icons/collapse_article.png');
 }
 
 .gdcollapseicon:hover {
-    background-image: url('qrcx://localhost/icons/collapse_article_hovered.png');
+    background-image: url('qrc:///icons/collapse_article_hovered.png');
 }
 
 /* The first headword in a (possibly) multi-headword DSL article */

article-style.css

@@ -1,5 +1,9 @@
 /******** Global, non-dictionary-specific classes ***********/
 
+:root
+{
+  --gd-page-background-color: #fefdeb;
+}
 
 body
 {
@@ -76,7 +80,7 @@ pre
 .gderrordesc
 {
   font-style: italic;
-  background: url("qrcx://localhost/icons/warning.png") center left no-repeat !important;
+  background: url("qrc:///icons/warning.png") center left no-repeat !important;
   padding-left: 22px !important;
   margin: 1em;
 }
@@ -499,7 +503,7 @@ div.xdxf
 .dsl_video .img
 {
   display: inline-block;
-  background: url('qrcx://localhost/icons/video.png');
+  background: url('qrc:///icons/video.png');
   background-repeat: no-repeat;
   /* Ugly hack since "vertical-align: middle;" looks _terrible_ in Qt4's webkit: */
   vertical-align: -30%;
@@ -1106,16 +1110,6 @@ div.xdxf
 ** http://style.cleverchimp.com/font_size_intervals/altintervals.html
 */
 
-/*
-body {
-	font: x-small sans-serif;
-	background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
-	color: black;
-	margin: 0;
-	padding: 0;
-}
-*/
-
 /* scale back up to a sane default */
 .mwiki #globalWrapper {
 	font-size: 127%;
@@ -1215,7 +1209,6 @@ body {
 	list-style-type: square;
 	margin: .3em 0 0 1.5em;
 	padding: 0;
-	list-style-image: url(bullet.gif);
 }
 .mwiki ol {
 	line-height: 1.5em;
@@ -1726,7 +1719,6 @@ special external link styling */
 .mwiki .portlet ul {
 	line-height: 1.5em;
 	list-style-type: square;
-	list-style-image: url(bullet.gif);
 	font-size: 95%;
 }
 .mwiki .portlet li {
@@ -2902,15 +2894,15 @@ in bg url to hide it from iemac */
     width:16px;
     height:16px;
     vertical-align: text-bottom;
-    background-image:url('qrcx://localhost/icons/arrow.png');
+    background-image:url('qrc:///icons/arrow.png');
 }
 
 .gdcollapseicon {
     cursor:pointer;
     width:16px;
     height:16px;
     vertical-align: text-bottom;
-    background-image:url('qrcx://localhost/icons/downarrow.png');
+    background-image:url('qrc:///icons/downarrow.png');
 }
 
 /********** Slob dictionaries ***********/