From 093143cfef8959261fc4f66a65d2ecc4cdc2e23c Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Mon, 6 Jan 2014 10:01:40 +0100
Subject: Fix instances getting deselected after FTB instances are loaded (or
 whenever the model is reset)

---
 gui/MainWindow.cpp | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'gui/MainWindow.cpp')

diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 968fecb7..905d14cf 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -289,24 +289,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 				this, &MainWindow::notificationsChanged);
 	}
 
-	const QString currentInstanceId = MMC->settings()->get("SelectedInstance").toString();
-	if (!currentInstanceId.isNull())
-	{
-		const QModelIndex index = MMC->instances()->getInstanceIndexById(currentInstanceId);
-		if (index.isValid())
-		{
-			const QModelIndex mappedIndex = proxymodel->mapFromSource(index);
-			view->setCurrentIndex(mappedIndex);
-		}
-		else
-		{
-			view->setCurrentIndex(proxymodel->index(0, 0));
-		}
-	}
-	else
-	{
-		view->setCurrentIndex(proxymodel->index(0, 0));
-	}
+	setSelectedInstanceById(MMC->settings()->get("SelectedInstance").toString());
 
 	// removing this looks stupid
 	view->setFocus();
@@ -788,6 +771,20 @@ void MainWindow::updateInstanceToolIcon(QString new_icon)
 	ui->actionChangeInstIcon->setIcon(MMC->icons()->getIcon(m_currentInstIcon));
 }
 
+void MainWindow::setSelectedInstanceById(const QString &id)
+{
+	QModelIndex selectionIndex = proxymodel->index(0, 0);
+	if (!id.isNull())
+	{
+		const QModelIndex index = MMC->instances()->getInstanceIndexById(id);
+		if (index.isValid())
+		{
+			selectionIndex = proxymodel->mapFromSource(index);
+		}
+	}
+	view->selectionModel()->setCurrentIndex(selectionIndex, QItemSelectionModel::ClearAndSelect);
+}
+
 void MainWindow::on_actionChangeInstGroup_triggered()
 {
 	if (!m_selectedInstance)
@@ -1274,12 +1271,16 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
 
 void MainWindow::selectionBad()
 {
+	// start by reseting everything...
 	m_selectedInstance = nullptr;
 
 	statusBar()->clearMessage();
 	ui->instanceToolBar->setEnabled(false);
 	renameButton->setText(tr("Rename Instance"));
 	updateInstanceToolIcon("infinity");
+
+	// ...and then see if we can enable the previously selected instance
+	setSelectedInstanceById(MMC->settings()->get("SelectedInstance").toString());
 }
 
 void MainWindow::on_actionEditInstNotes_triggered()
-- 
cgit 


From b767d4b134148ddb3f956253a2f7f2cad831e782 Mon Sep 17 00:00:00 2001
From: Forkk <forkk@forkk.net>
Date: Wed, 8 Jan 2014 18:02:15 -0600
Subject: Fix the window title

The window title now says
"MultiMC 5 - Version <version> [on <platform>]"
---
 gui/MainWindow.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'gui/MainWindow.cpp')

diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 905d14cf..69cdf602 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -99,7 +99,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 {
 	MultiMCPlatform::fixWM_CLASS(this);
 	ui->setupUi(this);
-	setWindowTitle(QString("MultiMC %1").arg(MMC->version().toString()));
+
+	QString winTitle = QString("MultiMC 5 - Version %1").arg(MMC->version().toString());
+	if (!MMC->version().platform.isEmpty())
+		winTitle += " on " + MMC->version().platform;
+	setWindowTitle(winTitle);
 
 	// OSX magic.
 	// setUnifiedTitleAndToolBarOnMac(true);
-- 
cgit