hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 15:24:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge pull request #1302 from xiaoyifang/opt/highlight

Browse source 
opt: use a new way to handle the highlight matched terms in the fullt…
This commit is contained in:
xiaoyifang 2023-11-25 17:35:58 +08:00 committed by GitHub
parent 8c87b934d4 439b780db5
commit 1a5024a29c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 1268 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/article_maker.cc
View file

@ -141,6 +141,7 @@ std::string ArticleMaker::makeHtmlHeader( QString const & word, QString const &
.toStdString();
result += R"(<script src="qrc:///scripts/gd-builtin.js"></script>)";
result += R"(<script src="qrc:///scripts/mark.min.js"></script>)";
if ( GlobalBroadcaster::instance()->getPreference()->darkReaderMode ) {
//only enable this darkmode on modern style.

1241
src/scripts/mark.js Normal file
View file

File diff suppressed because it is too large Load diff

13
src/scripts/mark.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

1
src/scripts/scripts.qrc
View file

@ -9,5 +9,6 @@
<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>

56
src/ui/articleview.cc
View file

@ -477,8 +477,9 @@ void ArticleView::loadFinished( bool result )
if ( result ) {
emit pageLoaded( this );
}
if ( Utils::Url::hasQueryItem( webview->url(), "regexp" ) )
if ( Utils::Url::hasQueryItem( webview->url(), "regexp" ) ) {
highlightFTSResults();
}
}
void ArticleView::handleTitleChanged( QString const & title )
@ -2137,54 +2138,21 @@ void ArticleView::highlightFTSResults()
if ( regString.isEmpty() )
return;
//<div><i>watch</i>out</div> to plainText will return "watchout".
//if application goes here,that means the article text must contains the search text.
//whole word match regString will contain \b . can not match the above senario.
//workaround ,remove \b from the regstring="(\bwatch\b)"
regString.remove( QRegularExpression( R"(\b)" ) );
//make it simple ,and do not support too much complex cases. such as wildcard etc.
firstAvailableText = regString;
//replace any unicode Number ,Symbol ,Punctuation ,Mark character to whitespace
regString.replace( QRegularExpression( R"([\p{N}\p{S}\p{P}\p{M}])", QRegularExpression::UseUnicodePropertiesOption ),
" " );
if ( firstAvailableText.isEmpty() ) {
return;
}
//remove possible wildcard character.
auto cleaned =
firstAvailableText.split( QRegularExpression( "\\p{P}", QRegularExpression::UseUnicodePropertiesOption ) );
if ( cleaned.empty() )
if ( regString.trimmed().isEmpty() )
return;
firstAvailableText = cleaned.at( 0 );
#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
webview->findText( firstAvailableText,
QWebEnginePage::FindBackward,
[ & ]( const QWebEngineFindTextResult & result ) {
qInfo() << result.activeMatch() << "of" << result.numberOfMatches() << "matches";
QString script = QString(
"var context = document.querySelector(\"body\");\n"
"var instance = new Mark(context);\n"
"instance.mark(\"%1\");" )
.arg( regString );
if ( result.numberOfMatches() == 0 ) {
ftsSearchPanel->statusLabel->setText( searchStatusMessageNoMatches() );
}
else {
ftsSearchPanel->statusLabel->setText(
searchStatusMessage( result.activeMatch(), result.numberOfMatches() ) );
}
ftsSearchPanel->show();
ftsSearchPanel->previous->setEnabled( result.numberOfMatches() > 1 );
ftsSearchPanel->next->setEnabled( result.numberOfMatches() > 1 );
ftsSearchIsOpened = true;
} );
#else
webview->findText( firstAvailableText, QWebEnginePage::FindBackward, [ this ]( bool res ) {
ftsSearchPanel->previous->setEnabled( res );
if ( !ftsSearchPanel->next->isEnabled() )
ftsSearchPanel->next->setEnabled( res );
} );
#endif
webview->page()->runJavaScript( script );
}
void ArticleView::setActiveDictIds( const ActiveDictIds & ad )