CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PasteUpload task changed to use 0x0.st's protocol

Browse Source 
- Modified PasteUpload task to upload the log file to 0x0.st and other
  services with the same protocol.

- Modified Paste settings UI to allow the user to select a custom paste
  URL, simplified the settings page code.
This commit is contained in:
Lenny McLennington
2022-01-19 07:44:29 +00:00
parent a606b47a22
commit b50e584369
9 changed files with 51 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
launcher/ui/pages/global/PastePage.cpp
View File

@ -20,6 +20,7 @@
#include <QFileDialog>
#include <QStandardPaths>
#include <QTabBar>
#include <QVariant>
#include "settings/SettingsObject.h"
#include "tools/BaseProfiler.h"
@ -31,7 +32,6 @@ PastePage::PastePage(QWidget *parent) :
{
ui->setupUi(this);
ui->tabWidget->tabBar()->hide();\
connect(ui->customAPIkeyEdit, &QLineEdit::textEdited, this, &PastePage::textEdited);
loadSettings();
}
@ -43,23 +43,15 @@ PastePage::~PastePage()
void PastePage::loadSettings()
{
auto s = APPLICATION->settings();
QString pastebin = s->get("PastebinURL");
int index = ui->urlChoices->findText(pastebin);
ui->urlChoices->setCurrentIndex(index);
QString pastebinURL = s->get("PastebinURL").toString();
ui->urlChoices->setCurrentText(pastebinURL);
}
void PastePage::applySettings()
{
auto s = APPLICATION->settings();
QString pasteKeyToUse;
if (ui->customButton->isChecked())
pasteKeyToUse = ui->customAPIkeyEdit->text();
else
{
pasteKeyToUse = "multimc";
}
s->set("PasteEEAPIKey", pasteKeyToUse);
QString pastebinURL = ui->urlChoices->currentText();
s->set("PastebinURL", pastebinURL);
}
bool PastePage::apply()
@ -67,8 +59,3 @@ bool PastePage::apply()
applySettings();
return true;
}
void PastePage::textEdited(const QString& text)
{
ui->customButton->setChecked(true);
}

3
launcher/ui/pages/global/PastePage.h
View File

@ -54,9 +54,6 @@ private:
void loadSettings();
void applySettings();
private slots:
void textEdited(const QString &text);
private:
Ui::PastePage *ui;
};

17
launcher/ui/pages/global/PastePage.ui
View File

@ -36,7 +36,7 @@
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Pastebin Site</string>
<string>Pastebin URL</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
<item>
@ -48,14 +48,20 @@
</item>
<item>
<widget class="QComboBox" name="urlChoices">
<property name="editable">
<bool>true</bool>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
</property>
<item>
<property name="text">
<string>0x0.st</string>
<string>https://0x0.st</string>
</property>
</item>
<item>
<property name="text">
<string>paste.polymc.org</string>
<string>https://paste.polymc.org</string>
</property>
</item>
</widget>
@ -63,7 +69,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;paste.polymc.org is a pastebin managed by PolyMC's lead maintainer. Something something trust&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Here you can choose from a predefined list, or input the URL of a different paste service, provided that it supports the same protocol as 0x0.st, that is POST a file to the URL and return a link in the response body.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
@ -103,7 +109,4 @@
</tabstops>
<resources/>
<connections/>
<buttongroups>
<buttongroup name="pasteButtonGroup"/>
</buttongroups>
</ui>