Make the new instance dialog support instance types.

gui/newinstancedialog.cpp

@@ -16,18 +16,117 @@
 #include "newinstancedialog.h"
 #include "ui_newinstancedialog.h"
 
+#include "instanceloader.h"
+#include "instancetypeinterface.h"
+
+#include "instversionlist.h"
+#include "instversion.h"
+
+#include "task.h"
+
+#include "versionselectdialog.h"
+#include "taskdialog.h"
+
 #include <QLayout>
+#include <QPushButton>
 
 NewInstanceDialog::NewInstanceDialog(QWidget *parent) :
 	QDialog(parent),
 	ui(new Ui::NewInstanceDialog)
 {
+	m_selectedType = NULL;
+	m_selectedVersion = NULL;
+	
 	ui->setupUi(this);
 	resize(minimumSizeHint());
 	layout()->setSizeConstraint(QLayout::SetFixedSize);
+	
+	loadTypeList();
 }
 
 NewInstanceDialog::~NewInstanceDialog()
 {
 	delete ui;
 }
+
+void NewInstanceDialog::loadTypeList()
+{
+	InstTypeList typeList = InstanceLoader::get().typeList();
+	
+	for (int i = 0; i < typeList.length(); i++)
+	{
+		ui->instTypeComboBox->addItem(typeList.at(i)->displayName(), typeList.at(i)->typeID());
+	}
+	
+	updateSelectedType();
+}
+
+void NewInstanceDialog::updateSelectedType()
+{
+	QString typeID = ui->instTypeComboBox->itemData(ui->instTypeComboBox->currentIndex()).toString();
+	
+	const InstanceTypeInterface *type = InstanceLoader::get().findType(typeID);
+	m_selectedType = type;
+	
+	updateDialogState();
+	
+	if (m_selectedType)
+	{
+		if (!m_selectedType->versionList()->isLoaded())
+			loadVersionList();
+	}
+}
+
+void NewInstanceDialog::updateDialogState()
+{
+	ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(m_selectedType && m_selectedVersion);
+	ui->btnChangeVersion->setEnabled(m_selectedType && m_selectedVersion);
+}
+
+void NewInstanceDialog::setSelectedVersion(const InstVersion *version)
+{
+	m_selectedVersion = version;
+	
+	if (m_selectedVersion)
+	{
+		ui->versionTextBox->setText(version->name());
+	}
+	else
+	{
+		ui->versionTextBox->setText("");
+	}
+	
+	updateDialogState();
+}
+
+void NewInstanceDialog::loadVersionList()
+{
+	if (!m_selectedType)
+		return;
+	
+	TaskDialog *taskDlg = new TaskDialog(this);
+	Task *loadTask = m_selectedType->versionList()->getLoadTask();
+	loadTask->setParent(taskDlg);
+	taskDlg->exec(loadTask);
+	
+	setSelectedVersion(m_selectedType->versionList()->getLatestStable());
+}
+
+void NewInstanceDialog::on_btnChangeVersion_clicked()
+{
+	if (m_selectedType)
+	{
+		VersionSelectDialog *vselect = new VersionSelectDialog(m_selectedType->versionList(), this);
+		if (vselect->exec())
+		{
+			const InstVersion *version = vselect->selectedVersion();
+			if (version)
+				setSelectedVersion(version);
+		}
+	}
+}
+
+void NewInstanceDialog::on_instTypeComboBox_activated(int index)
+{
+	updateSelectedType();
+}

gui/newinstancedialog.h

@@ -18,6 +18,9 @@
 
 #include <QDialog>
 
+class InstanceTypeInterface;
+class InstVersion;
+
 namespace Ui {
 class NewInstanceDialog;
 }
@@ -30,8 +33,24 @@ public:
 	explicit NewInstanceDialog(QWidget *parent = 0);
 	~NewInstanceDialog();
 	
