Merge branch 'staged' into dev

This commit is contained in:
Xiao YiFang 2022-06-22 07:52:34 +08:00
commit 77c1fb0100
2 changed files with 3 additions and 2 deletions

View file

@ -2256,7 +2256,7 @@ void ArticleView::on_searchCloseButton_clicked()
void ArticleView::on_searchCaseSensitive_clicked() void ArticleView::on_searchCaseSensitive_clicked()
{ {
performFindOperation( false, false, true ); performFindOperation( true, false );
} }
void ArticleView::on_highlightAllButton_clicked() void ArticleView::on_highlightAllButton_clicked()

3
mdx.cc
View file

@ -949,7 +949,8 @@ void MdxDictionary::loadArticle( uint32_t offset, string & articleText, bool noF
article = filterResource( articleId, article ); article = filterResource( articleId, article );
} }
articleText = article.toStdString(); // articleText = article.toStdString();
articleText = string( article.toUtf8().constData() );
} }
QString & MdxDictionary::filterResource( QString const & articleId, QString & article ) QString & MdxDictionary::filterResource( QString const & articleId, QString & article )