0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

preliminary stuff for paste.ee removal

Browse Source
This commit is contained in:
swirl 2022-01-14 18:20:06 -05:00
parent b4f750e7db
commit a62155c1c9
No known key found for this signature in database
GPG Key ID: 46507311CD292A08
8 changed files with 40 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -68,9 +68,6 @@ set(Launcher_NOTIFICATION_URL "" CACHE STRING "URL for checking for notification
# The metadata server # The metadata server
set(Launcher_META_URL "https://meta.multimc.org/v1/" CACHE STRING "URL to fetch Launcher's meta files from.") 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 # Imgur API Client ID
set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application") set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application")

1
buildconfig/BuildConfig.cpp.in
View File

@ -42,7 +42,6 @@ Config::Config()
VERSION_STR = "@Launcher_VERSION_STRING@"; VERSION_STR = "@Launcher_VERSION_STRING@";
NEWS_RSS_URL = "@Launcher_NEWS_RSS_URL@"; NEWS_RSS_URL = "@Launcher_NEWS_RSS_URL@";
PASTE_EE_KEY = "@Launcher_PASTE_EE_API_KEY@";
IMGUR_CLIENT_ID = "@Launcher_IMGUR_CLIENT_ID@"; IMGUR_CLIENT_ID = "@Launcher_IMGUR_CLIENT_ID@";
MSA_CLIENT_ID = "@Launcher_MSA_CLIENT_ID@"; MSA_CLIENT_ID = "@Launcher_MSA_CLIENT_ID@";
META_URL = "@Launcher_META_URL@"; META_URL = "@Launcher_META_URL@";

5
buildconfig/BuildConfig.h
View File

@ -67,11 +67,6 @@ public:
*/ */
QString NEWS_RSS_URL; 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 * Client ID you can get from Imgur when you register an application
*/ */

4
launcher/Application.cpp
View File

@ -14,7 +14,7 @@
#include "ui/pages/global/ProxyPage.h" #include "ui/pages/global/ProxyPage.h"
#include "ui/pages/global/ExternalToolsPage.h" #include "ui/pages/global/ExternalToolsPage.h"
#include "ui/pages/global/AccountListPage.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/pages/global/CustomCommandsPage.h"
#include "ui/themes/ITheme.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<ProxyPage>();
m_globalSettingsProvider->addPage<ExternalToolsPage>(); m_globalSettingsProvider->addPage<ExternalToolsPage>();
m_globalSettingsProvider->addPage<AccountListPage>(); m_globalSettingsProvider->addPage<AccountListPage>();
m_globalSettingsProvider->addPage<PasteEEPage>(); m_globalSettingsProvider->addPage<PastePage>();
} }
qDebug() << "<> Settings loaded."; qDebug() << "<> Settings loaded.";
} }

6
launcher/CMakeLists.txt
View File

