merged from 0.6.7 codebase

1 files changed, 47 insertions, 47 deletions

diff --git a/application/pages/modplatform/VanillaPage.cpp b/application/pages/modplatform/VanillaPage.cpp
index c355fccb..17535f1e 100644
--- a/application/pages/modplatform/VanillaPage.cpp
+++ b/application/pages/modplatform/VanillaPage.cpp
@@ -2,9 +2,6 @@
 #include "ui_VanillaPage.h"
 
 #include "MultiMC.h"
-#include "FolderInstanceProvider.h"
-#include "dialogs/CustomMessageBox.h"
-#include "dialogs/ProgressDialog.h"
 
 #include <meta/Index.h>
 #include <meta/VersionList.h>
@@ -15,81 +12,84 @@
 #include <QTabBar>
 
 VanillaPage::VanillaPage(NewInstanceDialog *dialog, QWidget *parent)
-	: QWidget(parent), dialog(dialog), ui(new Ui::VanillaPage)
+    : QWidget(parent), dialog(dialog), ui(new Ui::VanillaPage)
 {
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-	connect(ui->versionList, &VersionSelectWidget::selectedVersionChanged, this, &VanillaPage::setSelectedVersion);
-	filterChanged();
-	connect(ui->alphaFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged);
-	connect(ui->betaFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged);
-	connect(ui->snapshotFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged);
-	connect(ui->oldSnapshotFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged);
-	connect(ui->releaseFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged);
-	connect(ui->refreshBtn, &QPushButton::clicked, this, &VanillaPage::refresh);
+    ui->setupUi(this);
+    ui->tabWidget->tabBar()->hide();
+    connect(ui->versionList, &VersionSelectWidget::selectedVersionChanged, this, &VanillaPage::setSelectedVersion);
+    filterChanged();
+    connect(ui->alphaFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged);
+    connect(ui->betaFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged);
+    connect(ui->snapshotFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged);
+    connect(ui->oldSnapshotFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged);
+    connect(ui->releaseFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged);
+    connect(ui->experimentsFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged);
+    connect(ui->refreshBtn, &QPushButton::clicked, this, &VanillaPage::refresh);
 }
 
 void VanillaPage::openedImpl()
 {
-	if(!initialized)
-	{
-		auto vlist = ENV.metadataIndex()->get("net.minecraft");
-		ui->versionList->initialize(vlist.get());
-		initialized = true;
-	}
-	else
-	{
-		suggestCurrent();
-	}
+    if(!initialized)
+    {
+        auto vlist = ENV.metadataIndex()->get("net.minecraft");
+        ui->versionList->initialize(vlist.get());
+        initialized = true;
+    }
+    else
+    {
+        suggestCurrent();
+    }
 }
 
 void VanillaPage::refresh()
 {
-	ui->versionList->loadList();
+    ui->versionList->loadList();
 }
 
 void VanillaPage::filterChanged()
 {
-	QStringList out;
-	if(ui->alphaFilter->isChecked())
-		out << "(old_alpha)";
-	if(ui->betaFilter->isChecked())
-		out << "(old_beta)";
-	if(ui->snapshotFilter->isChecked())
-		out << "(snapshot)";
-	if(ui->oldSnapshotFilter->isChecked())
-		out << "(old_snapshot)";
-	if(ui->releaseFilter->isChecked())
-		out << "(release)";
-	auto regexp = out.join('|');
-	ui->versionList->setFilter(BaseVersionList::TypeRole, new RegexpFilter(regexp, false));
+    QStringList out;
+    if(ui->alphaFilter->isChecked())
+        out << "(old_alpha)";
+    if(ui->betaFilter->isChecked())
+        out << "(old_beta)";
+    if(ui->snapshotFilter->isChecked())
+        out << "(snapshot)";
+    if(ui->oldSnapshotFilter->isChecked())
+        out << "(old_snapshot)";
+    if(ui->releaseFilter->isChecked())
+        out << "(release)";
+    if(ui->experimentsFilter->isChecked())
+        out << "(experiment)";
+    auto regexp = out.join('|');
+    ui->versionList->setFilter(BaseVersionList::TypeRole, new RegexpFilter(regexp, false));
 }
 
 VanillaPage::~VanillaPage()
 {
-	delete ui;
+    delete ui;
 }
 
 bool VanillaPage::shouldDisplay() const
 {
-	return true;
+    return true;
 }
 
 BaseVersionPtr VanillaPage::selectedVersion() const
 {
-	return m_selectedVersion;
+    return m_selectedVersion;
 }
 
 void VanillaPage::suggestCurrent()
 {
-	if(m_selectedVersion && isOpened)
-	{
-		dialog->setSuggestedPack(m_selectedVersion->descriptor(), new InstanceCreationTask(m_selectedVersion));
-	}
+    if(m_selectedVersion && isOpened)
+    {
+        dialog->setSuggestedPack(m_selectedVersion->descriptor(), new InstanceCreationTask(m_selectedVersion));
+    }
 }
 
 void VanillaPage::setSelectedVersion(BaseVersionPtr version)
 {
-	m_selectedVersion = version;
-	suggestCurrent();
+    m_selectedVersion = version;
+    suggestCurrent();
 }