+ Remember last selected category per profile

HgAlexx · HgAlexx · commit 0c87b85e5f44 · 2023-06-16T01:27:45.000+02:00
* Other small fixes
diff --git a/Hg.SaveHistory.sln b/Hg.SaveHistory.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33723.286
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hg.SaveHistory", "Hg.SaveHistory\Hg.SaveHistory.csproj", "{FEA44985-2A16-4626-87DD-CF9C5E27A686}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -12,6 +12,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hash", "Hash\Hash.csproj",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{B8FCD930-CBF4-4330-A06A-0ED5C6DE090E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Info", "Info", "{3506CE02-ED35-440B-BA0F-8CA22F4ED2DC}"
+	ProjectSection(SolutionItems) = preProject
+		LICENSE = LICENSE
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/Hg.SaveHistory/Forms/FormMain.cs b/Hg.SaveHistory/Forms/FormMain.cs
@@ -458,13 +458,9 @@ internal void RefreshSnapshotsListView(ListView listView, EngineSnapshotStatus s
 
                 listView.Items.Clear();
 
-                foreach (var snapshot in _luaManager.ActiveEngine.Snapshots)
+                foreach (var snapshot in _luaManager.ActiveEngine.Snapshots.Where(snapshot => 
+                             category == null || category.Id == 0 || snapshot.CategoryId == category.Id))
                 {
-                    if (category != null && category.Id != 0 && snapshot.CategoryId != category.Id)
-                    {
-                        continue;
-                    }
-
                     var listViewItem = new ListViewItem();
                     bool first = true;
 
@@ -1214,7 +1210,6 @@ private void CleanSnapshots()
             }
 
             SetProgressBarVisibility(true);
-            Thread.Sleep(100);
 
             // Oldest first
             var comparer = GetSnapshotComparer("SavedAt", SortOrder.Ascending);
@@ -1234,9 +1229,6 @@ private void CleanSnapshots()
                 EngineSnapshotStatus.Nuked);
 
             SetProgressBarVisibility(false);
-            Thread.Sleep(100);
-
-            SortSnapshots();
         }
 
         private void CleanupSnapshotsCore(SettingsAutoCleanupBackup settings, EngineSnapshotStatus statusLookup,
@@ -1508,6 +1500,11 @@ private void closeProfileToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void comboBoxCategories_SelectionChangeCommitted(object sender, EventArgs e)
         {
+            if (comboBoxCategories.SelectedItem is EngineSnapshotCategory selection)
+            {
+                _activeProfileFile.LastSelectedCategory = selection.Id;
+            }
+            
             RefreshSnapshotLists();
         }
 
@@ -2674,6 +2671,10 @@ private void RefreshCategories()
                 id = selection.Id;
                 selection = null;
             }
+            else if (_activeProfileFile.LastSelectedCategory != -1)
+            {
+                id = _activeProfileFile.LastSelectedCategory;
+            }
 
             comboBoxCategories.Items.Clear();
             foreach (var category in _luaManager.ActiveEngine.Categories)
@@ -2706,6 +2707,7 @@ private void RefreshCategories()
                 if (category != null && comboBoxCategories.Items.Contains(category))
                 {
                     comboBoxCategories.SelectedItem = category;
+                    _activeProfileFile.LastSelectedCategory = category.Id;
                 }
             }
 
@@ -2828,7 +2830,7 @@ private void RefreshSnapshotLists()
             int archived = 0;
             int deleted = 0;
 
