when importing exported creatures, the list-view will show on front. …

…added species-filter to importExported. removed duplicate and wrong entry for Tek Quetzal in classicFlyers.
cadon · Feb 6, 2019 · a27a48f · a27a48f
1 parent d7c8c0d
commit a27a48f
Show file tree

Hide file tree

Showing 7 changed files with 197 additions and 71 deletions.
diff --git a/ARKBreedingStats/App.config b/ARKBreedingStats/App.config
@@ -145,6 +145,9 @@
             <setting name="importExportedSize" serializeAs="String">
                 <value>700, 700</value>
             </setting>
+            <setting name="ExportCreatureFolder" serializeAs="String">
+                <value />
+            </setting>
         </ARKBreedingStats.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs
@@ -71,6 +71,8 @@ public Form1()
             if (Properties.Settings.Default.UpgradeRequired)
             {
                 Properties.Settings.Default.Upgrade();
+                Properties.Settings.Default.Save();
+                Properties.Settings.Default.Reload();
                 Properties.Settings.Default.UpgradeRequired = false;
                 Properties.Settings.Default.Save();
             }
@@ -135,6 +137,14 @@ public Form1()
             timerGlobal.Interval = 1000;
             timerGlobal.Tick += TimerGlobal_Tick;
 
+            // load old importExported folder to new setting. TODO remove this part and the setting Properties.Settings.Default.ExportCreatureFolder around 2019-03
+            if (!string.IsNullOrEmpty(Properties.Settings.Default.ExportCreatureFolder)
+                && (Properties.Settings.Default.ExportCreatureFolders == null
+                || Properties.Settings.Default.ExportCreatureFolders.Length == 0))
+            {
+                Properties.Settings.Default.ExportCreatureFolders = new string[] { Properties.Settings.Default.ExportCreatureFolder };
+            }
+
             reactOnSelectionChange = true;
         }
 
@@ -5425,6 +5435,7 @@ private void showExportedCreatureListControl()
             }
             exportedCreatureList.ownerSuffix = "";
             exportedCreatureList.Show();
+            exportedCreatureList.BringToFront();
         }
 
         private void copyToMultiplierTesterToolStripButton_Click(object sender, EventArgs e)

diff --git a/ARKBreedingStats/Properties/Settings.Designer.cs b/ARKBreedingStats/Properties/Settings.Designer.cs
diff --git a/ARKBreedingStats/Properties/Settings.settings b/ARKBreedingStats/Properties/Settings.settings
@@ -158,5 +158,8 @@
     <Setting Name="importExportedSize" Type="System.Drawing.Size" Scope="User">
       <Value Profile="(Default)">700, 700</Value>
     </Setting>
+    <Setting Name="ExportCreatureFolder" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/ARKBreedingStats/importExported/ExportedCreatureList.Designer.cs b/ARKBreedingStats/importExported/ExportedCreatureList.Designer.cs