diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-13 20:05:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 20:05:16 -0700 |
| commit | 520594e5296b09205e55bc018b1f759df5725e96 (patch) | |
| tree | 07e334684062151c5fdf699e805d9326255a3dc3 /launcher/ui/pages/global | |
| parent | 8d7dcdfc5b2a231a1304878e25929e6f4ff4e338 (diff) | |
| parent | 94d4d12ee0a12572b2b661003f10cfbdda1b434a (diff) | |
| download | PrismLauncher-520594e5296b09205e55bc018b1f759df5725e96.tar.gz PrismLauncher-520594e5296b09205e55bc018b1f759df5725e96.tar.bz2 PrismLauncher-520594e5296b09205e55bc018b1f759df5725e96.zip | |
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/ui/pages/global')
| -rw-r--r-- | launcher/ui/pages/global/APIPage.cpp | 4 | ||||
| -rw-r--r-- | launcher/ui/pages/global/LauncherPage.ui | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/launcher/ui/pages/global/APIPage.cpp b/launcher/ui/pages/global/APIPage.cpp index dca1b3a6..668aa007 100644 --- a/launcher/ui/pages/global/APIPage.cpp +++ b/launcher/ui/pages/global/APIPage.cpp @@ -81,6 +81,8 @@ APIPage::APIPage(QWidget *parent) : connect(ui->pasteTypeComboBox, currentIndexChangedSignal, this, &APIPage::updateBaseURLPlaceholder); // This function needs to be called even when the ComboBox's index is still in its default state. updateBaseURLPlaceholder(ui->pasteTypeComboBox->currentIndex()); + // NOTE: this allows http://, but we replace that with https later anyway + ui->metaURL->setValidator(new QRegularExpressionValidator(validUrlRegExp, ui->metaURL)); ui->baseURLEntry->setValidator(new QRegularExpressionValidator(validUrlRegExp, ui->baseURLEntry)); ui->msaClientID->setValidator(new QRegularExpressionValidator(validMSAClientID, ui->msaClientID)); ui->flameKey->setValidator(new QRegularExpressionValidator(validFlameKey, ui->flameKey)); @@ -163,7 +165,7 @@ void APIPage::applySettings() QString msaClientID = ui->msaClientID->text(); s->set("MSAClientIDOverride", msaClientID); - QUrl metaURL = ui->metaURL->text(); + QUrl metaURL(ui->metaURL->text()); // Add required trailing slash if (!metaURL.isEmpty() && !metaURL.path().endsWith('/')) { diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui index d9116bfc..26408f44 100644 --- a/launcher/ui/pages/global/LauncherPage.ui +++ b/launcher/ui/pages/global/LauncherPage.ui @@ -169,7 +169,7 @@ <item> <widget class="QCheckBox" name="metadataDisableBtn"> <property name="toolTip"> - <string>Disable using metadata provided by mod providers (like Modrinth or Curseforge) for mods.</string> + <string>Disable using metadata provided by mod providers (like Modrinth or CurseForge) for mods.</string> </property> <property name="text"> <string>Disable using metadata for mods</string> |