Properly implement launching and downloading

Also added a system to select an active account to log in with.

3 files changed, 25 insertions, 1 deletions

diff --git a/gui/dialogs/AccountListDialog.cpp b/gui/dialogs/AccountListDialog.cpp
index 838bef7f..c685c164 100644
--- a/gui/dialogs/AccountListDialog.cpp
+++ b/gui/dialogs/AccountListDialog.cpp
@@ -34,6 +34,7 @@ AccountListDialog::AccountListDialog(QWidget *parent) :
 	ui->setupUi(this);
 
 	m_accounts = MMC->accounts();
+	// TODO: Make the "Active?" column show checkboxes or radio buttons.
 	ui->listView->setModel(m_accounts.get());
 }
 
@@ -63,6 +64,17 @@ void AccountListDialog::on_editAccountBtn_clicked()
 	// TODO
 }
 
+void AccountListDialog::on_setActiveBtn_clicked()
+{
+	QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
+	if (selection.size() > 0)
+	{
+		QModelIndex selected = selection.first();
+		MojangAccountPtr account = selected.data(MojangAccountList::PointerRole).value<MojangAccountPtr>();
+		m_accounts->setActiveAccount(account->username());
+	}
+}
+
 void AccountListDialog::on_closeBtnBox_rejected()
 {
 	close();
diff --git a/gui/dialogs/AccountListDialog.h b/gui/dialogs/AccountListDialog.h
index 99dee639..17a50bec 100644
--- a/gui/dialogs/AccountListDialog.h
+++ b/gui/dialogs/AccountListDialog.h
@@ -42,6 +42,8 @@ slots:
 
 	void on_editAccountBtn_clicked();
 
+	void on_setActiveBtn_clicked();
+
 	// This will be sent when the "close" button is clicked.
 	void on_closeBtnBox_rejected();
 
diff --git a/gui/dialogs/AccountListDialog.ui b/gui/dialogs/AccountListDialog.ui
index 034985a9..2872b368 100644
--- a/gui/dialogs/AccountListDialog.ui
+++ b/gui/dialogs/AccountListDialog.ui
@@ -27,7 +27,7 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QListView" name="listView"/>
+      <widget class="QTreeView" name="listView"/>
      </item>
      <item>
       <layout class="QVBoxLayout" name="manageAcctsBtnBox">
@@ -65,6 +65,16 @@
          </property>
         </spacer>
        </item>
+       <item>
+        <widget class="QPushButton" name="setActiveBtn">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the currently selected account as the active account. The active account is the account that is used to log in (unless it is overridden in an instance-specific setting).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>&amp;Set Active</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
     </layout>