Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derpstances

5 files changed, 20 insertions, 5 deletions

diff --git a/gui/dialogs/AccountListDialog.cpp b/gui/dialogs/AccountListDialog.cpp
index 1712e352..a38035a6 100644
--- a/gui/dialogs/AccountListDialog.cpp
+++ b/gui/dialogs/AccountListDialog.cpp
@@ -126,7 +126,7 @@ void AccountListDialog::addAccount(const QString& errMsg)
 
 		MojangAccountPtr account = MojangAccount::createFromUsername(username);
 		ProgressDialog progDialog(this);
-		auto task = account->login(password);
+		auto task = account->login(nullptr, password);
 		progDialog.exec(task.get());
 		if(task->successful())
 		{
diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp
index ebd685e8..1742ff80 100644
--- a/gui/dialogs/OneSixModEditDialog.cpp
+++ b/gui/dialogs/OneSixModEditDialog.cpp
@@ -161,6 +161,8 @@ void OneSixModEditDialog::on_forgeBtn_clicked()
 	}
 	VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this);
 	vselect.setFilter(1, m_inst->currentVersionId());
+	vselect.setEmptyString(tr("No Forge versions are currently available for Minecraft ") +
+							  m_inst->currentVersionId());
 	if (vselect.exec() && vselect.selectedVersion())
 	{
 		ForgeVersionPtr forgeVersion =
@@ -224,9 +226,9 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked()
 	}
 	if (!liteloader.add(m_inst))
 	{
-		QMessageBox::critical(
-			this, tr("LiteLoader"),
-			tr("For reasons unknown, the LiteLoader installation failed. Check your MultiMC log files for details."));
+		QMessageBox::critical(this, tr("LiteLoader"),
+							  tr("For reasons unknown, the LiteLoader installation failed. "
+								 "Check your MultiMC log files for details."));
 	}
 	else
 	{
diff --git a/gui/dialogs/VersionSelectDialog.cpp b/gui/dialogs/VersionSelectDialog.cpp
index d6efe3c0..0f379f56 100644
--- a/gui/dialogs/VersionSelectDialog.cpp
+++ b/gui/dialogs/VersionSelectDialog.cpp
@@ -51,6 +51,11 @@ VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QString title,
 	}
 }
 
+void VersionSelectDialog::setEmptyString(QString emptyString)
+{
+	ui->listView->setEmptyString(emptyString);
+}
+
 VersionSelectDialog::~VersionSelectDialog()
 {
 	delete ui;
diff --git a/gui/dialogs/VersionSelectDialog.h b/gui/dialogs/VersionSelectDialog.h
index e36341db..61fa8ab6 100644
--- a/gui/dialogs/VersionSelectDialog.h
+++ b/gui/dialogs/VersionSelectDialog.h
@@ -44,6 +44,7 @@ public:
 	BaseVersionPtr selectedVersion() const;
 
 	void setFilter(int column, QString filter);
+	void setEmptyString(QString emptyString);
 	void setResizeOn(int column);
 
 private
diff --git a/gui/dialogs/VersionSelectDialog.ui b/gui/dialogs/VersionSelectDialog.ui
index 58264f24..07e9e73e 100644
--- a/gui/dialogs/VersionSelectDialog.ui
+++ b/gui/dialogs/VersionSelectDialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QTreeView" name="listView">
+    <widget class="VersionListView" name="listView">
      <property name="horizontalScrollBarPolicy">
       <enum>Qt::ScrollBarAlwaysOff</enum>
      </property>
@@ -65,6 +65,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>VersionListView</class>
+   <extends>QTreeView</extends>
+   <header>gui/widgets/VersionListView.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>