-            foreach (var snapshot in _activeProfileFile.Snapshots.Where(snapshot =>
+            foreach (var snapshot in _luaManager.ActiveEngine.Snapshots.Where(snapshot =>
                          category == null || category.Id == 0 || snapshot.CategoryId == category.Id))
             {
                 switch (snapshot.Status)
@@ -2992,8 +2994,8 @@ private void SetProgressBarVisibility(bool visible)
             {
                 Invoke(new Action(() => { SetProgressBarVisibility(visible); }));
             }
-
-            toolStripProgressBar.Visible = visible;
+            else
+                toolStripProgressBar.Visible = visible;
         }
 
         private void SetSnapshotInfo(EngineSnapshot snapshot)
diff --git a/Hg.SaveHistory/Forms/FormMain.resx b/Hg.SaveHistory/Forms/FormMain.resx
@@ -140,7 +140,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA+
-        SQAAAk1TRnQBSQFMAgEBBAEAAbABAgGwAQIBIAEAASABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        SQAAAk1TRnQBSQFMAgEBBAEAAcABAgHAAQIBIAEAASABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAGA
         AwABQAMAAQEBAAEYBgABYP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AEIAIfsB1AHY
         AesBdAF/AcgBVwFkAb0BLQE+Aa0BLQE+Aa0BLQE+Aa0BLQE+Aa0BWwFnAb0BdgGAAckB2gHdAfAe+wP6
diff --git a/Hg.SaveHistory/Hg.SaveHistory.csproj b/Hg.SaveHistory/Hg.SaveHistory.csproj
@@ -407,6 +407,7 @@
   <PropertyGroup>
     <PostBuildEvent>copy /Y "$(SolutionDir)LICENSE" "$(TargetDir)"
 copy /Y "$(SolutionDir)README.md" "$(TargetDir)"
+del /q "$(TargetDir)\$(ProjectName).log"
 rmdir /s /q "$(TargetDir)\de"
 rmdir /s /q "$(TargetDir)\es"
 rmdir /s /q "$(TargetDir)\fr"
diff --git a/Hg.SaveHistory/Types/ProfileFile.cs b/Hg.SaveHistory/Types/ProfileFile.cs
@@ -27,6 +27,8 @@ public class ProfileFile
 
         public bool FirstTimeRun = true;
 
+        public int LastSelectedCategory = -1;
+
         // Display name of profile
         public string Name;
 
diff --git a/README.md b/README.md
@@ -168,6 +168,7 @@ Alpha testers:
 
 - \+ Added Auto Cleanup Snapshots feature
 - \+ Added window to forget Nuked snapshots
+- \+ Remember last selected category per profile
 - \* Updated NuGet packages
 - \* Other small improvements
 
diff --git a/Tests/Data/DOOM2016/Original/DOOM2016_Create.shp b/Tests/Data/DOOM2016/Original/DOOM2016_Create.shp
@@ -30,6 +30,7 @@
   "EngineScriptName": "DOOM2016",
   "FilePath": "%SOURCEFOLDER%\\DOOM2016_Create.shp",
   "FirstTimeRun": true,
+  "LastSelectedCategory": -1,
   "Name": "DOOM2016",
   "RootFolder": null,
   "Settings": [
diff --git a/Tests/Data/DOOM2016/Original/DOOM2016_Open.shp b/Tests/Data/DOOM2016/Original/DOOM2016_Open.shp
@@ -30,6 +30,7 @@
   "EngineScriptName": "DOOM2016",
   "FilePath": "%SOURCEFOLDER%\\DOOM2016_Open.shp",
   "FirstTimeRun": true,
+  "LastSelectedCategory": -1,
   "Name": "DOOM2016",
   "RootFolder": "%SOURCEFOLDER%",
   "Settings": [
diff --git a/Tests/Data/DOOMEternal/Bethesda/Original/DOOMEternal_Bethesda_Create.shp b/Tests/Data/DOOMEternal/Bethesda/Original/DOOMEternal_Bethesda_Create.shp
@@ -30,6 +30,7 @@
   "EngineScriptName": "DOOMEternal",
   "FilePath": "%SOURCEFOLDER%\\DOOMEternal_Bethesda_Create.shp",
   "FirstTimeRun": true,
+  "LastSelectedCategory": -1,
   "Name": "DOOMEternal_Bethesda",
   "RootFolder": null,
   "Settings": [
diff --git a/Tests/Data/DOOMEternal/Bethesda/Original/DOOMEternal_Bethesda_Open.shp b/Tests/Data/DOOMEternal/Bethesda/Original/DOOMEternal_Bethesda_Open.shp
@@ -30,6 +30,7 @@
   "EngineScriptName": "DOOMEternal",
   "FilePath": "%SOURCEFOLDER%\\DOOMEternal_Bethesda_Open.shp",
   "FirstTimeRun": true,
+  "LastSelectedCategory": -1,
   "Name": "DOOMEternal_Bethesda",
   "RootFolder": "%SOURCEFOLDER%",
   "Settings": [
diff --git a/Tests/Data/DOOMEternal/Steam/Original/DOOMEternal_Steam_Create.shp b/Tests/Data/DOOMEternal/Steam/Original/DOOMEternal_Steam_Create.shp
@@ -30,6 +30,7 @@
   "EngineScriptName": "DOOMEternal",
   "FilePath": "%SOURCEFOLDER%\\DOOMEternal_Steam_Create.shp",
   "FirstTimeRun": true,
+  "LastSelectedCategory": -1,
   "Name": "DOOMEternal_Steam",
   "RootFolder": null,
   "Settings": [
diff --git a/Tests/Data/DOOMEternal/Steam/Original/DOOMEternal_Steam_Open.shp b/Tests/Data/DOOMEternal/Steam/Original/DOOMEternal_Steam_Open.shp
@@ -30,6 +30,7 @@
   "EngineScriptName": "DOOMEternal",
   "FilePath": "%SOURCEFOLDER%\\DOOMEternal_Steam_Open.shp",
   "FirstTimeRun": true,
+  "LastSelectedCategory": -1,
   "Name": "DOOMEternal_Steam",
   "RootFolder": "%SOURCEFOLDER%",
   "Settings": [
diff --git a/Tests/Data/Satisfactory/Original/Satisfactory_Create.shp b/Tests/Data/Satisfactory/Original/Satisfactory_Create.shp
@@ -30,6 +30,7 @@
   "EngineScriptName": "Satisfactory",
   "FilePath": "%SOURCEFOLDER%\\Satisfactory_Create.shp",
   "FirstTimeRun": true,
+  "LastSelectedCategory": -1,
   "Name": "Satisfactory",
   "RootFolder": null,
   "Settings": [
diff --git a/Tests/Data/Satisfactory/Original/Satisfactory_Open.shp b/Tests/Data/Satisfactory/Original/Satisfactory_Open.shp
@@ -30,6 +30,7 @@
   "EngineScriptName": "Satisfactory",
   "FilePath": "%SOURCEFOLDER%\\Satisfactory_Open.shp",
   "FirstTimeRun": true,
+  "LastSelectedCategory": -1,
   "Name": "Satisfactory",
   "RootFolder": "%SOURCEFOLDER%",
   "Settings": [

Original file line number	Diff line number	Diff line change
`@@ -458,13 +458,9 @@ internal void RefreshSnapshotsListView(ListView listView, EngineSnapshotStatus s`
`458`	`458`
`459`	`459`	`listView.Items.Clear();`
`460`	`460`
`461`		`- foreach (var snapshot in _luaManager.ActiveEngine.Snapshots)`
	`461`	`+ foreach (var snapshot in _luaManager.ActiveEngine.Snapshots.Where(snapshot =>`
	`462`	`+ category == null \|\| category.Id == 0 \|\| snapshot.CategoryId == category.Id))`
`462`	`463`	`{`
`463`		`- if (category != null && category.Id != 0 && snapshot.CategoryId != category.Id)`
`464`		`- {`
`465`		`- continue;`
`466`		`- }`
`467`		`-`
`468`	`464`	`var listViewItem = new ListViewItem();`
`469`	`465`	`bool first = true;`
`470`	`466`
`@@ -1214,7 +1210,6 @@ private void CleanSnapshots()`
`1214`	`1210`	`}`
`1215`	`1211`
`1216`	`1212`	`SetProgressBarVisibility(true);`
`1217`		`- Thread.Sleep(100);`
`1218`	`1213`
`1219`	`1214`	`// Oldest first`
`1220`	`1215`	`var comparer = GetSnapshotComparer("SavedAt", SortOrder.Ascending);`
`@@ -1234,9 +1229,6 @@ private void CleanSnapshots()`
`1234`	`1229`	`EngineSnapshotStatus.Nuked);`
`1235`	`1230`
`1236`	`1231`	`SetProgressBarVisibility(false);`
`1237`		`- Thread.Sleep(100);`
`1238`		`-`
`1239`		`- SortSnapshots();`
`1240`	`1232`	`}`
`1241`	`1233`
`1242`	`1234`	`private void CleanupSnapshotsCore(SettingsAutoCleanupBackup settings, EngineSnapshotStatus statusLookup,`
`@@ -1508,6 +1500,11 @@ private void closeProfileToolStripMenuItem_Click(object sender, EventArgs e)`
`1508`	`1500`
`1509`	`1501`	`private void comboBoxCategories_SelectionChangeCommitted(object sender, EventArgs e)`
`1510`	`1502`	`{`
	`1503`	`+ if (comboBoxCategories.SelectedItem is EngineSnapshotCategory selection)`
	`1504`	`+ {`
	`1505`	`+ _activeProfileFile.LastSelectedCategory = selection.Id;`
	`1506`	`+ }`
	`1507`	`+`
`1511`	`1508`	`RefreshSnapshotLists();`
`1512`	`1509`	`}`
`1513`	`1510`
`@@ -2674,6 +2671,10 @@ private void RefreshCategories()`
`2674`	`2671`	`id = selection.Id;`
`2675`	`2672`	`selection = null;`
`2676`	`2673`	`}`
	`2674`	`+ else if (_activeProfileFile.LastSelectedCategory != -1)`
	`2675`	`+ {`
	`2676`	`+ id = _activeProfileFile.LastSelectedCategory;`
	`2677`	`+ }`
`2677`	`2678`
`2678`	`2679`	`comboBoxCategories.Items.Clear();`
`2679`	`2680`	`foreach (var category in _luaManager.ActiveEngine.Categories)`
`@@ -2706,6 +2707,7 @@ private void RefreshCategories()`
`2706`	`2707`	`if (category != null && comboBoxCategories.Items.Contains(category))`
`2707`	`2708`	`{`
`2708`	`2709`	`comboBoxCategories.SelectedItem = category;`
	`2710`	`+ _activeProfileFile.LastSelectedCategory = category.Id;`
`2709`	`2711`	`}`
`2710`	`2712`	`}`
`2711`	`2713`
`@@ -2828,7 +2830,7 @@ private void RefreshSnapshotLists()`
`2828`	`2830`	`int archived = 0;`
`2829`	`2831`	`int deleted = 0;`
`2830`	`2832`
`2831`		`- foreach (var snapshot in _activeProfileFile.Snapshots.Where(snapshot =>`
	`2833`	`+ foreach (var snapshot in _luaManager.ActiveEngine.Snapshots.Where(snapshot =>`
`2832`	`2834`	`category == null \|\| category.Id == 0 \|\| snapshot.CategoryId == category.Id))`
`2833`	`2835`	`{`
`2834`	`2836`	`switch (snapshot.Status)`
`@@ -2992,8 +2994,8 @@ private void SetProgressBarVisibility(bool visible)`
`2992`	`2994`	`{`
`2993`	`2995`	`Invoke(new Action(() => { SetProgressBarVisibility(visible); }));`
`2994`	`2996`	`}`
`2995`		`-`
`2996`		`- toolStripProgressBar.Visible = visible;`
	`2997`	`+ else`
	`2998`	`+ toolStripProgressBar.Visible = visible;`
`2997`	`2999`	`}`
`2998`	`3000`
`2999`	`3001`	`private void SetSnapshotInfo(EngineSnapshot snapshot)`