aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorflow <flowlnlnln@gmail.com>2022-05-26 20:09:07 -0300
committerGitHub <noreply@github.com>2022-05-26 20:09:07 -0300
commit3ff26d5cfe293c635655d35e96d093ef0b383dc2 (patch)
tree842b775750797c8e73f39611ff2008ebe968e3ec /launcher
parent88c1e504b03da380f7877abf944a1ae6fb25b950 (diff)
parente50ec31351fb226028fef5d746ecc59c9d51fecb (diff)
downloadPrismLauncher-3ff26d5cfe293c635655d35e96d093ef0b383dc2.tar.gz
PrismLauncher-3ff26d5cfe293c635655d35e96d093ef0b383dc2.tar.bz2
PrismLauncher-3ff26d5cfe293c635655d35e96d093ef0b383dc2.zip
Merge pull request #642 from ryanccn/metaserver-show-default
Show default metaserver in settings
Diffstat (limited to 'launcher')
-rw-r--r--launcher/ui/pages/global/APIPage.cpp3
-rw-r--r--launcher/ui/pages/global/APIPage.ui2
2 files changed, 4 insertions, 1 deletions
diff --git a/launcher/ui/pages/global/APIPage.cpp b/launcher/ui/pages/global/APIPage.cpp
index 6ad243dd..5d812d07 100644
--- a/launcher/ui/pages/global/APIPage.cpp
+++ b/launcher/ui/pages/global/APIPage.cpp
@@ -48,6 +48,7 @@
#include "tools/BaseProfiler.h"
#include "Application.h"
#include "net/PasteUpload.h"
+#include "BuildConfig.h"
APIPage::APIPage(QWidget *parent) :
QWidget(parent),
@@ -76,6 +77,8 @@ APIPage::APIPage(QWidget *parent) :
ui->baseURLEntry->setValidator(new QRegularExpressionValidator(validUrlRegExp, ui->baseURLEntry));
ui->tabWidget->tabBar()->hide();
+ ui->metaURL->setPlaceholderText(BuildConfig.META_URL);
+
loadSettings();
resetBaseURLNote();
diff --git a/launcher/ui/pages/global/APIPage.ui b/launcher/ui/pages/global/APIPage.ui
index 24189c5c..cf15065b 100644
--- a/launcher/ui/pages/global/APIPage.ui
+++ b/launcher/ui/pages/global/APIPage.ui
@@ -146,7 +146,7 @@
<item>
<widget class="QLineEdit" name="metaURL">
<property name="placeholderText">
- <string>(Default)</string>
+ <string/>
</property>
</widget>
</item>