Add: Remember collection collumns between runs

Piotrekol · Jul 31, 2024 · b1e57c0 · b1e57c0
1 parent 6b1f9ec
commit b1e57c0
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 5 deletions.
diff --git a/App/Presenters/Controls/CombinedListingPresenter.cs b/App/Presenters/Controls/CombinedListingPresenter.cs
@@ -1,8 +1,9 @@
 using System;
 using App.Interfaces;
 using CollectionManager.DataTypes;
-using CollectionManagerExtensionsDll.Modules.API.osustats;
+using CollectionManagerApp.Properties;
 using GuiComponents.Interfaces;
+using Newtonsoft.Json;
 
 namespace App.Presenters.Controls
 {
@@ -34,6 +35,19 @@ public CombinedListingPresenter(ICombinedListingView view, ICollectionListingMod
             BeatmapListingModel.SelectedBeatmapsChanged += BeatmapListingModelOnSelectedBeatmapsChanged;
             _collectionsView.SelectedCollectionChanged += CollectionsViewOnSelectedCollectionChanged;
             _collectionsView.SelectedCollectionsChanged += CollectionsViewOnSelectedCollectionsChanged;
+            _collectionsView.ColumnsToggled += OnColumnsToggled;
+
+            var visibleColumns = JsonConvert.DeserializeObject<string[]>(Settings.Default.CollectionColumns);
+
+            if (visibleColumns.Length > 0)
+            {
+                _collectionsView.SetVisibleColumns(visibleColumns);
+            }
+        }
+
+        private void OnColumnsToggled(object sender, string[] visibleCollumnAspectNames)
+        {
+            Settings.Default.CollectionColumns = JsonConvert.SerializeObject(visibleCollumnAspectNames);
         }
 
         private void BeatmapListingModelOnSelectedBeatmapsChanged(object sender, EventArgs e)

diff --git a/Common/Interfaces/Controls/ICollectionListingView.cs b/Common/Interfaces/Controls/ICollectionListingView.cs
@@ -23,8 +23,10 @@ public interface ICollectionListingView
         event EventHandler SelectedCollectionsChanged;
         event GuiHelpers.CollectionBeatmapsEventArgs BeatmapsDropped;
         event EventHandler<StringEventArgs> RightClick;
+        event GuiHelpers.ColumnsToggledEventArgs ColumnsToggled;
 
         void SetFilter(IModelFilter filter);
+        void SetVisibleColumns(string[] visibleColumnsAspectNames);
         void FilteringStarted();
         void FilteringFinished();
         //void OnCollectionEditing(CollectionEditArgs e);

diff --git a/GuiComponents/Controls/CollectionListingView.cs b/GuiComponents/Controls/CollectionListingView.cs
@@ -59,6 +59,7 @@ public Collections HighlightedCollections
         public event EventHandler SelectedCollectionsChanged;
         public event GuiHelpers.CollectionBeatmapsEventArgs BeatmapsDropped;
         public event EventHandler<StringEventArgs> RightClick;
+        public event GuiHelpers.ColumnsToggledEventArgs ColumnsToggled;
 
         private CollectionRenderer _collectionRenderer = new CollectionRenderer();
         private RearrangingDropSink _dropsink = new RearrangingDropSink();
@@ -84,6 +85,16 @@ private void Bind()
                 OnSelectedCollectionsChanged();
             };
 
+            ListViewCollections.ColumnWidthChanged += OnColumnReordered;
+        }
+
+        private void OnColumnReordered(object sender, ColumnWidthChangedEventArgs e)
+        {
+            var visibleColumnAspectNames = ListViewCollections.AllColumns
+                .Where(column => column.IsVisible)
+                .Select(column => column.AspectName);
+
+            ColumnsToggled?.Invoke(this, visibleColumnAspectNames.ToArray());
         }
 
         private void init()
@@ -176,6 +187,16 @@ public void SetFilter(IModelFilter filter)
             ListViewCollections.AdditionalFilter = filter;
         }
 
+        public void SetVisibleColumns(string[] visibleColumnsAspectNames)
+        {
+            foreach (var column in ListViewCollections.AllColumns)
+            {
+                column.IsVisible = visibleColumnsAspectNames.Contains(column.AspectName);
+            }
+
+            ListViewCollections.RebuildColumns();
+        }
+
         public void FilteringStarted()
         {
             ListViewCollections.BeginUpdate();
@@ -208,8 +229,8 @@ private void ListViewCollections_ModelDropped(object sender, ModelDropEventArgs
                 foreach (var collection in e.SourceModels)
                     collections.Add((Collection)collection);
 
-                var sortOrder = ListViewCollections.LastSortOrder == SortOrder.Ascending 
-                    ? CollectionManager.Enums.SortOrder.Ascending 
+                var sortOrder = ListViewCollections.LastSortOrder == SortOrder.Ascending
+                    ? CollectionManager.Enums.SortOrder.Ascending
                     : CollectionManager.Enums.SortOrder.Descending;
                 OnCollectionReorder?.Invoke(this, collections, targetCollection, e.DropTargetLocation == DropTargetLocation.AboveItem, ListViewCollections.LastSortColumn.AspectName, sortOrder);
 
@@ -219,7 +240,8 @@ private void ListViewCollections_ModelDropped(object sender, ModelDropEventArgs
                 return;
             }
 
-            if (targetCollection == null) return;
+            if (targetCollection == null)
+                return;
             var beatmaps = new Beatmaps();
             foreach (var b in e.SourceModels)
             {
@@ -249,7 +271,8 @@ private void MenuStripClick(object sender, EventArgs e)
         private void PasteCollectionFromClipboard()
         {
             var data = Clipboard.GetDataObject();
-            if (data == null) return;
+            if (data == null)
+                return;
             DropFile(data);
             return;
         }
@@ -303,5 +326,6 @@ private void ListViewCollections_KeyDown(object sender, KeyEventArgs e)
         {
             e.Handled = e.SuppressKeyPress = true;
         }
+
     }
 }