NOISSUE add button for creating empty, properly registered, components

9 files changed, 318 insertions, 0 deletions

diff --git a/api/logic/minecraft/ComponentList.cpp b/api/logic/minecraft/ComponentList.cpp
index 3fb04255..b4ab2151 100644
--- a/api/logic/minecraft/ComponentList.cpp
+++ b/api/logic/minecraft/ComponentList.cpp
@@ -971,6 +971,34 @@ void ComponentList::installCustomJar(QString selectedFile)
 	installCustomJar_internal(selectedFile);
 }
 
+bool ComponentList::installEmpty(const QString& uid, const QString& name)
+{
+	QString patchDir = FS::PathCombine(d->m_instance->instanceRoot(), "patches");
+	if(!FS::ensureFolderPathExists(patchDir))
+	{
+		return false;
+	}
+	auto f = std::make_shared<VersionFile>();
+	f->name = name;
+	f->uid = uid;
+	f->version = "1";
+	QString patchFileName = FS::PathCombine(patchDir, uid + ".json");
+	QFile file(patchFileName);
+	if (!file.open(QFile::WriteOnly))
+	{
+		qCritical() << "Error opening" << file.fileName()
+					<< "for reading:" << file.errorString();
+		return false;
+	}
+	file.write(OneSixVersionFormat::versionFileToJson(f).toJson());
+	file.close();
+
+	appendComponent(new Component(this, f->uid, f));
+	scheduleSave();
+	invalidateLaunchProfile();
+	return true;
+}
+
 bool ComponentList::removeComponent_internal(ComponentPtr patch)
 {
 	bool ok = true;
diff --git a/api/logic/minecraft/ComponentList.h b/api/logic/minecraft/ComponentList.h
index b66b3417..3b53a9fe 100644
--- a/api/logic/minecraft/ComponentList.h
+++ b/api/logic/minecraft/ComponentList.h
@@ -103,6 +103,8 @@ public:
 
 	bool setComponentVersion(const QString &uid, const QString &version, bool important = false);
 
+	bool installEmpty(const QString &uid, const QString &name);
+
 	QString patchFilePathForUid(const QString &uid) const;
 
 	/// if there is a save scheduled, do it now.
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
index 5ced4979..57abfcb3 100644
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -173,6 +173,8 @@ SET(MULTIMC_SOURCES
 	dialogs/LoginDialog.h
 	dialogs/ModEditDialogCommon.cpp
 	dialogs/ModEditDialogCommon.h
+	dialogs/NewComponentDialog.cpp
+	dialogs/NewComponentDialog.h
 	dialogs/NewInstanceDialog.cpp
 	dialogs/NewInstanceDialog.h
 	dialogs/NotificationDialog.cpp
@@ -254,6 +256,7 @@ SET(MULTIMC_UIS
 
 	# Dialogs
 	dialogs/CopyInstanceDialog.ui
+	dialogs/NewComponentDialog.ui
 	dialogs/NewInstanceDialog.ui
 	dialogs/AboutDialog.ui
 	dialogs/ProgressDialog.ui
diff --git a/application/dialogs/NewComponentDialog.cpp b/application/dialogs/NewComponentDialog.cpp
new file mode 100644
index 00000000..903e6a96
--- /dev/null
+++ b/application/dialogs/NewComponentDialog.cpp
@@ -0,0 +1,106 @@
+/* Copyright 2013-2017 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 "MultiMC.h"
+#include "NewComponentDialog.h"
+#include "ui_NewComponentDialog.h"
+
+#include <BaseVersion.h>
+#include <icons/IconList.h>
+#include <tasks/Task.h>
+#include <InstanceList.h>
+
+#include "VersionSelectDialog.h"
+#include "ProgressDialog.h"
+#include "IconPickerDialog.h"
+
+#include <QLayout>
+#include <QPushButton>
+#include <QFileDialog>
+#include <QValidator>
+
+#include <meta/Index.h>
+#include <meta/VersionList.h>
+
+NewComponentDialog::NewComponentDialog(const QString & initialName, const QString & initialUid, QWidget *parent)
+	: QDialog(parent), ui(new Ui::NewComponentDialog)
+{
+	ui->setupUi(this);
+	resize(minimumSizeHint());
+
+	ui->nameTextBox->setText(initialName);
+	ui->uidTextBox->setText(initialUid);
+
+	connect(ui->nameTextBox, &QLineEdit::textChanged, this, &NewComponentDialog::updateDialogState);
+	connect(ui->uidTextBox, &QLineEdit::textChanged, this, &NewComponentDialog::updateDialogState);
+
+	auto groups = MMC->instances()->getGroups().toSet();
+	ui->nameTextBox->setFocus();
+
+	originalPlaceholderText = ui->uidTextBox->placeholderText();
+	updateDialogState();
+}
+
+NewComponentDialog::~NewComponentDialog()
+{
+	delete ui;
+}
+
+void NewComponentDialog::updateDialogState()
+{
+	auto protoUid = ui->nameTextBox->text().toLower();
+	protoUid.remove(QRegularExpression("[^a-z]"));
+	if(protoUid.isEmpty())
+	{
+		ui->uidTextBox->setPlaceholderText(originalPlaceholderText);
+	}
+	else
+	{
+		QString suggestedUid = "org.multimc.custom." + protoUid;
+		ui->uidTextBox->setPlaceholderText(suggestedUid);
+	}
+	bool allowOK = !name().isEmpty() && !uid().isEmpty() && !uidBlacklist.contains(uid());
+	ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(allowOK);
+}
+
+QString NewComponentDialog::name() const
+{
+	auto result = ui->nameTextBox->text();
+	if(result.size())
+	{
+		return result.trimmed();
+	}
+	return QString();
+}
+
+QString NewComponentDialog::uid() const
+{
+	auto result = ui->uidTextBox->text();
+	if(result.size())
+	{
+		return result.trimmed();
+	}
+	result = ui->uidTextBox->placeholderText();
+	if(result.size() && result != originalPlaceholderText)
+	{
+		return result.trimmed();
+	}
+	return QString();
+}
+
+void NewComponentDialog::setBlacklist(QStringList badUids)
+{
+	uidBlacklist = badUids;
+}
diff --git a/application/dialogs/NewComponentDialog.h b/application/dialogs/NewComponentDialog.h
new file mode 100644
index 00000000..2797e0b9
--- /dev/null
+++ b/application/dialogs/NewComponentDialog.h
@@ -0,0 +1,48 @@
+/* Copyright 2013-2017 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 <QDialog>
+
+#include <QString>
+#include <QStringList>
+
+namespace Ui
+{
+class NewComponentDialog;
+}
+
+class NewComponentDialog : public QDialog
+{
+	Q_OBJECT
+
+public:
+	explicit NewComponentDialog(const QString & initialName = QString(), const QString & initialUid = QString(), QWidget *parent = 0);
+	virtual ~NewComponentDialog();
+	void setBlacklist(QStringList badUids);
+
+	QString name() const;
+	QString uid() const;
+
+private slots:
+	void updateDialogState();
+
+private:
+	Ui::NewComponentDialog *ui;
+
+	QString originalPlaceholderText;
+	QStringList uidBlacklist;
+};
diff --git a/application/dialogs/NewComponentDialog.ui b/application/dialogs/NewComponentDialog.ui
new file mode 100644
index 00000000..b30c2431
--- /dev/null
+++ b/application/dialogs/NewComponentDialog.ui
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NewComponentDialog</class>
+ <widget class="QDialog" name="NewComponentDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>345</width>
+    <height>146</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Copy Instance</string>
+  </property>
+  <property name="windowIcon">
+   <iconset>
+    <normaloff>:/icons/toolbar/copy</normaloff>:/icons/toolbar/copy</iconset>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLineEdit" name="nameTextBox">
+     <property name="placeholderText">
+      <string>Name</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="uidTextBox">
+     <property name="placeholderText">
+      <string>uid</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>nameTextBox</tabstop>
+  <tabstop>uidTextBox</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../../graphics.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>NewComponentDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>NewComponentDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/application/pages/VersionPage.cpp b/application/pages/VersionPage.cpp
index c86e76d5..50cc825f 100644
--- a/application/pages/VersionPage.cpp
+++ b/application/pages/VersionPage.cpp
@@ -24,6 +24,7 @@
 
 #include "dialogs/CustomMessageBox.h"
 #include "dialogs/VersionSelectDialog.h"
+#include "dialogs/NewComponentDialog.h"
 #include "dialogs/ModEditDialogCommon.h"
 
 #include "dialogs/ProgressDialog.h"
@@ -402,6 +403,24 @@ void VersionPage::on_forgeBtn_clicked()
 	}
 }
 
+void VersionPage::on_addEmptyBtn_clicked()
+{
+	NewComponentDialog compdialog(QString(), QString(), this);
+	QStringList blacklist;
+	for(int i = 0; i < m_profile->rowCount(); i++)
+	{
+		auto comp = m_profile->getComponent(i);
+		blacklist.push_back(comp->getID());
+	}
+	compdialog.setBlacklist(blacklist);
+	if (compdialog.exec())
+	{
+		qDebug() << "name:" << compdialog.name();
+		qDebug() << "uid:" << compdialog.uid();
+		m_profile->installEmpty(compdialog.uid(), compdialog.name());
+	}
+}
+
 void VersionPage::on_liteloaderBtn_clicked()
 {
 	auto vlist = ENV.metadataIndex()->get("com.mumfrey.liteloader");
diff --git a/application/pages/VersionPage.h b/application/pages/VersionPage.h
index b4c18367..d4b65983 100644
--- a/application/pages/VersionPage.h
+++ b/application/pages/VersionPage.h
@@ -50,6 +50,7 @@ public:
 
 private slots:
 	void on_forgeBtn_clicked();
+	void on_addEmptyBtn_clicked();
 	void on_liteloaderBtn_clicked();
 	void on_reloadBtn_clicked();
 	void on_removeBtn_clicked();
diff --git a/application/pages/VersionPage.ui b/application/pages/VersionPage.ui
index b6da3294..1d2adff7 100644
--- a/application/pages/VersionPage.ui
+++ b/application/pages/VersionPage.ui
@@ -218,6 +218,13 @@
           </widget>
          </item>
          <item>
+          <widget class="QPushButton" name="addEmptyBtn">
+           <property name="text">
+            <string>Add Empty</string>
+           </property>
+          </widget>
+         </item>
+         <item>
           <widget class="QPushButton" name="reloadBtn">
            <property name="toolTip">
             <string>Reload all packages.</string>
@@ -290,7 +297,10 @@
   <tabstop>liteloaderBtn</tabstop>
   <tabstop>modBtn</tabstop>
   <tabstop>jarmodBtn</tabstop>
+  <tabstop>jarBtn</tabstop>
+  <tabstop>addEmptyBtn</tabstop>
   <tabstop>reloadBtn</tabstop>
+  <tabstop>tabWidget</tabstop>
  </tabstops>
  <resources/>
  <connections/>