Revert "NOISSUE Import page is now a MultiMC pack page"

This reverts commit f74e3db804f2fb3d73cbf7ab5fbdb12ecea0f259.

3 files changed, 28 insertions, 23 deletions

diff --git a/application/pages/modplatform/MultiMCPage.cpp b/application/pages/modplatform/ImportPage.cpp
index c98596c2..3910dfda 100644
--- a/application/pages/modplatform/MultiMCPage.cpp
+++ b/application/pages/modplatform/ImportPage.cpp
@@ -1,5 +1,5 @@
-#include "MultiMCPage.h"
-#include "ui_MultiMCPage.h"
+#include "ImportPage.h"
+#include "ui_ImportPage.h"
 
 #include "MultiMC.h"
 #include "dialogs/NewInstanceDialog.h"
@@ -30,30 +30,30 @@ public:
     }
 };
 
-MultiMCPage::MultiMCPage(NewInstanceDialog* dialog, QWidget *parent)
-    : QWidget(parent), ui(new Ui::MultiMCPage), dialog(dialog)
+ImportPage::ImportPage(NewInstanceDialog* dialog, QWidget *parent)
+    : QWidget(parent), ui(new Ui::ImportPage), dialog(dialog)
 {
     ui->setupUi(this);
     ui->modpackEdit->setValidator(new UrlValidator(ui->modpackEdit));
-    connect(ui->modpackEdit, &QLineEdit::textChanged, this, &MultiMCPage::updateState);
+    connect(ui->modpackEdit, &QLineEdit::textChanged, this, &ImportPage::updateState);
 }
 
-MultiMCPage::~MultiMCPage()
+ImportPage::~ImportPage()
 {
     delete ui;
 }
 
-bool MultiMCPage::shouldDisplay() const
+bool ImportPage::shouldDisplay() const
 {
     return true;
 }
 
-void MultiMCPage::openedImpl()
+void ImportPage::openedImpl()
 {
     updateState();
 }
 
-void MultiMCPage::updateState()
+void ImportPage::updateState()
 {
     if(!isOpened)
     {
@@ -75,6 +75,11 @@ void MultiMCPage::updateState()
         }
         else
         {
+            if(input.endsWith("?client=y")) {
+                input.chop(9);
+                input.append("/file");
+                url = QUrl::fromUserInput(input);
+            }
             // hook, line and sinker.
             QFileInfo fi(url.fileName());
             dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url));
@@ -86,13 +91,13 @@ void MultiMCPage::updateState()
     }
 }
 
-void MultiMCPage::setUrl(const QString& url)
+void ImportPage::setUrl(const QString& url)
 {
     ui->modpackEdit->setText(url);
     updateState();
 }
 
-void MultiMCPage::on_modpackBtn_clicked()
+void ImportPage::on_modpackBtn_clicked()
 {
     const QUrl url = QFileDialog::getOpenFileUrl(this, tr("Choose modpack"), modpackUrl(), tr("Zip (*.zip)"));
     if (url.isValid())
@@ -109,7 +114,7 @@ void MultiMCPage::on_modpackBtn_clicked()
 }
 
 
-QUrl MultiMCPage::modpackUrl() const
+QUrl ImportPage::modpackUrl() const
 {
     const QUrl url(ui->modpackEdit->text());
     if (url.isValid() && !url.isRelative() && !url.host().isEmpty())
diff --git a/application/pages/modplatform/MultiMCPage.h b/application/pages/modplatform/ImportPage.h
index 1d9b7744..3afb0045 100644
--- a/application/pages/modplatform/MultiMCPage.h
+++ b/application/pages/modplatform/ImportPage.h
@@ -23,33 +23,33 @@
 
 namespace Ui
 {
-class MultiMCPage;
+class ImportPage;
 }
 
 class NewInstanceDialog;
 
-class MultiMCPage : public QWidget, public BasePage
+class ImportPage : public QWidget, public BasePage
 {
     Q_OBJECT
 
 public:
-    explicit MultiMCPage(NewInstanceDialog* dialog, QWidget *parent = 0);
-    virtual ~MultiMCPage();
+    explicit ImportPage(NewInstanceDialog* dialog, QWidget *parent = 0);
+    virtual ~ImportPage();
     virtual QString displayName() const override
     {
-        return tr("MultiMC");
+        return tr("Import from zip");
     }
     virtual QIcon icon() const override
     {
-        return MMC->getThemedIcon("multimc");
+        return MMC->getThemedIcon("viewfolder");
     }
     virtual QString id() const override
     {
-        return "multimc";
+        return "import";
     }
     virtual QString helpPage() const override
     {
-        return "MultiMC-packs";
+        return "Zip-import";
     }
     virtual bool shouldDisplay() const override;
 
@@ -64,7 +64,7 @@ private:
     QUrl modpackUrl() const;
 
 private:
-    Ui::MultiMCPage *ui = nullptr;
+    Ui::ImportPage *ui = nullptr;
     NewInstanceDialog* dialog = nullptr;
 };
 
diff --git a/application/pages/modplatform/MultiMCPage.ui b/application/pages/modplatform/ImportPage.ui
index dc329c4c..eb63cbe9 100644
--- a/application/pages/modplatform/MultiMCPage.ui
+++ b/application/pages/modplatform/ImportPage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>MultiMCPage</class>
- <widget class="QWidget" name="MultiMCPage">
+ <class>ImportPage</class>
+ <widget class="QWidget" name="ImportPage">
   <property name="geometry">
    <rect>
     <x>0</x>