SCRATCH second mods page, placeholder

5 files changed, 461 insertions, 0 deletions

diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
index c0268da5..9ec59a2d 100644
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -90,6 +90,8 @@ SET(MULTIMC_SOURCES
 	pages/instance/ResourcePackPage.h
 	pages/instance/ModFolderPage.cpp
 	pages/instance/ModFolderPage.h
+	pages/instance/NewModFolderPage.cpp
+	pages/instance/NewModFolderPage.h
 	pages/instance/NotesPage.cpp
 	pages/instance/NotesPage.h
 	pages/instance/LogPage.cpp
@@ -227,6 +229,7 @@ SET(MULTIMC_UIS
 	# Instance pages
 	pages/instance/VersionPage.ui
 	pages/instance/ModFolderPage.ui
+	pages/instance/NewModFolderPage.ui
 	pages/instance/LogPage.ui
 	pages/instance/InstanceSettingsPage.ui
 	pages/instance/NotesPage.ui
diff --git a/application/InstancePageProvider.h b/application/InstancePageProvider.h
index b7a9513c..08e9fe95 100644
--- a/application/InstancePageProvider.h
+++ b/application/InstancePageProvider.h
@@ -7,6 +7,7 @@
 #include "pages/instance/LogPage.h"
 #include "pages/instance/VersionPage.h"
 #include "pages/instance/ModFolderPage.h"
+#include "pages/instance/NewModFolderPage.h"
 #include "pages/instance/ResourcePackPage.h"
 #include "pages/instance/TexturePackPage.h"
 #include "pages/instance/NotesPage.h"
@@ -39,6 +40,9 @@ public:
 			auto modsPage = new ModFolderPage(onesix.get(), onesix->loaderModList(), "mods", "loadermods", tr("Loader mods"), "Loader-mods");
 			modsPage->setFilter("%1 (*.zip *.jar *.litemod)");
 			values.append(modsPage);
+			auto modsPage2 = new NewModFolderPage(onesix.get(), onesix->loaderModList(), "newmods", "newloadermods", tr("New loader mods"), "New-loader-mods");
+			modsPage2->setFilter("%1 (*.zip *.jar *.litemod)");
+			values.append(modsPage2);
 			values.append(new CoreModFolderPage(onesix.get(), onesix->coreModList(), "coremods", "coremods", tr("Core mods"), "Core-mods"));
 			values.append(new ResourcePackPage(onesix.get()));
 			values.append(new TexturePackPage(onesix.get()));
diff --git a/application/pages/instance/NewModFolderPage.cpp b/application/pages/instance/NewModFolderPage.cpp
new file mode 100644
index 00000000..dc00fefa
--- /dev/null
+++ b/application/pages/instance/NewModFolderPage.cpp
@@ -0,0 +1,177 @@
+/* Copyright 2013-2018 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "NewModFolderPage.h"
+#include "ui_NewModFolderPage.h"
+
+#include <QMessageBox>
+#include <QEvent>
+#include <QKeyEvent>
+#include <QAbstractItemModel>
+
+#include "MultiMC.h"
+#include "dialogs/CustomMessageBox.h"
+#include "dialogs/ModEditDialogCommon.h"
+#include <GuiUtil.h>
+#include "minecraft/ModList.h"
+#include "minecraft/Mod.h"
+#include "minecraft/VersionFilterData.h"
+#include "minecraft/ComponentList.h"
+#include <DesktopServices.h>
+
+NewModFolderPage::NewModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
+							 QString iconName, QString displayName, QString helpPage,
+							 QWidget *parent)
+	: QWidget(parent), ui(new Ui::NewModFolderPage)
+{
+	ui->setupUi(this);
+	ui->tabWidget->tabBar()->hide();
+	m_inst = inst;
+	m_mods = mods;
+	m_id = id;
+	m_displayName = displayName;
+	m_iconName = iconName;
+	m_helpName = helpPage;
+	m_fileSelectionFilter = "%1 (*.zip *.jar)";
+	m_filterModel = new QSortFilterProxyModel(this);
+	m_filterModel->setDynamicSortFilter(true);
+	m_filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+	m_filterModel->setSortCaseSensitivity(Qt::CaseInsensitive);
+	m_filterModel->setSourceModel(m_mods.get());
+	m_filterModel->setFilterKeyColumn(-1);
+	ui->modTreeView->setModel(m_filterModel);
+	ui->modTreeView->installEventFilter(this);
+	ui->modTreeView->sortByColumn(1, Qt::AscendingOrder);
+	auto smodel = ui->modTreeView->selectionModel();
+	connect(smodel, &QItemSelectionModel::currentChanged, this, &NewModFolderPage::modCurrent);
+	connect(ui->filterEdit, &QLineEdit::textChanged, this, &NewModFolderPage::on_filterTextChanged );
+}
+
+void NewModFolderPage::openedImpl()
+{
+	m_mods->startWatching();
+}
+
+void NewModFolderPage::closedImpl()
+{
+	m_mods->stopWatching();
+}
+
+void NewModFolderPage::on_filterTextChanged(const QString& newContents)
+{
+	m_viewFilter = newContents;
+	m_filterModel->setFilterFixedString(m_viewFilter);
+}
+
+
+NewModFolderPage::~NewModFolderPage()
+{
+	m_mods->stopWatching();
+	delete ui;
+}
+
+bool NewModFolderPage::shouldDisplay() const
+{
+	if (m_inst)
+		return !m_inst->isRunning();
+	return true;
+}
+
+bool NewModFolderPage::modListFilter(QKeyEvent *keyEvent)
+{
+	switch (keyEvent->key())
+	{
+	case Qt::Key_Delete:
+		on_rmModBtn_clicked();
+		return true;
+	case Qt::Key_Plus:
+		on_addModBtn_clicked();
+		return true;
+	default:
+		break;
+	}
+	return QWidget::eventFilter(ui->modTreeView, keyEvent);
+}
+
+bool NewModFolderPage::eventFilter(QObject *obj, QEvent *ev)
+{
+	if (ev->type() != QEvent::KeyPress)
+	{
+		return QWidget::eventFilter(obj, ev);
+	}
+	QKeyEvent *keyEvent = static_cast<QKeyEvent *>(ev);
+	if (obj == ui->modTreeView)
+		return modListFilter(keyEvent);
+	return QWidget::eventFilter(obj, ev);
+}
+
+void NewModFolderPage::on_addModBtn_clicked()
+{
+	auto list = GuiUtil::BrowseForFiles(
+		m_helpName,
+		tr("Select %1",
+		   "Select whatever type of files the page contains. Example: 'Loader Mods'")
+			.arg(m_displayName),
+		m_fileSelectionFilter.arg(m_displayName), MMC->settings()->get("CentralModsDir").toString(),
+		this->parentWidget());
+	if (!list.empty())
+	{
+		for (auto filename : list)
+		{
+			m_mods->installMod(filename);
+		}
+	}
+}
+
+void NewModFolderPage::on_enableModBtn_clicked()
+{
+	auto selection = m_filterModel->mapSelectionToSource(ui->modTreeView->selectionModel()->selection());
+	m_mods->enableMods(selection.indexes(), true);
+}
+
+void NewModFolderPage::on_disableModBtn_clicked()
+{
+	auto selection = m_filterModel->mapSelectionToSource(ui->modTreeView->selectionModel()->selection());
+	m_mods->enableMods(selection.indexes(), false);
+}
+
+void NewModFolderPage::on_rmModBtn_clicked()
+{
+	auto selection = m_filterModel->mapSelectionToSource(ui->modTreeView->selectionModel()->selection());
+	m_mods->deleteMods(selection.indexes());
+}
+
+void NewModFolderPage::on_configFolderBtn_clicked()
+{
+	DesktopServices::openDirectory(m_inst->instanceConfigFolder(), true);
+}
+
+void NewModFolderPage::on_viewModBtn_clicked()
+{
+	DesktopServices::openDirectory(m_mods->dir().absolutePath(), true);
+}
+
+void NewModFolderPage::modCurrent(const QModelIndex &current, const QModelIndex &previous)
+{
+	if (!current.isValid())
+	{
+		ui->frame->clear();
+		return;
+	}
+	auto sourceCurrent = m_filterModel->mapToSource(current);
+	int row = sourceCurrent.row();
+	Mod &m = m_mods->operator[](row);
+	ui->frame->updateWithMod(m);
+}
diff --git a/application/pages/instance/NewModFolderPage.h b/application/pages/instance/NewModFolderPage.h
new file mode 100644
index 00000000..2c81a233
--- /dev/null
+++ b/application/pages/instance/NewModFolderPage.h
@@ -0,0 +1,97 @@
+/* Copyright 2013-2018 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <QWidget>
+
+#include "minecraft/MinecraftInstance.h"
+#include "pages/BasePage.h"
+#include <MultiMC.h>
+
+class ModList;
+namespace Ui
+{
+class NewModFolderPage;
+}
+
+class NewModFolderPage : public QWidget, public BasePage
+{
+	Q_OBJECT
+
+public:
+	explicit NewModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
+						   QString iconName, QString displayName, QString helpPage = "",
+						   QWidget *parent = 0);
+	virtual ~NewModFolderPage();
+
+	void setFilter(const QString & filter)
+	{
+		m_fileSelectionFilter = filter;
+	}
+
+	virtual QString displayName() const override
+	{
+		return m_displayName;
+	}
+	virtual QIcon icon() const override
+	{
+		return MMC->getThemedIcon(m_iconName);
+	}
+	virtual QString id() const override
+	{
+		return m_id;
+	}
+	virtual QString helpPage() const override
+	{
+		return m_helpName;
+	}
+	virtual bool shouldDisplay() const override;
+
+	virtual void openedImpl() override;
+	virtual void closedImpl() override;
+protected:
+	bool eventFilter(QObject *obj, QEvent *ev) override;
+	bool modListFilter(QKeyEvent *ev);
+
+protected:
+	BaseInstance *m_inst;
+
+protected:
+	Ui::NewModFolderPage *ui;
+	std::shared_ptr<ModList> m_mods;
+	QSortFilterProxyModel *m_filterModel;
+	QString m_iconName;
+	QString m_id;
+	QString m_displayName;
+	QString m_helpName;
+	QString m_fileSelectionFilter;
+	QString m_viewFilter;
+
+public
+slots:
+	void modCurrent(const QModelIndex &current, const QModelIndex &previous);
+
+private
+slots:
+	void on_filterTextChanged(const QString & newContents);
+	void on_addModBtn_clicked();
+	void on_rmModBtn_clicked();
+	void on_viewModBtn_clicked();
+	void on_enableModBtn_clicked();
+	void on_disableModBtn_clicked();
+	void on_configFolderBtn_clicked();
+};
+
diff --git a/application/pages/instance/NewModFolderPage.ui b/application/pages/instance/NewModFolderPage.ui
new file mode 100644
index 00000000..48c36383
--- /dev/null
+++ b/application/pages/instance/NewModFolderPage.ui
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NewModFolderPage</class>
+ <widget class="QWidget" name="NewModFolderPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>723</width>
+    <height>532</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <attribute name="title">
+       <string notr="true">Tab 1</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout" columnstretch="0,1,0">
+       <item row="0" column="2">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <widget class="QPushButton" name="addModBtn">
+           <property name="text">
+            <string>&amp;Add</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="rmModBtn">
+           <property name="text">
+            <string>&amp;Remove</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="enableModBtn">
+           <property name="text">
+            <string>Enable</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="disableModBtn">
+           <property name="text">
+            <string>Disable</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="configFolderBtn">
+           <property name="toolTip">
+            <string>Open the 'config' folder in the system file manager.</string>
+           </property>
+           <property name="text">
+            <string>View configs</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="viewModBtn">
+           <property name="text">
+            <string>&amp;View Folder</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="0" colspan="3">
+        <widget class="MCModInfoFrame" name="frame">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0" colspan="2">
+        <layout class="QGridLayout" name="gridLayout_2">
+         <item row="1" column="1">
+          <widget class="QLineEdit" name="filterEdit">
+           <property name="clearButtonEnabled">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="filterLabel">
+           <property name="text">
+            <string>Filter:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0" colspan="3">
+          <widget class="ModListView" name="modTreeView">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="acceptDrops">
+            <bool>true</bool>
+           </property>
+           <property name="dragDropMode">
+            <enum>QAbstractItemView::DropOnly</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ModListView</class>
+   <extends>QTreeView</extends>
+   <header>widgets/ModListView.h</header>
+  </customwidget>
+  <customwidget>
+   <class>MCModInfoFrame</class>
+   <extends>QFrame</extends>
+   <header>widgets/MCModInfoFrame.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>modTreeView</tabstop>
+  <tabstop>filterEdit</tabstop>
+  <tabstop>addModBtn</tabstop>
+  <tabstop>rmModBtn</tabstop>
+  <tabstop>enableModBtn</tabstop>
+  <tabstop>disableModBtn</tabstop>
+  <tabstop>configFolderBtn</tabstop>
+  <tabstop>viewModBtn</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>