diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-28 23:48:48 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-28 23:48:48 +0100 |
| commit | 695ad1474e00a62b5afe19fb2b81974f584efeef (patch) | |
| tree | 4bd1c7e516e2add07c48977de18369c83ad683e7 /gui | |
| parent | c816a26647ca0537709f0d15cdd550feea4de109 (diff) | |
| parent | 5b54a4ca8c4849a4476bb9a5e1c2414463949621 (diff) | |
| download | MultiMC-695ad1474e00a62b5afe19fb2b81974f584efeef.tar MultiMC-695ad1474e00a62b5afe19fb2b81974f584efeef.tar.gz MultiMC-695ad1474e00a62b5afe19fb2b81974f584efeef.tar.lz MultiMC-695ad1474e00a62b5afe19fb2b81974f584efeef.tar.xz MultiMC-695ad1474e00a62b5afe19fb2b81974f584efeef.zip | |
Merge branch 'feature_liteloader' of https://github.com/02JanDal/MultiMC5 into develop
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/dialogs/OneSixModEditDialog.cpp | 20 | ||||
| -rw-r--r-- | gui/dialogs/OneSixModEditDialog.h | 1 | ||||
| -rw-r--r-- | gui/dialogs/OneSixModEditDialog.ui | 7 |
3 files changed, 28 insertions, 0 deletions
diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp index 51ea2d19..fb422941 100644 --- a/gui/dialogs/OneSixModEditDialog.cpp +++ b/gui/dialogs/OneSixModEditDialog.cpp @@ -38,6 +38,7 @@ #include "logic/EnabledItemFilter.h" #include "logic/lists/ForgeVersionList.h" #include "logic/ForgeInstaller.h" +#include "logic/LiteLoaderInstaller.h" OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent) : QDialog(parent), ui(new Ui::OneSixModEditDialog), m_inst(inst) @@ -71,6 +72,8 @@ OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent) auto smodel = ui->loaderModTreeView->selectionModel(); connect(smodel, SIGNAL(currentChanged(QModelIndex, QModelIndex)), SLOT(loaderCurrent(QModelIndex, QModelIndex))); + + ui->liteloaderBtn->setEnabled(LiteLoaderInstaller(m_inst->intendedVersionId()).canApply()); } // resource packs { @@ -204,6 +207,23 @@ void OneSixModEditDialog::on_forgeBtn_clicked() } } +void OneSixModEditDialog::on_liteloaderBtn_clicked() +{ + LiteLoaderInstaller liteloader(m_inst->intendedVersionId()); + if (!liteloader.canApply()) + { + QMessageBox::critical( + this, tr("LiteLoader"), + tr("There is no information available on how to install LiteLoader " + "into this version of Minecraft")); + return; + } + if (!liteloader.apply(m_version)) + { + // failure notice + } +} + bool OneSixModEditDialog::loaderListFilter(QKeyEvent *keyEvent) { switch (keyEvent->key()) diff --git a/gui/dialogs/OneSixModEditDialog.h b/gui/dialogs/OneSixModEditDialog.h index 5376e526..09bd7946 100644 --- a/gui/dialogs/OneSixModEditDialog.h +++ b/gui/dialogs/OneSixModEditDialog.h @@ -44,6 +44,7 @@ slots: // Questionable: SettingsDialog doesn't need this for some reason? void on_buttonBox_rejected(); void on_forgeBtn_clicked(); + void on_liteloaderBtn_clicked(); void on_customizeBtn_clicked(); void on_revertBtn_clicked(); void updateVersionControls(); diff --git a/gui/dialogs/OneSixModEditDialog.ui b/gui/dialogs/OneSixModEditDialog.ui index 48aa87ee..ad20cd73 100644 --- a/gui/dialogs/OneSixModEditDialog.ui +++ b/gui/dialogs/OneSixModEditDialog.ui @@ -78,6 +78,13 @@ </widget> </item> <item> + <widget class="QPushButton" name="liteloaderBtn"> + <property name="text"> + <string>Install LiteLoader</string> + </property> + </widget> + </item> + <item> <widget class="QPushButton" name="customizeBtn"> <property name="toolTip"> <string>Create an customized copy of the base version</string> |