preliminary stuff for paste.ee removal
This commit is contained in:
parent
b4f750e7db
commit
a62155c1c9
@ -68,9 +68,6 @@ set(Launcher_NOTIFICATION_URL "" CACHE STRING "URL for checking for notification
|
||||
# The metadata server
|
||||
set(Launcher_META_URL "https://meta.multimc.org/v1/" CACHE STRING "URL to fetch Launcher's meta files from.")
|
||||
|
||||
# paste.ee API key
|
||||
set(Launcher_PASTE_EE_API_KEY "utLvciUouSURFzfjPxLBf5W4ISsUX4pwBDF7N1AfZ" CACHE STRING "API key you can get from paste.ee when you register an account")
|
||||
|
||||
# Imgur API Client ID
|
||||
set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application")
|
||||
|
||||
|
@ -42,7 +42,6 @@ Config::Config()
|
||||
|
||||
VERSION_STR = "@Launcher_VERSION_STRING@";
|
||||
NEWS_RSS_URL = "@Launcher_NEWS_RSS_URL@";
|
||||
PASTE_EE_KEY = "@Launcher_PASTE_EE_API_KEY@";
|
||||
IMGUR_CLIENT_ID = "@Launcher_IMGUR_CLIENT_ID@";
|
||||
MSA_CLIENT_ID = "@Launcher_MSA_CLIENT_ID@";
|
||||
META_URL = "@Launcher_META_URL@";
|
||||
|
@ -67,11 +67,6 @@ public:
|
||||
*/
|
||||
QString NEWS_RSS_URL;
|
||||
|
||||
/**
|
||||
* API key you can get from paste.ee when you register an account
|
||||
*/
|
||||
QString PASTE_EE_KEY;
|
||||
|
||||
/**
|
||||
* Client ID you can get from Imgur when you register an application
|
||||
*/
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include "ui/pages/global/ProxyPage.h"
|
||||
#include "ui/pages/global/ExternalToolsPage.h"
|
||||
#include "ui/pages/global/AccountListPage.h"
|
||||
#include "ui/pages/global/PasteEEPage.h"
|
||||
#include "ui/pages/global/PastePage.h"
|
||||
#include "ui/pages/global/CustomCommandsPage.h"
|
||||
|
||||
#include "ui/themes/ITheme.h"
|
||||
@ -728,7 +728,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
|
||||
m_globalSettingsProvider->addPage<ProxyPage>();
|
||||
m_globalSettingsProvider->addPage<ExternalToolsPage>();
|
||||
m_globalSettingsProvider->addPage<AccountListPage>();
|
||||
m_globalSettingsProvider->addPage<PasteEEPage>();
|
||||
m_globalSettingsProvider->addPage<PastePage>();
|
||||
}
|
||||
qDebug() << "<> Settings loaded.";
|
||||
}
|
||||
|
@ -711,8 +711,8 @@ SET(LAUNCHER_SOURCES
|
||||
ui/pages/global/LauncherPage.h
|
||||
ui/pages/global/ProxyPage.cpp
|
||||
ui/pages/global/ProxyPage.h
|
||||
ui/pages/global/PasteEEPage.cpp
|
||||
ui/pages/global/PasteEEPage.h
|
||||
ui/pages/global/PastePage.cpp
|
||||
ui/pages/global/PastePage.h
|
||||
|
||||
# GUI - platform pages
|
||||
ui/pages/modplatform/VanillaPage.cpp
|
||||
@ -848,7 +848,7 @@ qt5_wrap_ui(LAUNCHER_UI
|
||||
ui/pages/global/AccountListPage.ui
|
||||
ui/pages/global/JavaPage.ui
|
||||
ui/pages/global/LauncherPage.ui
|
||||
ui/pages/global/PasteEEPage.ui
|
||||
ui/pages/global/PastePage.ui
|
||||
ui/pages/global/ProxyPage.ui
|
||||
ui/pages/global/MinecraftPage.ui
|
||||
ui/pages/global/ExternalToolsPage.ui
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright 2013-2021 MultiMC Contributors
|
||||
/* 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.
|
||||
@ -13,8 +13,8 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "PasteEEPage.h"
|
||||
#include "ui_PasteEEPage.h"
|
||||
#include "PastePage.h"
|
||||
#include "ui_PastePage.h"
|
||||
|
||||
#include <QMessageBox>
|
||||
#include <QFileDialog>
|
||||
@ -25,22 +25,22 @@
|
||||
#include "tools/BaseProfiler.h"
|
||||
#include "Application.h"
|
||||
|
||||
PasteEEPage::PasteEEPage(QWidget *parent) :
|
||||
PastePage::PastePage(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::PasteEEPage)
|
||||
ui(new Ui::PastePage)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
ui->tabWidget->tabBar()->hide();\
|
||||
connect(ui->customAPIkeyEdit, &QLineEdit::textEdited, this, &PasteEEPage::textEdited);
|
||||
connect(ui->customAPIkeyEdit, &QLineEdit::textEdited, this, &PastePage::textEdited);
|
||||
loadSettings();
|
||||
}
|
||||
|
||||
PasteEEPage::~PasteEEPage()
|
||||
PastePage::~PastePage()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void PasteEEPage::loadSettings()
|
||||
void PastePage::loadSettings()
|
||||
{
|
||||
auto s = APPLICATION->settings();
|
||||
QString keyToUse = s->get("PasteEEAPIKey").toString();
|
||||
@ -55,7 +55,7 @@ void PasteEEPage::loadSettings()
|
||||
}
|
||||
}
|
||||
|
||||
void PasteEEPage::applySettings()
|
||||
void PastePage::applySettings()
|
||||
{
|
||||
auto s = APPLICATION->settings();
|
||||
|
||||
@ -69,13 +69,13 @@ void PasteEEPage::applySettings()
|
||||
s->set("PasteEEAPIKey", pasteKeyToUse);
|
||||
}
|
||||
|
||||
bool PasteEEPage::apply()
|
||||
bool PastePage::apply()
|
||||
{
|
||||
applySettings();
|
||||
return true;
|
||||
}
|
||||
|
||||
void PasteEEPage::textEdited(const QString& text)
|
||||
void PastePage::textEdited(const QString& text)
|
||||
{
|
||||
ui->customButton->setChecked(true);
|
||||
}
|
@ -21,16 +21,16 @@
|
||||
#include <Application.h>
|
||||
|
||||
namespace Ui {
|
||||
class PasteEEPage;
|
||||
class PastePage;
|
||||
}
|
||||
|
||||
class PasteEEPage : public QWidget, public BasePage
|
||||
class PastePage : public QWidget, public BasePage
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit PasteEEPage(QWidget *parent = 0);
|
||||
~PasteEEPage();
|
||||
explicit PastePage(QWidget *parent = 0);
|
||||
~PastePage();
|
||||
|
||||
QString displayName() const override
|
||||
{
|
||||
@ -58,5 +58,6 @@ private slots:
|
||||
void textEdited(const QString &text);
|
||||
|
||||
private:
|
||||
Ui::PasteEEPage *ui;
|
||||
Ui::PastePage *ui;
|
||||
};
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>PasteEEPage</class>
|
||||
<widget class="QWidget" name="PasteEEPage">
|
||||
<class>PastePage</class>
|
||||
<widget class="QWidget" name="PastePage">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
@ -36,39 +36,9 @@
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_2">
|
||||
<property name="title">
|
||||
<string>paste.ee API key</string>
|
||||
<string>Pastebin Site</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_10">
|
||||
<item>
|
||||
<widget class="QRadioButton" name="multimcButton">
|
||||
<property name="text">
|
||||
<string>MultiMC key - 12MB &upload limit</string>
|
||||
</property>
|
||||
<attribute name="buttonGroup">
|
||||
<string notr="true">pasteButtonGroup</string>
|
||||
</attribute>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="customButton">
|
||||
<property name="text">
|
||||
<string>&Your own key - 12MB upload limit:</string>
|
||||
</property>
|
||||
<attribute name="buttonGroup">
|
||||
<string notr="true">pasteButtonGroup</string>
|
||||
</attribute>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="customAPIkeyEdit">
|
||||
<property name="echoMode">
|
||||
<enum>QLineEdit::Password</enum>
|
||||
</property>
|
||||
<property name="placeholderText">
|
||||
<string>Paste your API key here!</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="Line" name="line">
|
||||
<property name="orientation">
|
||||
@ -76,10 +46,24 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="comboBox">
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>0x0.st</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>paste.polymc.org</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><a href="https://paste.ee">paste.ee</a> is used by MultiMC for log uploads. If you have a <a href="https://paste.ee">paste.ee</a> account, you can add your API key here and have your uploaded logs paired with your account.</p></body></html></string>
|
||||
<string><html><head/><body><p>paste.polymc.org is a pastebin managed by PolyMC's lead maintainer. Something something trust</p></body></html></string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::RichText</enum>
|
||||
@ -116,9 +100,6 @@
|
||||
</widget>
|
||||
<tabstops>
|
||||
<tabstop>tabWidget</tabstop>
|
||||
<tabstop>multimcButton</tabstop>
|
||||
<tabstop>customButton</tabstop>
|
||||
<tabstop>customAPIkeyEdit</tabstop>
|
||||
</tabstops>
|
||||
<resources/>
|
||||
<connections/>
|
Loading…
Reference in New Issue
Block a user