From bb02226870a21c08ec534295ea0dcb8dd4c542cf Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 12 Feb 2022 20:08:50 +0100 Subject: feat(ui): add custom MSA client id setting --- launcher/ui/pages/global/APIPage.cpp | 67 ++++++++++++ launcher/ui/pages/global/APIPage.h | 60 +++++++++++ launcher/ui/pages/global/APIPage.ui | 179 +++++++++++++++++++++++++++++++++ launcher/ui/pages/global/PastePage.cpp | 63 ------------ launcher/ui/pages/global/PastePage.h | 60 ----------- launcher/ui/pages/global/PastePage.ui | 127 ----------------------- 6 files changed, 306 insertions(+), 250 deletions(-) create mode 100644 launcher/ui/pages/global/APIPage.cpp create mode 100644 launcher/ui/pages/global/APIPage.h create mode 100644 launcher/ui/pages/global/APIPage.ui delete mode 100644 launcher/ui/pages/global/PastePage.cpp delete mode 100644 launcher/ui/pages/global/PastePage.h delete mode 100644 launcher/ui/pages/global/PastePage.ui (limited to 'launcher/ui') diff --git a/launcher/ui/pages/global/APIPage.cpp b/launcher/ui/pages/global/APIPage.cpp new file mode 100644 index 00000000..ad79e00c --- /dev/null +++ b/launcher/ui/pages/global/APIPage.cpp @@ -0,0 +1,67 @@ +/* Copyright 2013-2021 MultiMC & PolyMC 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. + */ + +#include "APIPage.h" +#include "ui_APIPage.h" + +#include +#include +#include +#include +#include + +#include "settings/SettingsObject.h" +#include "tools/BaseProfiler.h" +#include "Application.h" + +APIPage::APIPage(QWidget *parent) : + QWidget(parent), + ui(new Ui::APIPage) +{ + static QRegularExpression validUrlRegExp("https?://.+"); + ui->setupUi(this); + ui->urlChoices->setValidator(new QRegularExpressionValidator(validUrlRegExp, ui->urlChoices)); + ui->tabWidget->tabBar()->hide();\ + loadSettings(); +} + +APIPage::~APIPage() +{ + delete ui; +} + +void APIPage::loadSettings() +{ + auto s = APPLICATION->settings(); + QString pastebinURL = s->get("PastebinURL").toString(); + ui->urlChoices->setCurrentText(pastebinURL); + QString msaClientID = s->get("MSAClientIDOverride").toString(); + ui->msaClientID->setText(msaClientID); +} + +void APIPage::applySettings() +{ + auto s = APPLICATION->settings(); + QString pastebinURL = ui->urlChoices->currentText(); + s->set("PastebinURL", pastebinURL); + QString msaClientID = ui->msaClientID->text(); + s->set("MSAClientIDOverride", msaClientID); +} + +bool APIPage::apply() +{ + applySettings(); + return true; +} diff --git a/launcher/ui/pages/global/APIPage.h b/launcher/ui/pages/global/APIPage.h new file mode 100644 index 00000000..9474ebbb --- /dev/null +++ b/launcher/ui/pages/global/APIPage.h @@ -0,0 +1,60 @@ +/* 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 "ui/pages/BasePage.h" +#include + +namespace Ui { +class APIPage; +} + +class APIPage : public QWidget, public BasePage +{ + Q_OBJECT + +public: + explicit APIPage(QWidget *parent = 0); + ~APIPage(); + + QString displayName() const override + { + return tr("APIs"); + } + QIcon icon() const override + { + return APPLICATION->getThemedIcon("worlds"); + } + QString id() const override + { + return "apis"; + } + QString helpPage() const override + { + return "APIs"; + } + virtual bool apply() override; + +private: + void loadSettings(); + void applySettings(); + +private: + Ui::APIPage *ui; +}; + diff --git a/launcher/ui/pages/global/APIPage.ui b/launcher/ui/pages/global/APIPage.ui new file mode 100644 index 00000000..38bbc525 --- /dev/null +++ b/launcher/ui/pages/global/APIPage.ui @@ -0,0 +1,179 @@ + + + APIPage + + + + 0 + 0 + 491 + 474 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 0 + + + + Tab 1 + + + + + + Pastebin URL + + + + + + Qt::Horizontal + + + + + + + + 10 + + + + <html><head/><body><p>Note: only input that starts with <span style=" font-weight:600;">http://</span> or <span style=" font-weight:600;">https://</span> will be accepted.</p></body></html> + + + false + + + + + + + true + + + QComboBox::NoInsert + + + + https://0x0.st + + + + + https://paste.polymc.org + + + + + + + + <html><head/><body><p>Here you can choose from a predefined list of paste services, or input the URL of a different paste service of your choice, provided it supports the same protocol as 0x0.st, that is POST a file parameter to the URL and return a link in the response body.</p></body></html> + + + Qt::RichText + + + true + + + true + + + + + + + + + + Microsoft Secured Account + + + + + + Qt::Horizontal + + + + + + + Note: you probably don't need to set this if logging in via Microsoft Secured Account already works. + + + Qt::RichText + + + true + + + + + + + (Default) + + + + + + + Enter a custom client ID for Microsoft Secured Account here. + + + Qt::RichText + + + true + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + tabWidget + + + + diff --git a/launcher/ui/pages/global/PastePage.cpp b/launcher/ui/pages/global/PastePage.cpp deleted file mode 100644 index 7c69e1a4..00000000 --- a/launcher/ui/pages/global/PastePage.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/* Copyright 2013-2021 MultiMC & PolyMC 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. - */ - -#include "PastePage.h" -#include "ui_PastePage.h" - -#include -#include -#include -#include -#include - -#include "settings/SettingsObject.h" -#include "tools/BaseProfiler.h" -#include "Application.h" - -PastePage::PastePage(QWidget *parent) : - QWidget(parent), - ui(new Ui::PastePage) -{ - static QRegularExpression validUrlRegExp("https?://.+"); - ui->setupUi(this); - ui->urlChoices->setValidator(new QRegularExpressionValidator(validUrlRegExp, ui->urlChoices)); - ui->tabWidget->tabBar()->hide();\ - loadSettings(); -} - -PastePage::~PastePage() -{ - delete ui; -} - -void PastePage::loadSettings() -{ - auto s = APPLICATION->settings(); - QString pastebinURL = s->get("PastebinURL").toString(); - ui->urlChoices->setCurrentText(pastebinURL); -} - -void PastePage::applySettings() -{ - auto s = APPLICATION->settings(); - QString pastebinURL = ui->urlChoices->currentText(); - s->set("PastebinURL", pastebinURL); -} - -bool PastePage::apply() -{ - applySettings(); - return true; -} diff --git a/launcher/ui/pages/global/PastePage.h b/launcher/ui/pages/global/PastePage.h deleted file mode 100644 index d475dfd9..00000000 --- a/launcher/ui/pages/global/PastePage.h +++ /dev/null @@ -1,60 +0,0 @@ -/* 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 "ui/pages/BasePage.h" -#include - -namespace Ui { -class PastePage; -} - -class PastePage : public QWidget, public BasePage -{ - Q_OBJECT - -public: - explicit PastePage(QWidget *parent = 0); - ~PastePage(); - - QString displayName() const override - { - return tr("Log Upload"); - } - QIcon icon() const override - { - return APPLICATION->getThemedIcon("log"); - } - QString id() const override - { - return "log-upload"; - } - QString helpPage() const override - { - return "Log-Upload"; - } - virtual bool apply() override; - -private: - void loadSettings(); - void applySettings(); - -private: - Ui::PastePage *ui; -}; - diff --git a/launcher/ui/pages/global/PastePage.ui b/launcher/ui/pages/global/PastePage.ui deleted file mode 100644 index 2d13a765..00000000 --- a/launcher/ui/pages/global/PastePage.ui +++ /dev/null @@ -1,127 +0,0 @@ - - - PastePage - - - - 0 - 0 - 491 - 474 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 0 - - - - Tab 1 - - - - - - Pastebin URL - - - - - - Qt::Horizontal - - - - - - - - 10 - - - - <html><head/><body><p>Note: only input that starts with <span style=" font-weight:600;">http://</span> or <span style=" font-weight:600;">https://</span> will be accepted.</p></body></html> - - - false - - - - - - - true - - - QComboBox::NoInsert - - - - https://0x0.st - - - - - https://paste.polymc.org - - - - - - - - <html><head/><body><p>Here you can choose from a predefined list of paste services, or input the URL of a different paste service of your choice, provided it supports the same protocol as 0x0.st, that is POST a file parameter to the URL and return a link in the response body.</p></body></html> - - - Qt::RichText - - - true - - - true - - - - - - - - - - Qt::Vertical - - - - 20 - 216 - - - - - - - - - - - - tabWidget - - - - -- cgit