タイマーが残り時間と終了時間のどちらを表示するかを保存する

diff --git a/KancolleSniffer/Config.cs b/KancolleSniffer/Config.cs
index fc88372..f5f9473 100644 (file)
--- a/KancolleSniffer/Config.cs
+++ b/KancolleSniffer/Config.cs
@@ -183,6 +183,13 @@ namespace KancolleSniffer
         All = (1 << 3) - 1\r
     }\r
 \r
+    [Flags]\r
+    public enum TimerKind\r
+    {\r
+        Mission = 1,\r
+        NDock = 1 << 1\r
+    }\r
+\r
     public class Config\r
     {\r
         private readonly string _baseDir = AppDomain.CurrentDomain.BaseDirectory;\r
@@ -196,6 +203,7 @@ namespace KancolleSniffer
         public bool SaveLocationPerMachine { get; set; }\r
         public List<LocationPerMachine> LocationList { get; set; } = new List<LocationPerMachine>();\r
         public bool ShowHpInPercent { get; set; }\r
+        public TimerKind ShowEndTime { get; set; }\r
         public bool FlashWindow { get; set; } = true;\r
         public bool ShowBaloonTip { get; set; } = true;\r
         public bool PlaySound { get; set; } = true;\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index f09f499..7111fae 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -49,8 +49,6 @@ namespace KancolleSniffer
         private DateTime _prev, _now;\r
 \r
         private readonly ErrorDialog _errorDialog = new ErrorDialog();\r
-        private bool _missionFinishTimeMode;\r
-        private bool _ndockFinishTimeMode;\r
         private readonly KancolleDb _kancolleDb = new KancolleDb();\r
         private readonly ErrorLog _errorLog;\r
 \r
@@ -689,7 +687,7 @@ namespace KancolleSniffer
 \r
         private void labelNDock_Click(object sender, EventArgs e)\r
         {\r
-            _ndockFinishTimeMode = !_ndockFinishTimeMode;\r
+            _config.ShowEndTime ^= TimerKind.NDock;\r
             UpdateTimers();\r
         }\r
 \r
@@ -703,7 +701,7 @@ namespace KancolleSniffer
 \r
         private void labelMission_Click(object sender, EventArgs e)\r
         {\r
-            _missionFinishTimeMode = !_missionFinishTimeMode;\r
+            _config.ShowEndTime ^= TimerKind.Mission;\r
             UpdateTimers();\r
         }\r
 \r
@@ -714,12 +712,12 @@ namespace KancolleSniffer
             {\r
                 var entry = _sniffer.Missions[i];\r
                 SetTimerColor(mission[i], entry.Timer, _now);\r
-                mission[i].Text = entry.Timer.ToString(_now, _missionFinishTimeMode);\r
+                mission[i].Text = entry.Timer.ToString(_now, (_config.ShowEndTime & TimerKind.Mission) != 0);\r
             }\r
             for (var i = 0; i < _sniffer.NDock.Length; i++)\r
             {\r
                 var entry = _sniffer.NDock[i];\r
-                _shipLabels.SetNDockTimer(i, entry.Timer, _now, _ndockFinishTimeMode);\r
+                _shipLabels.SetNDockTimer(i, entry.Timer, _now, (_config.ShowEndTime & TimerKind.NDock) != 0);\r
             }\r
             var kdock = new[] {labelConstruct1, labelConstruct2, labelConstruct3, labelConstruct4};\r
             for (var i = 0; i < kdock.Length; i++)\r