From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 application/dialogs/NewInstanceDialog.h | 56 +++++++++++++++++----------------
 1 file changed, 29 insertions(+), 27 deletions(-)

(limited to 'application/dialogs/NewInstanceDialog.h')

diff --git a/application/dialogs/NewInstanceDialog.h b/application/dialogs/NewInstanceDialog.h
index 1448d225..0b8b2fb8 100644
--- a/application/dialogs/NewInstanceDialog.h
+++ b/application/dialogs/NewInstanceDialog.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,49 +29,51 @@ class NewInstanceDialog;
 class PageContainer;
 class QDialogButtonBox;
 class ImportPage;
+class TwitchPage;
 
 class NewInstanceDialog : public QDialog, public BasePageProvider
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit NewInstanceDialog(const QString & initialGroup, const QString & url = QString(), QWidget *parent = 0);
-	~NewInstanceDialog();
+    explicit NewInstanceDialog(const QString & initialGroup, const QString & url = QString(), QWidget *parent = 0);
+    ~NewInstanceDialog();
 
-	void updateDialogState();
+    void updateDialogState();
 
-	void setSuggestedPack(const QString & name = QString(), InstanceTask * task = nullptr);
-	void setSuggestedIconFromFile(const QString &path, const QString &name);
+    void setSuggestedPack(const QString & name = QString(), InstanceTask * task = nullptr);
+    void setSuggestedIconFromFile(const QString &path, const QString &name);
 
-	InstanceTask * extractTask();
+    InstanceTask * extractTask();
 
-	QString dialogTitle() override;
-	QList<BasePage *> getPages() override;
+    QString dialogTitle() override;
+    QList<BasePage *> getPages() override;
 
-	QString instName() const;
-	QString instGroup() const;
-	QString iconKey() const;
+    QString instName() const;
+    QString instGroup() const;
+    QString iconKey() const;
 
 public slots:
-	void accept() override;
-	void reject() override;
+    void accept() override;
+    void reject() override;
 
 private slots:
-	void on_iconButton_clicked();
-	void on_instNameTextBox_textChanged(const QString &arg1);
+    void on_iconButton_clicked();
+    void on_instNameTextBox_textChanged(const QString &arg1);
 
 private:
-	Ui::NewInstanceDialog *ui = nullptr;
-	PageContainer * m_container = nullptr;
-	QDialogButtonBox * m_buttons = nullptr;
+    Ui::NewInstanceDialog *ui = nullptr;
+    PageContainer * m_container = nullptr;
+    QDialogButtonBox * m_buttons = nullptr;
 
-	QString InstIconKey;
-	ImportPage *importPage = nullptr;
-	std::unique_ptr<InstanceTask> creationTask;
+    QString InstIconKey;
+    ImportPage *importPage = nullptr;
+    TwitchPage *twitchPage = nullptr;
+    std::unique_ptr<InstanceTask> creationTask;
 
-	bool importIcon = false;
-	QString importIconPath;
-	QString importIconName;
+    bool importIcon = false;
+    QString importIconPath;
+    QString importIconName;
 
-	void importIconNow();
+    void importIconNow();
 };
-- 
cgit v1.2.3