Resource provider column

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

launcher/minecraft/mod/ModFolderModel.cpp

@@ -160,7 +160,7 @@ QVariant ModFolderModel::headerData(int section, [[maybe_unused]] Qt::Orientatio
                 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.");
+                    return tr("The source provider of the mod.");
                 default:
                     return QVariant();
             }

launcher/minecraft/mod/ResourceFolderModel.cpp

@@ -466,6 +466,8 @@ QVariant ResourceFolderModel::data(const QModelIndex& index, int role) const
                     return m_resources[row]->name();
                 case DATE_COLUMN:
                     return m_resources[row]->dateTimeChanged();
+                case PROVIDER_COLUMN:
+                    return m_resources[row]->provider();
                 default:
                     return {};
             }
@@ -535,21 +537,22 @@ QVariant ResourceFolderModel::headerData(int section, [[maybe_unused]] Qt::Orien
                 case ACTIVE_COLUMN:
                 case NAME_COLUMN:
                 case DATE_COLUMN:
+                case PROVIDER_COLUMN:
                     return columnNames().at(section);
                 default:
                     return {};
             }
         case Qt::ToolTipRole: {
+            //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
             switch (section) {
                 case ACTIVE_COLUMN:
-                    //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
                     return tr("Is the resource enabled?");
                 case NAME_COLUMN:
-                    //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
                     return tr("The name of the resource.");
                 case DATE_COLUMN:
-                    //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
                     return tr("The date and time this resource was last changed (or added).");
+                case PROVIDER_COLUMN:
+                    return tr("The source provider of the resource.");
                 default:
                     return {};
             }

launcher/minecraft/mod/ResourceFolderModel.h

@@ -100,7 +100,7 @@ class ResourceFolderModel : public QAbstractListModel {
     /* Qt behavior */
 
     /* Basic columns */
-    enum Columns { ACTIVE_COLUMN = 0, NAME_COLUMN, DATE_COLUMN, NUM_COLUMNS };
+    enum Columns { ACTIVE_COLUMN = 0, NAME_COLUMN, DATE_COLUMN, PROVIDER_COLUMN, NUM_COLUMNS };
     QStringList columnNames(bool translated = true) const { return translated ? m_column_names_translated : m_column_names; }
 
     [[nodiscard]] int rowCount(const QModelIndex& parent = {}) const override { return parent.isValid() ? 0 : static_cast<int>(size()); }
@@ -205,11 +205,11 @@ class ResourceFolderModel : public QAbstractListModel {
     // Represents the relationship between a column's index (represented by the list index), and it's sorting key.
     // As such, the order in with they appear is very important!
     QList<SortType> m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::DATE };
-    QStringList m_column_names = { "Enable", "Name", "Last Modified" };
+    QStringList m_column_names = { "Enable", "Name", "Last Modified", "Provider" };
-    QStringList m_column_names_translated = { tr("Enable"), tr("Name"), tr("Last Modified") };
+    QStringList m_column_names_translated = { tr("Enable"), tr("Name"), tr("Last Modified"), tr("Provider") };
     QList<QHeaderView::ResizeMode> m_column_resize_modes = { QHeaderView::ResizeToContents, QHeaderView::Stretch,
                                                              QHeaderView::ResizeToContents };
-    QList<bool> m_columnsHideable = { false, false, true };
+    QList<bool> m_columnsHideable = { false, false, true, true };
 
     QDir m_dir;
     BaseInstance* m_instance;

launcher/minecraft/mod/ResourcePackFolderModel.cpp

@@ -50,12 +50,12 @@
 ResourcePackFolderModel::ResourcePackFolderModel(const QDir& dir, BaseInstance* instance, bool is_indexed, bool create_dir, QObject* parent)
     : ResourceFolderModel(dir, instance, is_indexed, create_dir, parent)
 {
-    m_column_names = QStringList({ "Enable", "Image", "Name", "Pack Format", "Last Modified" });
+    m_column_names = QStringList({ "Enable", "Image", "Name", "Pack Format", "Last Modified", "Provider" });
-    m_column_names_translated = QStringList({ tr("Enable"), tr("Image"), tr("Name"), tr("Pack Format"), tr("Last Modified") });
+    m_column_names_translated = QStringList({ tr("Enable"), tr("Image"), tr("Name"), tr("Pack Format"), tr("Last Modified"), tr("Provider") });
     m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::NAME, SortType::PACK_FORMAT, SortType::DATE };
     m_column_resize_modes = { QHeaderView::ResizeToContents, QHeaderView::Interactive, QHeaderView::Stretch, QHeaderView::ResizeToContents,
                               QHeaderView::ResizeToContents };
-    m_columnsHideable = { false, true, false, true, true };
+    m_columnsHideable = { false, true, false, true, true, true };
 }
 
 QVariant ResourcePackFolderModel::data(const QModelIndex& index, int role) const
@@ -86,7 +86,8 @@ QVariant ResourcePackFolderModel::data(const QModelIndex& index, int role) const
                 }
                 case DateColumn:
                     return m_resources[row]->dateTimeChanged();
-
+                case ProviderColumn:
+                    return m_resources[row]->provider();
                 default:
                     return {};
             }
@@ -140,6 +141,7 @@ QVariant ResourcePackFolderModel::headerData(int section, [[maybe_unused]] Qt::O
                 case PackFormatColumn:
                 case DateColumn:
                 case ImageColumn:
+                case ProviderColumn:
                     return columnNames().at(section);
                 default:
                     return {};
@@ -148,7 +150,7 @@ QVariant ResourcePackFolderModel::headerData(int section, [[maybe_unused]] Qt::O
         case Qt::ToolTipRole:
             switch (section) {
                 case ActiveColumn:
-                    return tr("Is the resource pack enabled? (Only valid for ZIPs)");
+                    return tr("Is the resource pack enabled?");
                 case NameColumn:
                     return tr("The name of the resource pack.");
                 case PackFormatColumn:
@@ -156,6 +158,8 @@ QVariant ResourcePackFolderModel::headerData(int section, [[maybe_unused]] Qt::O
                     return tr("The resource pack format ID, as well as the Minecraft versions it was designed for.");
                 case DateColumn:
                     return tr("The date and time this resource pack was last changed (or added).");
+                case ProviderColumn:
+                    return tr("The source provider of the resource pack.");
                 default:
                     return {};
             }

launcher/minecraft/mod/ResourcePackFolderModel.h

@@ -7,7 +7,7 @@
 class ResourcePackFolderModel : public ResourceFolderModel {
     Q_OBJECT
    public:
-    enum Columns { ActiveColumn = 0, ImageColumn, NameColumn, PackFormatColumn, DateColumn, NUM_COLUMNS };
+    enum Columns { ActiveColumn = 0, ImageColumn, NameColumn, PackFormatColumn, DateColumn, ProviderColumn, NUM_COLUMNS };
 
     explicit ResourcePackFolderModel(const QDir& dir, BaseInstance* instance, bool is_indexed, bool create_dir, QObject* parent = nullptr);
 

launcher/minecraft/mod/TexturePackFolderModel.cpp

@@ -45,12 +45,12 @@
 TexturePackFolderModel::TexturePackFolderModel(const QDir& dir, BaseInstance* instance, bool is_indexed, bool create_dir, QObject* parent)
     : ResourceFolderModel(QDir(dir), instance, is_indexed, create_dir, parent)
 {
-    m_column_names = QStringList({ "Enable", "Image", "Name", "Last Modified" });
+    m_column_names = QStringList({ "Enable", "Image", "Name", "Last Modified", "Provider" });
-    m_column_names_translated = QStringList({ tr("Enable"), tr("Image"), tr("Name"), tr("Last Modified") });
+    m_column_names_translated = QStringList({ tr("Enable"), tr("Image"), tr("Name"), tr("Last Modified"), tr("Provider") });
     m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::NAME, SortType::DATE };
     m_column_resize_modes = { QHeaderView::ResizeToContents, QHeaderView::Interactive, QHeaderView::Stretch,
                               QHeaderView::ResizeToContents };
-    m_columnsHideable = { false, true, false, true };
+    m_columnsHideable = { false, true, false, true, true };
 }
 
 Task* TexturePackFolderModel::createParseTask(Resource& resource)
@@ -73,6 +73,8 @@ QVariant TexturePackFolderModel::data(const QModelIndex& index, int role) const
                     return m_resources[row]->name();
                 case DateColumn:
                     return m_resources[row]->dateTimeChanged();
+                case ProviderColumn:
+                    return m_resources[row]->provider();
                 default:
                     return {};
             }
@@ -119,6 +121,7 @@ QVariant TexturePackFolderModel::headerData(int section, [[maybe_unused]] Qt::Or
                 case NameColumn:
                 case DateColumn:
                 case ImageColumn:
+                case ProviderColumn:
                     return columnNames().at(section);
                 default:
                     return {};
@@ -126,14 +129,13 @@ QVariant TexturePackFolderModel::headerData(int section, [[maybe_unused]] Qt::Or
         case Qt::ToolTipRole: {
             switch (section) {
                 case ActiveColumn:
-                    //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
+                    return tr("Is the texture pack enabled?");
-                    return tr("Is the resource enabled?");
                 case NameColumn:
-                    //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
+                    return tr("The name of the texture pack.");
-                    return tr("The name of the resource.");
                 case DateColumn:
-                    //: Here, resource is a generic term for external resources, like Mods, Resource Packs, Shader Packs, etc.
+                    return tr("The date and time this texture pack was last changed (or added).");
-                    return tr("The date and time this resource was last changed (or added).");
+                case ProviderColumn:
+                    return tr("The source provider of the texture pack.");
                 default:
                     return {};
             }

launcher/minecraft/mod/TexturePackFolderModel.h

@@ -44,7 +44,7 @@ class TexturePackFolderModel : public ResourceFolderModel {
     Q_OBJECT
 
    public:
-    enum Columns { ActiveColumn = 0, ImageColumn, NameColumn, DateColumn, NUM_COLUMNS };
+    enum Columns { ActiveColumn = 0, ImageColumn, NameColumn, DateColumn, ProviderColumn, NUM_COLUMNS };
 
     explicit TexturePackFolderModel(const QDir& dir, BaseInstance* instance, bool is_indexed, bool create_dir, QObject* parent = nullptr);