UI for natural sorting

cadon · Mar 11, 2023 · 58dab70 · 58dab70
1 parent 6750a72
commit 58dab70
Show file tree

Hide file tree

Showing 8 changed files with 118 additions and 58 deletions.
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/Form1.cs b/ARKBreedingStats/Form1.cs
@@ -222,6 +222,9 @@ private void Form1_Load(object sender, EventArgs e)
 
             LoadListViewSettings(tribesControl1.ListViewPlayers, "PlayerListColumnWidths", "PlayerListColumnDisplayIndices", "PlayerListSortColumn", "PlayerListSortAsc");
 
+            _creatureListSorter.UseNaturalSort = Properties.Settings.Default.UseNaturalSort;
+            _creatureListSorter.IgnoreSpacesBetweenWords = Properties.Settings.Default.NaturalSortIgnoreSpaces;
+
             CbLibraryInfoUseFilter.Checked = Properties.Settings.Default.LibraryColorInfoUseFilter;
 
             // load stat weights
@@ -1949,6 +1952,9 @@ private void OpenSettingsDialog(SettingsTabPages page = SettingsTabPages.Unknown
             CreatureColored.InitializeSpeciesImageLocation();
             creatureBoxListView.CreatureCollection = _creatureCollection;
 
+            _creatureListSorter.UseNaturalSort = Properties.Settings.Default.UseNaturalSort;
+            _creatureListSorter.IgnoreSpacesBetweenWords = Properties.Settings.Default.NaturalSortIgnoreSpaces;
+
             SetupAutoLoadFileWatcher();
             SetupExportFileWatcher();
 

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
@@ -539,5 +539,11 @@
     <Setting Name="LibraryColorInfoUseFilter" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="UseNaturalSort" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="NaturalSortIgnoreSpaces" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/ARKBreedingStats/settings/Settings.Designer.cs b/ARKBreedingStats/settings/Settings.Designer.cs
diff --git a/ARKBreedingStats/settings/Settings.cs b/ARKBreedingStats/settings/Settings.cs
@@ -327,6 +327,9 @@ private void LoadSettings(CreatureCollection cc)
             CbLibrarySelectSelectedSpeciesOnLoad.Checked = Properties.Settings.Default.LibrarySelectSelectedSpeciesOnLoad;
             cbLibraryHighlightTopCreatures.Checked = Properties.Settings.Default.LibraryHighlightTopCreatures;
             CbConsiderWastedStatsForTopCreatures.Checked = Properties.Settings.Default.ConsiderWastedStatsForTopCreatures;
+            CbNaturalSorting.Checked = Properties.Settings.Default.UseNaturalSort;
+            CbNaturalSortIgnoreSpaces.Enabled = Properties.Settings.Default.UseNaturalSort;
+            CbNaturalSortIgnoreSpaces.Checked = Properties.Settings.Default.NaturalSortIgnoreSpaces;
 
             #endregion
 
@@ -560,6 +563,8 @@ private void SaveSettings()
             Properties.Settings.Default.LibrarySelectSelectedSpeciesOnLoad = CbLibrarySelectSelectedSpeciesOnLoad.Checked;
             Properties.Settings.Default.LibraryHighlightTopCreatures = cbLibraryHighlightTopCreatures.Checked;
             Properties.Settings.Default.ConsiderWastedStatsForTopCreatures = CbConsiderWastedStatsForTopCreatures.Checked;
+            Properties.Settings.Default.UseNaturalSort = CbNaturalSorting.Checked;
+            Properties.Settings.Default.NaturalSortIgnoreSpaces = CbNaturalSortIgnoreSpaces.Checked;
 
             #endregion
 
@@ -1505,5 +1510,13 @@ private void CbbInfoGraphicFontName_SelectedIndexChanged(object sender, EventArg
         }
 
         #endregion
+
+        private void CbNaturalSorting_CheckedChanged(object sender, EventArgs e)
+        {
+            var isChecked = ((CheckBox)sender).Checked;
+            if (!isChecked)
+                CbNaturalSortIgnoreSpaces.Checked = false;
+            CbNaturalSortIgnoreSpaces.Enabled = isChecked;
+        }
     }
 }
diff --git a/ARKBreedingStats/settings/Settings.resx b/ARKBreedingStats/settings/Settings.resx
@@ -133,18 +133,6 @@ You can also select the text of the settings and drag&amp;&amp;drop the selectio
   <metadata name="aTImportFileLocationBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="dgvFileLocation_Change.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ImportWithQuickImport.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dgvFileLocation_Delete.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="aTImportFileLocationBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <data name="label24.Text" xml:space="preserve">
     <value>The creature data can be directly imported from the save-game, if you have access to that. This is also possible via an ftp-adress. 
 If you set the according files below, you can start the process automatically from the file-menu.</value>
@@ -161,18 +149,6 @@ If you set the according files below, you can start the process automatically fr
   <metadata name="aTExportFolderLocationsBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>262, 17</value>
   </metadata>
-  <metadata name="dgvExportFolderChange.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dgvExportFolderDelete.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dgvExportMakeDefault.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="aTExportFolderLocationsBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>262, 17</value>
-  </metadata>
   <data name="label25.Text" xml:space="preserve">
     <value>In ARK you can export a creature (hold use while looking at a creature, then choose "Options" - "Export" from the wheel).
 Note: Parents and the mutations count are only exported and imported if you have opened the ancestor tab of the creature before the export!

diff --git a/ARKBreedingStats/utils/CreatureListSorter.cs b/ARKBreedingStats/utils/CreatureListSorter.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Text;
 using System.Windows.Forms;
 using ARKBreedingStats.Library;
 using ARKBreedingStats.species;
@@ -35,7 +37,7 @@ public class CreatureListSorter
         public bool UseNaturalSort { get; set; } = false;
 
         /// <summary>
-        /// Whether to ignore spaces between words. This option is only relevant whern using natural sort.
+        /// Whether to ignore spaces between words. This option is only relevant when using natural sort.
         /// </summary>
         public bool IgnoreSpacesBetweenWords { get; set; } = false;