From 53069205faf4063e838bab4beea5089d6ec2a0af Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Sat, 8 Feb 2014 17:22:26 +0100
Subject: Allow overriding the order in which patches are applied
---
gui/dialogs/OneSixModEditDialog.cpp | 122 ++++++++++++++++++++++++++++++++++++
gui/dialogs/OneSixModEditDialog.h | 6 ++
gui/dialogs/OneSixModEditDialog.ui | 28 +++++++++
3 files changed, 156 insertions(+)
(limited to 'gui/dialogs')
diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp
index 1b61771d..9e585de5 100644
--- a/gui/dialogs/OneSixModEditDialog.cpp
+++ b/gui/dialogs/OneSixModEditDialog.cpp
@@ -39,6 +39,18 @@
#include "logic/lists/ForgeVersionList.h"
#include "logic/ForgeInstaller.h"
#include "logic/LiteLoaderInstaller.h"
+#include "logic/OneSixVersionBuilder.h"
+
+template<typename A, typename B>
+QMap<A, B> invert(const QMap<B, A> &in)
+{
+ QMap<A, B> out;
+ for (auto it = in.begin(); it != in.end(); ++it)
+ {
+ out.insert(it.value(), it.key());
+ }
+ return out;
+}
OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
: QDialog(parent), ui(new Ui::OneSixModEditDialog), m_inst(inst)
@@ -129,6 +141,87 @@ void OneSixModEditDialog::on_removeLibraryBtn_clicked()
}
}
+void OneSixModEditDialog::on_resetLibraryOrderBtn_clicked()
+{
+ QDir(m_inst->instanceRoot()).remove("order.json");
+ m_inst->reloadVersion(this);
+}
+void OneSixModEditDialog::on_moveLibraryUpBtn_clicked()
+{
+
+ QMap<QString, int> order = getExistingOrder();
+ if (order.size() < 2 || ui->libraryTreeView->selectionModel()->selectedIndexes().isEmpty())
+ {
+ return;
+ }
+ const int ourRow = ui->libraryTreeView->selectionModel()->selectedIndexes().first().row();
+ const QString ourId = m_version->versionFileId(ourRow);
+ const int ourOrder = order[ourId];
+ if (ourId.isNull() || ourId.startsWith("org.multimc."))
+ {
+ return;
+ }
+
+ QMap<int, QString> sortedOrder = invert(order);
+
+ QList<int> sortedOrders = sortedOrder.keys();
+ const int ourIndex = sortedOrders.indexOf(ourOrder);
+ if (ourIndex <= 0)
+ {
+ return;
+ }
+ const int ourNewOrder = sortedOrders.at(ourIndex - 1);
+ order[ourId] = ourNewOrder;
+ order[sortedOrder[sortedOrders[ourIndex - 1]]] = ourOrder;
+
+ if (!OneSixVersionBuilder::writeOverrideOrders(order, m_inst))
+ {
+ QMessageBox::critical(this, tr("Error"), tr("Couldn't save the new order"));
+ }
+ else
+ {
+ m_inst->reloadVersion(this);
+ ui->libraryTreeView->selectionModel()->select(m_version->index(ourRow - 1), QItemSelectionModel::SelectCurrent);
+ }
+}
+void OneSixModEditDialog::on_moveLibraryDownBtn_clicked()
+{
+ QMap<QString, int> order = getExistingOrder();
+ if (order.size() < 2 || ui->libraryTreeView->selectionModel()->selectedIndexes().isEmpty())
+ {
+ return;
+ }
+ const int ourRow = ui->libraryTreeView->selectionModel()->selectedIndexes().first().row();
+ const QString ourId = m_version->versionFileId(ourRow);
+ const int ourOrder = order[ourId];
+ if (ourId.isNull() || ourId.startsWith("org.multimc."))
+ {
+ return;
+ }
+
+ QMap<int, QString> sortedOrder = invert(order);
+
+ QList<int> sortedOrders = sortedOrder.keys();
+ const int ourIndex = sortedOrders.indexOf(ourOrder);
+ if ((ourIndex + 1) >= sortedOrders.size())
+ {
+ return;
+ }
+ const int ourNewOrder = sortedOrders.at(ourIndex + 1);
+ order[ourId] = ourNewOrder;
+ order[sortedOrder[sortedOrders[ourIndex + 1]]] = ourOrder;
+
+ if (!OneSixVersionBuilder::writeOverrideOrders(order, m_inst))
+ {
+ QMessageBox::critical(this, tr("Error"), tr("Couldn't save the new order"));
+ }
+ else
+ {
+ m_inst->reloadVersion(this);
+ ui->libraryTreeView->selectionModel()->select(m_version->index(ourRow + 1), QItemSelectionModel::SelectCurrent);
+ }
+}
+
void OneSixModEditDialog::on_forgeBtn_clicked()
{
if (QDir(m_inst->instanceRoot()).exists("custom.json"))
@@ -250,6 +343,35 @@ bool OneSixModEditDialog::resourcePackListFilter(QKeyEvent *keyEvent)
return QDialog::eventFilter(ui->resPackTreeView, keyEvent);
}
+QMap<QString, int> OneSixModEditDialog::getExistingOrder() const
+{
+
+ QMap<QString, int> order;
+ // default
+ {
+ for (OneSixVersion::VersionFile file : m_version->versionFiles)
+ {
+ if (file.id.startsWith("org.multimc."))
+ {
+ continue;
+ }
+ order.insert(file.id, file.order);
+ }
+ }
+ // overriden
+ {
+ QMap<QString, int> overridenOrder = OneSixVersionBuilder::readOverrideOrders(m_inst);
+ for (auto id : order.keys())
+ {
+ if (overridenOrder.contains(id))
+ {
+ order[id] = overridenOrder[id];
+ }
+ }
+ }
+ return order;
+}
+
bool OneSixModEditDialog::eventFilter(QObject *obj, QEvent *ev)
{
if (ev->type() != QEvent::KeyPress)
diff --git a/gui/dialogs/OneSixModEditDialog.h b/gui/dialogs/OneSixModEditDialog.h
index a7def967..f44b336b 100644
--- a/gui/dialogs/OneSixModEditDialog.h
+++ b/gui/dialogs/OneSixModEditDialog.h
@@ -47,6 +47,9 @@ slots:
void on_liteloaderBtn_clicked();
void on_reloadLibrariesBtn_clicked();
void on_removeLibraryBtn_clicked();
+ void on_resetLibraryOrderBtn_clicked();
+ void on_moveLibraryUpBtn_clicked();
+ void on_moveLibraryDownBtn_clicked();
void updateVersionControls();
void disableVersionControls();
@@ -62,6 +65,9 @@ private:
std::shared_ptr<ModList> m_resourcepacks;
EnabledItemFilter *main_model;
OneSixInstance *m_inst;
+
+ QMap<QString, int> getExistingOrder() const;
+
public
slots:
void loaderCurrent(QModelIndex current, QModelIndex previous);
diff --git a/gui/dialogs/OneSixModEditDialog.ui b/gui/dialogs/OneSixModEditDialog.ui
index b97fa323..eaf8f7fd 100644
--- a/gui/dialogs/OneSixModEditDialog.ui
+++ b/gui/dialogs/OneSixModEditDialog.ui
@@ -108,6 +108,34 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QPushButton" name="resetLibraryOrderBtn">
+ <property name="text">
+ <string>Reset order</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="moveLibraryUpBtn">
+ <property name="text">
+ <string>Move up</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="moveLibraryDownBtn">
+ <property name="text">
+ <string>Move down</string>
+ </property>
+ </widget>
+ </item>
<item>
<spacer name="verticalSpacer_7">
<property name="orientation">
--
cgit