mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-12-18 03:14:06 +00:00
Merge branch 'staged' into dev
This commit is contained in:
commit
77c1fb0100
|
@ -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
3
mdx.cc
|
@ -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 )
|
||||||
|
|
Loading…
Reference in a new issue