mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-07-03 03:46:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(clang-tidy): modernize the code

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2026-05-10 23:16:46 +03:00
parent 170d59de2a
commit 1af838db2e
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
38 changed files with 1088 additions and 956 deletions
Download patch file Download diff file Expand all files Collapse all files

134
launcher/ui/dialogs/MSALoginDialog.cpp
View file

@ -46,27 +46,28 @@
#include <QClipboard>
#include <QColor>
#include <QPainter>
#include <QPixmap>
#include <QPainterPath>
#include <QSize>
#include <QUrl>
#include <QtWidgets/QPushButton>
#include <span>
#include "qrencode.h"
MSALoginDialog::MSALoginDialog(QWidget* parent) : QDialog(parent), ui(new Ui::MSALoginDialog)
MSALoginDialog::MSALoginDialog(QWidget* parent) : QDialog(parent), m_ui(new Ui::MSALoginDialog)
{
ui->setupUi(this);
m_ui->setupUi(this);
// make font monospace
QFont font;
font.setPixelSize(ui->code->fontInfo().pixelSize());
font.setPixelSize(m_ui->code->fontInfo().pixelSize());
font.setFamily(APPLICATION->settings()->get("ConsoleFont").toString());
font.setStyleHint(QFont::Monospace);
font.setFixedPitch(true);
ui->code->setFont(font);
m_ui->code->setFont(font);
connect(ui->copyCode, &QPushButton::clicked, this, [this] { QApplication::clipboard()->setText(ui->code->text()); });
connect(ui->loginButton, &QPushButton::clicked, this, [this] {
connect(m_ui->copyCode, &QPushButton::clicked, this, [this] { QApplication::clipboard()->setText(m_ui->code->text()); });
connect(m_ui->loginButton, &QPushButton::clicked, this, [this] {
if (m_url.isValid()) {
if (!DesktopServices::openUrl(m_url)) {
QApplication::clipboard()->setText(m_url.toString());
@ -74,79 +75,80 @@ MSALoginDialog::MSALoginDialog(QWidget* parent) : QDialog(parent), ui(new Ui::MS
}
});
ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
}
int MSALoginDialog::exec()
{
// Setup the login task and start it
m_account = MinecraftAccount::createBlankMSA();
m_authflow_task = m_account->login(false);
connect(m_authflow_task.get(), &Task::failed, this, &MSALoginDialog::onTaskFailed);
connect(m_authflow_task.get(), &Task::succeeded, this, &QDialog::accept);
connect(m_authflow_task.get(), &Task::aborted, this, &MSALoginDialog::reject);
connect(m_authflow_task.get(), &Task::status, this, &MSALoginDialog::onAuthFlowStatus);
connect(m_authflow_task.get(), &AuthFlow::authorizeWithBrowser, this, &MSALoginDialog::authorizeWithBrowser);
connect(m_authflow_task.get(), &AuthFlow::authorizeWithBrowserWithExtra, this, &MSALoginDialog::authorizeWithBrowserWithExtra);
connect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, m_authflow_task.get(), &Task::abort);
m_authflowTask = m_account->login(false);
connect(m_authflowTask.get(), &Task::failed, this, &MSALoginDialog::onTaskFailed);
connect(m_authflowTask.get(), &Task::succeeded, this, &QDialog::accept);
connect(m_authflowTask.get(), &Task::aborted, this, &MSALoginDialog::reject);
connect(m_authflowTask.get(), &Task::status, this, &MSALoginDialog::onAuthFlowStatus);
connect(m_authflowTask.get(), &AuthFlow::authorizeWithBrowser, this, &MSALoginDialog::authorizeWithBrowser);
connect(m_authflowTask.get(), &AuthFlow::authorizeWithBrowserWithExtra, this, &MSALoginDialog::authorizeWithBrowserWithExtra);
connect(m_ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, m_authflowTask.get(), &Task::abort);
m_devicecode_task.reset(new AuthFlow(m_account->accountData(), AuthFlow::Action::DeviceCode));
connect(m_devicecode_task.get(), &Task::failed, this, &MSALoginDialog::onTaskFailed);
connect(m_devicecode_task.get(), &Task::succeeded, this, &QDialog::accept);
connect(m_devicecode_task.get(), &Task::aborted, this, &MSALoginDialog::reject);
connect(m_devicecode_task.get(), &Task::status, this, &MSALoginDialog::onDeviceFlowStatus);
connect(m_devicecode_task.get(), &AuthFlow::authorizeWithBrowser, this, &MSALoginDialog::authorizeWithBrowser);
connect(m_devicecode_task.get(), &AuthFlow::authorizeWithBrowserWithExtra, this, &MSALoginDialog::authorizeWithBrowserWithExtra);
connect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, m_devicecode_task.get(), &Task::abort);
QMetaObject::invokeMethod(m_authflow_task.get(), &Task::start, Qt::QueuedConnection);
QMetaObject::invokeMethod(m_devicecode_task.get(), &Task::start, Qt::QueuedConnection);
m_devicecodeTask.reset(new AuthFlow(m_account->accountData(), AuthFlow::Action::DeviceCode));
connect(m_devicecodeTask.get(), &Task::failed, this, &MSALoginDialog::onTaskFailed);
connect(m_devicecodeTask.get(), &Task::succeeded, this, &QDialog::accept);
connect(m_devicecodeTask.get(), &Task::aborted, this, &MSALoginDialog::reject);
connect(m_devicecodeTask.get(), &Task::status, this, &MSALoginDialog::onDeviceFlowStatus);
connect(m_devicecodeTask.get(), &AuthFlow::authorizeWithBrowser, this, &MSALoginDialog::authorizeWithBrowser);
connect(m_devicecodeTask.get(), &AuthFlow::authorizeWithBrowserWithExtra, this, &MSALoginDialog::authorizeWithBrowserWithExtra);
connect(m_ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, m_devicecodeTask.get(), &Task::abort);
QMetaObject::invokeMethod(m_authflowTask.get(), &Task::start, Qt::QueuedConnection);
QMetaObject::invokeMethod(m_devicecodeTask.get(), &Task::start, Qt::QueuedConnection);
return QDialog::exec();
}
MSALoginDialog::~MSALoginDialog()
{
delete ui;
delete m_ui;
}
void MSALoginDialog::onTaskFailed(QString reason)
void MSALoginDialog::onTaskFailed(const QString& reason)
{
// Set message
m_authflow_task->disconnect();
m_devicecode_task->disconnect();
ui->stackedWidget->setCurrentIndex(0);
m_authflowTask->disconnect();
m_devicecodeTask->disconnect();
m_ui->stackedWidget->setCurrentIndex(0);
auto lines = reason.split('\n');
QString processed;
for (auto line : lines) {
if (line.size()) {
for (const auto& line : lines) {
if (line.size() != 0) {
processed += "<font color='red'>" + line + "</font><br />";
} else {
processed += "<br />";
}
}
ui->status->setText(processed);
auto task = m_authflow_task;
m_ui->status->setText(processed);
auto task = m_authflowTask;
if (task->failReason().isEmpty()) {
task = m_devicecode_task;
task = m_devicecodeTask;
}
if (task) {
ui->loadingLabel->setText(task->getStatus());
m_ui->loadingLabel->setText(task->getStatus());
}
disconnect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, m_authflow_task.get(), &Task::abort);
disconnect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, m_devicecode_task.get(), &Task::abort);
connect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &MSALoginDialog::reject);
disconnect(m_ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, m_authflowTask.get(), &Task::abort);
disconnect(m_ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, m_devicecodeTask.get(), &Task::abort);
connect(m_ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &MSALoginDialog::reject);
}
void MSALoginDialog::authorizeWithBrowser(const QUrl& url)
{
ui->stackedWidget2->setCurrentIndex(1);
ui->stackedWidget2->adjustSize();
ui->stackedWidget2->updateGeometry();
m_ui->stackedWidget2->setCurrentIndex(1);
m_ui->stackedWidget2->adjustSize();
m_ui->stackedWidget2->updateGeometry();
this->adjustSize();
ui->loginButton->setToolTip(QString("<div style='width: 200px;'>%1</div>").arg(url.toString()));
m_ui->loginButton->setToolTip(QString("<div style='width: 200px;'>%1</div>").arg(url.toString()));
m_url = url;
}
namespace {
void paintQR(QPainter& painter, const QSize canvasSize, const QString& data, QColor fg)
{
const auto* qr = QRcode_encodeString(data.toUtf8().constData(), 0, QRecLevel::QR_ECLEVEL_M, QRencodeMode::QR_MODE_8, 1);
@ -165,25 +167,27 @@ void paintQR(QPainter& painter, const QSize canvasSize, const QString& data, QCo
const auto scale = 0.8 * std::min(canvasWidth / qrSize, canvasHeight / qrSize);
// Find an offset to center it in the canvas
const auto offsetX = (canvasWidth - qrSize * scale) / 2;
const auto offsetY = (canvasHeight - qrSize * scale) / 2;
const auto offsetX = (canvasWidth - (qrSize * scale)) / 2;
const auto offsetY = (canvasHeight - (qrSize * scale)) / 2;
auto qrData = std::span(qr->data, static_cast<long>(qrSize) * qrSize);
for (int y = 0; y < qrSize; y++) {
for (int x = 0; x < qrSize; x++) {
auto shouldFillIn = qr->data[y * qrSize + x] & 1;
if (shouldFillIn) {
QRectF r(offsetX + x * scale, offsetY + y * scale, scale, scale);
auto shouldFillIn = qrData[(y * qrSize) + x] & 1U;
if (shouldFillIn != 0) {
QRectF r(offsetX + (x * scale), offsetY + (y * scale), scale, scale);
painter.drawRects(&r, 1);
}
}
}
}
} // namespace
void MSALoginDialog::authorizeWithBrowserWithExtra(const QUrl& verificationUrl, const QString& code, const QUrl& completeVerificationUrl)
{
ui->stackedWidget->setCurrentIndex(1);
ui->stackedWidget->adjustSize();
ui->stackedWidget->updateGeometry();
m_ui->stackedWidget->setCurrentIndex(1);
m_ui->stackedWidget->adjustSize();
m_ui->stackedWidget->updateGeometry();
this->adjustSize();
auto url = verificationUrl.toString();
@ -195,7 +199,7 @@ void MSALoginDialog::authorizeWithBrowserWithExtra(const QUrl& verificationUrl,
if (!completeVerificationUrl.isValid() && url == "https://www.microsoft.com/link" && !code.isEmpty()) {
url += QString("?otc=%1").arg(code);
}
ui->code->setText(code);
m_ui->code->setText(code);
auto size = QSize(150, 150);
QPixmap pixmap(size);
@ -205,27 +209,27 @@ void MSALoginDialog::authorizeWithBrowserWithExtra(const QUrl& verificationUrl,
paintQR(painter, size, url, Qt::black);
// Set the generated pixmap to the label
ui->qr->setPixmap(pixmap);
m_ui->qr->setPixmap(pixmap);
ui->qrMessage->setText(tr("Open %1 or scan the QR and enter the above code if needed.").arg(linkString));
m_ui->qrMessage->setText(tr("Open %1 or scan the QR and enter the above code if needed.").arg(linkString));
}
void MSALoginDialog::onDeviceFlowStatus(QString status)
void MSALoginDialog::onDeviceFlowStatus(const QString& status)
{
ui->stackedWidget->setCurrentIndex(0);
ui->stackedWidget->adjustSize();
ui->stackedWidget->updateGeometry();
m_ui->stackedWidget->setCurrentIndex(0);
m_ui->stackedWidget->adjustSize();
m_ui->stackedWidget->updateGeometry();
this->adjustSize();
ui->status->setText(status);
m_ui->status->setText(status);
}
void MSALoginDialog::onAuthFlowStatus(QString status)
void MSALoginDialog::onAuthFlowStatus(const QString& status)
{
ui->stackedWidget2->setCurrentIndex(0);
ui->stackedWidget2->adjustSize();
ui->stackedWidget2->updateGeometry();
m_ui->stackedWidget2->setCurrentIndex(0);
m_ui->stackedWidget2->adjustSize();
m_ui->stackedWidget2->updateGeometry();
this->adjustSize();
ui->status2->setText(status);
m_ui->status2->setText(status);
}
// Public interface