From 7e1c5d439a2ef6ce1346a3581776f58508a22afe Mon Sep 17 00:00:00 2001 From: Janrupf Date: Sat, 7 Apr 2018 16:15:58 +0200 Subject: #2228, #2229 - Auto import pack icons and fixed to big version selection - Closes #2228, Closes #2229 --- application/pages/modplatform/FtbListModel.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'application/pages/modplatform/FtbListModel.cpp') diff --git a/application/pages/modplatform/FtbListModel.cpp b/application/pages/modplatform/FtbListModel.cpp index 8e52f541..c14907c6 100644 --- a/application/pages/modplatform/FtbListModel.cpp +++ b/application/pages/modplatform/FtbListModel.cpp @@ -175,6 +175,9 @@ void FtbListModel::requestLogo(QString file) auto fullPath = entry->getFullPath(); QObject::connect(job, &NetJob::finished, this, [this, file, fullPath]{ emit logoLoaded(file, QIcon(fullPath)); + if(waitingCallbacks.contains(file)) { + waitingCallbacks.value(file)(fullPath); + } }); QObject::connect(job, &NetJob::failed, this, [this, file]{ @@ -185,3 +188,12 @@ void FtbListModel::requestLogo(QString file) m_loadingLogos.append(file); } + +void FtbListModel::getLogo(const QString &logo, LogoCallback callback) +{ + if(m_logoMap.contains(logo)) { + callback(ENV.metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(logo.section(".", 0, 0)))->getFullPath()); + } else { + requestLogo(logo); + } +} -- cgit