}\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
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
PreliminaryPeriods[Config.NotificationIndex[name]] = value.PreliminaryPeriod;\r
}\r
}\r
+\r
+ public void Normalization()\r
+ {\r
+ Settings = Settings.Select(s =>\r
+ (s & NotificationType.Pushbullet) != 0\r
+ ? s ^ NotificationType.Pushbullet | NotificationType.Push\r
+ : s)\r
+ .ToArray();\r
+ RepeatIntervals = RepeatIntervals.Select(v => v < 0 ? 0 : v).ToArray();\r
+ PreliminaryPeriods = PreliminaryPeriods.Select(v => v < 0 ? 0 : v).ToArray();\r
+ }\r
}\r
\r
public class LocationPerMachine\r
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
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
\r
\r
private const string FileName = "config.xml";\r
- private static readonly string BaseDir = AppDomain.CurrentDomain.BaseDirectory;\r
+ public static readonly string BaseDir = AppDomain.CurrentDomain.BaseDirectory;\r
private static readonly string ConfigFile = Path.Combine(BaseDir, FileName);\r
\r
public Config()\r
config = (Config)serializer.Deserialize(file);\r
foreach (var property in GetType().GetProperties())\r
property.SetValue(this, property.GetValue(config, null), null);\r
- var ns = Notifications.Settings;\r
- for (var i = 0; i < ns.Length; i++)\r
- {\r
- if ((ns[i] & NotificationType.Pushbullet) != 0)\r
- ns[i] = ns[i] ^ NotificationType.Pushbullet | NotificationType.Push;\r
- }\r
+ Notifications.Normalization();\r
ComposeNotificationFlags();\r
if (AlwaysShowResultRank)\r
{\r
DecomposeNotificationFlags();\r
ConvertPath(StripBaseDir);\r
var serializer = new XmlSerializer(typeof(Config));\r
- using (var file = File.CreateText(ConfigFile))\r
+ using (var file = File.CreateText(ConfigFile + ".tmp"))\r
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