1 files changed, 179 insertions, 26 deletions

diff --git a/application/pages/instance/ModFolderPage.cpp b/application/pages/instance/ModFolderPage.cpp
index d891c068..98f20e77 100644
--- a/application/pages/instance/ModFolderPage.cpp
+++ b/application/pages/instance/ModFolderPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2021 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,32 +20,135 @@
 #include <QEvent>
 #include <QKeyEvent>
 #include <QAbstractItemModel>
+#include <QMenu>
 
 #include "MultiMC.h"
 #include "dialogs/CustomMessageBox.h"
-#include "dialogs/ModEditDialogCommon.h"
 #include <GuiUtil.h>
-#include "minecraft/SimpleModList.h"
-#include "minecraft/Mod.h"
+#include "minecraft/mod/ModFolderModel.h"
+#include "minecraft/mod/Mod.h"
 #include "minecraft/VersionFilterData.h"
-#include "minecraft/ComponentList.h"
+#include "minecraft/PackProfile.h"
 #include <DesktopServices.h>
 
-ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<SimpleModList> mods, QString id,
-                             QString iconName, QString displayName, QString helpPage,
-                             QWidget *parent)
-    : QWidget(parent), ui(new Ui::ModFolderPage)
+#include <QSortFilterProxyModel>
+#include "Version.h"
+
+namespace {
+    // FIXME: wasteful
+    void RemoveThePrefix(QString & string) {
+        QRegularExpression regex(QStringLiteral("^(([Tt][Hh][eE])|([Tt][eE][Hh])) +"));
+        string.remove(regex);
+        string = string.trimmed();
+    }
+}
+
+class ModSortProxy : public QSortFilterProxyModel
+{
+public:
+    explicit ModSortProxy(QObject *parent = 0) : QSortFilterProxyModel(parent)
+    {
+    }
+
+protected:
+    bool filterAcceptsRow(int source_row, const QModelIndex & source_parent) const override {
+        ModFolderModel *model = qobject_cast<ModFolderModel *>(sourceModel());
+        if(!model) {
+            return false;
+        }
+        const auto &mod = model->at(source_row);
+        if(mod.name().contains(filterRegExp())) {
+            return true;
+        }
+        if(mod.description().contains(filterRegExp())) {
+            return true;
+        }
+        for(auto & author: mod.authors()) {
+            if (author.contains(filterRegExp())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    bool lessThan(const QModelIndex & source_left, const QModelIndex & source_right) const override
+    {
+        ModFolderModel *model = qobject_cast<ModFolderModel *>(sourceModel());
+        if(
+            !model ||
+            !source_left.isValid() ||
+            !source_right.isValid() ||
+            source_left.column() != source_right.column()
+        ) {
+            return QSortFilterProxyModel::lessThan(source_left, source_right);
+        }
+
+        // we are now guaranteed to have two valid indexes in the same column... we love the provided invariants unconditionally and proceed.
+
+        auto column = (ModFolderModel::Columns) source_left.column();
+        bool invert = false;
+        switch(column) {
+            // GH-2550 - sort by enabled/disabled
+            case ModFolderModel::ActiveColumn: {
+                auto dataL = source_left.data(Qt::CheckStateRole).toBool();
+                auto dataR = source_right.data(Qt::CheckStateRole).toBool();
+                if(dataL != dataR) {
+                    return dataL > dataR;
+                }
+                // fallthrough
+                invert = sortOrder() == Qt::DescendingOrder;
+            }
+            // GH-2722 - sort mod names in a way that discards "The" prefixes
+            case ModFolderModel::NameColumn: {
+                auto dataL = model->data(model->index(source_left.row(), ModFolderModel::NameColumn)).toString();
+                RemoveThePrefix(dataL);
+                auto dataR = model->data(model->index(source_right.row(), ModFolderModel::NameColumn)).toString();
+                RemoveThePrefix(dataR);
+
+                auto less = dataL.compare(dataR, sortCaseSensitivity());
+                if(less != 0) {
+                    return invert ? (less > 0) : (less < 0);
+                }
+                // fallthrough
+                invert = sortOrder() == Qt::DescendingOrder;
+            }
+            // GH-2762 - sort versions by parsing them as versions
+            case ModFolderModel::VersionColumn: {
+                auto dataL = Version(model->data(model->index(source_left.row(), ModFolderModel::VersionColumn)).toString());
+                auto dataR = Version(model->data(model->index(source_right.row(), ModFolderModel::VersionColumn)).toString());
+                return invert ? (dataL > dataR) : (dataL < dataR);
+            }
+            default: {
+                return QSortFilterProxyModel::lessThan(source_left, source_right);
+            }
+        }
+    }
+};
+
+ModFolderPage::ModFolderPage(
+    BaseInstance *inst,
+    std::shared_ptr<ModFolderModel> mods,
+    QString id,
+    QString iconName,
+    QString displayName,
+    QString helpPage,
+    QWidget *parent
+) :
+    QMainWindow(parent),
+    ui(new Ui::ModFolderPage)
 {
     ui->setupUi(this);
-    ui->tabWidget->tabBar()->hide();
+    ui->actionsToolbar->insertSpacer(ui->actionView_configs);
+
     m_inst = inst;
+    on_RunningState_changed(m_inst && m_inst->isRunning());
     m_mods = mods;
     m_id = id;
     m_displayName = displayName;
     m_iconName = iconName;
     m_helpName = helpPage;
     m_fileSelectionFilter = "%1 (*.zip *.jar)";
-    m_filterModel = new QSortFilterProxyModel(this);
+    m_filterModel = new ModSortProxy(this);
     m_filterModel->setDynamicSortFilter(true);
     m_filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
     m_filterModel->setSortCaseSensitivity(Qt::CaseInsensitive);
@@ -54,9 +157,37 @@ ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<SimpleModList>
     ui->modTreeView->setModel(m_filterModel);
     ui->modTreeView->installEventFilter(this);
     ui->modTreeView->sortByColumn(1, Qt::AscendingOrder);
+    ui->modTreeView->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(ui->modTreeView, &ModListView::customContextMenuRequested, this, &ModFolderPage::ShowContextMenu);
+    connect(ui->modTreeView, &ModListView::activated, this, &ModFolderPage::modItemActivated);
+
     auto smodel = ui->modTreeView->selectionModel();
     connect(smodel, &QItemSelectionModel::currentChanged, this, &ModFolderPage::modCurrent);
-    connect(ui->filterEdit, &QLineEdit::textChanged, this, &ModFolderPage::on_filterTextChanged );
+    connect(ui->filterEdit, &QLineEdit::textChanged, this, &ModFolderPage::on_filterTextChanged);
+    connect(m_inst, &BaseInstance::runningStatusChanged, this, &ModFolderPage::on_RunningState_changed);
+}
+
+void ModFolderPage::modItemActivated(const QModelIndex&)
+{
+    if(!m_controlsEnabled) {
+        return;
+    }
+    auto selection = m_filterModel->mapSelectionToSource(ui->modTreeView->selectionModel()->selection());
+    m_mods->setModStatus(selection.indexes(), ModFolderModel::Toggle);
+}
+
+QMenu * ModFolderPage::createPopupMenu()
+{
+    QMenu* filteredMenu = QMainWindow::createPopupMenu();
+    filteredMenu->removeAction(ui->actionsToolbar->toggleViewAction() );
+    return filteredMenu;
+}
+
+void ModFolderPage::ShowContextMenu(const QPoint& pos)
+{
+    auto menu = ui->actionsToolbar->createContextMenu(this, tr("Context menu"));
+    menu->exec(ui->modTreeView->mapToGlobal(pos));
+    delete menu;
 }
 
 void ModFolderPage::openedImpl()
@@ -76,7 +207,7 @@ void ModFolderPage::on_filterTextChanged(const QString& newContents)
 }
 
 
-CoreModFolderPage::CoreModFolderPage(BaseInstance *inst, std::shared_ptr<SimpleModList> mods,
+CoreModFolderPage::CoreModFolderPage(BaseInstance *inst, std::shared_ptr<ModFolderModel> mods,
                                      QString id, QString iconName, QString displayName,
                                      QString helpPage, QWidget *parent)
     : ModFolderPage(inst, mods, id, iconName, displayName, helpPage, parent)
@@ -89,10 +220,20 @@ ModFolderPage::~ModFolderPage()
     delete ui;
 }
 
+void ModFolderPage::on_RunningState_changed(bool running)
+{
+    if(m_controlsEnabled == !running) {
+        return;
+    }
+    m_controlsEnabled = !running;
+    ui->actionAdd->setEnabled(m_controlsEnabled);
+    ui->actionDisable->setEnabled(m_controlsEnabled);
+    ui->actionEnable->setEnabled(m_controlsEnabled);
+    ui->actionRemove->setEnabled(m_controlsEnabled);
+}
+
 bool ModFolderPage::shouldDisplay() const
 {
-    if (m_inst)
-        return !m_inst->isRunning();
     return true;
 }
 
@@ -103,7 +244,7 @@ bool CoreModFolderPage::shouldDisplay() const
         auto inst = dynamic_cast<MinecraftInstance *>(m_inst);
         if (!inst)
             return true;
-        auto version = inst->getComponentList();
+        auto version = inst->getPackProfile();
         if (!version)
             return true;
         if(!version->getComponent("net.minecraftforge"))
@@ -127,10 +268,10 @@ bool ModFolderPage::modListFilter(QKeyEvent *keyEvent)
     switch (keyEvent->key())
     {
     case Qt::Key_Delete:
-        on_rmModBtn_clicked();
+        on_actionRemove_triggered();
         return true;
     case Qt::Key_Plus:
-        on_addModBtn_clicked();
+        on_actionAdd_triggered();
         return true;
     default:
         break;
@@ -150,8 +291,11 @@ bool ModFolderPage::eventFilter(QObject *obj, QEvent *ev)
     return QWidget::eventFilter(obj, ev);
 }
 
-void ModFolderPage::on_addModBtn_clicked()
+void ModFolderPage::on_actionAdd_triggered()
 {
+    if(!m_controlsEnabled) {
+        return;
+    }
     auto list = GuiUtil::BrowseForFiles(
         m_helpName,
         tr("Select %1",
@@ -168,30 +312,39 @@ void ModFolderPage::on_addModBtn_clicked()
     }
 }
 
-void ModFolderPage::on_enableModBtn_clicked()
+void ModFolderPage::on_actionEnable_triggered()
 {
+    if(!m_controlsEnabled) {
+        return;
+    }
     auto selection = m_filterModel->mapSelectionToSource(ui->modTreeView->selectionModel()->selection());
-    m_mods->enableMods(selection.indexes(), true);
+    m_mods->setModStatus(selection.indexes(), ModFolderModel::Enable);
 }
 
-void ModFolderPage::on_disableModBtn_clicked()
+void ModFolderPage::on_actionDisable_triggered()
 {
+    if(!m_controlsEnabled) {
+        return;
+    }
     auto selection = m_filterModel->mapSelectionToSource(ui->modTreeView->selectionModel()->selection());
-    m_mods->enableMods(selection.indexes(), false);
+    m_mods->setModStatus(selection.indexes(), ModFolderModel::Disable);
 }
 
-void ModFolderPage::on_rmModBtn_clicked()
+void ModFolderPage::on_actionRemove_triggered()
 {
+    if(!m_controlsEnabled) {
+        return;
+    }
     auto selection = m_filterModel->mapSelectionToSource(ui->modTreeView->selectionModel()->selection());
     m_mods->deleteMods(selection.indexes());
 }
 
-void ModFolderPage::on_configFolderBtn_clicked()
+void ModFolderPage::on_actionView_configs_triggered()
 {
     DesktopServices::openDirectory(m_inst->instanceConfigFolder(), true);
 }
 
-void ModFolderPage::on_viewModBtn_clicked()
+void ModFolderPage::on_actionView_Folder_triggered()
 {
     DesktopServices::openDirectory(m_mods->dir().absolutePath(), true);
 }