Bladeren bron

Made sort result inverting a saved setting. Maintains between sessions
now.

Stephen Damm 6 jaren geleden
bovenliggende
commit
cf3913c78c

+ 2 - 7
SongBrowserPlugin/DataAccess/SongBrowserModel.cs

@@ -44,11 +44,6 @@ namespace SongBrowserPlugin
         public static Action<List<CustomLevel>> didFinishProcessingSongs;
         public static Action<List<CustomLevel>> didFinishProcessingSongs;
 
 
         /// <summary>
         /// <summary>
-        /// Toggle whether inverting the results.
-        /// </summary>
-        public bool InvertingResults { get; private set; }
-
-        /// <summary>
         /// Get the settings the model is using.
         /// Get the settings the model is using.
         /// </summary>
         /// </summary>
         public SongBrowserSettings Settings
         public SongBrowserSettings Settings
@@ -223,7 +218,7 @@ namespace SongBrowserPlugin
         /// </summary>
         /// </summary>
         public void ToggleInverting()
         public void ToggleInverting()
         {
         {
-            this.InvertingResults = !this.InvertingResults;
+            this.Settings.invertSortResults = !this.Settings.invertSortResults;
         }
         }
 
 
         /// <summary>
         /// <summary>
@@ -655,7 +650,7 @@ namespace SongBrowserPlugin
                     break;
                     break;
             }
             }
 
 
-            if (this.InvertingResults && _settings.sortMode != SongSortMode.Random)
+            if (this.Settings.invertSortResults && _settings.sortMode != SongSortMode.Random)
             {
             {
                 _sortedSongs.Reverse();
                 _sortedSongs.Reverse();
             }
             }

+ 1 - 0
SongBrowserPlugin/DataAccess/SongBrowserSettings.cs

@@ -56,6 +56,7 @@ namespace SongBrowserPlugin.DataAccess
         public bool randomInstantQueue = false;
         public bool randomInstantQueue = false;
         public bool deleteNumberedSongFolder = true;
         public bool deleteNumberedSongFolder = true;
         public int randomSongSeed;
         public int randomSongSeed;
+        public bool invertSortResults = false;
 
 
         [XmlIgnore]
         [XmlIgnore]
         [NonSerialized]
         [NonSerialized]

+ 1 - 1
SongBrowserPlugin/UI/Browser/SongBrowserUI.cs

@@ -994,7 +994,7 @@ namespace SongBrowserPlugin.UI
                 UIBuilder.SetButtonBorder(ref sortButton.Button, Color.black);
                 UIBuilder.SetButtonBorder(ref sortButton.Button, Color.black);
                 if (sortButton.SortMode == _model.Settings.sortMode)
                 if (sortButton.SortMode == _model.Settings.sortMode)
                 {
                 {
-                    if (_model.InvertingResults)
+                    if (this._model.Settings.invertSortResults)
                     {
                     {
                         UIBuilder.SetButtonBorder(ref sortButton.Button, Color.red);
                         UIBuilder.SetButtonBorder(ref sortButton.Button, Color.red);
                     }
                     }