From 6e8b7f405370c9bd25fee00baa9f993149e542a2 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 3 Jul 2020 22:20:31 -0400 Subject: [PATCH] CEditorApplication: Mark string as translatable --- src/Editor/CEditorApplication.cpp | 33 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/Editor/CEditorApplication.cpp b/src/Editor/CEditorApplication.cpp index 9eac4d3a..0c7d5dae 100644 --- a/src/Editor/CEditorApplication.cpp +++ b/src/Editor/CEditorApplication.cpp @@ -226,28 +226,27 @@ bool CEditorApplication::CookAllDirtyPackages() bool CEditorApplication::CookPackageList(QList PackageList) { - if (!PackageList.isEmpty()) + if (PackageList.isEmpty()) + return true; + + CProgressDialog Dialog(tr("Cooking package%1)").arg(PackageList.size() > 1 ? tr("s") : QString{}), false, true, mpWorldEditor); + + QFuture Future = QtConcurrent::run([&]() { - CProgressDialog Dialog("Cooking package" + QString(PackageList.size() > 1 ? "s" : ""), false, true, mpWorldEditor); + Dialog.SetNumTasks(PackageList.size()); - QFuture Future = QtConcurrent::run([&]() + for (int PkgIdx = 0; PkgIdx < PackageList.size() && !Dialog.ShouldCancel(); PkgIdx++) { - Dialog.SetNumTasks(PackageList.size()); + CPackage *pPkg = PackageList[PkgIdx]; + Dialog.SetTask(PkgIdx, "Cooking " + pPkg->Name() + ".pak..."); + pPkg->Cook(&Dialog); + } + }); - for (int PkgIdx = 0; PkgIdx < PackageList.size() && !Dialog.ShouldCancel(); PkgIdx++) - { - CPackage *pPkg = PackageList[PkgIdx]; - Dialog.SetTask(PkgIdx, "Cooking " + pPkg->Name() + ".pak..."); - pPkg->Cook(&Dialog); - } - }); + Dialog.WaitForResults(Future); - Dialog.WaitForResults(Future); - - emit PackagesCooked(); - return !Dialog.ShouldCancel(); - } - else return true; + emit PackagesCooked(); + return !Dialog.ShouldCancel(); } bool CEditorApplication::HasAnyDirtyPackages()