replace "create instance" title by "setting up instance"

fixed bad game location for custom paths

4 files changed, 23 insertions, 11 deletions

diff --git a/src/createinstancedialog.cpp b/src/createinstancedialog.cpp
index d67e3451..d2846367 100644
--- a/src/createinstancedialog.cpp
+++ b/src/createinstancedialog.cpp
@@ -99,13 +99,18 @@ void CreateInstanceDialog::back()
   changePage(-1);
 }
 
-void CreateInstanceDialog::setSinglePageImpl()
+void CreateInstanceDialog::setSinglePageImpl(const QString& instanceName)
 {
   m_singlePage = true;
 
   if (m_pages[ui->pages->currentIndex()]->skip()) {
     next();
   }
+
+  // don't show the "create a new instance" title for single pages, this is
+  // when the instance already exists but some info is missing
+  ui->title->setText(tr("Setting up instance %1").arg(instanceName));
+  setWindowTitle(tr("Setting up an instance %1").arg(instanceName));
 }
 
 void CreateInstanceDialog::changePage(int d)
diff --git a/src/createinstancedialog.h b/src/createinstancedialog.h
index 6947f2e2..f05495c6 100644
--- a/src/createinstancedialog.h
+++ b/src/createinstancedialog.h
@@ -58,7 +58,7 @@ public:
   Settings* settings();
 
   template <class Page>
-  void setSinglePage()
+  void setSinglePage(const QString& instanceName)
   {
     for (auto&& p : m_pages) {
       if (auto* tp=dynamic_cast<Page*>(p.get())) {
@@ -68,7 +68,7 @@ public:
       }
     }
 
-    setSinglePageImpl();
+    setSinglePageImpl(instanceName);
   }
 
   template <class Page>
@@ -113,7 +113,7 @@ private:
   bool m_singlePage;
 
 
-  void setSinglePageImpl();
+  void setSinglePageImpl(const QString& instanceName);
 
   template <class T>
   T getSelected(T (cid::Page::*mf)() const) const
diff --git a/src/createinstancedialog.ui b/src/createinstancedialog.ui
index b7f4f502..b10d74a7 100644
--- a/src/createinstancedialog.ui
+++ b/src/createinstancedialog.ui
@@ -30,9 +30,16 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="QLabel" name="label">
+       <widget class="QLabel" name="title">
+        <property name="font">
+         <font>
+          <pointsize>14</pointsize>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
         <property name="text">
-         <string>&lt;h2&gt;Creating a new instance&lt;/h2&gt;</string>
+         <string>Creating a new instance</string>
         </property>
        </widget>
       </item>
diff --git a/src/main.cpp b/src/main.cpp
index 2a5a3e81..bfc074ec 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -344,7 +344,7 @@ SetupInstanceResults setupInstance(Instance& instance, PluginContainer& pc)
             .arg(instance.name()).arg(instance.iniPath()));
 
       CreateInstanceDialog dlg(pc, nullptr);
-      dlg.setSinglePage<cid::GamePage>();
+      dlg.setSinglePage<cid::GamePage>(instance.name());
 
       dlg.show();
       dlg.activateWindow();
@@ -356,7 +356,7 @@ SetupInstanceResults setupInstance(Instance& instance, PluginContainer& pc)
 
       instance.setGame(
         dlg.creationInfo().game->gameName(),
-        dlg.creationInfo().game->gameDirectory().absolutePath());
+        dlg.creationInfo().gameLocation);
 
       return SetupInstanceResults::TryAgain;
     }
@@ -384,7 +384,7 @@ SetupInstanceResults setupInstance(Instance& instance, PluginContainer& pc)
             .arg(instance.gameName()));
 
       CreateInstanceDialog dlg(pc, nullptr);
-      dlg.setSinglePage<cid::GamePage>();
+      dlg.setSinglePage<cid::GamePage>(instance.name());
 
       dlg.show();
       dlg.activateWindow();
@@ -396,7 +396,7 @@ SetupInstanceResults setupInstance(Instance& instance, PluginContainer& pc)
 
       instance.setGame(
         dlg.creationInfo().game->gameName(),
-        dlg.creationInfo().game->gameDirectory().absolutePath());
+        dlg.creationInfo().gameLocation);
 
       return SetupInstanceResults::TryAgain;
     }
@@ -408,7 +408,7 @@ SetupInstanceResults setupInstance(Instance& instance, PluginContainer& pc)
       dlg.getPage<cid::GamePage>()->select(
         instance.gamePlugin(), instance.gameDirectory());
 
-      dlg.setSinglePage<cid::VariantsPage>();
+      dlg.setSinglePage<cid::VariantsPage>(instance.name());
 
       dlg.show();
       dlg.activateWindow();