一覧の分類で種別を表示してスクロールすると種別が残るのを直す

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / Config.cs

diff --git a/KancolleSniffer/Config.cs b/KancolleSniffer/Config.cs
index b6abf7f..fcd7e60 100644 (file)
--- a/KancolleSniffer/Config.cs
+++ b/KancolleSniffer/Config.cs
@@ -38,13 +38,29 @@ namespace KancolleSniffer
         }\r
     }\r
 \r
+    [Flags]\r
+    public enum ShipCategory\r
+    {\r
+        None = 0,\r
+        BattleShip = 1 << 0,\r
+        AircraftCarrier = 1 << 1,\r
+        HeavyCruiser = 1 << 2,\r
+        LightCruiser = 1 << 3,\r
+        Destroyer = 1 << 4,\r
+        Escort = 1 << 5,\r
+        Submarine = 1 << 6,\r
+        Assistant = 1 << 7,\r
+        All = (1 << 8) - 1\r
+    }\r
+\r
     public class ShipListConfig\r
     {\r
         public bool Visible { get; set; }\r
         public Point Location { get; set; }\r
         public Size Size { get; set; }\r
         public string Mode { get; set; }\r
-        public bool ShipType { get; set; }\r
+        public ShipCategory ShipCategories { get; set; } = ShipCategory.All;\r
+        public bool ShipType;\r
         public bool ShowHpInPercent { get; set; }\r
         public ListForm.SortOrder SortOrder { get; set; } = ListForm.SortOrder.ExpToNext;\r
         public List<List<int>> ShipGroup { get; set; }\r
@@ -112,6 +128,7 @@ namespace KancolleSniffer
     public enum NotificationType\r
     {\r
         FlashWindow = 1,\r
+        // ReSharper disable once IdentifierTypo\r
         ShowBaloonTip = 1 << 1,\r
         PlaySound = 1 << 2,\r
         All = (1 << 3) - 1,\r
@@ -186,7 +203,8 @@ namespace KancolleSniffer
         ResultRank = 1,\r
         AirBattleResult = 1 << 1,\r
         BattleResult = 1 << 2,\r
-        All = (1 << 3) - 1\r
+        NextCell = 1 << 3,\r
+        All = (1 << 4) - 1\r
     }\r
 \r
     [Flags]\r
@@ -208,12 +226,13 @@ namespace KancolleSniffer
         public bool ShowHpInPercent { get; set; }\r
         public TimerKind ShowEndTime { get; set; }\r
         public bool FlashWindow { get; set; } = true;\r
+        // ReSharper disable once IdentifierTypo\r
         public bool ShowBaloonTip { get; set; } = true;\r
         public bool PlaySound { get; set; } = true;\r
         public NotificationType NotificationFlags { get; set; } = NotificationType.All;\r
         public NotificationConfig Notifications { get; set; } = new NotificationConfig();\r
-        public int MarginShips { get; set; } = 4;\r
-        public int MarginEquips { get; set; } = 10;\r
+        public int MarginShips { get; set; } = 5;\r
+        public int MarginEquips { get; set; } = 5;\r
         public List<int> NotifyConditions { get; set; }\r
         public List<int> ResetHours { get; set; }\r
         public bool AlwaysShowResultRank { get; set; }\r
@@ -328,6 +347,7 @@ namespace KancolleSniffer
                 serializer.Serialize(file, this);\r
             File.Copy(ConfigFile + ".tmp", ConfigFile, true);\r
             File.Delete(ConfigFile + ".tmp");\r
+            ConvertPath(PrependBaseDir);\r
         }\r
 \r
         private void DecomposeNotificationFlags()\r