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

code clean: format

Browse source
This commit is contained in:
yifang 2022-01-01 18:19:11 +08:00
parent 8fc762a57b
commit aaea8d8e04
1 changed files with 26 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
articleview.cc
View file

@ -180,7 +180,7 @@ QString ArticleView::runJavaScriptSync(QWebEnginePage* frame, const QString& var
QString result; QString result;
QSharedPointer<QEventLoop> loop = QSharedPointer<QEventLoop>(new QEventLoop()); QSharedPointer<QEventLoop> loop = QSharedPointer<QEventLoop>(new QEventLoop());
QTimer::singleShot(1000, loop.data(), &QEventLoop::quit); QTimer::singleShot(1000, loop.data(), &QEventLoop::quit);
frame->runJavaScript(variable, [loop,&result](const QVariant &v) frame->runJavaScript(variable, [=,&result](const QVariant &v)
{ {
if(loop->isRunning()){ if(loop->isRunning()){
if(v.isValid()) if(v.isValid())
@ -758,7 +758,7 @@ void ArticleView::tryMangleWebsiteClickedUrl( QUrl & url, Contexts & contexts )
void ArticleView::updateCurrentArticleFromCurrentFrame( QWebEnginePage * frame ,QPoint * point) void ArticleView::updateCurrentArticleFromCurrentFrame( QWebEnginePage * frame ,QPoint * point)
{ {
qDebug("updateCurrentArticleFromCurrentFrame");
} }
void ArticleView::saveHistoryUserData() void ArticleView::saveHistoryUserData()
@ -973,41 +973,36 @@ QString ArticleView::getMutedForGroup( unsigned group )
return QString(); return QString();
} }
QStringList ArticleView::getMutedDictionaries(unsigned group) QStringList ArticleView::getMutedDictionaries(unsigned group) {
{ if (dictionaryBarToggled && dictionaryBarToggled->isChecked()) {
if (dictionaryBarToggled && dictionaryBarToggled->isChecked()) // Dictionary bar is active -- mute the muted dictionaries
{ Instances::Group const *groupInstance = groups.findGroup(group);
// Dictionary bar is active -- mute the muted dictionaries
Instances::Group const* groupInstance = groups.findGroup(group);
// Find muted dictionaries for current group // Find muted dictionaries for current group
Config::Group const* grp = cfg.getGroup(group); Config::Group const *grp = cfg.getGroup(group);
Config::MutedDictionaries const* mutedDictionaries; Config::MutedDictionaries const *mutedDictionaries;
if (group == Instances::Group::AllGroupId) if (group == Instances::Group::AllGroupId)
mutedDictionaries = popupView ? &cfg.popupMutedDictionaries : &cfg.mutedDictionaries; mutedDictionaries = popupView ? &cfg.popupMutedDictionaries : &cfg.mutedDictionaries;
else else
mutedDictionaries = grp ? (popupView ? &grp->popupMutedDictionaries : &grp->mutedDictionaries) : 0; mutedDictionaries = grp ? (popupView ? &grp->popupMutedDictionaries : &grp->mutedDictionaries) : 0;
if (!mutedDictionaries) if (!mutedDictionaries)
return QStringList(); return QStringList();
QStringList mutedDicts; QStringList mutedDicts;
if (groupInstance) if (groupInstance) {
{ for (unsigned x = 0; x < groupInstance->dictionaries.size(); ++x) {
for (unsigned x = 0; x < groupInstance->dictionaries.size(); ++x) QString id = QString::fromStdString(groupInstance->dictionaries[x]->getId());
{
QString id = QString::fromStdString(
groupInstance->dictionaries[x]->getId());
if (mutedDictionaries->contains(id)) if (mutedDictionaries->contains(id))
mutedDicts.append(id); mutedDicts.append(id);
} }
} }
return mutedDicts; return mutedDicts;
} }
return QStringList(); return QStringList();
} }
void ArticleView::linkHovered ( const QString & link ) void ArticleView::linkHovered ( const QString & link )