GH-2087 remove the revert to vanilla functionality, add file download button to version page

This commit is contained in:
Petr Mrázek
2018-01-05 04:26:46 +01:00
parent ee341b78ba
commit 0636c03d7c
6 changed files with 30 additions and 81 deletions

View File

@ -324,6 +324,19 @@ void VersionPage::on_changeVersionBtn_clicked()
if (!vselect.exec() || !vselect.selectedVersion())
return;
qDebug() << "Change" << uid << "to" << vselect.selectedVersion()->descriptor();
bool important = false;
if(uid == "net.minecraft")
{
important = true;
}
m_profile->setComponentVersion(uid, vselect.selectedVersion()->descriptor(), important);
m_profile->resolve(Net::Mode::Online);
m_container->refreshContainer();
}
void VersionPage::on_downloadBtn_clicked()
{
if (!MMC->accounts()->anyAccountIsValid())
{
CustomMessageBox::selectable(
@ -334,44 +347,16 @@ void VersionPage::on_changeVersionBtn_clicked()
return;
}
qDebug() << "Change" << uid << "to" << vselect.selectedVersion()->descriptor();
bool important = false;
if(uid == "net.minecraft")
{
important = true;
if (!m_profile->isVanilla())
{
auto result = CustomMessageBox::selectable(
this, tr("Are you sure?"),
tr("This will remove any library/version customization you did previously. "
"This includes things like Forge install and similar."),
QMessageBox::Warning, QMessageBox::Ok | QMessageBox::Abort,
QMessageBox::Abort)->exec();
if (result != QMessageBox::Ok)
return;
m_profile->revertToVanilla();
reloadComponentList();
}
}
m_profile->setComponentVersion(uid, vselect.selectedVersion()->descriptor(), important);
doUpdate();
m_container->refreshContainer();
}
int VersionPage::doUpdate()
{
auto updateTask = m_inst->createUpdateTask(Net::Mode::Online);
if (!updateTask)
{
return 1;
return;
}
ProgressDialog tDialog(this);
connect(updateTask.get(), SIGNAL(failed(QString)), SLOT(onGameUpdateError(QString)));
int ret = tDialog.execWithTask(updateTask.get());
updateButtons();
m_container->refreshContainer();
return ret;
}
void VersionPage::on_forgeBtn_clicked()

View File

@ -62,6 +62,7 @@ private slots:
void on_editBtn_clicked();
void on_modBtn_clicked();
void on_customizeBtn_clicked();
void on_downloadBtn_clicked();
void updateVersionControls();
void disableVersionControls();

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>693</width>
<height>833</height>
<width>870</width>
<height>1008</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@ -234,6 +234,16 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="downloadBtn">
<property name="toolTip">
<string>Download the files needed to launch the instance now.</string>
</property>
<property name="text">
<string>Download All</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_7">
<property name="orientation">
@ -300,6 +310,7 @@
<tabstop>jarBtn</tabstop>
<tabstop>addEmptyBtn</tabstop>
<tabstop>reloadBtn</tabstop>
<tabstop>downloadBtn</tabstop>
<tabstop>tabWidget</tabstop>
</tabstops>
<resources/>