Merge branch 'dev'

cadon · Mar 11, 2023 · 71221cd · 71221cd
2 parents e37a9c3 + ba8a5a3
commit 71221cd
Show file tree

Hide file tree

Showing 21 changed files with 683 additions and 398 deletions.
diff --git a/ARKBreedingStats/ARKBreedingStats.csproj b/ARKBreedingStats/ARKBreedingStats.csproj
@@ -636,6 +636,7 @@
     <Compile Include="utils\CreatureListSorter.cs" />
     <Compile Include="utils\MessageBoxes.cs" />
     <Compile Include="NamePatterns\NamePatternFunctions.cs" />
+    <Compile Include="utils\NaturalComparer.cs" />
     <Compile Include="utils\RepositoryInfo.cs" />
     <Compile Include="utils\SoundFeedback.cs" />
     <Compile Include="utils\Themes.cs" />

diff --git a/ARKBreedingStats/App.config b/ARKBreedingStats/App.config
@@ -481,6 +481,12 @@
             <setting name="LibraryColorInfoUseFilter" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="UseNaturalSort" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="NaturalSortIgnoreSpaces" serializeAs="String">
+                <value>False</value>
+            </setting>
         </ARKBreedingStats.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/ARKBreedingStats/CreatureBox.Designer.cs b/ARKBreedingStats/CreatureBox.Designer.cs
diff --git a/ARKBreedingStats/CreatureInfoInput.cs b/ARKBreedingStats/CreatureInfoInput.cs
@@ -278,8 +278,8 @@ public bool ShowSaveButton
             set
             {
                 btSaveChanges.Visible = value;
-                btAdd2Library.Size = new Size((value ? 120 : 250), 37);
-                btAdd2Library.Location = new Point(value ? 136 : 6, btAdd2Library.Location.Y);
+                btAdd2Library.Size = new Size((value ? Width / 2 : Width) - 10, btAdd2Library.Size.Height);
+                btAdd2Library.Location = new Point(value ? Width / 2 + 6 : 6, btAdd2Library.Location.Y);
             }
         }
 

diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs