From 6ec2652b4562119ccf45d3bc455ef865fdfbd3ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 4 Aug 2016 22:57:16 +0200
Subject: [PATCH] GH-1273 allow extended selection in mod lists

---
 api/logic/minecraft/ModList.cpp     | 27 +++------------------------
 api/logic/minecraft/ModList.h       |  8 +-------
 application/pages/ModFolderPage.cpp | 15 ++-------------
 application/widgets/ModListView.cpp |  2 +-
 4 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/api/logic/minecraft/ModList.cpp b/api/logic/minecraft/ModList.cpp
index ad588f16..b9c7d9ba 100644
--- a/api/logic/minecraft/ModList.cpp
+++ b/api/logic/minecraft/ModList.cpp
@@ -175,35 +175,14 @@ bool ModList::installMod(const QString &filename)
 	return false;
 }
 
-bool ModList::deleteMod(int index)
+bool ModList::deleteMods(const QModelIndexList& indexes)
 {
-	if (index >= mods.size() || index < 0)
-		return false;
-	Mod &m = mods[index];
-	if (m.destroy())
-	{
-		emit changed();
+	if(indexes.isEmpty())
 		return true;
-	}
-	return false;
-}
 
-bool ModList::deleteMods(int first, int last)
-{
-	for (int i = first; i <= last; i++)
-	{
-		Mod &m = mods[i];
-		m.destroy();
-	}
-	emit changed();
-	return true;
-}
-
-bool ModList::deleteMods(const QVector<int> &indexes)
-{
 	for (auto i: indexes)
 	{
-		Mod &m = mods[i];
+		Mod &m = mods[i.row()];
 		m.destroy();
 	}
 	emit changed();
diff --git a/api/logic/minecraft/ModList.h b/api/logic/minecraft/ModList.h
index 24dcdaa4..14b102e1 100644
--- a/api/logic/minecraft/ModList.h
+++ b/api/logic/minecraft/ModList.h
@@ -83,14 +83,8 @@ public:
 	 */
 	bool installMod(const QString& filename);
 
-	/// Deletes the mod at the given index.
-	virtual bool deleteMod(int index);
-
 	/// Deletes all the selected mods
-	virtual bool deleteMods(int first, int last);
-
-	/// Deletes all the selected mods
-	virtual bool deleteMods(const QVector<int> &indexes);
+	virtual bool deleteMods(const QModelIndexList &indexes);
 
 	void startWatching();
 	void stopWatching();
diff --git a/application/pages/ModFolderPage.cpp b/application/pages/ModFolderPage.cpp
index 3926fc46..a1d02ccf 100644
--- a/application/pages/ModFolderPage.cpp
+++ b/application/pages/ModFolderPage.cpp
@@ -167,19 +167,8 @@ void ModFolderPage::on_addModBtn_clicked()
 
 void ModFolderPage::on_rmModBtn_clicked()
 {
-	int first, last;
-	auto list = ui->modTreeView->selectionModel()->selectedRows();
-
-	if (!lastfirst(list, first, last))
-		return;
-
-	QVector<int> toDelete;
-	for(int i = first; i <= last; i++)
-	{
-		auto index = m_filterModel->mapToSource(m_filterModel->index(i,0,QModelIndex()));
-		toDelete.append(index.row());
-	}
-	m_mods->deleteMods(toDelete);
+	auto selection = m_filterModel->mapSelectionToSource(ui->modTreeView->selectionModel()->selection());
+	m_mods->deleteMods(selection.indexes());
 }
 
 void ModFolderPage::on_viewModBtn_clicked()
diff --git a/application/widgets/ModListView.cpp b/application/widgets/ModListView.cpp
index 51b4a475..90c6f798 100644
--- a/application/widgets/ModListView.cpp
+++ b/application/widgets/ModListView.cpp
@@ -28,7 +28,7 @@ ModListView::ModListView ( QWidget* parent )
 	setRootIsDecorated ( false );
 	setSortingEnabled ( false );
 	setAlternatingRowColors ( true );
-	setSelectionMode ( QAbstractItemView::ContiguousSelection );
+	setSelectionMode ( QAbstractItemView::ExtendedSelection );
 	setHeaderHidden ( false );
 	setSelectionBehavior(QAbstractItemView::SelectRows);
 	setVerticalScrollBarPolicy ( Qt::ScrollBarAlwaysOn );