dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make Services page nicer

Browse source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-03-24 13:23:53 +00:00
parent 4e6bfde723
commit a8ea072d36
No known key found for this signature in database
GPG key ID: 5E39D70B4C93C38E
2 changed files with 105 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

195
launcher/ui/pages/global/APIPage.ui
View file

@ -20,40 +20,12 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>-342</y> <y>-270</y>
<width>804</width> <width>807</width>
<height>946</height> <height>870</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox_ua">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>User Agent</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QLineEdit" name="userAgentLineEdit"/>
</item>
<item>
<widget class="QLabel" name="userAgentLabel">
<property name="text">
<string>Enter a custom User Agent here. The special string $LAUNCHER_VER will be replaced with the version of the launcher.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="groupBox_paste"> <widget class="QGroupBox" name="groupBox_paste">
<property name="title"> <property name="title">
@ -86,7 +58,7 @@
<item> <item>
<widget class="QLineEdit" name="baseURLEntry"> <widget class="QLineEdit" name="baseURLEntry">
<property name="placeholderText"> <property name="placeholderText">
<string/> <string>Use Default</string>
</property> </property>
<property name="clearButtonEnabled"> <property name="clearButtonEnabled">
<bool>true</bool> <bool>true</bool>
@ -128,7 +100,7 @@
<item> <item>
<widget class="QLineEdit" name="metaURL"> <widget class="QLineEdit" name="metaURL">
<property name="placeholderText"> <property name="placeholderText">
<string/> <string>Use Default</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -151,16 +123,48 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_ua">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>User Agent</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QLineEdit" name="userAgentLineEdit">
<property name="placeholderText">
<string>Use Default</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="userAgentLabel">
<property name="text">
<string>Enter a custom User Agent here. The special string $LAUNCHER_VER will be replaced with the version of the launcher.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="groupBox_msa"> <widget class="QGroupBox" name="groupBox_msa">
<property name="title"> <property name="title">
<string>&amp;Microsoft Authentication</string> <string>&amp;API Keys</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<widget class="QLabel" name="msaClientIDLabel"> <widget class="QLabel" name="msaClientIDLabel">
<property name="text"> <property name="text">
<string>&amp;Client ID</string> <string>&amp;Microsoft Authentation</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::RichText</enum> <enum>Qt::RichText</enum>
@ -179,7 +183,7 @@
<item> <item>
<widget class="QLineEdit" name="msaClientID"> <widget class="QLineEdit" name="msaClientID">
<property name="placeholderText"> <property name="placeholderText">
<string>(Default)</string> <string>Use Default</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -196,32 +200,23 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</widget> <spacer name="verticalSpacer">
</item> <property name="sizeType">
<item> <enum>QSizePolicy::Fixed</enum>
<widget class="QGroupBox" name="groupBox_modrinth">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>&amp;Modrinth</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QLineEdit" name="modrinthToken">
<property name="enabled">
<bool>true</bool>
</property> </property>
<property name="placeholderText"> <property name="sizeHint" stdset="0">
<string>(None)</string> <size>
<width>0</width>
<height>6</height>
</size>
</property> </property>
</widget> </spacer>
</item> </item>
<item row="0" column="0"> <item>
<widget class="QLabel" name="modrinthTokenLabel"> <widget class="QLabel" name="modrinthTokenLabel">
<property name="text"> <property name="text">
<string>&amp;API Token</string> <string>Mod&amp;rinth</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::RichText</enum> <enum>Qt::RichText</enum>
@ -237,7 +232,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item>
<widget class="QLineEdit" name="modrinthToken">
<property name="enabled">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>Use None</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: you only need to set this to access private data. Read the &lt;a href=&quot;https://docs.modrinth.com/api/#authentication&quot;&gt;documentation&lt;/a&gt; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: you only need to set this to access private data. Read the &lt;a href=&quot;https://docs.modrinth.com/api/#authentication&quot;&gt;documentation&lt;/a&gt; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -250,32 +255,23 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</widget> <spacer name="verticalSpacer_4">
</item> <property name="sizeType">
<item> <enum>QSizePolicy::Fixed</enum>
<widget class="QGroupBox" name="groupBox_flame">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>&amp;CurseForge</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="2" column="0">
<widget class="QLineEdit" name="flameKey">
<property name="enabled">
<bool>true</bool>
</property> </property>
<property name="placeholderText"> <property name="sizeHint" stdset="0">
<string>(Default)</string> <size>
<width>0</width>
<height>6</height>
</size>
</property> </property>
</widget> </spacer>
</item> </item>
<item row="1" column="0"> <item>
<widget class="QLabel" name="flameKeyLabel"> <widget class="QLabel" name="flameKeyLabel">
<property name="text"> <property name="text">
<string>API &amp;Key</string> <string>&amp;CurseForge</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::RichText</enum> <enum>Qt::RichText</enum>
@ -291,7 +287,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item>
<widget class="QLineEdit" name="flameKey">
<property name="enabled">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>Use Default</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>Note: you probably don't need to set this if CurseForge already works.</string> <string>Note: you probably don't need to set this if CurseForge already works.</string>
@ -301,26 +307,33 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</widget> <spacer name="verticalSpacer_3">
</item> <property name="sizeType">
<item> <enum>QSizePolicy::Fixed</enum>
<widget class="QGroupBox" name="groupBox"> </property>
<property name="title"> <property name="sizeHint" stdset="0">
<string>Technic</string> <size>
</property> <width>0</width>
<layout class="QVBoxLayout" name="verticalLayout_9"> <height>6</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="label_12">
<property name="text"> <property name="text">
<string>GUID Client ID</string> <string>&amp;Technic</string>
</property>
<property name="buddy">
<cstring>technicClientID</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="technicClientID"> <widget class="QLineEdit" name="technicClientID">
<property name="placeholderText"> <property name="placeholderText">
<string>(None)</string> <string>Use Default</string>
</property> </property>
</widget> </widget>
</item> </item>

2
launcher/ui/widgets/JavaSettingsWidget.cpp
View file

@ -298,7 +298,7 @@ void JavaSettingsWidget::updateThresholds()
m_ui->labelMaxMemNotice->setText(warningColour.arg(tr("Your maximum memory allocation is close to your system memory capacity."))); m_ui->labelMaxMemNotice->setText(warningColour.arg(tr("Your maximum memory allocation is close to your system memory capacity.")));
m_ui->labelMaxMemNotice->show(); m_ui->labelMaxMemNotice->show();
} else if (maxMem < minMem) { } else if (maxMem < minMem) {
m_ui->labelMaxMemNotice->setText(warningColour.arg(tr("Your maximum memory allocation is below the minimum memory allocation."))) m_ui->labelMaxMemNotice->setText(warningColour.arg(tr("Your maximum memory allocation is below the minimum memory allocation.")));
} else { } else {
m_ui->labelMaxMemNotice->hide(); m_ui->labelMaxMemNotice->hide();
} }