diff options
author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-05-28 11:25:58 -0700 |
---|---|---|
committer | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-11 21:42:29 -0700 |
commit | 9957aeb003a28f24a7d3b2bbc46d21c31506615d (patch) | |
tree | 891048851c7819f334abf384a7d99dbeec7bf0ea /launcher/translations | |
parent | eb079c80605f88cbd0aaff8285dafc459c6f42eb (diff) | |
parent | 640aaa8c23d714ce17bc8e78754af6219abc6466 (diff) | |
download | PrismLauncher-9957aeb003a28f24a7d3b2bbc46d21c31506615d.tar.gz PrismLauncher-9957aeb003a28f24a7d3b2bbc46d21c31506615d.tar.bz2 PrismLauncher-9957aeb003a28f24a7d3b2bbc46d21c31506615d.zip |
Merge branch 'develop' into curseforge-url-handle
Diffstat (limited to 'launcher/translations')
-rw-r--r-- | launcher/translations/TranslationsModel.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp index 46db4804..489dff86 100644 --- a/launcher/translations/TranslationsModel.cpp +++ b/launcher/translations/TranslationsModel.cpp @@ -190,7 +190,7 @@ struct TranslationsModel::Private std::unique_ptr<QTranslator> m_qt_translator; std::unique_ptr<QTranslator> m_app_translator; - Net::Download::Ptr m_index_task; + Net::Download* m_index_task; QString m_downloadingTranslation; NetJob::Ptr m_dl_job; NetJob::Ptr m_index_job; @@ -454,6 +454,7 @@ QVariant TranslationsModel::data(const QModelIndex& index, int role) const return QString("%1%").arg(lang.percentTranslated(), 3, 'f', 1); } } + qWarning("TranslationModel::data not implemented when role is DisplayRole"); } case Qt::ToolTipRole: { @@ -673,8 +674,9 @@ void TranslationsModel::downloadIndex() d->m_index_job.reset(new NetJob("Translations Index", APPLICATION->network())); MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("translations", "index_v2.json"); entry->setStale(true); - d->m_index_task = Net::Download::makeCached(QUrl(BuildConfig.TRANSLATIONS_BASE_URL + "index_v2.json"), entry); - d->m_index_job->addNetAction(d->m_index_task); + auto task = Net::Download::makeCached(QUrl(BuildConfig.TRANSLATIONS_BASE_URL + "index_v2.json"), entry); + d->m_index_task = task.get(); + d->m_index_job->addNetAction(task); connect(d->m_index_job.get(), &NetJob::failed, this, &TranslationsModel::indexFailed); connect(d->m_index_job.get(), &NetJob::succeeded, this, &TranslationsModel::indexReceived); d->m_index_job->start(); |