From bd99309c3195c0b4e336ad227e4e923a1020f329 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sat, 13 Jan 2018 17:43:42 +0900
Subject: [PATCH 1/1] =?utf8?q?=E3=82=BF=E3=82=A4=E3=83=9E=E3=83=BC?=
 =?utf8?q?=E3=81=8C=E6=AE=8B=E3=82=8A=E6=99=82=E9=96=93=E3=81=A8=E7=B5=82?=
 =?utf8?q?=E4=BA=86=E6=99=82=E9=96=93=E3=81=AE=E3=81=A9=E3=81=A1=E3=82=89?=
 =?utf8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=81=8B=E3=82=92?=
 =?utf8?q?=E4=BF=9D=E5=AD=98=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer/Config.cs   |  8 ++++++++
 KancolleSniffer/MainForm.cs | 10 ++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/KancolleSniffer/Config.cs b/KancolleSniffer/Config.cs
index fc88372..f5f9473 100644
--- a/KancolleSniffer/Config.cs
+++ b/KancolleSniffer/Config.cs
@@ -183,6 +183,13 @@ namespace KancolleSniffer
         All = (1 << 3) - 1
     }
 
+    [Flags]
+    public enum TimerKind
+    {
+        Mission = 1,
+        NDock = 1 << 1
+    }
+
     public class Config
     {
         private readonly string _baseDir = AppDomain.CurrentDomain.BaseDirectory;
@@ -196,6 +203,7 @@ namespace KancolleSniffer
         public bool SaveLocationPerMachine { get; set; }
         public List<LocationPerMachine> LocationList { get; set; } = new List<LocationPerMachine>();
         public bool ShowHpInPercent { get; set; }
+        public TimerKind ShowEndTime { get; set; }
         public bool FlashWindow { get; set; } = true;
         public bool ShowBaloonTip { get; set; } = true;
         public bool PlaySound { get; set; } = true;
diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index f09f499..7111fae 100644
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -49,8 +49,6 @@ namespace KancolleSniffer
         private DateTime _prev, _now;
 
         private readonly ErrorDialog _errorDialog = new ErrorDialog();
-        private bool _missionFinishTimeMode;
-        private bool _ndockFinishTimeMode;
         private readonly KancolleDb _kancolleDb = new KancolleDb();
         private readonly ErrorLog _errorLog;
 
@@ -689,7 +687,7 @@ namespace KancolleSniffer
 
         private void labelNDock_Click(object sender, EventArgs e)
         {
-            _ndockFinishTimeMode = !_ndockFinishTimeMode;
+            _config.ShowEndTime ^= TimerKind.NDock;
             UpdateTimers();
         }
 
@@ -703,7 +701,7 @@ namespace KancolleSniffer
 
         private void labelMission_Click(object sender, EventArgs e)
         {
-            _missionFinishTimeMode = !_missionFinishTimeMode;
+            _config.ShowEndTime ^= TimerKind.Mission;
             UpdateTimers();
         }
 
@@ -714,12 +712,12 @@ namespace KancolleSniffer
             {
                 var entry = _sniffer.Missions[i];
                 SetTimerColor(mission[i], entry.Timer, _now);
-                mission[i].Text = entry.Timer.ToString(_now, _missionFinishTimeMode);
+                mission[i].Text = entry.Timer.ToString(_now, (_config.ShowEndTime & TimerKind.Mission) != 0);
             }
             for (var i = 0; i < _sniffer.NDock.Length; i++)
             {
                 var entry = _sniffer.NDock[i];
-                _shipLabels.SetNDockTimer(i, entry.Timer, _now, _ndockFinishTimeMode);
+                _shipLabels.SetNDockTimer(i, entry.Timer, _now, (_config.ShowEndTime & TimerKind.NDock) != 0);
             }
             var kdock = new[] {labelConstruct1, labelConstruct2, labelConstruct3, labelConstruct4};
             for (var i = 0; i < kdock.Length; i++)
-- 
2.11.0