merged from 0.6.7 codebase

1 files changed, 117 insertions, 77 deletions

diff --git a/application/pages/global/AccountListPage.cpp b/application/pages/global/AccountListPage.cpp
index 63943174..c14134f3 100644
--- a/application/pages/global/AccountListPage.cpp
+++ b/application/pages/global/AccountListPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 #include "ui_AccountListPage.h"
 
 #include <QItemSelectionModel>
+#include <QMenu>
 
 #include <QDebug>
 
@@ -34,120 +35,159 @@
 #include "MultiMC.h"
 
 AccountListPage::AccountListPage(QWidget *parent)
-	: QWidget(parent), ui(new Ui::AccountListPage)
+    : QMainWindow(parent), ui(new Ui::AccountListPage)
 {
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
+    ui->setupUi(this);
+    ui->listView->setEmptyString(tr(
+        "Welcome!\n"
+        "If you're new here, you can click the \"Add\" button to add your Mojang or Minecraft account."
+    ));
+    ui->listView->setEmptyMode(VersionListView::String);
+    ui->listView->setContextMenuPolicy(Qt::CustomContextMenu);
 
-	m_accounts = MMC->accounts();
+    m_accounts = MMC->accounts();
 
-	ui->listView->setModel(m_accounts.get());
-	ui->listView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+    ui->listView->setModel(m_accounts.get());
+    ui->listView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+    ui->listView->setSelectionMode(QAbstractItemView::SingleSelection);
 
-	// Expand the account column
-	ui->listView->header()->setSectionResizeMode(1, QHeaderView::Stretch);
+    // Expand the account column
+    ui->listView->header()->setSectionResizeMode(1, QHeaderView::Stretch);
 
-	QItemSelectionModel *selectionModel = ui->listView->selectionModel();
+    QItemSelectionModel *selectionModel = ui->listView->selectionModel();
 
-	connect(selectionModel, &QItemSelectionModel::selectionChanged,
-			[this](const QItemSelection &sel, const QItemSelection &dsel)
-	{ updateButtonStates(); });
+    connect(selectionModel, &QItemSelectionModel::selectionChanged, [this](const QItemSelection &sel, const QItemSelection &dsel) {
+        updateButtonStates();
+    });
+    connect(ui->listView, &VersionListView::customContextMenuRequested, this, &AccountListPage::ShowContextMenu);
 
-	connect(m_accounts.get(), SIGNAL(listChanged()), SLOT(listChanged()));
-	connect(m_accounts.get(), SIGNAL(activeAccountChanged()), SLOT(listChanged()));
+    connect(m_accounts.get(), SIGNAL(listChanged()), SLOT(listChanged()));
+    connect(m_accounts.get(), SIGNAL(activeAccountChanged()), SLOT(listChanged()));
 
-	updateButtonStates();
+    updateButtonStates();
 }
 
 AccountListPage::~AccountListPage()
 {
-	delete ui;
+    delete ui;
 }
 
+void AccountListPage::ShowContextMenu(const QPoint& pos)
+{
+    auto menu = ui->toolBar->createContextMenu(this, tr("Context menu"));
+    menu->exec(ui->listView->mapToGlobal(pos));
+    delete menu;
+}
+
+void AccountListPage::changeEvent(QEvent* event)
+{
+    if (event->type() == QEvent::LanguageChange)
+    {
+        ui->retranslateUi(this);
+    }
+    QMainWindow::changeEvent(event);
+}
+
+QMenu * AccountListPage::createPopupMenu()
+{
+    QMenu* filteredMenu = QMainWindow::createPopupMenu();
+    filteredMenu->removeAction(ui->toolBar->toggleViewAction() );
+    return filteredMenu;
+}
+
+
 void AccountListPage::listChanged()
 {
-	updateButtonStates();
+    updateButtonStates();
 }
 
-void AccountListPage::on_addAccountBtn_clicked()
+void AccountListPage::on_actionAdd_triggered()
 {
-	addAccount(tr("Please enter your Mojang or Minecraft account username and password to add "
-				  "your account."));
+    addAccount(tr("Please enter your Mojang or Minecraft account username and password to add "
+                  "your account."));
 }
 
