Skip to content
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

opt: use link instead of button and tooltip #1331

Merged
merged 2 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions src/article_maker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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, "
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions src/scripts/popper.min.js

This file was deleted.

2 changes: 0 additions & 2 deletions src/scripts/scripts.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 0 additions & 2 deletions src/scripts/tippy.min.js

This file was deleted.

1 change: 0 additions & 1 deletion src/stylesheets/css.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
27 changes: 0 additions & 27 deletions src/stylesheets/tippy-light.css

This file was deleted.

13 changes: 1 addition & 12 deletions website/docs/howto/how to build ffmpeg for visual studio.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Use vcpkg to build ffmpeg.
# Use vcpkg to build ffmpeg(on Windows).

Steps:

Expand All @@ -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.
Expand Down