1 files changed, 82 insertions, 1 deletions

diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index af2ba7c8..18f5f2ac 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -48,18 +48,23 @@
 
 #include "JavaCommon.h"
 #include "Application.h"
+#include "minecraft/auth/AccountList.h"
 
 #include "java/JavaInstallList.h"
 #include "java/JavaUtils.h"
 #include "FileSystem.h"
 
-
 InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
     : QWidget(parent), ui(new Ui::InstanceSettingsPage), m_instance(inst)
 {
     m_settings = inst->settings();
     ui->setupUi(this);
 
+    accountMenu = new QMenu(this);
+    // Use undocumented property... https://stackoverflow.com/questions/7121718/create-a-scrollbar-in-a-submenu-qt
+    accountMenu->setStyleSheet("QMenu { menu-scrollable: 1; }");
+    ui->instanceAccountSelector->setMenu(accountMenu);
+
     connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked);
     connect(APPLICATION, &Application::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);
     connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
@@ -75,6 +80,7 @@ bool InstanceSettingsPage::shouldDisplay() const
 InstanceSettingsPage::~InstanceSettingsPage()
 {
     delete ui;
+    delete accountMenu;
 }
 
 void InstanceSettingsPage::globalSettingsButtonClicked(bool)
@@ -275,6 +281,14 @@ void InstanceSettingsPage::applySettings()
         m_settings->reset("JoinServerOnLaunchAddress");
     }
 
+    // Use an account for this instance
+    bool useAccountForInstance = ui->instanceAccountGroupBox->isChecked();
+    m_settings->set("UseAccountForInstance", useAccountForInstance);
+    if (!useAccountForInstance)
+    {
+        m_settings->reset("InstanceAccountId");
+    }
+
     // FIXME: This should probably be called by a signal instead
     m_instance->updateRuntimeContext();
 }
@@ -372,6 +386,9 @@ void InstanceSettingsPage::loadSettings()
 
     ui->serverJoinGroupBox->setChecked(m_settings->get("JoinServerOnLaunch").toBool());
     ui->serverJoinAddress->setText(m_settings->get("JoinServerOnLaunchAddress").toString());
+
+    ui->instanceAccountGroupBox->setChecked(m_settings->get("UseAccountForInstance").toBool());
+    updateAccountsMenu();
 }
 
 void InstanceSettingsPage::on_javaDetectBtn_clicked()
@@ -437,6 +454,70 @@ void InstanceSettingsPage::on_javaTestBtn_clicked()
     checker->run();
 }
 
+void InstanceSettingsPage::updateAccountsMenu()
+{
+    accountMenu->clear();
+
+    auto accounts = APPLICATION->accounts();
+    int accountIndex = accounts->findAccountByProfileId(m_settings->get("InstanceAccountId").toString());
+
+    if (accountIndex != -1)
+    {
+        auto account = accounts->at(accountIndex);
+        ui->instanceAccountSelector->setText(account->profileName());
+        ui->instanceAccountSelector->setIcon(account->getFace());
+    } else {
+        ui->instanceAccountSelector->setText(tr("No default account"));
+        ui->instanceAccountSelector->setIcon(APPLICATION->getThemedIcon("noaccount"));
+    }
+
+    for (int i = 0; i < accounts->count(); i++)
+    {
+        MinecraftAccountPtr account = accounts->at(i);
+        QAction *action = new QAction(account->profileName(), this);
+        action->setData(i);
+        action->setCheckable(true);
+        if (accountIndex == i)
+        {
+            action->setChecked(true);
+        }
+
+        auto face = account->getFace();
+        if(!face.isNull()) {
+            action->setIcon(face);
+        }
+        else {
+            action->setIcon(APPLICATION->getThemedIcon("noaccount"));
+        }
+
+        accountMenu->addAction(action);
+        connect(action, SIGNAL(triggered(bool)), SLOT(changeInstanceAccount()));
+    }
+}
+
+void InstanceSettingsPage::changeInstanceAccount()
+{
+    QAction *sAction = (QAction *)sender();
+
+    // Profile's associated Mojang username
+    if (sAction->data().type() != QVariant::Type::Int)
+        return;
+
+    QVariant data = sAction->data();
+    bool valid = false;
+    int index = data.toInt(&valid);
+    if(!valid) {
+        index = -1;
+    }
+    auto accounts = APPLICATION->accounts();
+    auto account = accounts->at(index);
+
+    m_settings->set("InstanceAccountId", account->profileId());
+
+    ui->instanceAccountSelector->setText(account->profileName());
+    ui->instanceAccountSelector->setIcon(account->getFace());
+}
+
 void InstanceSettingsPage::on_maxMemSpinBox_valueChanged(int i)
 {
     updateThresholds();