InstanceManager now returns new Instance struct instead of instance name

moved most of the figuring out of instance parameters from InstanceManager to Instance, separated all the ui from it and put it in main.cpp
added ways to show single pages in the create instance dialog so they can be used when info is missing

1 files changed, 22 insertions, 10 deletions

diff --git a/src/createinstancedialogpages.h b/src/createinstancedialogpages.h
index 412f2d84..e239c196 100644
--- a/src/createinstancedialogpages.h
+++ b/src/createinstancedialogpages.h
@@ -37,16 +37,18 @@ public:
   Page(CreateInstanceDialog& dlg);
 
   virtual bool ready() const;
-  virtual bool skip() const;
   virtual void activated();
 
+  void setSkip(bool b);
+  bool skip() const;
+
   void updateNavigation();
   void next();
 
   virtual CreateInstanceDialog::Types selectedInstanceType() const;
   virtual MOBase::IPluginGame* selectedGame() const;
   virtual QString selectedGameLocation() const;
-  virtual QString selectedGameEdition() const;
+  virtual QString selectedGameVariant() const;
   virtual QString selectedInstanceName() const;
   virtual CreateInstanceDialog::Paths selectedPaths() const;
 
@@ -54,6 +56,9 @@ protected:
   Ui::CreateInstanceDialog* ui;
   CreateInstanceDialog& m_dlg;
   const PluginContainer& m_pc;
+  bool m_skip;
+
+  virtual bool doSkip() const;
 };
 
 
@@ -62,7 +67,8 @@ class IntroPage : public Page
 public:
   IntroPage(CreateInstanceDialog& dlg);
 
-  bool skip() const override;
+protected:
+  bool doSkip() const override;
 };
 
 
@@ -91,7 +97,7 @@ public:
   MOBase::IPluginGame* selectedGame() const override;
   QString selectedGameLocation() const override;
 
-  void select(MOBase::IPluginGame* game);
+  void select(MOBase::IPluginGame* game, const QString& dir={});
   void selectCustom();
 
   void warnUnrecognized(const QString& path);
@@ -133,18 +139,20 @@ private:
 };
 
 
-class EditionsPage : public Page
+class VariantsPage : public Page
 {
 public:
-  EditionsPage(CreateInstanceDialog& dlg);
+  VariantsPage(CreateInstanceDialog& dlg);
 
   bool ready() const override;
-  bool skip() const override;
   void activated() override;
-  QString selectedGameEdition() const override;
+  QString selectedGameVariant() const override;
 
   void select(const QString& variant);
 
+protected:
+  bool doSkip() const override;
+
 private:
   MOBase::IPluginGame* m_previousGame;
   std::vector<QCommandLinkButton*> m_buttons;
@@ -160,10 +168,12 @@ public:
   NamePage(CreateInstanceDialog& dlg);
 
   bool ready() const override;
-  bool skip() const override;
   void activated() override;
   QString selectedInstanceName() const override;
 
+protected:
+  bool doSkip() const override;
+
 private:
   mutable PlaceholderLabel m_label, m_exists, m_invalid;
   bool m_modified;
@@ -212,9 +222,11 @@ public:
   ~NexusPage();
 
   bool ready() const override;
-  bool skip() const override;
   void activated() override;
 
+protected:
+  bool doSkip() const override;
+
 private:
   std::unique_ptr<NexusConnectionUI> m_connectionUI;
   bool m_skip;