forked from MultiMC/Launcher
-
Notifications
You must be signed in to change notification settings - Fork 154
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
UltimMC: Make separate section for local accounts
- Loading branch information
1 parent
eba8c1e
commit bd59296
Showing
8 changed files
with
266 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| #include "LocalLoginDialog.h" | ||
| #include "ui_LocalLoginDialog.h" | ||
|
|
||
| #include "minecraft/auth/AuthProviders.h" | ||
| #include "minecraft/auth/AccountTask.h" | ||
|
|
||
| #include <QtWidgets/QPushButton> | ||
|
|
||
| LocalLoginDialog::LocalLoginDialog(QWidget *parent) : QDialog(parent), ui(new Ui::LocalLoginDialog) | ||
| { | ||
| ui->setupUi(this); | ||
| ui->progressBar->setVisible(false); | ||
| ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); | ||
|
|
||
| connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); | ||
| connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); | ||
| } | ||
|
|
||
| LocalLoginDialog::~LocalLoginDialog() | ||
| { | ||
| delete ui; | ||
| } | ||
|
|
||
| // Stage 1: User interaction | ||
| void LocalLoginDialog::accept() | ||
| { | ||
| setUserInputsEnabled(false); | ||
| ui->progressBar->setVisible(true); | ||
|
|
||
| m_account = MinecraftAccount::createFromUsername(ui->userTextBox->text()); | ||
| m_account->setProvider(AuthProviders::lookup("dummy")); | ||
|
|
||
| // Setup the login task and start it | ||
| const char *dummy_password = " "; | ||
| m_loginTask = m_account->login(QString::fromAscii(dummy_password)); | ||
| connect(m_loginTask.get(), &Task::failed, this, &LocalLoginDialog::onTaskFailed); | ||
| connect(m_loginTask.get(), &Task::succeeded, this, &LocalLoginDialog::onTaskSucceeded); | ||
| connect(m_loginTask.get(), &Task::status, this, &LocalLoginDialog::onTaskStatus); | ||
| connect(m_loginTask.get(), &Task::progress, this, &LocalLoginDialog::onTaskProgress); | ||
| if (!m_loginTask) | ||
| { | ||
| onTaskSucceeded(); | ||
| } else { | ||
| m_loginTask->start(); | ||
| } | ||
| } | ||
|
|
||
| void LocalLoginDialog::setUserInputsEnabled(bool enable) | ||
| { | ||
| ui->userTextBox->setEnabled(enable); | ||
| ui->buttonBox->setEnabled(enable); | ||
| } | ||
|
|
||
| void LocalLoginDialog::on_userTextBox_textEdited(const QString &newText) | ||
| { | ||
| ui->buttonBox->button(QDialogButtonBox::Ok) | ||
| ->setEnabled(!newText.isEmpty()); | ||
| } | ||
|
|
||
| void LocalLoginDialog::onTaskFailed(const QString &reason) | ||
| { | ||
| // Set message | ||
| auto lines = reason.split('\n'); | ||
| QString processed; | ||
| for(auto line: lines) { | ||
| if(line.size()) { | ||
| processed += "<font color='red'>" + line + "</font><br />"; | ||
| } | ||
| else { | ||
| processed += "<br />"; | ||
| } | ||
| } | ||
| ui->label->setText(processed); | ||
|
|
||
| // Re-enable user-interaction | ||
| setUserInputsEnabled(true); | ||
| ui->progressBar->setVisible(false); | ||
| } | ||
|
|
||
| void LocalLoginDialog::onTaskSucceeded() | ||
| { | ||
| QDialog::accept(); | ||
| } | ||
|
|
||
| void LocalLoginDialog::onTaskStatus(const QString &status) | ||
| { | ||
| ui->label->setText(status); | ||
| } | ||
|
|
||
| void LocalLoginDialog::onTaskProgress(qint64 current, qint64 total) | ||
| { | ||
| ui->progressBar->setMaximum(total); | ||
| ui->progressBar->setValue(current); | ||
| } | ||
|
|
||
| // Public interface | ||
| MinecraftAccountPtr LocalLoginDialog::newAccount(QWidget *parent, QString msg) | ||
| { | ||
| LocalLoginDialog dlg(parent); | ||
| dlg.ui->label->setText(msg); | ||
| if (dlg.exec() == QDialog::Accepted) | ||
| { | ||
| return dlg.m_account; | ||
| } | ||
| return 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* 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 <QtWidgets/QDialog> | ||
| #include <QtCore/QEventLoop> | ||
|
|
||
| #include "minecraft/auth/MinecraftAccount.h" | ||
| #include "tasks/Task.h" | ||
|
|
||
| namespace Ui | ||
| { | ||
| class LocalLoginDialog; | ||
| } | ||
|
|
||
| class LocalLoginDialog : public QDialog | ||
| { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
| ~LocalLoginDialog(); | ||
|
|
||
| static MinecraftAccountPtr newAccount(QWidget *parent, QString message); | ||
|
|
||
| private: | ||
| explicit LocalLoginDialog(QWidget *parent = 0); | ||
|
|
||
| void setUserInputsEnabled(bool enable); | ||
|
|
||
| protected | ||
| slots: | ||
| void accept(); | ||
|
|
||
| void onTaskFailed(const QString &reason); | ||
| void onTaskSucceeded(); | ||
| void onTaskStatus(const QString &status); | ||
| void onTaskProgress(qint64 current, qint64 total); | ||
|
|
||
| void on_userTextBox_textEdited(const QString &newText); | ||
|
|
||
| private: | ||
| Ui::LocalLoginDialog *ui; | ||
| MinecraftAccountPtr m_account; | ||
| Task::Ptr m_loginTask; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <ui version="4.0"> | ||
| <class>LocalLoginDialog</class> | ||
| <widget class="QDialog" name="LocalLoginDialog"> | ||
| <property name="geometry"> | ||
| <rect> | ||
| <x>0</x> | ||
| <y>0</y> | ||
| <width>421</width> | ||
| <height>198</height> | ||
| </rect> | ||
| </property> | ||
| <property name="sizePolicy"> | ||
| <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> | ||
| <horstretch>0</horstretch> | ||
| <verstretch>0</verstretch> | ||
| </sizepolicy> | ||
| </property> | ||
| <property name="windowTitle"> | ||
| <string>Add Local Account</string> | ||
| </property> | ||
| <layout class="QVBoxLayout" name="verticalLayout"> | ||
| <item> | ||
| <widget class="QLabel" name="label"> | ||
| <property name="text"> | ||
| <string notr="true">Message label placeholder.</string> | ||
| </property> | ||
| <property name="textFormat"> | ||
| <enum>Qt::RichText</enum> | ||
| </property> | ||
| <property name="textInteractionFlags"> | ||
| <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> | ||
| </property> | ||
| </widget> | ||
| </item> | ||
| <item> | ||
| <widget class="QLineEdit" name="userTextBox"> | ||
| <property name="placeholderText"> | ||
| <string>Username</string> | ||
| </property> | ||
| </widget> | ||
| </item> | ||
| <item> | ||
| <widget class="QProgressBar" name="progressBar"> | ||
| <property name="value"> | ||
| <number>24</number> | ||
| </property> | ||
| <property name="textVisible"> | ||
| <bool>false</bool> | ||
| </property> | ||
| </widget> | ||
| </item> | ||
| <item> | ||
| <layout class="QVBoxLayout" name="radioLayout"/> | ||
| </item> | ||
| <item> | ||
| <widget class="QDialogButtonBox" name="buttonBox"> | ||
| <property name="orientation"> | ||
| <enum>Qt::Horizontal</enum> | ||
| </property> | ||
| <property name="standardButtons"> | ||
| <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> | ||
| </property> | ||
| </widget> | ||
| </item> | ||
| </layout> | ||
| </widget> | ||
| <resources/> | ||
| <connections/> | ||
| </ui> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters