From b1fce709593090ab9d70314e544c4685a8fd0ccd Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Mon, 10 Apr 2017 20:16:43 +0200
Subject: [PATCH] replace WebKit by WebEngine. Add a musrfit help icon. For
 now, not everywhere the help icon will be shown in the proper theme.

---
 src/musredit_qt5/musredit/PHelp.cpp           |  22 ++-
 src/musredit_qt5/musredit/PHelp.h             |   7 +-
 src/musredit_qt5/musredit/PTextEdit.cpp       |   2 +-
 .../musredit/icons/musrfit-help-dark.svg      | 171 ++++++++++++++++++
 .../musredit/icons/musrfit-help-plain.svg     | 171 ++++++++++++++++++
 src/musredit_qt5/musredit/musredit.pro        |   2 +-
 src/musredit_qt5/musredit/musredit.qrc        |   2 +
 7 files changed, 365 insertions(+), 12 deletions(-)
 create mode 100644 src/musredit_qt5/musredit/icons/musrfit-help-dark.svg
 create mode 100644 src/musredit_qt5/musredit/icons/musrfit-help-plain.svg

diff --git a/src/musredit_qt5/musredit/PHelp.cpp b/src/musredit_qt5/musredit/PHelp.cpp
index d8069257..5d261f41 100644
--- a/src/musredit_qt5/musredit/PHelp.cpp
+++ b/src/musredit_qt5/musredit/PHelp.cpp
@@ -28,7 +28,7 @@
  ***************************************************************************/
 
 #include <QtWidgets>
-#include <QtWebKitWidgets>
+#include <QWebEngineView>
 #include <QNetworkProxyFactory>
 
 #include <QtDebug>
@@ -41,13 +41,21 @@
  *
  * \param url help url
  */
-PHelp::PHelp(const QString &url)
+PHelp::PHelp(const QString &url, const bool isDarkTheme) :
+  fDarkTheme(isDarkTheme)
 {
   fProgress = 0;
 
+  QString iconName("");
+  if (fDarkTheme)
+    iconName = QString(":/icons/musrfit-help-dark.svg");
+  else
+    iconName = QString(":/icons/musrfit-help-plain.svg");
+  setWindowIcon( QIcon( QPixmap(iconName) ) );
+
   QNetworkProxyFactory::setUseSystemConfiguration(true);
 
-  fView = new QWebView(this);
+  fView = new QWebEngineView(this);
   fView->load(QUrl(url));
   connect(fView, SIGNAL(loadFinished(bool)), SLOT(adjustLocation()));
   connect(fView, SIGNAL(titleChanged(QString)), SLOT(adjustTitle()));
@@ -59,10 +67,10 @@ PHelp::PHelp(const QString &url)
   connect(fLocationEdit, SIGNAL(returnPressed()), SLOT(changeLocation()));
 
   QToolBar *toolBar = addToolBar(tr("Navigation"));
-  toolBar->addAction(fView->pageAction(QWebPage::Back));
-  toolBar->addAction(fView->pageAction(QWebPage::Forward));
-  toolBar->addAction(fView->pageAction(QWebPage::Reload));
-  toolBar->addAction(fView->pageAction(QWebPage::Stop));
+  toolBar->addAction(fView->pageAction(QWebEnginePage::Back));
+  toolBar->addAction(fView->pageAction(QWebEnginePage::Forward));
+  toolBar->addAction(fView->pageAction(QWebEnginePage::Reload));
+  toolBar->addAction(fView->pageAction(QWebEnginePage::Stop));
   toolBar->addWidget(fLocationEdit);
 
   QMenu *exitMenu = menuBar()->addMenu(tr("&File"));
diff --git a/src/musredit_qt5/musredit/PHelp.h b/src/musredit_qt5/musredit/PHelp.h
index cc66bb02..b2335009 100644
--- a/src/musredit_qt5/musredit/PHelp.h
+++ b/src/musredit_qt5/musredit/PHelp.h
@@ -32,7 +32,7 @@
 
 #include <QtWidgets>
 
-class QWebView;
+class QWebEngineView;
 QT_BEGIN_NAMESPACE
 class QLineEdit;
 QT_END_NAMESPACE
@@ -47,7 +47,7 @@ class PHelp : public QMainWindow
   Q_OBJECT
 
   public:
-    PHelp(const QString &url);
+    PHelp(const QString &url, const bool isDarkTheme=false);
     virtual ~PHelp();
 
   protected slots:
@@ -59,7 +59,8 @@ class PHelp : public QMainWindow
     void finishLoading(bool);
 
   private:
-    QWebView *fView; ///< web viewer
+    bool fDarkTheme;
+    QWebEngineView *fView; ///< web viewer
     QLineEdit *fLocationEdit; ///< url address line edit
     int fProgress; ///< progress value (0-100) while loading an url
 };
diff --git a/src/musredit_qt5/musredit/PTextEdit.cpp b/src/musredit_qt5/musredit/PTextEdit.cpp
index 077ad0b4..ee4d3b7c 100644
--- a/src/musredit_qt5/musredit/PTextEdit.cpp
+++ b/src/musredit_qt5/musredit/PTextEdit.cpp
@@ -2709,7 +2709,7 @@ void PTextEdit::musrDump()
  */
 void PTextEdit::helpContents()
 {
-  PHelp *help = new PHelp(fAdmin->getHelpUrl("main"));
+  PHelp *help = new PHelp(fAdmin->getHelpUrl("main"), fDarkTheme);
   help->show();
 }
 
diff --git a/src/musredit_qt5/musredit/icons/musrfit-help-dark.svg b/src/musredit_qt5/musredit/icons/musrfit-help-dark.svg
new file mode 100644
index 00000000..de27d7cd
--- /dev/null
+++ b/src/musredit_qt5/musredit/icons/musrfit-help-dark.svg
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="23.466667"
+   height="23.466667"
+   viewBox="0 0 22.000001 22"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.1 r"
+   sodipodi:docname="musrfit-help-dark.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.054545"
+     inkscape:cx="5.0203301"
+     inkscape:cy="9.5212278"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="pt"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-grids="true"
+     showguides="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5486"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1030.3622)">
+    <g
+       id="g7616"
+       transform="translate(-0.50000006,-1.0000005)">
+      <circle
+         r="0.77277893"
+         cy="1036.3622"
+         cx="3.0000002"
+         id="path3626"
+         style="fill:#da4453;fill-opacity:1;fill-rule:evenodd;stroke:#da4453;stroke-width:1.45444238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7403"
+         d="m 3.0000002,1033.3622 v 6"
+         style="fill:none;fill-rule:evenodd;stroke:#da4453;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g7616-1"
+       transform="translate(3.5000002,-3.0000006)">
+      <circle
+         r="0.77277893"
+         cy="1036.3622"
+         cx="3.0000002"
+         id="path3626-0"
+         style="fill:#da4453;fill-opacity:1;fill-rule:evenodd;stroke:#da4453;stroke-width:1.45444238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7403-7"
+         d="m 3.0000002,1033.3622 v 6"
+         style="fill:none;fill-rule:evenodd;stroke:#da4453;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g7616-1-8"
+       transform="translate(6.5000004,0.99999964)">
+      <circle
+         r="0.77277893"
+         cy="1036.3622"
+         cx="3.0000002"
+         id="path3626-0-7"
+         style="fill:#da4453;fill-opacity:1;fill-rule:evenodd;stroke:#da4453;stroke-width:1.45444238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7403-7-3"
+         d="m 3.0000002,1033.3622 v 6"
+         style="fill:none;fill-rule:evenodd;stroke:#da4453;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g7616-1-8-3"
+       transform="translate(10.500001,4.9999999)">
+      <circle
+         r="0.77277893"
+         cy="1036.3622"
+         cx="3.0000002"
+         id="path3626-0-7-5"
+         style="fill:#da4453;fill-opacity:1;fill-rule:evenodd;stroke:#da4453;stroke-width:1.45444238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7403-7-3-8"
+         d="m 3.0000002,1033.3622 v 6"
+         style="fill:none;fill-rule:evenodd;stroke:#da4453;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g7616-1-8-5"
+       transform="translate(14.500001,4.9999999)">
+      <circle
+         r="0.77277893"
+         cy="1036.3622"
+         cx="3.0000002"
+         id="path3626-0-7-6"
+         style="fill:#da4453;fill-opacity:1;fill-rule:evenodd;stroke:#da4453;stroke-width:1.45444238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7403-7-3-7"
+         d="m 3.0000002,1033.3622 v 6"
+         style="fill:none;fill-rule:evenodd;stroke:#da4453;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g7616-1-8-2"
+       transform="translate(16.500001,12)">
+      <circle
+         r="0.77277893"
+         cy="1036.3622"
+         cx="3.0000002"
+         id="path3626-0-7-60"
+         style="fill:#da4453;fill-opacity:1;fill-rule:evenodd;stroke:#da4453;stroke-width:1.45444238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7403-7-3-0"
+         d="m 3.0000002,1033.3622 v 6"
+         style="fill:none;fill-rule:evenodd;stroke:#da4453;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:17.5px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.9375;"
+       x="0.61889648"
+       y="1051.4247"
+       id="text861"><tspan
+         sodipodi:role="line"
+         id="tspan859"
+         x="0.61889648"
+         y="1051.4247"
+         style="font-size:17.5px;stroke-width:0.9375;fill:#f2f2f2;fill-opacity:1;">?</tspan></text>
+  </g>
+</svg>
diff --git a/src/musredit_qt5/musredit/icons/musrfit-help-plain.svg b/src/musredit_qt5/musredit/icons/musrfit-help-plain.svg
new file mode 100644
index 00000000..75338437
--- /dev/null
+++ b/src/musredit_qt5/musredit/icons/musrfit-help-plain.svg
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="23.466667"
+   height="23.466667"
+   viewBox="0 0 22.000001 22"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.1 r"
+   sodipodi:docname="musrfit-help-plain.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.054545"
+     inkscape:cx="5.0203301"
+     inkscape:cy="9.5212278"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="pt"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-grids="true"
+     showguides="true"
+     borderlayer="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5486"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1030.3622)">
+    <g
+       id="g7616"
+       transform="translate(-0.50000006,-1.0000005)">
+      <circle
+         r="0.77277893"
+         cy="1036.3622"
+         cx="3.0000002"
+         id="path3626"
+         style="fill:#da4453;fill-opacity:1;fill-rule:evenodd;stroke:#da4453;stroke-width:1.45444238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7403"
+         d="m 3.0000002,1033.3622 v 6"
+         style="fill:none;fill-rule:evenodd;stroke:#da4453;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g7616-1"
+       transform="translate(3.5000002,-3.0000006)">
+      <circle
+         r="0.77277893"
+         cy="1036.3622"
+         cx="3.0000002"
+         id="path3626-0"
+         style="fill:#da4453;fill-opacity:1;fill-rule:evenodd;stroke:#da4453;stroke-width:1.45444238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7403-7"
+         d="m 3.0000002,1033.3622 v 6"
+         style="fill:none;fill-rule:evenodd;stroke:#da4453;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g7616-1-8"
+       transform="translate(6.5000004,0.99999964)">
+      <circle
+         r="0.77277893"
+         cy="1036.3622"
+         cx="3.0000002"
+         id="path3626-0-7"
+         style="fill:#da4453;fill-opacity:1;fill-rule:evenodd;stroke:#da4453;stroke-width:1.45444238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7403-7-3"
+         d="m 3.0000002,1033.3622 v 6"
+         style="fill:none;fill-rule:evenodd;stroke:#da4453;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g7616-1-8-3"
+       transform="translate(10.500001,4.9999999)">
+      <circle
+         r="0.77277893"
+         cy="1036.3622"
+         cx="3.0000002"
+         id="path3626-0-7-5"
+         style="fill:#da4453;fill-opacity:1;fill-rule:evenodd;stroke:#da4453;stroke-width:1.45444238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7403-7-3-8"
+         d="m 3.0000002,1033.3622 v 6"
+         style="fill:none;fill-rule:evenodd;stroke:#da4453;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g7616-1-8-5"
+       transform="translate(14.500001,4.9999999)">
+      <circle
+         r="0.77277893"
+         cy="1036.3622"
+         cx="3.0000002"
+         id="path3626-0-7-6"
+         style="fill:#da4453;fill-opacity:1;fill-rule:evenodd;stroke:#da4453;stroke-width:1.45444238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7403-7-3-7"
+         d="m 3.0000002,1033.3622 v 6"
+         style="fill:none;fill-rule:evenodd;stroke:#da4453;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g7616-1-8-2"
+       transform="translate(16.500001,12)">
+      <circle
+         r="0.77277893"
+         cy="1036.3622"
+         cx="3.0000002"
+         id="path3626-0-7-60"
+         style="fill:#da4453;fill-opacity:1;fill-rule:evenodd;stroke:#da4453;stroke-width:1.45444238;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7403-7-3-0"
+         d="m 3.0000002,1033.3622 v 6"
+         style="fill:none;fill-rule:evenodd;stroke:#da4453;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:17.5px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.9375"
+       x="0.61889648"
+       y="1051.4247"
+       id="text861"><tspan
+         sodipodi:role="line"
+         id="tspan859"
+         x="0.61889648"
+         y="1051.4247"
+         style="font-size:17.5px;stroke-width:0.9375">?</tspan></text>
+  </g>
+</svg>
diff --git a/src/musredit_qt5/musredit/musredit.pro b/src/musredit_qt5/musredit/musredit.pro
index 2a15854c..3650eb2a 100644
--- a/src/musredit_qt5/musredit/musredit.pro
+++ b/src/musredit_qt5/musredit/musredit.pro
@@ -71,7 +71,7 @@ CONFIG += qt \
 
 QT += widgets
 QT += xml
-QT += webkitwidgets
+QT += webenginewidgets
 QT += network
 QT += printsupport
 QT += svg
diff --git a/src/musredit_qt5/musredit/musredit.qrc b/src/musredit_qt5/musredit/musredit.qrc
index 3dbc000d..25d00e80 100644
--- a/src/musredit_qt5/musredit/musredit.qrc
+++ b/src/musredit_qt5/musredit/musredit.qrc
@@ -32,6 +32,8 @@
         <file>icons/musrchisq-dark.svg</file>
         <file>icons/musrfit-plain.svg</file>
         <file>icons/musrfit-dark.svg</file>
+        <file>icons/musrfit-help-plain.svg</file>
+        <file>icons/musrfit-help-dark.svg</file>
         <file>icons/msr2data-plain.svg</file>
         <file>icons/msr2data-dark.svg</file>
         <file>icons/musrprefs-plain.svg</file>