+
+MSALoginDialog::MSALoginDialog(QWidget *parent) : QDialog(parent), ui(new Ui::MSALoginDialog)
+{
+ ui->setupUi(this);
+ ui->progressBar->setVisible(false);
+ // ui->buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(false);
+
+ connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+ connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+}
+
+int MSALoginDialog::exec() {
+ setUserInputsEnabled(false);
+ ui->progressBar->setVisible(true);
+
+ // Setup the login task and start it
+ m_account = MinecraftAccount::createBlankMSA();
+ m_loginTask = m_account->loginMSA(nullptr);
+ connect(m_loginTask.get(), &Task::failed, this, &MSALoginDialog::onTaskFailed);
+ connect(m_loginTask.get(), &Task::succeeded, this, &MSALoginDialog::onTaskSucceeded);
+ connect(m_loginTask.get(), &Task::status, this, &MSALoginDialog::onTaskStatus);
+ connect(m_loginTask.get(), &Task::progress, this, &MSALoginDialog::onTaskProgress);
+ connect(m_loginTask.get(), &AccountTask::showVerificationUriAndCode, this, &MSALoginDialog::showVerificationUriAndCode);
+ connect(m_loginTask.get(), &AccountTask::hideVerificationUriAndCode, this, &MSALoginDialog::hideVerificationUriAndCode);
+ connect(&m_externalLoginTimer, &QTimer::timeout, this, &MSALoginDialog::externalLoginTick);
+ m_loginTask->start();
+
+ return QDialog::exec();
+}
+
+
+MSALoginDialog::~MSALoginDialog()
+{
+ delete ui;
+}
+
+void MSALoginDialog::externalLoginTick() {
+ m_externalLoginElapsed++;
+ ui->progressBar->setValue(m_externalLoginElapsed);
+ ui->progressBar->repaint();
+
+ if(m_externalLoginElapsed >= m_externalLoginTimeout) {
+ m_externalLoginTimer.stop();
+ }
+}
+
+
+void MSALoginDialog::showVerificationUriAndCode(const QUrl& uri, const QString& code, int expiresIn) {
+ m_externalLoginElapsed = 0;
+ m_externalLoginTimeout = expiresIn;
+
+ m_externalLoginTimer.setInterval(1000);
+ m_externalLoginTimer.setSingleShot(false);
+ m_externalLoginTimer.start();
+
+ ui->progressBar->setMaximum(expiresIn);
+ ui->progressBar->setValue(m_externalLoginElapsed);
+
+ QString urlString = uri.toString();
+ QString linkString = QString("%2").arg(urlString, urlString);
+ ui->label->setText(tr("Please open up %1 in a browser and put in the code %2 to proceed with login.
").arg(linkString, code));
+}
+
+void MSALoginDialog::hideVerificationUriAndCode() {
+ m_externalLoginTimer.stop();
+}
+
+void MSALoginDialog::setUserInputsEnabled(bool enable)
+{
+ ui->buttonBox->setEnabled(enable);
+}
+
+void MSALoginDialog::onTaskFailed(const QString &reason)
+{
+ // Set message
+ auto lines = reason.split('\n');
+ QString processed;
+ for(auto line: lines) {
+ if(line.size()) {
+ processed += "" + line + "
";
+ }
+ else {
+ processed += "
";
+ }
+ }
+ ui->label->setText(processed);
+
+ // Re-enable user-interaction
+ setUserInputsEnabled(true);
+ ui->progressBar->setVisible(false);
+}
+
+void MSALoginDialog::onTaskSucceeded()
+{
+ QDialog::accept();
+}
+
+void MSALoginDialog::onTaskStatus(const QString &status)
+{
+ ui->label->setText(status);
+}
+
+void MSALoginDialog::onTaskProgress(qint64 current, qint64 total)
+{
+ ui->progressBar->setMaximum(total);
+ ui->progressBar->setValue(current);
+}
+
+// Public interface
+MinecraftAccountPtr MSALoginDialog::newAccount(QWidget *parent, QString msg)
+{
+ MSALoginDialog dlg(parent);
+ dlg.ui->label->setText(msg);
+ if (dlg.exec() == QDialog::Accepted)
+ {
+ return dlg.m_account;
+ }
+ return 0;
+}
diff --git a/launcher/dialogs/MSALoginDialog.h b/launcher/dialogs/MSALoginDialog.h
new file mode 100644
index 0000000000..3d26a0dd6e
--- /dev/null
+++ b/launcher/dialogs/MSALoginDialog.h
@@ -0,0 +1,63 @@
+/* Copyright 2013-2021 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
+#include
+#include
+
+#include "minecraft/auth/MinecraftAccount.h"
+
+namespace Ui
+{
+class MSALoginDialog;
+}
+
+class MSALoginDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ ~MSALoginDialog();
+
+ static MinecraftAccountPtr newAccount(QWidget *parent, QString message);
+ int exec() override;
+
+private:
+ explicit MSALoginDialog(QWidget *parent = 0);
+
+ void setUserInputsEnabled(bool enable);
+
+protected
+slots:
+ void onTaskFailed(const QString &reason);
+ void onTaskSucceeded();
+ void onTaskStatus(const QString &status);
+ void onTaskProgress(qint64 current, qint64 total);
+ void showVerificationUriAndCode(const QUrl &uri, const QString &code, int expiresIn);
+ void hideVerificationUriAndCode();
+
+ void externalLoginTick();
+
+private:
+ Ui::MSALoginDialog *ui;
+ MinecraftAccountPtr m_account;
+ std::shared_ptr m_loginTask;
+ QTimer m_externalLoginTimer;
+ int m_externalLoginElapsed = 0;
+ int m_externalLoginTimeout = 0;
+};
+
diff --git a/launcher/dialogs/MSALoginDialog.ui b/launcher/dialogs/MSALoginDialog.ui
new file mode 100644
index 0000000000..78cbfb269f
--- /dev/null
+++ b/launcher/dialogs/MSALoginDialog.ui
@@ -0,0 +1,65 @@
+
+
+ MSALoginDialog
+
+
+
+ 0
+ 0
+ 491
+ 143
+
+
+
+
+ 0
+ 0
+
+
+
+ Add Microsoft Account
+
+
+ -
+
+
+ Message label placeholder.
+
+aaaaa
+
+
+ Qt::RichText
+
+
+ true
+
+
+ Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+ -
+
+
+ 24
+
+
+ false
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel
+
+
+
+
+
+
+
+
diff --git a/application/dialogs/NewComponentDialog.cpp b/launcher/dialogs/NewComponentDialog.cpp
similarity index 100%
rename from application/dialogs/NewComponentDialog.cpp
rename to launcher/dialogs/NewComponentDialog.cpp
diff --git a/application/dialogs/NewComponentDialog.h b/launcher/dialogs/NewComponentDialog.h
similarity index 100%
rename from application/dialogs/NewComponentDialog.h
rename to launcher/dialogs/NewComponentDialog.h
diff --git a/application/dialogs/NewComponentDialog.ui b/launcher/dialogs/NewComponentDialog.ui
similarity index 100%
rename from application/dialogs/NewComponentDialog.ui
rename to launcher/dialogs/NewComponentDialog.ui
diff --git a/application/dialogs/NewInstanceDialog.cpp b/launcher/dialogs/NewInstanceDialog.cpp
similarity index 95%
rename from application/dialogs/NewInstanceDialog.cpp
rename to launcher/dialogs/NewInstanceDialog.cpp
index d70cbffed7..86963149fd 100644
--- a/application/dialogs/NewInstanceDialog.cpp
+++ b/launcher/dialogs/NewInstanceDialog.cpp
@@ -37,7 +37,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -124,17 +124,17 @@ void NewInstanceDialog::accept()
QList NewInstanceDialog::getPages()
{
importPage = new ImportPage(this);
- twitchPage = new TwitchPage(this);
+ flamePage = new FlamePage(this);
auto technicPage = new TechnicPage(this);
return
{
new VanillaPage(this),
importPage,
new AtlPage(this),
+ flamePage,
new FtbPage(this),
new LegacyFTB::Page(this),
- technicPage,
- twitchPage
+ technicPage
};
}
@@ -173,6 +173,14 @@ void NewInstanceDialog::setSuggestedIconFromFile(const QString &path, const QStr
ui->iconButton->setIcon(QIcon(path));
}
+void NewInstanceDialog::setSuggestedIcon(const QString &key)
+{
+ auto icon = MMC->icons()->getIcon(key);
+ importIcon = false;
+
+ ui->iconButton->setIcon(icon);
+}
+
InstanceTask * NewInstanceDialog::extractTask()
{
InstanceTask * extracted = creationTask.get();
diff --git a/application/dialogs/NewInstanceDialog.h b/launcher/dialogs/NewInstanceDialog.h
similarity index 95%
rename from application/dialogs/NewInstanceDialog.h
rename to launcher/dialogs/NewInstanceDialog.h
index 88ed00e58d..53abf8cfbd 100644
--- a/application/dialogs/NewInstanceDialog.h
+++ b/launcher/dialogs/NewInstanceDialog.h
@@ -29,7 +29,7 @@ class NewInstanceDialog;
class PageContainer;
class QDialogButtonBox;
class ImportPage;
-class TwitchPage;
+class FlamePage;
class NewInstanceDialog : public QDialog, public BasePageProvider
{
@@ -43,6 +43,7 @@ class NewInstanceDialog : public QDialog, public BasePageProvider
void setSuggestedPack(const QString & name = QString(), InstanceTask * task = nullptr);
void setSuggestedIconFromFile(const QString &path, const QString &name);
+ void setSuggestedIcon(const QString &key);
InstanceTask * extractTask();
@@ -68,7 +69,7 @@ private slots:
QString InstIconKey;
ImportPage *importPage = nullptr;
- TwitchPage *twitchPage = nullptr;
+ FlamePage *flamePage = nullptr;
std::unique_ptr creationTask;
bool importIcon = false;
diff --git a/application/dialogs/NewInstanceDialog.ui b/launcher/dialogs/NewInstanceDialog.ui
similarity index 100%
rename from application/dialogs/NewInstanceDialog.ui
rename to launcher/dialogs/NewInstanceDialog.ui
diff --git a/application/dialogs/NotificationDialog.cpp b/launcher/dialogs/NotificationDialog.cpp
similarity index 100%
rename from application/dialogs/NotificationDialog.cpp
rename to launcher/dialogs/NotificationDialog.cpp
diff --git a/application/dialogs/NotificationDialog.h b/launcher/dialogs/NotificationDialog.h
similarity index 100%
rename from application/dialogs/NotificationDialog.h
rename to launcher/dialogs/NotificationDialog.h
diff --git a/application/dialogs/NotificationDialog.ui b/launcher/dialogs/NotificationDialog.ui
similarity index 100%
rename from application/dialogs/NotificationDialog.ui
rename to launcher/dialogs/NotificationDialog.ui
diff --git a/application/dialogs/ProfileSelectDialog.cpp b/launcher/dialogs/ProfileSelectDialog.cpp
similarity index 76%
rename from application/dialogs/ProfileSelectDialog.cpp
rename to launcher/dialogs/ProfileSelectDialog.cpp
index ae34709f2a..e2ad73e4ff 100644
--- a/application/dialogs/ProfileSelectDialog.cpp
+++ b/launcher/dialogs/ProfileSelectDialog.cpp
@@ -33,9 +33,10 @@ ProfileSelectDialog::ProfileSelectDialog(const QString &message, int flags, QWid
m_accounts = MMC->accounts();
auto view = ui->listView;
//view->setModel(m_accounts.get());
- //view->hideColumn(MojangAccountList::ActiveColumn);
+ //view->hideColumn(AccountList::ActiveColumn);
view->setColumnCount(1);
view->setRootIsDecorated(false);
+ // FIXME: use a real model, not this
if(QTreeWidgetItem* header = view->headerItem())
{
header->setText(0, tr("Name"));
@@ -47,20 +48,19 @@ ProfileSelectDialog::ProfileSelectDialog(const QString &message, int flags, QWid
QList items;
for (int i = 0; i < m_accounts->count(); i++)
{
- MojangAccountPtr account = m_accounts->at(i);
- for (auto profile : account->profiles())
- {
- auto profileLabel = profile.name;
- if(account->isInUse())
- {
- profileLabel += tr(" (in use)");
- }
- auto item = new QTreeWidgetItem(view);
- item->setText(0, profileLabel);
- item->setIcon(0, SkinUtils::getFaceFromCache(profile.id));
- item->setData(0, MojangAccountList::PointerRole, QVariant::fromValue(account));
- items.append(item);
+ MinecraftAccountPtr account = m_accounts->at(i);
+ QString profileLabel;
+ if(account->isInUse()) {
+ profileLabel = tr("%1 (in use)").arg(account->profileName());
}
+ else {
+ profileLabel = account->profileName();
+ }
+ auto item = new QTreeWidgetItem(view);
+ item->setText(0, profileLabel);
+ item->setIcon(0, account->getFace());
+ item->setData(0, AccountList::PointerRole, QVariant::fromValue(account));
+ items.append(item);
}
view->addTopLevelItems(items);
@@ -84,7 +84,7 @@ ProfileSelectDialog::~ProfileSelectDialog()
delete ui;
}
-MojangAccountPtr ProfileSelectDialog::selectedAccount() const
+MinecraftAccountPtr ProfileSelectDialog::selectedAccount() const
{
return m_selected;
}
@@ -105,7 +105,7 @@ void ProfileSelectDialog::on_buttonBox_accepted()
if (selection.size() > 0)
{
QModelIndex selected = selection.first();
- m_selected = selected.data(MojangAccountList::PointerRole).value();
+ m_selected = selected.data(AccountList::PointerRole).value();
}
close();
}
diff --git a/application/dialogs/ProfileSelectDialog.h b/launcher/dialogs/ProfileSelectDialog.h
similarity index 93%
rename from application/dialogs/ProfileSelectDialog.h
rename to launcher/dialogs/ProfileSelectDialog.h
index 9f95830c15..a4acd9a1b4 100644
--- a/application/dialogs/ProfileSelectDialog.h
+++ b/launcher/dialogs/ProfileSelectDialog.h
@@ -19,7 +19,7 @@
#include
-#include "minecraft/auth/MojangAccountList.h"
+#include "minecraft/auth/AccountList.h"
namespace Ui
{
@@ -59,7 +59,7 @@ class ProfileSelectDialog : public QDialog
* Gets a pointer to the account that the user selected.
* This is null if the user clicked cancel or hasn't clicked OK yet.
*/
- MojangAccountPtr selectedAccount() const;
+ MinecraftAccountPtr selectedAccount() const;
/*!
* Returns true if the user checked the "use as global default" checkbox.
@@ -80,10 +80,10 @@ public
void on_buttonBox_rejected();
protected:
- std::shared_ptr m_accounts;
+ std::shared_ptr m_accounts;
//! The account that was selected when the user clicked OK.
- MojangAccountPtr m_selected;
+ MinecraftAccountPtr m_selected;
private:
Ui::ProfileSelectDialog *ui;
diff --git a/application/dialogs/ProfileSelectDialog.ui b/launcher/dialogs/ProfileSelectDialog.ui
similarity index 100%
rename from application/dialogs/ProfileSelectDialog.ui
rename to launcher/dialogs/ProfileSelectDialog.ui
diff --git a/application/dialogs/ProgressDialog.cpp b/launcher/dialogs/ProgressDialog.cpp
similarity index 100%
rename from application/dialogs/ProgressDialog.cpp
rename to launcher/dialogs/ProgressDialog.cpp
diff --git a/application/dialogs/ProgressDialog.h b/launcher/dialogs/ProgressDialog.h
similarity index 100%
rename from application/dialogs/ProgressDialog.h
rename to launcher/dialogs/ProgressDialog.h
diff --git a/application/dialogs/ProgressDialog.ui b/launcher/dialogs/ProgressDialog.ui
similarity index 100%
rename from application/dialogs/ProgressDialog.ui
rename to launcher/dialogs/ProgressDialog.ui
diff --git a/application/dialogs/SkinUploadDialog.cpp b/launcher/dialogs/SkinUploadDialog.cpp
similarity index 64%
rename from application/dialogs/SkinUploadDialog.cpp
rename to launcher/dialogs/SkinUploadDialog.cpp
index 56133529bd..97478f4b18 100644
--- a/application/dialogs/SkinUploadDialog.cpp
+++ b/launcher/dialogs/SkinUploadDialog.cpp
@@ -1,11 +1,16 @@
#include
#include
+#include
+
#include
#include
+#include
+
#include "SkinUploadDialog.h"
#include "ui_SkinUploadDialog.h"
#include "ProgressDialog.h"
#include "CustomMessageBox.h"
+#include
void SkinUploadDialog::on_buttonBox_rejected()
{
@@ -15,7 +20,7 @@ void SkinUploadDialog::on_buttonBox_rejected()
void SkinUploadDialog::on_buttonBox_accepted()
{
AuthSessionPtr session = std::make_shared();
- auto login = m_acct->login(session);
+ auto login = m_acct->refresh(session);
ProgressDialog prog(this);
if (prog.execWithTask((Task*)login.get()) != QDialog::Accepted)
{
@@ -85,8 +90,13 @@ void SkinUploadDialog::on_buttonBox_accepted()
{
model = SkinUpload::ALEX;
}
- SkinUploadPtr upload = std::make_shared(this, session, FS::read(fileName), model);
- if (prog.execWithTask((Task*)upload.get()) != QDialog::Accepted)
+ SequentialTask skinUpload;
+ skinUpload.addTask(std::make_shared(this, session, FS::read(fileName), model));
+ auto selectedCape = ui->capeCombo->currentData().toString();
+ if(selectedCape != session->m_accountPtr->accountData()->minecraftProfile.currentCape) {
+ skinUpload.addTask(std::make_shared(this, session, selectedCape));
+ }
+ if (prog.execWithTask(&skinUpload) != QDialog::Accepted)
{
CustomMessageBox::selectable(this, tr("Skin Upload"), tr("Failed to upload skin!"), QMessageBox::Warning)->exec();
close();
@@ -107,8 +117,38 @@ void SkinUploadDialog::on_skinBrowseBtn_clicked()
ui->skinPathTextBox->setText(cooked_path);
}
-SkinUploadDialog::SkinUploadDialog(MojangAccountPtr acct, QWidget *parent)
+SkinUploadDialog::SkinUploadDialog(MinecraftAccountPtr acct, QWidget *parent)
:QDialog(parent), m_acct(acct), ui(new Ui::SkinUploadDialog)
{
ui->setupUi(this);
+
+ // FIXME: add a model for this, download/refresh the capes on demand
+ auto &data = *acct->accountData();
+ int index = 0;
+ ui->capeCombo->addItem(tr("No Cape"), QVariant());
+ auto currentCape = data.minecraftProfile.currentCape;
+ if(currentCape.isEmpty()) {
+ ui->capeCombo->setCurrentIndex(index);
+ }
+
+ for(auto & cape: data.minecraftProfile.capes) {
+ index++;
+ if(cape.data.size()) {
+ QPixmap capeImage;
+ if(capeImage.loadFromData(cape.data, "PNG")) {
+ QPixmap preview = QPixmap(10, 16);
+ QPainter painter(&preview);
+ painter.drawPixmap(0, 0, capeImage.copy(1, 1, 10, 16));
+ ui->capeCombo->addItem(capeImage, cape.alias, cape.id);
+ if(currentCape == cape.id) {
+ ui->capeCombo->setCurrentIndex(index);
+ }
+ continue;
+ }
+ }
+ ui->capeCombo->addItem(cape.alias, cape.id);
+ if(currentCape == cape.id) {
+ ui->capeCombo->setCurrentIndex(index);
+ }
+ }
}
diff --git a/application/dialogs/SkinUploadDialog.h b/launcher/dialogs/SkinUploadDialog.h
similarity index 69%
rename from application/dialogs/SkinUploadDialog.h
rename to launcher/dialogs/SkinUploadDialog.h
index deb44eac0d..84d17dc6fb 100644
--- a/application/dialogs/SkinUploadDialog.h
+++ b/launcher/dialogs/SkinUploadDialog.h
@@ -1,7 +1,7 @@
#pragma once
#include
-#include
+#include
namespace Ui
{
@@ -11,7 +11,7 @@ namespace Ui
class SkinUploadDialog : public QDialog {
Q_OBJECT
public:
- explicit SkinUploadDialog(MojangAccountPtr acct, QWidget *parent = 0);
+ explicit SkinUploadDialog(MinecraftAccountPtr acct, QWidget *parent = 0);
virtual ~SkinUploadDialog() {};
public slots:
@@ -22,7 +22,7 @@ public slots:
void on_skinBrowseBtn_clicked();
protected:
- MojangAccountPtr m_acct;
+ MinecraftAccountPtr m_acct;
private:
Ui::SkinUploadDialog *ui;
diff --git a/launcher/dialogs/SkinUploadDialog.ui b/launcher/dialogs/SkinUploadDialog.ui
new file mode 100644
index 0000000000..f4b0ed0aa7
--- /dev/null
+++ b/launcher/dialogs/SkinUploadDialog.ui
@@ -0,0 +1,97 @@
+
+
+ SkinUploadDialog
+
+
+
+ 0
+ 0
+ 394
+ 360
+
+
+
+ Skin Upload
+
+
+ -
+
+
-