Merge pull request #626 from leo78913/mods-provider-column

closes https://github.com/PrismLauncher/PrismLauncher/issues/402

1 files changed, 14 insertions, 1 deletions

diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index 4ccc5d4d..f258ad69 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -48,10 +48,11 @@
 
 #include "minecraft/mod/tasks/LocalModParseTask.h"
 #include "minecraft/mod/tasks/ModFolderLoadTask.h"
+#include "modplatform/ModIndex.h"
 
 ModFolderModel::ModFolderModel(const QString &dir, bool is_indexed) : ResourceFolderModel(QDir(dir)), m_is_indexed(is_indexed)
 {
-    m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::VERSION, SortType::DATE };
+    m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::VERSION, SortType::DATE, SortType::PROVIDER };
 }
 
 QVariant ModFolderModel::data(const QModelIndex &index, int role) const
@@ -82,7 +83,15 @@ QVariant ModFolderModel::data(const QModelIndex &index, int role) const
         }
         case DateColumn:
             return m_resources[row]->dateTimeChanged();
+        case ProviderColumn: {
+            auto provider = at(row)->provider();
+            if (!provider.has_value()) {
+	            //: Unknown mod provider (i.e. not Modrinth, CurseForge, etc...)
+                return tr("Unknown");
+            }
 
+            return provider.value();
+        }
         default:
             return QVariant();
         }
@@ -118,6 +127,8 @@ QVariant ModFolderModel::headerData(int section, Qt::Orientation orientation, in
             return tr("Version");
         case DateColumn:
             return tr("Last changed");
+        case ProviderColumn:
+            return tr("Provider");
         default:
             return QVariant();
         }
@@ -133,6 +144,8 @@ QVariant ModFolderModel::headerData(int section, Qt::Orientation orientation, in
             return tr("The version of the mod.");
         case DateColumn:
             return tr("The date and time this mod was last changed (or added).");
+        case ProviderColumn:
+            return tr("Where the mod was downloaded from.");
         default:
             return QVariant();
         }