+	void loadTypeList();
+	void updateSelectedType();
+	void updateDialogState();
+	
+	void setSelectedVersion(const InstVersion *version);
+	
+	void loadVersionList();
+	
+private slots:
+	void on_btnChangeVersion_clicked();
+	
+	void on_instTypeComboBox_activated(int index);
+	
 private:
 	Ui::NewInstanceDialog *ui;
+	
+	const InstVersion *m_selectedVersion;
+	const InstanceTypeInterface *m_selectedType;
 };
 
 #endif // NEWINSTANCEDIALOG_H

gui/newinstancedialog.ui

@@ -75,6 +75,27 @@
      </property>
     </widget>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="typeLabel">
+       <property name="text">
+        <string>Type:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="instTypeComboBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item>
     <widget class="Line" name="line">
      <property name="orientation">

gui/versionselectdialog.cpp

@@ -21,6 +21,7 @@
 #include <gui/taskdialog.h>
 
 #include <instversionlist.h>
+#include <instversion.h>
 #include <task.h>
 
 VersionSelectDialog::VersionSelectDialog(InstVersionList *vlist, QWidget *parent) :
@@ -56,6 +57,15 @@ void VersionSelectDialog::loadList()
 	taskDlg->exec(loadTask);
 }
 
+const InstVersion *VersionSelectDialog::selectedVersion() const
+{
+	const InstVersion *versionPtr = (const InstVersion *)
+			m_vlist->data(ui->listView->selectionModel()->currentIndex(),
+						  InstVersionList::VersionPointerRole).value<void *>();
+	
+	return versionPtr;
+}
+
 void VersionSelectDialog::on_refreshButton_clicked()
 {
     loadList();

gui/versionselectdialog.h

@@ -19,6 +19,7 @@
 #include <QDialog>
 
 class InstVersionList;
+class InstVersion;
 
 namespace Ui
 {
@@ -38,6 +39,8 @@ public:
 	//! Starts a task that loads the list.
 	void loadList();
 	
+	const InstVersion *selectedVersion() const;
+	
 private slots:
 	void on_refreshButton_clicked();
 	

libmultimc/include/instversionlist.h

@@ -41,6 +41,11 @@ class LIBMULTIMC_EXPORT InstVersionList : public QAbstractListModel
 {
 	Q_OBJECT
 public:
+	enum ModelRoles
+	{
+		VersionPointerRole = 0x34B1CB48
+	};
+	
 	explicit InstVersionList(QObject *parent = 0);
 	
 	/*!
@@ -75,6 +80,13 @@ public:
 	 * one doesn't exist.
 	 */
 	virtual const InstVersion *findVersion(const QString &descriptor);
+	
+	/*!
+	 * \brief Gets the latest stable version of this instance type.
+	 * This is the version that will be selected by default.
+	 * By default, this is simply the first version in the list.
+	 */
+	virtual const InstVersion *getLatestStable();
 };
 
 #endif // INSTVERSIONLIST_H

libmultimc/src/instversionlist.cpp

@@ -31,6 +31,14 @@ const InstVersion *InstVersionList::findVersion(const QString &descriptor)
 	return NULL;
 }
 
+const InstVersion *InstVersionList::getLatestStable()
+{
+	if (count() <= 0)
+		return NULL;
+	else
+		return at(0);
+}
+
 // Column Enum
 enum VListColumns
 {
@@ -73,6 +81,9 @@ QVariant InstVersionList::data(const QModelIndex &index, int role) const
 	case Qt::ToolTipRole:
 		return version->descriptor();
 		
+	case VersionPointerRole:
+		return qVariantFromValue((void *) version);
+		
 	default:
 		return QVariant();
 	}

plugins/stdinstance/stdinstversionlist.cpp

@@ -162,6 +162,8 @@ void StdInstVListLoadTask::finalize()
 	m_list->m_vlist.swap(tempList);
 	m_list->endResetModel();
 	
+	m_list->loaded = true;
+	
 	// We called swap, so all the data that was in the version list previously is now in 
 	// tempList (and vice-versa). Now we just free the memory.
 	while (!tempList.isEmpty())