diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-02 18:25:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-02 18:25:51 +0200 |
| commit | 01d3eea379e7cb843104130b205e68147c6d6f27 (patch) | |
| tree | 19d912541fb29d540f71f97576469b75c279ef62 /launcher/ui/dialogs | |
| parent | 39d7bc6c24922c2d6e3d6f7eb2ab7efb9b35940a (diff) | |
| parent | f13eccb03d053453fd063850a35d7d17d76f9ce3 (diff) | |
| download | PrismLauncher-01d3eea379e7cb843104130b205e68147c6d6f27.tar.gz PrismLauncher-01d3eea379e7cb843104130b205e68147c6d6f27.tar.bz2 PrismLauncher-01d3eea379e7cb843104130b205e68147c6d6f27.zip | |
Merge pull request #1359 from Trial97/import
Diffstat (limited to 'launcher/ui/dialogs')
| -rw-r--r-- | launcher/ui/dialogs/NewInstanceDialog.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/launcher/ui/dialogs/NewInstanceDialog.cpp b/launcher/ui/dialogs/NewInstanceDialog.cpp index 7b9bb944..76b139fc 100644 --- a/launcher/ui/dialogs/NewInstanceDialog.cpp +++ b/launcher/ui/dialogs/NewInstanceDialog.cpp @@ -33,38 +33,37 @@ * limitations under the License. */ -#include "Application.h" #include "NewInstanceDialog.h" +#include "Application.h" +#include "ui/pages/modplatform/import_ftb/ImportFTBPage.h" #include "ui_NewInstanceDialog.h" #include <BaseVersion.h> +#include <InstanceList.h> #include <icons/IconList.h> #include <tasks/Task.h> -#include <InstanceList.h> -#include "VersionSelectDialog.h" -#include "ProgressDialog.h" #include "IconPickerDialog.h" +#include "ProgressDialog.h" +#include "VersionSelectDialog.h" +#include <QDialogButtonBox> +#include <QFileDialog> #include <QLayout> #include <QPushButton> -#include <QFileDialog> #include <QValidator> -#include <QDialogButtonBox> #include <utility> -#include "ui/widgets/PageContainer.h" #include "ui/pages/modplatform/CustomPage.h" +#include "ui/pages/modplatform/ImportPage.h" #include "ui/pages/modplatform/atlauncher/AtlPage.h" -#include "ui/pages/modplatform/legacy_ftb/Page.h" #include "ui/pages/modplatform/flame/FlamePage.h" -#include "ui/pages/modplatform/ImportPage.h" +#include "ui/pages/modplatform/legacy_ftb/Page.h" #include "ui/pages/modplatform/modrinth/ModrinthPage.h" #include "ui/pages/modplatform/technic/TechnicPage.h" +#include "ui/widgets/PageContainer.h" - - -NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString & url, QWidget *parent) +NewInstanceDialog::NewInstanceDialog(const QString& initialGroup, const QString& url, QWidget* parent) : QDialog(parent), ui(new Ui::NewInstanceDialog) { ui->setupUi(this); @@ -168,6 +167,7 @@ QList<BasePage *> NewInstanceDialog::getPages() if (APPLICATION->capabilities() & Application::SupportsFlame) pages.append(new FlamePage(this)); pages.append(new LegacyFTB::Page(this)); + pages.append(new FTBImportAPP::ImportFTBPage(this)); pages.append(new ModrinthPage(this)); pages.append(new TechnicPage(this)); |