Merge pull request #1331 from xiaoyifang/opt/scanpopup

opt: use link instead of button and tooltip
xiaoyifang · Dec 20, 2023 · a7eff05 · a7eff05
2 parents 17d46fc + 2ae6c16
commit a7eff05
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 69 deletions.
diff --git a/src/article_maker.cc b/src/article_maker.cc
@@ -250,19 +250,14 @@ std::string ArticleMaker::makeNotFoundBody( QString const & word, QString const
 string ArticleMaker::makeWelcomeHtml() const
 {
   string result = makeHtmlHeader( tr( "Welcome!" ), QString(), cfg.alwaysExpandOptionalParts );
-  //tooltip
-  result += R"(<script src="qrc:///scripts/popper.min.js"></script>)";
-  result += R"(<script src="qrc:///scripts/tippy.min.js"></script>)";
-  result += R"(<link href="qrc:///tippy-light.css" rel="stylesheet">)";
-
 
   result +=
     tr(
       "<h3 align=\"center\">Welcome to <b>GoldenDict</b>!</h3>"
       "<p>To start working with the program, first visit <b>Edit|Dictionaries</b> to add some directory paths where to search "
       "for the dictionary files, set up various Wikipedia sites or other sources, adjust dictionary order or create dictionary groups."
       "<p>And then you're ready to look up your words! You can do that in this window "
-      "by using a pane to the left, or you can <button id=\"lookup-popup\">look up words from other active applications</button>. "
+      "by using a pane to the left, or you can <a href=\"https://xiaoyifang.github.io/goldendict-ng/ui_popup/\">look up words from other active applications</a>. "
       "<p>To customize program, check out the available preferences at <b>Edit|Preferences</b>. "
       "All settings there have tooltips, be sure to read them if you are in doubt about anything."
       "<p>Should you need further help, have any questions, "
@@ -302,19 +297,6 @@ string ArticleMaker::makeWelcomeHtml() const
     theme = "light";
   }
 
-  result += QString(
-              R"(<script>
-      const template = document.getElementById('popup');
-
-      tippy('#lookup-popup', {
-        content: template.innerHTML,
-        allowHTML: true,
-        theme: '%1'
-      });
-      </script>)" )
-              .arg( theme )
-              .toStdString();
-
   result += "</body></html>";
 
   return result;

diff --git a/src/scripts/popper.min.js b/src/scripts/popper.min.js
diff --git a/src/scripts/scripts.qrc b/src/scripts/scripts.qrc
@@ -7,8 +7,6 @@
         <file>iframeResizer.contentWindow.min.js</file>
         <file>iframeResizer.min.js</file>
         <file>jquery-3.6.0.slim.min.js</file>
-        <file>popper.min.js</file>
-        <file>tippy.min.js</file>
         <file>mark.min.js</file>
     </qresource>
 </RCC>
diff --git a/src/scripts/tippy.min.js b/src/scripts/tippy.min.js
diff --git a/src/stylesheets/css.qrc b/src/stylesheets/css.qrc
@@ -17,6 +17,5 @@
         <file>qt-style-win.css</file>
         <file>qt-style.css</file>
         <file>article-style-darkmode.css</file>
-        <file>tippy-light.css</file>
     </qresource>
 </RCC>
diff --git a/src/stylesheets/tippy-light.css b/src/stylesheets/tippy-light.css
diff --git a/website/docs/howto/how to build ffmpeg for visual studio.md b/website/docs/howto/how to build ffmpeg for visual studio.md
@@ -1,4 +1,4 @@
-# Use vcpkg to build ffmpeg.
+# Use vcpkg to build ffmpeg(on Windows).
 
 Steps:
 
@@ -23,17 +23,6 @@ Then replace the dlls and libs in the winlibs\lib\msvc.
 **Pros**: Easy to manage.
 
 
-# I have tried the following methods without success
-
-## Use the scripts provided by the following url
-
-https://github.com/Microsoft/FFmpegInterop/issues/67
-
-https://github.com/Microsoft/FFmpegInterop   
-
-
-did not know how to link to libspeex. 
-
 ## conan
 
   conan does not seem to have the libspeex option yet.