diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/dialogs/OneSixModEditDialog.cpp | 26 | ||||
| -rw-r--r-- | gui/dialogs/OneSixModEditDialog.h | 2 |
2 files changed, 16 insertions, 12 deletions
diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp index fe621a9a..cc383993 100644 --- a/gui/dialogs/OneSixModEditDialog.cpp +++ b/gui/dialogs/OneSixModEditDialog.cpp @@ -34,7 +34,7 @@ #include "gui/dialogs/ProgressDialog.h" #include "logic/ModList.h" -#include "logic/OneSixVersion.h" +#include "logic/VersionFinal.h" #include "logic/EnabledItemFilter.h" #include "logic/lists/ForgeVersionList.h" #include "logic/lists/LiteLoaderVersionList.h" @@ -124,7 +124,7 @@ void OneSixModEditDialog::disableVersionControls() void OneSixModEditDialog::on_reloadLibrariesBtn_clicked() { - m_inst->reloadVersion(this); + m_inst->reloadVersion(); } void OneSixModEditDialog::on_removeLibraryBtn_clicked() @@ -137,7 +137,7 @@ void OneSixModEditDialog::on_removeLibraryBtn_clicked() } else { - m_inst->reloadVersion(this); + m_inst->reloadVersion(); } } } @@ -145,7 +145,7 @@ void OneSixModEditDialog::on_removeLibraryBtn_clicked() void OneSixModEditDialog::on_resetLibraryOrderBtn_clicked() { QDir(m_inst->instanceRoot()).remove("order.json"); - m_inst->reloadVersion(this); + m_inst->reloadVersion(); } void OneSixModEditDialog::on_moveLibraryUpBtn_clicked() { @@ -175,16 +175,19 @@ void OneSixModEditDialog::on_moveLibraryUpBtn_clicked() order[ourId] = ourNewOrder; order[sortedOrder[sortedOrders[ourIndex - 1]]] = ourOrder; + // FIXME: why is GUI code doing this in particular? why isn't this part of a model? if (!OneSixVersionBuilder::writeOverrideOrders(order, m_inst)) { QMessageBox::critical(this, tr("Error"), tr("Couldn't save the new order")); } else { - m_inst->reloadVersion(this); + m_inst->reloadVersion(); ui->libraryTreeView->selectionModel()->select(m_version->index(ourRow - 1), QItemSelectionModel::SelectCurrent); } } + +// FIXME: WHY IS THIS DUPLICATED? void OneSixModEditDialog::on_moveLibraryDownBtn_clicked() { QMap<QString, int> order = getExistingOrder(); @@ -212,13 +215,14 @@ void OneSixModEditDialog::on_moveLibraryDownBtn_clicked() order[ourId] = ourNewOrder; order[sortedOrder[sortedOrders[ourIndex + 1]]] = ourOrder; + // FIXME: why is GUI code doing this in particular? why isn't this part of a model? if (!OneSixVersionBuilder::writeOverrideOrders(order, m_inst)) { QMessageBox::critical(this, tr("Error"), tr("Couldn't save the new order")); } else { - m_inst->reloadVersion(this); + m_inst->reloadVersion(); ui->libraryTreeView->selectionModel()->select(m_version->index(ourRow + 1), QItemSelectionModel::SelectCurrent); } } @@ -232,7 +236,7 @@ void OneSixModEditDialog::on_forgeBtn_clicked() return; } QDir(m_inst->instanceRoot()).remove("custom.json"); - m_inst->reloadVersion(this); + m_inst->reloadVersion(); } VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this); vselect.setFilter(1, m_inst->currentVersionId()); @@ -277,7 +281,7 @@ void OneSixModEditDialog::on_forgeBtn_clicked() } } } - m_inst->reloadVersion(this); + m_inst->reloadVersion(); } void OneSixModEditDialog::on_liteloaderBtn_clicked() @@ -289,7 +293,7 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked() return; } QDir(m_inst->instanceRoot()).remove("custom.json"); - m_inst->reloadVersion(this); + m_inst->reloadVersion(); } VersionSelectDialog vselect(MMC->liteloaderlist().get(), tr("Select LiteLoader version"), this); vselect.setFilter(1, m_inst->currentVersionId()); @@ -310,7 +314,7 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked() } else { - m_inst->reloadVersion(this); + m_inst->reloadVersion(); } } } @@ -353,7 +357,7 @@ QMap<QString, int> OneSixModEditDialog::getExistingOrder() const QMap<QString, int> order; // default { - for (OneSixVersion::VersionFile file : m_version->versionFiles) + for (VersionFinal::VersionFile file : m_version->versionFiles) { if (file.id.startsWith("org.multimc.")) { diff --git a/gui/dialogs/OneSixModEditDialog.h b/gui/dialogs/OneSixModEditDialog.h index f44b336b..1f3f9f67 100644 --- a/gui/dialogs/OneSixModEditDialog.h +++ b/gui/dialogs/OneSixModEditDialog.h @@ -60,7 +60,7 @@ protected: private: Ui::OneSixModEditDialog *ui; - std::shared_ptr<OneSixVersion> m_version; + std::shared_ptr<VersionFinal> m_version; std::shared_ptr<ModList> m_mods; std::shared_ptr<ModList> m_resourcepacks; EnabledItemFilter *main_model; |