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/InstancePageProvider.h | 95 ++++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 45 deletions(-)

(limited to 'application/InstancePageProvider.h')

diff --git a/application/InstancePageProvider.h b/application/InstancePageProvider.h
index 9dda7859..dde36aef 100644
--- a/application/InstancePageProvider.h
+++ b/application/InstancePageProvider.h
@@ -15,57 +15,62 @@
 #include "pages/instance/OtherLogsPage.h"
 #include "pages/instance/LegacyUpgradePage.h"
 #include "pages/instance/WorldListPage.h"
+#include "pages/instance/ServersPage.h"
+#include "pages/instance/GameOptionsPage.h"
 
+#include "Env.h"
 
 class InstancePageProvider : public QObject, public BasePageProvider
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit InstancePageProvider(InstancePtr parent)
-	{
-		inst = parent;
-	}
+    explicit InstancePageProvider(InstancePtr parent)
+    {
+        inst = parent;
+    }
 
-	virtual ~InstancePageProvider() {};
-	virtual QList<BasePage *> getPages() override
-	{
-		QList<BasePage *> values;
-		values.append(new LogPage(inst));
-		std::shared_ptr<MinecraftInstance> onesix = std::dynamic_pointer_cast<MinecraftInstance>(inst);
-		if(onesix)
-		{
-			values.append(new VersionPage(onesix.get()));
-			auto modsPage = new ModFolderPage(onesix.get(), onesix->loaderModList(), "mods", "loadermods", tr("Loader mods"), "Loader-mods");
-			modsPage->setFilter("%1 (*.zip *.jar *.litemod)");
-			values.append(modsPage);
-			values.append(new CoreModFolderPage(onesix.get(), onesix->coreModList(), "coremods", "coremods", tr("Core mods"), "Core-mods"));
-			values.append(new ResourcePackPage(onesix.get()));
-			values.append(new TexturePackPage(onesix.get()));
-			values.append(new NotesPage(onesix.get()));
-			values.append(new WorldListPage(onesix.get(), onesix->worldList(), "worlds", "worlds", tr("Worlds"), "Worlds"));
-			values.append(new ScreenshotsPage(FS::PathCombine(onesix->minecraftRoot(), "screenshots")));
-			values.append(new InstanceSettingsPage(onesix.get()));
-		}
-		std::shared_ptr<LegacyInstance> legacy = std::dynamic_pointer_cast<LegacyInstance>(inst);
-		if(legacy)
-		{
-			values.append(new LegacyUpgradePage(legacy));
-			values.append(new NotesPage(legacy.get()));
-			values.append(new WorldListPage(legacy.get(), legacy->worldList(), "worlds", "worlds", tr("Worlds"), "Worlds"));
-			values.append(new ScreenshotsPage(FS::PathCombine(legacy->minecraftRoot(), "screenshots")));
-		}
-		auto logMatcher = inst->getLogFileMatcher();
-		if(logMatcher)
-		{
-			values.append(new OtherLogsPage(inst->getLogFileRoot(), logMatcher));
-		}
-		return values;
-	}
+    virtual ~InstancePageProvider() {};
+    virtual QList<BasePage *> getPages() override
+    {
+        QList<BasePage *> values;
+        values.append(new LogPage(inst));
+        std::shared_ptr<MinecraftInstance> onesix = std::dynamic_pointer_cast<MinecraftInstance>(inst);
+        if(onesix)
+        {
+            values.append(new VersionPage(onesix.get()));
+            auto modsPage = new ModFolderPage(onesix.get(), onesix->loaderModList(), "mods", "loadermods", tr("Loader mods"), "Loader-mods");
+            modsPage->setFilter("%1 (*.zip *.jar *.litemod)");
+            values.append(modsPage);
+            values.append(new CoreModFolderPage(onesix.get(), onesix->coreModList(), "coremods", "coremods", tr("Core mods"), "Core-mods"));
+            values.append(new ResourcePackPage(onesix.get()));
+            values.append(new TexturePackPage(onesix.get()));
+            values.append(new NotesPage(onesix.get()));
+            values.append(new WorldListPage(onesix.get(), onesix->worldList()));
+            values.append(new ServersPage(onesix.get()));
+            // values.append(new GameOptionsPage(onesix.get()));
+            values.append(new ScreenshotsPage(FS::PathCombine(onesix->gameRoot(), "screenshots")));
+            values.append(new InstanceSettingsPage(onesix.get()));
+        }
+        std::shared_ptr<LegacyInstance> legacy = std::dynamic_pointer_cast<LegacyInstance>(inst);
+        if(legacy)
+        {
+            values.append(new LegacyUpgradePage(legacy));
+            values.append(new NotesPage(legacy.get()));
+            values.append(new WorldListPage(legacy.get(), legacy->worldList()));
+            values.append(new ScreenshotsPage(FS::PathCombine(legacy->gameRoot(), "screenshots")));
+        }
+        auto logMatcher = inst->getLogFileMatcher();
+        if(logMatcher)
+        {
+            values.append(new OtherLogsPage(inst->getLogFileRoot(), logMatcher));
+        }
+        return values;
+    }
 
-	virtual QString dialogTitle() override
-	{
-		return tr("Edit Instance (%1)").arg(inst->name());
-	}
+    virtual QString dialogTitle() override
+    {
+        return tr("Edit Instance (%1)").arg(inst->name());
+    }
 protected:
-	InstancePtr inst;
+    InstancePtr inst;
 };
-- 
cgit v1.2.3