-void AccountListPage::on_rmAccountBtn_clicked()
+void AccountListPage::on_actionRemove_triggered()
 {
-	QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-	if (selection.size() > 0)
-	{
-		QModelIndex selected = selection.first();
-		m_accounts->removeAccount(selected);
-	}
+    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
+    if (selection.size() > 0)
+    {
+        QModelIndex selected = selection.first();
+        m_accounts->removeAccount(selected);
+    }
 }
 
-void AccountListPage::on_setDefaultBtn_clicked()
+void AccountListPage::on_actionSetDefault_triggered()
 {
-	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());
-	}
+    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 AccountListPage::on_noDefaultBtn_clicked()
+void AccountListPage::on_actionNoDefault_triggered()
 {
-	m_accounts->setActiveAccount("");
+    m_accounts->setActiveAccount("");
 }
 
 void AccountListPage::updateButtonStates()
 {
-	// If there is no selection, disable buttons that require something selected.
-	QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-
-	ui->rmAccountBtn->setEnabled(selection.size() > 0);
-	ui->setDefaultBtn->setEnabled(selection.size() > 0);
-	ui->uploadSkinBtn->setEnabled(selection.size() > 0);
+    // If there is no selection, disable buttons that require something selected.
+    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
+
+    ui->actionRemove->setEnabled(selection.size() > 0);
+    ui->actionSetDefault->setEnabled(selection.size() > 0);
+    ui->actionUploadSkin->setEnabled(selection.size() > 0);
+
+    if(m_accounts->activeAccount().get() == nullptr) {
+        ui->actionNoDefault->setEnabled(false);
+        ui->actionNoDefault->setChecked(true);
+    }
+    else {
+        ui->actionNoDefault->setEnabled(true);
+        ui->actionNoDefault->setChecked(false);
+    }
 
-	ui->noDefaultBtn->setDown(m_accounts->activeAccount().get() == nullptr);
 }
 
 void AccountListPage::addAccount(const QString &errMsg)
 {
-	// TODO: The login dialog isn't quite done yet
-	MojangAccountPtr account = LoginDialog::newAccount(this, errMsg);
-
-	if (account != nullptr)
-	{
-		m_accounts->addAccount(account);
-		if (m_accounts->count() == 1)
-			m_accounts->setActiveAccount(account->username());
-
-		// Grab associated player skins
-		auto job = new NetJob("Player skins: " + account->username());
-
-		for (AccountProfile profile : account->profiles())
-		{
-			auto meta = Env::getInstance().metacache()->resolveEntry("skins", profile.id + ".png");
-			auto action = Net::Download::makeCached(QUrl("https://" + URLConstants::SKINS_BASE + profile.id + ".png"), meta);
-			job->addNetAction(action);
-			meta->setStale(true);
-		}
-
-		job->start();
-	}
+    // TODO: The login dialog isn't quite done yet
+    MojangAccountPtr account = LoginDialog::newAccount(this, errMsg);
+
+    if (account != nullptr)
+    {
+        m_accounts->addAccount(account);
+        if (m_accounts->count() == 1)
+            m_accounts->setActiveAccount(account->username());
+
+        // Grab associated player skins
+        auto job = new NetJob("Player skins: " + account->username());
+
+        for (AccountProfile profile : account->profiles())
+        {
+            auto meta = Env::getInstance().metacache()->resolveEntry("skins", profile.id + ".png");
+            auto action = Net::Download::makeCached(QUrl(URLConstants::SKINS_BASE + profile.id + ".png"), meta);
+            job->addNetAction(action);
+            meta->setStale(true);
+        }
+
+        job->start();
+    }
 }
 
-void AccountListPage::on_uploadSkinBtn_clicked()
+void AccountListPage::on_actionUploadSkin_triggered()
 {
-	QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
-	if (selection.size() > 0)
-	{
-		QModelIndex selected = selection.first();
-		MojangAccountPtr account = selected.data(MojangAccountList::PointerRole).value<MojangAccountPtr>();
-		SkinUploadDialog dialog(account, this);
-		dialog.exec();
-	}
+    QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
+    if (selection.size() > 0)
+    {
+        QModelIndex selected = selection.first();
+        MojangAccountPtr account = selected.data(MojangAccountList::PointerRole).value<MojangAccountPtr>();
+        SkinUploadDialog dialog(account, this);
+        dialog.exec();
+    }
 }