update translation

kaniol-lck · Jul 12, 2024 · 6b067bb · 6b067bb
1 parent 6178b76
commit 6b067bb
Show file tree

Hide file tree

Showing 11 changed files with 1,191 additions and 675 deletions.
diff --git a/languages/zh_CN.ts b/languages/zh_CN.ts
diff --git a/languages/zh_TW.ts b/languages/zh_TW.ts
diff --git a/src/download/qaria2.cpp b/src/download/qaria2.cpp
@@ -46,6 +46,9 @@ QAria2::QAria2(QObject *parent) : QObject(parent)
     connect(qApp, &QCoreApplication::aboutToQuit, this, [=]{
         aria2::shutdown(session_);
         MMLogger() << "aria2 shutdown.";
+        // FIXME: sometime app donot exit after close
+        // (when local mod linked)
+        qTerminate();
     });
     updateOptions();
 }

diff --git a/src/images/image.qrc b/src/images/image.qrc
@@ -31,6 +31,7 @@
         <file>modrinth/transportation.svg</file>
         <file>liteloader.png</file>
         <file>rift.png</file>
+        <file>modrinth/game-mechanics.svg</file>
     </qresource>
     <qresource prefix="/"/>
 </RCC>
diff --git a/src/images/modrinth/game-mechanics.svg b/src/images/modrinth/game-mechanics.svg
diff --git a/src/local/localmod.cpp b/src/local/localmod.cpp
@@ -671,27 +671,27 @@ void LocalMod::updateIcon()
         emit modIconUpdated();
         return;
     }
-    auto applyIcon = [=]{
-        if(isDisabled()){
-            QImage image(icon_.toImage());
+    static auto applyIcon = [](LocalMod *p){
+        if(p->isDisabled()){
+            QImage image(p->icon_.toImage());
             auto alphaChannel = image.convertToFormat(QImage::Format_Alpha8);
             image = image.convertToFormat(QImage::Format_Grayscale8);
             image.setAlphaChannel(alphaChannel);
-            icon_.convertFromImage(image);
+            p->icon_.convertFromImage(image);
         }
-        emit modIconUpdated();
+        emit p->modIconUpdated();
     };
 
     if(!commonInfo()->iconBytes().isEmpty()){
         icon_.loadFromData(commonInfo()->iconBytes());
-        applyIcon();
+        applyIcon(this);
     }else if(commonInfo()->id() == "optifine") {
         icon_.load(":/image/optifine.png");
-        applyIcon();
+        applyIcon(this);
     }else if(curseforgeMod_){
         auto setCurseforgeIcon = [=]{
             icon_ = curseforgeMod_->modInfo().icon();
-            applyIcon();
+            applyIcon(this);
         };
         if(!curseforgeMod_->modInfo().icon().isNull())
             setCurseforgeIcon();
@@ -705,7 +705,7 @@ void LocalMod::updateIcon()
     } else if(modrinthMod_){
         auto setModrinthIcon = [=]{
             icon_ = modrinthMod_->modInfo().icon();
-            applyIcon();
+            applyIcon(this);
         };
         if(!modrinthMod_->modInfo().icon().isNull())
             setModrinthIcon();
@@ -718,7 +718,7 @@ void LocalMod::updateIcon()
         }
     } else{
         icon_.load(":/image/modmanager.png");
-        applyIcon();
+        applyIcon(this);
     }
 }
 

diff --git a/src/local/localmodfile.cpp b/src/local/localmodfile.cpp
@@ -31,8 +31,8 @@ LocalModFile::~LocalModFile()
 
 ModLoaderType::Type LocalModFile::loadInfo()
 {
-    auto timer = new QElapsedTimer;
-    timer->start();
+    // auto timer = new QElapsedTimer;
+    // timer->start();
     if(type() == NotMod) return ModLoaderType::Any;
     QFile modFile(path_);
 
@@ -87,7 +87,6 @@ ModLoaderType::Type LocalModFile::loadInfo()
         }
     }
 
-
     //qDebug() << "finish" << timer->elapsed();
 
     //for count

diff --git a/src/local/localmodpath.cpp b/src/local/localmodpath.cpp
@@ -190,7 +190,7 @@ void LocalModPath::loadMods(bool autoLoaderType)
         //delete unused files
         nonModFiles_.clear();
         for(const auto &file : qAsConst(modFileList)){
-            if(!file->parent()){
+            if(file->parent() == this){
                 nonModFiles_ << file->fileInfo().fileName();
                 file->deleteLater();
             }

diff --git a/src/modrinth/modrinthapi.cpp b/src/modrinth/modrinthapi.cpp
@@ -230,6 +230,7 @@ const QList<std::tuple<QString, QString> > &ModrinthAPI::getCategories()
         { tr("Economy"), "economy" },
         { tr("Equipment"), "equipment" },
         { tr("Food"), "food" },
+        { tr("Game Mechanics"), "game-mechanics" },
         { tr("Library"), "library" },
         { tr("Magic"), "magic" },
         { tr("Management"), "management" },

diff --git a/src/modrinth/modrinthmodinfo.cpp b/src/modrinth/modrinthmodinfo.cpp
@@ -85,7 +85,6 @@ ModrinthModInfo ModrinthModInfo::fromVariant(const QVariant &variant)
         if(it != ModrinthAPI::getCategories().end()){
             auto [name, iconName] = *it;
             modInfo.importTag(Tag(name, TagCategory::ModrinthCategory, ":/image/modrinth/" + iconName));
-            qDebug() << iconName;
         } else if(auto loaderType = ModLoaderType::fromString(categoryId);
                    loaderType != ModLoaderType::Any && ModLoaderType::modrinth.contains(loaderType)){
             modInfo.loaderTypes_ << loaderType;

diff --git a/src/ui/modmanager.cpp b/src/ui/modmanager.cpp
@@ -206,7 +206,7 @@ void ModManager::updateLockPanels()
 void ModManager::closeEvent(QCloseEvent *event[[maybe_unused]])
 {
     emit closed();
-//    qDebug() << "closed";
+    qDebug() << "closed";
 }
 
 #if defined (DE_KDE) || defined (Q_OS_WIN)