@ -711,8 +711,8 @@ SET(LAUNCHER_SOURCES
ui/pages/global/LauncherPage.h ui/pages/global/LauncherPage.h
ui/pages/global/ProxyPage.cpp ui/pages/global/ProxyPage.cpp
ui/pages/global/ProxyPage.h ui/pages/global/ProxyPage.h
ui/pages/global/PasteEEPage.cpp ui/pages/global/PastePage.cpp
ui/pages/global/PasteEEPage.h ui/pages/global/PastePage.h
# GUI - platform pages # GUI - platform pages
ui/pages/modplatform/VanillaPage.cpp ui/pages/modplatform/VanillaPage.cpp
@ -848,7 +848,7 @@ qt5_wrap_ui(LAUNCHER_UI
ui/pages/global/AccountListPage.ui ui/pages/global/AccountListPage.ui
ui/pages/global/JavaPage.ui ui/pages/global/JavaPage.ui
ui/pages/global/LauncherPage.ui ui/pages/global/LauncherPage.ui
ui/pages/global/PasteEEPage.ui ui/pages/global/PastePage.ui
ui/pages/global/ProxyPage.ui ui/pages/global/ProxyPage.ui
ui/pages/global/MinecraftPage.ui ui/pages/global/MinecraftPage.ui
ui/pages/global/ExternalToolsPage.ui ui/pages/global/ExternalToolsPage.ui

22
launcher/ui/pages/global/PasteEEPage.cpp → launcher/ui/pages/global/PastePage.cpp
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -13,8 +13,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include "PasteEEPage.h" #include "PastePage.h"
#include "ui_PasteEEPage.h" #include "ui_PastePage.h"
#include <QMessageBox> #include <QMessageBox>
#include <QFileDialog> #include <QFileDialog>
@ -25,22 +25,22 @@
#include "tools/BaseProfiler.h" #include "tools/BaseProfiler.h"
#include "Application.h" #include "Application.h"
PasteEEPage::PasteEEPage(QWidget *parent) : PastePage::PastePage(QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::PasteEEPage) ui(new Ui::PastePage)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->tabWidget->tabBar()->hide();\ ui->tabWidget->tabBar()->hide();\
connect(ui->customAPIkeyEdit, &QLineEdit::textEdited, this, &PasteEEPage::textEdited); connect(ui->customAPIkeyEdit, &QLineEdit::textEdited, this, &PastePage::textEdited);
loadSettings(); loadSettings();
} }
PasteEEPage::~PasteEEPage() PastePage::~PastePage()
{ {
delete ui; delete ui;
} }
void PasteEEPage::loadSettings() void PastePage::loadSettings()
{ {
auto s = APPLICATION->settings(); auto s = APPLICATION->settings();
QString keyToUse = s->get("PasteEEAPIKey").toString(); QString keyToUse = s->get("PasteEEAPIKey").toString();
@ -55,7 +55,7 @@ void PasteEEPage::loadSettings()
} }
} }
void PasteEEPage::applySettings() void PastePage::applySettings()
{ {
auto s = APPLICATION->settings(); auto s = APPLICATION->settings();
@ -69,13 +69,13 @@ void PasteEEPage::applySettings()
s->set("PasteEEAPIKey", pasteKeyToUse); s->set("PasteEEAPIKey", pasteKeyToUse);
} }
bool PasteEEPage::apply() bool PastePage::apply()
{ {
applySettings(); applySettings();
return true; return true;
} }
void PasteEEPage::textEdited(const QString& text) void PastePage::textEdited(const QString& text)
{ {
ui->customButton->setChecked(true); ui->customButton->setChecked(true);
} }

11
launcher/ui/pages/global/PasteEEPage.h → launcher/ui/pages/global/PastePage.h
View File

@ -21,16 +21,16 @@
#include <Application.h> #include <Application.h>
namespace Ui { namespace Ui {
class PasteEEPage; class PastePage;
} }
class PasteEEPage : public QWidget, public BasePage class PastePage : public QWidget, public BasePage
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit PasteEEPage(QWidget *parent = 0); explicit PastePage(QWidget *parent = 0);
~PasteEEPage(); ~PastePage();
QString displayName() const override QString displayName() const override
{ {
@ -58,5 +58,6 @@ private slots:
void textEdited(const QString &text); void textEdited(const QString &text);
private: private:
Ui::PasteEEPage *ui; Ui::PastePage *ui;
}; };

55
launcher/ui/pages/global/PasteEEPage.ui → launcher/ui/pages/global/PastePage.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>PasteEEPage</class> <class>PastePage</class>
<widget class="QWidget" name="PasteEEPage"> <widget class="QWidget" name="PastePage">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -36,39 +36,9 @@
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>paste.ee API key</string> <string>Pastebin Site</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_10"> <layout class="QVBoxLayout" name="verticalLayout_10">
<item>
<widget class="QRadioButton" name="multimcButton">
<property name="text">
<string>MultiMC key - 12MB &amp;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>&amp;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> <item>
<widget class="Line" name="line"> <widget class="Line" name="line">
<property name="orientation"> <property name="orientation">
@ -76,10 +46,24 @@
</property> </property>
</widget> </widget>
</item> </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> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://paste.ee&quot;&gt;paste.ee&lt;/a&gt; is used by MultiMC for log uploads. If you have a &lt;a href=&quot;https://paste.ee&quot;&gt;paste.ee&lt;/a&gt; account, you can add your API key here and have your uploaded logs paired with your account.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <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>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::RichText</enum> <enum>Qt::RichText</enum>
@ -116,9 +100,6 @@
</widget> </widget>
<tabstops> <tabstops>
<tabstop>tabWidget</tabstop> <tabstop>tabWidget</tabstop>
<tabstop>multimcButton</tabstop>
<tabstop>customButton</tabstop>
<tabstop>customAPIkeyEdit</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>