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

GH-2859 remove twitch page and modpack import from URL

Browse Source 
The functionality was broken, beyond repair and an ongoing maintenance
nightmare.
This commit is contained in:
Petr Mrázek
2019-11-18 00:38:36 +01:00
parent 47ed2f48d4
commit af5120c828
12 changed files with 2 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/dialogs/NewInstanceDialog.cpp
View File

@ -35,7 +35,6 @@
#include "widgets/PageContainer.h"
#include <pages/modplatform/VanillaPage.h>
#include <pages/modplatform/legacy_ftb/Page.h>
#include <pages/modplatform/TwitchPage.h>
#include <pages/modplatform/ImportPage.h>
@ -95,14 +94,8 @@ NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString
if(!url.isEmpty())
{
QUrl actualUrl(url);
if(actualUrl.host() == "www.curseforge.com") {
m_container->selectPage("twitch");
twitchPage->setUrl(url);
}
else {
m_container->selectPage("import");
importPage->setUrl(url);
}
m_container->selectPage("import");
importPage->setUrl(url);
}
updateDialogState();
@ -126,13 +119,11 @@ void NewInstanceDialog::accept()
QList<BasePage *> NewInstanceDialog::getPages()
{
importPage = new ImportPage(this);
twitchPage = new TwitchPage(this);
return
{
new VanillaPage(this),
importPage,
new LegacyFTB::Page(this),
twitchPage
};
}

2
application/dialogs/NewInstanceDialog.h
View File

@ -29,7 +29,6 @@ class NewInstanceDialog;
class PageContainer;
class QDialogButtonBox;
class ImportPage;
class TwitchPage;
class NewInstanceDialog : public QDialog, public BasePageProvider
{
@ -68,7 +67,6 @@ private:
QString InstIconKey;
ImportPage *importPage = nullptr;
TwitchPage *twitchPage = nullptr;
std::unique_ptr<InstanceTask> creationTask;
bool importIcon = false;