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

right panel founded dictionaries

Browse source
This commit is contained in:
yifang 2021-10-05 09:23:30 +08:00
parent c10d8654bc
commit f13c713265
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
articleview.cc
View file

@ -759,23 +759,15 @@ void ArticleView::setCurrentArticle( QString const & id, bool moveToIt )
if ( !ui.definition->isVisible() )
return; // No action on background page, scrollIntoView there don't work
QString articleId=id.mid( 7 );
QString script=QString(""
"var s=gdArticleContents;"
"var index=s.split(' ').indexOf(%1);"
"if(index>-1){"
" if(%2){"
" document.getElementById('%3').scrollIntoView(true);"
" }"
""
" gdMakeArticleActive( '%1' );"
" currentArticle='%3';"
"}").arg(articleId).arg(moveToIt).arg(id);
if(moveToIt){
QString script=QString(" document.getElementById('%1').scrollIntoView(true);").arg(id);
ui.definition->page()->runJavaScript(script);
onJsActiveArticleChanged(id);
ui.definition->page()->runJavaScript(script);
ui.definition->setProperty("currentArticle",id);
onJsActiveArticleChanged(id);
ui.definition->setProperty("currentArticle",id);
}
}
void ArticleView::selectCurrentArticle()
@ -1086,7 +1078,7 @@ QStringList ArticleView::getMutedDictionaries(unsigned group)
// Find muted dictionaries for current group
Config::Group const* grp = cfg.getGroup(group);
Config::MutedDictionaries const* mutedDictionaries;
if (group == Instances::Group::AllGroupId||!grp)
if (group == Instances::Group::AllGroupId)
mutedDictionaries = popupView ? &cfg.popupMutedDictionaries : &cfg.mutedDictionaries;
else
mutedDictionaries = grp ? (popupView ? &grp->popupMutedDictionaries : &grp->mutedDictionaries) : 0;

2
articleview.hh
View file

@ -364,6 +364,8 @@ private:
/// for the given group. If there are none, returns empty string.
QString getMutedForGroup( unsigned group );
QStringList getMutedDictionaries(unsigned group);
protected:
// We need this to hide the search bar when we're showed