Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

3 files changed, 78 insertions, 5 deletions

diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 75ebefe4..d1119028 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -92,6 +92,7 @@
 #include "logic/assets/AssetsUtils.h"
 #include "logic/assets/AssetsMigrateTask.h"
 #include <logic/updater/UpdateChecker.h>
+#include <logic/updater/NotificationChecker.h>
 #include <logic/tasks/ThreadTask.h>
 
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
@@ -283,6 +284,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 		// if automatic update checks are allowed, start one.
 		if (MMC->settings()->get("AutoUpdate").toBool())
 			on_actionCheckUpdate_triggered();
+
+		connect(MMC->notificationChecker().get(), &NotificationChecker::notificationCheckFinished,
+				this, &MainWindow::notificationsChanged);
 	}
 
 	const QString currentInstanceId = MMC->settings()->get("SelectedInstance").toString();
@@ -522,6 +526,63 @@ void MainWindow::updateAvailable(QString repo, QString versionName, int versionI
 	}
 }
 
+QList<int> stringToIntList(const QString &string)
+{
+	QStringList split = string.split(',', QString::SkipEmptyParts);
+	QList<int> out;
+	for (int i = 0; i < split.size(); ++i)
+	{
+		out.append(split.at(i).toInt());
+	}
+	return out;
+}
+QString intListToString(const QList<int> &list)
+{
+	QStringList slist;
+	for (int i = 0; i < list.size(); ++i)
+	{
+		slist.append(QString::number(list.at(i)));
+	}
+	return slist.join(',');
+}
+void MainWindow::notificationsChanged()
+{
+	QList<NotificationChecker::NotificationEntry> entries =
+		MMC->notificationChecker()->notificationEntries();
+	QList<int> shownNotifications =
+		stringToIntList(MMC->settings()->get("ShownNotifications").toString());
+	for (auto it = entries.begin(); it != entries.end(); ++it)
+	{
+		NotificationChecker::NotificationEntry entry = *it;
+		if (!shownNotifications.contains(entry.id) && entry.applies())
+		{
+			QMessageBox::Icon icon;
+			switch (entry.type)
+			{
+			case NotificationChecker::NotificationEntry::Critical:
+				icon = QMessageBox::Critical;
+				break;
+			case NotificationChecker::NotificationEntry::Warning:
+				icon = QMessageBox::Warning;
+				break;
+			case NotificationChecker::NotificationEntry::Information:
+				icon = QMessageBox::Information;
+				break;
+			}
+
+			QMessageBox box(icon, tr("Notification"), entry.message, QMessageBox::Close, this);
+			QPushButton *dontShowAgainButton = box.addButton(tr("Don't show again"), QMessageBox::AcceptRole);
+			box.setDefaultButton(QMessageBox::Close);
+			box.exec();
+			if (box.clickedButton() == dontShowAgainButton)
+			{
+				shownNotifications.append(entry.id);
+			}
+		}
+	}
+	MMC->settings()->set("ShownNotifications", intListToString(shownNotifications));
+}
+
 void MainWindow::downloadUpdates(QString repo, int versionId, bool installOnExit)
 {
 	QLOG_INFO() << "Downloading updates.";
diff --git a/gui/MainWindow.h b/gui/MainWindow.h
index ca11b380..af2f1dca 100644
--- a/gui/MainWindow.h
+++ b/gui/MainWindow.h
@@ -159,6 +159,8 @@ slots:
 
 	void updateAvailable(QString repo, QString versionName, int versionId);
 
+	void notificationsChanged();
+
 	void activeAccountChanged();
 
 	void changeActiveAccount();
diff --git a/gui/widgets/ModListView.cpp b/gui/widgets/ModListView.cpp
index 9d5950c3..358e6331 100644
--- a/gui/widgets/ModListView.cpp
+++ b/gui/widgets/ModListView.cpp
@@ -44,9 +44,19 @@ void ModListView::setModel ( QAbstractItemModel* model )
 	QTreeView::setModel ( model );
 	auto head = header();
 	head->setStretchLastSection(false);
-	head->setSectionResizeMode(0, QHeaderView::ResizeToContents);
-	head->setSectionResizeMode(1, QHeaderView::Stretch);
-	for(int i = 2; i < head->count(); i++)
-		head->setSectionResizeMode(i, QHeaderView::ResizeToContents);
-	dropIndicatorPosition();
+	// HACK: this is true for the checkbox column of mod lists
+	auto string = model->headerData(0,head->orientation()).toString();
+	if(!string.size())
+	{
+		head->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+		head->setSectionResizeMode(1, QHeaderView::Stretch);
+		for(int i = 2; i < head->count(); i++)
+			head->setSectionResizeMode(i, QHeaderView::ResizeToContents);
+	}
+	else
+	{
+		head->setSectionResizeMode(0, QHeaderView::Stretch);
+		for(int i = 1; i < head->count(); i++)
+			head->setSectionResizeMode(i, QHeaderView::ResizeToContents);
+	}
 }