OSDN Git Service

通信ログからトークン、提督名、艦隊名を削除する
[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / MainForm.cs
index 279a7d8..810d826 100644 (file)
 \r
 using System;\r
 using System.Collections.Generic;\r
+using System.ComponentModel;\r
 using System.Diagnostics;\r
 using System.Drawing;\r
 using System.Globalization;\r
 using System.IO;\r
-using System.IO.Compression;\r
 using System.Linq;\r
+using System.Net;\r
 using System.Runtime.InteropServices;\r
 using System.Text;\r
 using System.Text.RegularExpressions;\r
+using System.Threading;\r
 using System.Threading.Tasks;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Log;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.Net;\r
+using KancolleSniffer.Util;\r
+using KancolleSniffer.View;\r
 using Microsoft.CSharp.RuntimeBinder;\r
+using Timer = System.Windows.Forms.Timer;\r
 using static System.Math;\r
 \r
 namespace KancolleSniffer\r
@@ -36,20 +44,23 @@ namespace KancolleSniffer
         private readonly Config _config = new Config();\r
         private readonly ConfigDialog _configDialog;\r
         private readonly ProxyManager _proxyManager;\r
+        private readonly ResizableToolTip _toolTip = new ResizableToolTip {ShowAlways = true};\r
+        private readonly ResizableToolTip _toolTipQuest = new ResizableToolTip {ShowAlways = true, AutoPopDelay = 10000};\r
+        private readonly ResizableToolTip _tooltipCopy = new ResizableToolTip {AutomaticDelay = 0};\r
         private int _currentFleet;\r
         private bool _combinedFleet;\r
         private readonly Label[] _labelCheckFleets;\r
-        private readonly ShipLabels _shipLabels;\r
+        private readonly MainFormLabels _mainLabels;\r
         private readonly ListForm _listForm;\r
         private readonly NotificationManager _notificationManager;\r
         private bool _started;\r
+        private bool _timerEnabled;\r
         private string _debugLogFile;\r
         private IEnumerator<string> _playLog;\r
+        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
         public MainForm()\r
         {\r
@@ -64,25 +75,103 @@ namespace KancolleSniffer
                 CurrentAutoScaleDimensions.Height / 12f);\r
 \r
             SetupFleetClick();\r
-            _shipLabels = new ShipLabels();\r
-            _shipLabels.CreateAkashiTimers(panelShipInfo);\r
-            _shipLabels.CreateShipLabels(panelShipInfo, ShowShipOnShipList);\r
-            _shipLabels.CreateCombinedShipLabels(panelCombinedFleet, ShowShipOnShipList);\r
-            _shipLabels.CreateNDockLabels(panelDock, labelNDock_Click);\r
+            _mainLabels = new MainFormLabels();\r
+            _mainLabels.CreateAkashiTimers(panelShipInfo);\r
+            _mainLabels.CreateShipLabels(panelShipInfo, ShowShipOnShipList);\r
+            _mainLabels.CreateAkashiTimers7(panel7Ships);\r
+            _mainLabels.CreateShipLabels7(panel7Ships, ShowShipOnShipList);\r
+            _mainLabels.CreateCombinedShipLabels(panelCombinedFleet, ShowShipOnShipList);\r
+            _mainLabels.CreateNDockLabels(panelDock, labelNDock_Click);\r
             panelRepairList.CreateLabels(panelRepairList_Click);\r
-            labelPresetAkashiTimer.BackColor = ShipLabels.ColumnColors[1];\r
+            labelPresetAkashiTimer.BackColor = ShipLabel.ColumnColors[1];\r
             _listForm = new ListForm(_sniffer, _config) {Owner = this};\r
-            _notificationManager = new NotificationManager(Ring);\r
+            _notificationManager = new NotificationManager(Alarm);\r
             _config.Load();\r
             _proxyManager = new ProxyManager(_config, this);\r
+            _errorLog = new ErrorLog(_sniffer);\r
+            _proxyManager.UpdatePacFile();\r
             PerformZoom();\r
-            _shipLabels.AdjustAkashiTimers();\r
+            _mainLabels.AdjustAkashiTimers();\r
+            LoadData();\r
+            _sniffer.RepeatingTimerController = new RepeatingTimerController(_notificationManager, _config);\r
+        }\r
+\r
+        /// <summary>\r
+        /// パネルのz-orderがくるうのを避ける\r
+        /// https://stackoverflow.com/a/5777090/1429506\r
+        /// </summary>\r
+        private void MainForm_Shown(object sender, EventArgs e)\r
+        {\r
+            // ReSharper disable once NotAccessedVariable\r
+            IntPtr handle;\r
+            foreach (var panel in new[] {panelShipInfo, panel7Ships, panelCombinedFleet})\r
+                // ReSharper disable once RedundantAssignment\r
+                handle = panel.Handle;\r
+        }\r
+\r
+        private readonly FileSystemWatcher _watcher = new FileSystemWatcher\r
+        {\r
+            Path = AppDomain.CurrentDomain.BaseDirectory,\r
+            NotifyFilter = NotifyFilters.LastWrite\r
+        };\r
+\r
+        private readonly Timer _watcherTimer = new Timer {Interval = 1000};\r
+\r
+        private void LoadData()\r
+        {\r
+            var target = "";\r
             _sniffer.LoadState();\r
+            _watcher.SynchronizingObject = this;\r
+            _watcherTimer.Tick += (sender, ev) =>\r
+            {\r
+                _watcherTimer.Stop();\r
+                switch (target)\r
+                {\r
+                    case "status.xml":\r
+                        _sniffer.LoadState();\r
+                        break;\r
+                    case "TP.csv":\r
+                        _sniffer.AdditionalData.LoadTpSpec();\r
+                        break;\r
+                }\r
+            };\r
+            _watcher.Changed += (sender, ev) =>\r
+            {\r
+                target = ev.Name;\r
+                _watcherTimer.Stop();\r
+                _watcherTimer.Start();\r
+            };\r
+            _watcher.EnableRaisingEvents = true;\r
+        }\r
+\r
+        private class RepeatingTimerController : Sniffer.IRepeatingTimerController\r
+        {\r
+            private readonly NotificationManager _manager;\r
+            private readonly Config _config;\r
+\r
+            public RepeatingTimerController(NotificationManager manager, Config config)\r
+            {\r
+                _manager = manager;\r
+                _config = config;\r
+            }\r
+\r
+            public void Stop(string key)\r
+            {\r
+                _manager.StopRepeat(key,\r
+                    (key == "入渠終了" || key == "遠征終了") &&\r
+                    (_config.Notifications[key].Flags & NotificationType.Cont) != 0);\r
+            }\r
+\r
+            public void Stop(string key, int fleet) => _manager.StopRepeat(key, fleet);\r
+\r
+            public void Suspend(string exception = null) => _manager.SuspendRepeat(exception);\r
+\r
+            public void Resume() => _manager.ResumeRepeat();\r
         }\r
 \r
         private void HttpProxy_AfterSessionComplete(HttpProxy.Session session)\r
         {\r
-            Invoke(new Action<HttpProxy.Session>(ProcessRequest), session);\r
+            BeginInvoke(new Action<HttpProxy.Session>(ProcessRequest), session);\r
         }\r
 \r
         private void ProcessRequest(HttpProxy.Session session)\r
@@ -92,124 +181,56 @@ namespace KancolleSniffer
                 return;\r
             var request = session.Request.BodyAsString;\r
             var response = session.Response.BodyAsString;\r
+            Privacy.Remove(ref url, ref request, ref response);\r
             if (response == null || !response.StartsWith("svdata="))\r
             {\r
                 WriteDebugLog(url, request, response);\r
                 return;\r
             }\r
-            if (_config.KancolleDb.On)\r
-                _kancolleDb.Send(url, request, response);\r
-            response = UnescapeString(response.Remove(0, "svdata=".Length));\r
+            response = UnEscapeString(response.Remove(0, "svdata=".Length));\r
             WriteDebugLog(url, request, response);\r
             ProcessRequestMain(url, request, response);\r
         }\r
 \r
-        private readonly List<string[]> _battleApiLog = new List<string[]>();\r
-\r
         private void ProcessRequestMain(string url, string request, string response)\r
         {\r
             try\r
             {\r
                 UpdateInfo(_sniffer.Sniff(url, request, JsonParser.Parse(response)));\r
-                SaveBattleApi(url, request, response);\r
-                CheckBattleResult();\r
+                _errorLog.CheckBattleApi(url, request, response);\r
             }\r
 \r
             catch (RuntimeBinderException e)\r
             {\r
                 if (_errorDialog.ShowDialog(this,\r
                         "艦これに仕様変更があったか、受信内容が壊れています。",\r
-                        GenerateErrorLog(url, request, response, e.ToString())) == DialogResult.Abort)\r
-                    Application.Exit();\r
+                        _errorLog.GenerateErrorLog(url, request, response, e.ToString())) == DialogResult.Abort)\r
+                    Exit();\r
             }\r
             catch (LogIOException e)\r
             {\r
                 // ReSharper disable once PossibleNullReferenceException\r
                 if (_errorDialog.ShowDialog(this, e.Message, e.InnerException.ToString()) == DialogResult.Abort)\r
-                    Application.Exit();\r
+                    Exit();\r
+            }\r
+            catch (BattleResultError)\r
+            {\r
+                if (_errorDialog.ShowDialog(this, "戦闘結果の計算に誤りがあります。",\r
+                        _errorLog.GenerateBattleErrorLog()) == DialogResult.Abort)\r
+                    Exit();\r
             }\r
             catch (Exception e)\r
             {\r
                 if (_errorDialog.ShowDialog(this, "エラーが発生しました。",\r
-                        GenerateErrorLog(url, request, response, e.ToString())) == DialogResult.Abort)\r
-                    Application.Exit();\r
+                        _errorLog.GenerateErrorLog(url, request, response, e.ToString())) == DialogResult.Abort)\r
+                    Exit();\r
             }\r
         }\r
 \r
-        private void CheckBattleResult()\r
+        private void Exit()\r
         {\r
-            if (_sniffer.Battle.WrongResultRank.Count == 0 && _sniffer.WrongBattleResult.Count == 0)\r
-                return;\r
-            if (_errorDialog.ShowDialog(this,\r
-                    "戦闘結果の計算に誤りがあります。",\r
-                    GenerateBattleErrorLog()) == DialogResult.Abort)\r
-                Application.Exit();\r
-            _sniffer.Battle.WrongResultRank.Clear();\r
-            _sniffer.WrongBattleResult.Clear();\r
-        }\r
-\r
-        private BattleState _prevBattleState = BattleState.None;\r
-\r
-        private void SaveBattleApi(string url, string request, string response)\r
-        {\r
-            if (_prevBattleState == BattleState.None)\r
-                _battleApiLog.Clear();\r
-            if (_sniffer.Battle.BattleState != BattleState.None)\r
-                _battleApiLog.Add(new[] {url, request, response});\r
-            _prevBattleState = _sniffer.Battle.BattleState;\r
-        }\r
-\r
-        private string GenerateBattleErrorLog()\r
-        {\r
-            foreach (var logs in _battleApiLog)\r
-                RemoveUnwantedInformation(ref logs[1], ref logs[2]);\r
-            var version = string.Join(".", Application.ProductVersion.Split('.').Take(2));\r
-            var api = CompressApi(string.Join("\r\n", _battleApiLog.Select(logs => string.Join("\r\n", logs))));\r
-            var ranks = _sniffer.Battle.WrongResultRank;\r
-            var status = ranks.Count > 0\r
-                ? $"{ranks[0]}->{ranks[1]}"\r
-                : string.Join(" ",\r
-                    from pair in _sniffer.WrongBattleResult\r
-                    let assumed = pair.Assumed\r
-                    let actual = pair.Actual\r
-                    select $"({assumed.Fleet}-{assumed.DeckIndex}) {assumed.Id}: {assumed.NowHp}->{actual.NowHp}");\r
-            var result = $"{{{{{{\r\n{DateTime.Now:g} {version}\r\n{status}\r\n{api}\r\n}}}}}}";\r
-            File.WriteAllText("error.log", result);\r
-            return result;\r
-        }\r
-\r
-        private string GenerateErrorLog(string url, string request, string response, string exception)\r
-        {\r
-            RemoveUnwantedInformation(ref request, ref response);\r
-            var version = string.Join(".", Application.ProductVersion.Split('.').Take(2));\r
-            var api = CompressApi($"{url}\r\n{request}\r\n{response}");\r
-            var result = $"{{{{{{\r\n{DateTime.Now:g} {version}\r\n{exception}\r\n{api}\r\n}}}}}}";\r
-            File.WriteAllText("error.log", result);\r
-            return result;\r
-        }\r
-\r
-        private void RemoveUnwantedInformation(ref string request, ref string response)\r
-        {\r
-            var token = new Regex("&api%5Ftoken=[^&]*|api%5Ftoken=[^&]*&?");\r
-            request = token.Replace(request, "");\r
-            var id = new Regex(@"""api_member_id"":\d+,?|""api_nickname"":[^,]+,""api_nickname_id"":""d+"",?");\r
-            response = id.Replace(response, "");\r
-        }\r
-\r
-        private string CompressApi(string api)\r
-        {\r
-            var output = new MemoryStream();\r
-            var gzip = new GZipStream(output, CompressionLevel.Optimal);\r
-            var bytes = Encoding.UTF8.GetBytes(api);\r
-            gzip.Write(bytes, 0, bytes.Length);\r
-            gzip.Close();\r
-            var ascii85 = Ascii85.Encode(output.ToArray());\r
-            var result = new List<string>();\r
-            var rest = ascii85.Length;\r
-            const int lineLength = 46;\r
-            for (var i = 0; i < ascii85.Length; i += lineLength, rest -= lineLength)\r
-                result.Add(ascii85.Substring(i, Min(rest, lineLength)));\r
-            return string.Join("\r\n", result);\r
+            _proxyManager.Shutdown();\r
+            Environment.Exit(1);\r
         }\r
 \r
         private void WriteDebugLog(string url, string request, string response)\r
@@ -221,7 +242,7 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        private string UnescapeString(string s)\r
+        private string UnEscapeString(string s)\r
         {\r
             try\r
             {\r
@@ -240,12 +261,14 @@ namespace KancolleSniffer
             if (update == Sniffer.Update.Start)\r
             {\r
                 labelLogin.Visible = false;\r
-                labelGuide.Visible = false;\r
+                linkLabelGuide.Visible = false;\r
                 _started = true;\r
                 return;\r
             }\r
             if (!_started)\r
                 return;\r
+            if (_now == DateTime.MinValue)\r
+                _now = DateTime.Now;\r
             if ((update & Sniffer.Update.Item) != 0)\r
                 UpdateItemInfo();\r
             if ((update & Sniffer.Update.Timer) != 0)\r
@@ -260,6 +283,8 @@ namespace KancolleSniffer
                 UpdateShipInfo();\r
             if ((update & Sniffer.Update.Battle) != 0)\r
                 UpdateBattleInfo();\r
+            if ((update & Sniffer.Update.Cell) != 0)\r
+                UpdateCellInfo();\r
         }\r
 \r
         private void MainForm_Load(object sender, EventArgs e)\r
@@ -267,12 +292,45 @@ namespace KancolleSniffer
             RestoreLocation();\r
             if (_config.HideOnMinimized && WindowState == FormWindowState.Minimized)\r
                 ShowInTaskbar = false;\r
+            if (_config.ShowHpInPercent)\r
+                _mainLabels.ToggleHpPercent();\r
+            if (_config.ShipList.Visible)\r
+                _listForm.Show();\r
             ApplyConfig();\r
             ApplyDebugLogSetting();\r
             ApplyLogSetting();\r
             ApplyProxySetting();\r
-            if (_config.KancolleDb.On)\r
-                _kancolleDb.Start(_config.KancolleDb.Token);\r
+            CheckVersionUp((current, latest) =>\r
+            {\r
+                if (latest == current)\r
+                    return;\r
+                linkLabelGuide.Text = $"バージョン{latest}があります。";\r
+                linkLabelGuide.LinkArea = new LinkArea(0, linkLabelGuide.Text.Length);\r
+                linkLabelGuide.Click += (obj, ev) =>\r
+                {\r
+                    Process.Start("https://ja.osdn.net/rel/kancollesniffer/" + latest);\r
+                };\r
+            });\r
+        }\r
+\r
+        public async void CheckVersionUp(Action<string, string> action)\r
+        {\r
+            var current = string.Join(".", Application.ProductVersion.Split('.').Take(2));\r
+            try\r
+            {\r
+                var latest = (await new WebClient().DownloadStringTaskAsync("http://kancollesniffer.osdn.jp/version"))\r
+                    .TrimEnd();\r
+                try\r
+                {\r
+                    action(current, latest);\r
+                }\r
+                catch (InvalidOperationException)\r
+                {\r
+                }\r
+            }\r
+            catch (WebException)\r
+            {\r
+            }\r
         }\r
 \r
         private void MainForm_FormClosing(object sender, FormClosingEventArgs e)\r
@@ -291,9 +349,11 @@ namespace KancolleSniffer
             e.Cancel = false;\r
             _sniffer.FlashLog();\r
             _config.Location = (WindowState == FormWindowState.Normal ? Bounds : RestoreBounds).Location;\r
+            _config.ShowHpInPercent = _mainLabels.ShowHpInPercent;\r
+            _config.ShipList.Visible = _listForm.Visible && _listForm.WindowState == FormWindowState.Normal;\r
             _config.Save();\r
+            _sniffer.SaveState();\r
             _proxyManager.Shutdown();\r
-            _kancolleDb.Stop();\r
         }\r
 \r
         private void MainForm_Resize(object sender, EventArgs e)\r
@@ -322,7 +382,17 @@ namespace KancolleSniffer
         private void ConfigToolStripMenuItem_Click(object sender, EventArgs e)\r
         {\r
             if (_configDialog.ShowDialog(this) == DialogResult.OK)\r
+            {\r
+                _config.Save();\r
                 ApplyConfig();\r
+                StopRepeatingTimer(_configDialog.RepeatSettingsChanged);\r
+            }\r
+        }\r
+\r
+        private void StopRepeatingTimer(IEnumerable<string> names)\r
+        {\r
+            foreach (var name in names)\r
+                _notificationManager.StopRepeat(name);\r
         }\r
 \r
         private void PerformZoom()\r
@@ -330,8 +400,19 @@ namespace KancolleSniffer
             if (_config.Zoom == 100)\r
                 return;\r
             var prev = CurrentAutoScaleDimensions;\r
-            foreach (var control in new Control[] {this, _listForm, labelLogin, labelGuide})\r
+            foreach (var control in new Control[]\r
+            {\r
+                this, _listForm, labelLogin, linkLabelGuide,\r
+                _configDialog, _configDialog.NotificationConfigDialog,\r
+                contextMenuStripMain, _errorDialog\r
+            })\r
+            {\r
                 control.Font = new Font(control.Font.FontFamily, control.Font.Size * _config.Zoom / 100);\r
+            }\r
+            foreach (var toolTip in new[]{_toolTip, _toolTipQuest, _tooltipCopy})\r
+            {\r
+                toolTip.Font = new Font(toolTip.Font.FontFamily, toolTip.Font.Size * _config.Zoom / 100);\r
+            }\r
             ShipLabel.LatinFont = new Font("Tahoma", 8f * _config.Zoom / 100);\r
             var cur = CurrentAutoScaleDimensions;\r
             ShipLabel.ScaleFactor = new SizeF(ShipLabel.ScaleFactor.Width * cur.Width / prev.Width,\r
@@ -349,13 +430,13 @@ namespace KancolleSniffer
         private void ApplyConfig()\r
         {\r
             _listForm.TopMost = TopMost = _config.TopMost;\r
-            _sniffer.Item.MarginShips = _config.MarginShips;\r
-            _sniffer.Item.MarginEquips = _config.MarginEquips;\r
+            _sniffer.ShipCounter.Margin = _config.MarginShips;\r
+            UpdateNumOfShips();\r
+            _sniffer.ItemCounter.Margin = _config.MarginEquips;\r
+            UpdateNumOfEquips();\r
             _sniffer.Achievement.ResetHours = _config.ResetHours;\r
             labelAkashiRepair.Visible = labelAkashiRepairTimer.Visible =\r
                 labelPresetAkashiTimer.Visible = _config.UsePresetAkashi;\r
-            if (_config.KancolleDb.On)\r
-                _kancolleDb.Start(_config.KancolleDb.Token);\r
         }\r
 \r
         public void ApplyDebugLogSetting()\r
@@ -371,7 +452,7 @@ namespace KancolleSniffer
         public void ApplyLogSetting()\r
         {\r
             LogServer.OutputDir = _config.Log.OutputDir;\r
-            LogServer.MaterialHistory = _sniffer.Material.MaterialHistory;\r
+            LogServer.LogProcessor = new LogProcessor(_sniffer.Material.MaterialHistory, _sniffer.MapDictionary);\r
             _sniffer.EnableLog(_config.Log.On ? LogType.All : LogType.None);\r
             _sniffer.MaterialLogInterval = _config.Log.MaterialLogInterval;\r
             _sniffer.LogOutputDir = _config.Log.OutputDir;\r
@@ -381,22 +462,25 @@ namespace KancolleSniffer
         {\r
             var rect = new Rectangle(\r
                 new Point(location.X + SystemInformation.IconSize.Width + SystemInformation.HorizontalFocusThickness,\r
-                    location.Y + SystemInformation.CaptionHeight) , new Size(60, 1));\r
+                    location.Y + SystemInformation.CaptionHeight), new Size(60, 1));\r
             return Screen.AllScreens.Any(screen => screen.WorkingArea.Contains(rect));\r
         }\r
 \r
         private void timerMain_Tick(object sender, EventArgs e)\r
         {\r
-            if (_started)\r
+            if (_timerEnabled)\r
             {\r
                 try\r
                 {\r
+                    _now = DateTime.Now;\r
                     UpdateTimers();\r
+                    NotifyTimers();\r
+                    _prev = _now;\r
                 }\r
                 catch (Exception ex)\r
                 {\r
                     if (_errorDialog.ShowDialog(this, "エラーが発生しました。", ex.ToString()) == DialogResult.Abort)\r
-                        Application.Exit();\r
+                        Exit();\r
                 }\r
             }\r
             if (_playLog == null || _configDialog.Visible)\r
@@ -436,53 +520,55 @@ namespace KancolleSniffer
             if (!_listForm.Visible)\r
                 return;\r
             var idx = (int)((Control)sender).Tag;\r
-            var statuses = _sniffer.GetShipStatuses(_currentFleet);\r
-            if (statuses.Length <= idx)\r
-                return;\r
-            _listForm.ShowShip(statuses[idx].Id);\r
+            var ship = (_combinedFleet\r
+                ? _sniffer.Fleets[0].Ships.Concat(_sniffer.Fleets[1].Ships).ToArray()\r
+                : _sniffer.Fleets[_currentFleet].Ships)[idx];\r
+            if (!ship.Empty)\r
+                _listForm.ShowShip(ship.Id);\r
         }\r
 \r
         private void UpdateItemInfo()\r
         {\r
             UpdateNumOfShips();\r
             UpdateNumOfEquips();\r
+            _notificationManager.Flash();\r
             labelNumOfBuckets.Text = _sniffer.Material.MaterialHistory[(int)Material.Bucket].Now.ToString("D");\r
             UpdateBucketHistory();\r
             var ac = _sniffer.Achievement.Value;\r
             if (ac >= 10000)\r
                 ac = 9999;\r
             labelAchievement.Text = ac >= 1000 ? ((int)ac).ToString("D") : ac.ToString("F1");\r
-            toolTipAchievement.SetToolTip(labelAchievement,\r
+            _toolTip.SetToolTip(labelAchievement,\r
                 "今月 " + _sniffer.Achievement.ValueOfMonth.ToString("F1") + "\n" +\r
                 "EO " + _sniffer.ExMap.Achievement);\r
-            UpdateMaterialHistry();\r
+            UpdateMaterialHistory();\r
             if (_listForm.Visible)\r
                 _listForm.UpdateList();\r
         }\r
 \r
         private void UpdateNumOfShips()\r
         {\r
-            var item = _sniffer.Item;\r
-            labelNumOfShips.Text = $"{item.NowShips:D}/{item.MaxShips:D}";\r
-            labelNumOfShips.ForeColor = item.TooManyShips ? CUDColor.Red : Color.Black;\r
-            if (item.RingShips)\r
+            var ship = _sniffer.ShipCounter;\r
+            labelNumOfShips.Text = $"{ship.Now:D}/{ship.Max:D}";\r
+            labelNumOfShips.ForeColor = ship.TooMany ? CUDColors.Red : Color.Black;\r
+            if (ship.Alarm)\r
             {\r
-                var message = $"残り{_sniffer.Item.MaxShips - _sniffer.Item.NowShips:D}隻";\r
+                var message = $"残り{ship.Rest:D}隻";\r
                 _notificationManager.Enqueue("艦娘数超過", message);\r
-                item.RingShips = false;\r
+                ship.Alarm = false;\r
             }\r
         }\r
 \r
         private void UpdateNumOfEquips()\r
         {\r
-            var item = _sniffer.Item;\r
-            labelNumOfEquips.Text = $"{item.NowEquips:D}/{item.MaxEquips:D}";\r
-            labelNumOfEquips.ForeColor = item.TooManyEquips ? CUDColor.Red : Color.Black;\r
-            if (item.RingEquips)\r
+            var item = _sniffer.ItemCounter;\r
+            labelNumOfEquips.Text = $"{item.Now:D}/{item.Max:D}";\r
+            labelNumOfEquips.ForeColor = item.TooMany ? CUDColors.Red : Color.Black;\r
+            if (item.Alarm)\r
             {\r
-                var message = $"残り{_sniffer.Item.MaxEquips - _sniffer.Item.NowEquips:D}個";\r
+                var message = $"残り{item.Rest:D}個";\r
                 _notificationManager.Enqueue("装備数超過", message);\r
-                item.RingEquips = false;\r
+                item.Alarm = false;\r
             }\r
         }\r
 \r
@@ -494,7 +580,7 @@ namespace KancolleSniffer
             labelBucketHistory.Text = $"{day:+#;-#;±0} 今日\n{week:+#;-#;±0} 今週";\r
         }\r
 \r
-        private void UpdateMaterialHistry()\r
+        private void UpdateMaterialHistory()\r
         {\r
             var labels = new[] {labelFuelHistory, labelBulletHistory, labelSteelHistory, labelBouxiteHistory};\r
             var text = new[] {"燃料", "弾薬", "鋼材", "ボーキ"};\r
@@ -519,81 +605,125 @@ namespace KancolleSniffer
 \r
         private void UpdateShipInfo()\r
         {\r
+            SetCurrentFleet();\r
+            SetCombined();\r
             UpdatePanelShipInfo();\r
             NotifyDamagedShip();\r
             UpdateChargeInfo();\r
             UpdateRepairList();\r
+            UpdateMissionLabels();\r
             if (_listForm.Visible)\r
                 _listForm.UpdateList();\r
         }\r
 \r
+        private bool _inSortie;\r
+\r
+        private void SetCurrentFleet()\r
+        {\r
+            var states = _sniffer.Fleets.Select(fleet => fleet.State).ToArray();\r
+            var inSortie = states.Any(state => state >= FleetState.Sortie);\r
+            if (_inSortie || !inSortie)\r
+            {\r
+                _inSortie = inSortie;\r
+                return;\r
+            }\r
+            _inSortie = true;\r
+            if (states[0] == FleetState.Sortie && states[1] == FleetState.Sortie)\r
+            {\r
+                _combinedFleet = true;\r
+                _currentFleet = 0;\r
+            }\r
+            else\r
+            {\r
+                _combinedFleet = false;\r
+                _currentFleet = Array.FindIndex(states, state => state >= FleetState.Sortie);\r
+            }\r
+        }\r
+\r
+        private bool _prevCombined;\r
+\r
+        private void SetCombined()\r
+        {\r
+            if (_sniffer.IsCombinedFleet && !_prevCombined)\r
+            {\r
+                _combinedFleet = true;\r
+                _currentFleet = 0;\r
+            }\r
+            _prevCombined = _sniffer.IsCombinedFleet;\r
+        }\r
+\r
         private void UpdatePanelShipInfo()\r
         {\r
-            var statuses = _sniffer.GetShipStatuses(_currentFleet);\r
-            _shipLabels.SetShipLabels(statuses);\r
-            if (_sniffer.CombinedFleetType == 0)\r
+            var fleets = _sniffer.Fleets;\r
+            var ships = fleets[_currentFleet].ActualShips;\r
+            panel7Ships.Visible = ships.Count == 7;\r
+            _mainLabels.SetShipLabels(ships);\r
+            if (!_sniffer.IsCombinedFleet)\r
                 _combinedFleet = false;\r
-            labelFleet1.Text = _combinedFleet ? "連合" : "第一";\r
+            labelFleet1.Text = _combinedFleet ? CombinedName : "第一";\r
             panelCombinedFleet.Visible = _combinedFleet;\r
             if (_combinedFleet)\r
-                _shipLabels.SetCombinedShipLabels(_sniffer.GetShipStatuses(0), _sniffer.GetShipStatuses(1));\r
+                _mainLabels.SetCombinedShipLabels(fleets[0].ActualShips, fleets[1].ActualShips);\r
+            for (var i = 0; i < _labelCheckFleets.Length; i++)\r
+                _labelCheckFleets[i].Visible = _currentFleet == i;\r
             UpdateAkashiTimer();\r
-            UpdateFighterPower(_combinedFleet);\r
+            var battle = _sniffer.Battle;\r
+            UpdateFighterPower(_combinedFleet && (battle.BattleState == BattleState.None || battle.EnemyIsCombined));\r
             UpdateLoS();\r
             UpdateCondTimers();\r
         }\r
 \r
-        private void NotifyDamagedShip()\r
+        private string CombinedName\r
         {\r
-            if (_sniffer.BadlyDamagedShips.Any())\r
-                _notificationManager.Enqueue("大破警告", string.Join(" ", _sniffer.BadlyDamagedShips));\r
+            get\r
+            {\r
+                switch (_sniffer.Fleets[0].CombinedType)\r
+                {\r
+                    case CombinedType.Carrier:\r
+                        return "機動";\r
+                    case CombinedType.Surface:\r
+                        return "水上";\r
+                    case CombinedType.Transport:\r
+                        return "輸送";\r
+                    default:\r
+                        return "連合";\r
+                }\r
+            }\r
         }\r
 \r
-        private void NotifyAkashiTimer()\r
+        private void NotifyDamagedShip()\r
         {\r
-            var akashi = _sniffer.AkashiTimer;\r
-            var msgs = akashi.GetNotice();\r
-            if (msgs.Length == 0)\r
+            if (!_sniffer.BadlyDamagedShips.Any())\r
                 return;\r
-            if (!akashi.CheckReparing() && !(akashi.CheckPresetReparing() && _config.UsePresetAkashi))\r
-                return;\r
-            if (msgs[0].Proceeded == "20分経過しました。")\r
-            {\r
-                _notificationManager.Enqueue("泊地修理20分経過", msgs[0].Proceeded);\r
-                msgs[0].Proceeded = "";\r
-                // 修理完了がいるかもしれないので続ける\r
-            }\r
-            for (var i = 0; i < ShipInfo.FleetCount; i++)\r
-            {\r
-                if (msgs[i].Proceeded != "")\r
-                    _notificationManager.Enqueue("泊地修理進行", i, msgs[i].Proceeded);\r
-                if (msgs[i].Completed != "")\r
-                    _notificationManager.Enqueue("泊地修理完了", i, msgs[i].Completed);\r
-            }\r
+            _notificationManager.StopRepeat("大破警告");\r
+            SetNotification("大破警告", string.Join(" ", _sniffer.BadlyDamagedShips));\r
+            _notificationManager.Flash();\r
         }\r
 \r
         public void UpdateFighterPower(bool combined)\r
         {\r
+            var fleets = _sniffer.Fleets;\r
             var fp = combined\r
-                ? _sniffer.GetFighterPower(0).Zip(_sniffer.GetFighterPower(1), (a, b) => a + b).ToArray()\r
-                : _sniffer.GetFighterPower(_currentFleet);\r
+                ? fleets[0].FighterPower.Zip(fleets[1].FighterPower, (a, b) => a + b).ToArray()\r
+                : fleets[_currentFleet].FighterPower;\r
             labelFighterPower.Text = fp[0].ToString("D");\r
             var cr = combined\r
-                ? _sniffer.GetContactTriggerRate(0) + _sniffer.GetContactTriggerRate(1)\r
-                : _sniffer.GetContactTriggerRate(_currentFleet);\r
+                ? fleets[0].ContactTriggerRate + fleets[1].ContactTriggerRate\r
+                : fleets[_currentFleet].ContactTriggerRate;\r
             var text = "制空: " + (fp[0] == fp[1] ? $"{fp[0]}" : $"{fp[0]}~{fp[1]}") +\r
                        $" 触接: {cr * 100:f1}";\r
-            toolTipFighterPower.SetToolTip(labelFighterPower, text);\r
-            toolTipFighterPower.SetToolTip(labelFighterPowerCaption, text);\r
+            _toolTip.SetToolTip(labelFighterPower, text);\r
+            _toolTip.SetToolTip(labelFighterPowerCaption, text);\r
         }\r
 \r
         private void UpdateLoS()\r
         {\r
-            labelLoS.Text = RoundDown(_sniffer.GetFleetLineOfSights(_currentFleet, 1)).ToString("F1");\r
-            var text = $"係数3: {RoundDown(_sniffer.GetFleetLineOfSights(_currentFleet, 3)):F1}\r\n" +\r
-                       $"係数4: {RoundDown(_sniffer.GetFleetLineOfSights(_currentFleet, 4)):F1}";\r
-            toolTipLoS.SetToolTip(labelLoS, text);\r
-            toolTipLoS.SetToolTip(labelLoSCaption, text);\r
+            var fleet = _sniffer.Fleets[_currentFleet];\r
+            labelLoS.Text = RoundDown(fleet.GetLineOfSights(1)).ToString("F1");\r
+            var text = $"係数3: {RoundDown(fleet.GetLineOfSights(3)):F1}\r\n" +\r
+                       $"係数4: {RoundDown(fleet.GetLineOfSights(4)):F1}";\r
+            _toolTip.SetToolTip(labelLoS, text);\r
+            _toolTip.SetToolTip(labelLoSCaption, text);\r
         }\r
 \r
         private double RoundDown(double number)\r
@@ -604,16 +734,21 @@ namespace KancolleSniffer
         private void UpdateBattleInfo()\r
         {\r
             ResetBattleInfo();\r
+            _listForm.UpdateBattleResult();\r
+            _listForm.UpdateAirBattleResult();\r
             if (_sniffer.Battle.BattleState == BattleState.None)\r
                 return;\r
             panelBattleInfo.BringToFront();\r
             var battle = _sniffer.Battle;\r
-            labelFormation.Text = battle.Formation;\r
+            labelFormation.Text = new[] {"同航戦", "反航戦", "T字有利", "T字不利"}[battle.Formation[2] - 1];\r
             UpdateBattleFighterPower();\r
-            if (_config.AlwaysShowResultRank)\r
+            if ((_config.Spoilers & Spoiler.ResultRank) != 0)\r
                 ShowResultRank();\r
-            if (_sniffer.Battle.BattleState == BattleState.Day)\r
-                _listForm.UpdateAirBattleResult();\r
+        }\r
+\r
+        private void UpdateCellInfo()\r
+        {\r
+            _listForm.UpdateCellInfo();\r
         }\r
 \r
         private void ResetBattleInfo()\r
@@ -633,12 +768,17 @@ namespace KancolleSniffer
             if (power.AirCombat != power.Interception)\r
             {\r
                 var text = "防空: " + power.Interception + power.UnknownMark;\r
-                toolTipFighterPower.SetToolTip(labelEnemyFighterPower, text);\r
-                toolTipFighterPower.SetToolTip(labelEnemyFighterPowerCaption, text);\r
+                _toolTip.SetToolTip(labelEnemyFighterPower, text);\r
+                _toolTip.SetToolTip(labelEnemyFighterPowerCaption, text);\r
             }\r
-            UpdateFighterPower(_sniffer.CombinedFleetType > 0 && battle.EnemyIsCombined);\r
+            else\r
+            {\r
+                _toolTip.SetToolTip(labelEnemyFighterPower, "");\r
+                _toolTip.SetToolTip(labelEnemyFighterPowerCaption, "");\r
+            }\r
+            UpdateFighterPower(_sniffer.IsCombinedFleet && battle.EnemyIsCombined);\r
             labelFighterPower.ForeColor = new[]\r
-                {DefaultForeColor, DefaultForeColor, CUDColor.Blue, CUDColor.Green, CUDColor.Orange, CUDColor.Red}[\r
+                {DefaultForeColor, DefaultForeColor, CUDColors.Blue, CUDColors.Green, CUDColors.Orange, CUDColors.Red}[\r
                 battle.AirControlLevel + 1];\r
         }\r
 \r
@@ -660,7 +800,7 @@ namespace KancolleSniffer
 \r
             for (var i = 0; i < fuelSq.Length; i++)\r
             {\r
-                var stat = _sniffer.ChargeStatuses[i];\r
+                var stat = _sniffer.Fleets[i].ChargeStatus;\r
                 fuelSq[i].ImageIndex = stat.Fuel;\r
                 bullSq[i].ImageIndex = stat.Bull;\r
             }\r
@@ -668,74 +808,136 @@ namespace KancolleSniffer
 \r
         private void UpdateNDocLabels()\r
         {\r
-            _shipLabels.SetNDockLabels(_sniffer.NDock);\r
+            _mainLabels.SetNDockLabels(_sniffer.NDock);\r
+            SetNDockLabel();\r
         }\r
 \r
+        private void SetNDockLabel()\r
+        {\r
+            labelNDock.Text = (_config.ShowEndTime & TimerKind.NDock) != 0 ? "入渠終了" : "入渠";\r
+        }\r
 \r
         private void labelNDock_Click(object sender, EventArgs e)\r
         {\r
-            _ndockFinishTimeMode = !_ndockFinishTimeMode;\r
+            _config.ShowEndTime ^= TimerKind.NDock;\r
+            SetNDockLabel();\r
             UpdateTimers();\r
         }\r
 \r
         private void UpdateMissionLabels()\r
         {\r
-            foreach (var entry in\r
-                new[] {labelMissionName1, labelMissionName2, labelMissionName3}.Zip(_sniffer.Missions,\r
-                    (label, mission) => new {label, mission.Name}))\r
-                entry.label.Text = entry.Name;\r
+            var nameLabels = new[] {labelMissionName1, labelMissionName2, labelMissionName3};\r
+            var paramsLabels = new[] {labelMissionParams1, labelMissionParams2, labelMissionParams3};\r
+            var names = _sniffer.Missions.Select(mission => mission.Name).ToArray();\r
+            for (var i = 0; i < ShipInfo.FleetCount - 1; i++)\r
+            {\r
+                paramsLabels[i].Visible = false;\r
+                if (string.IsNullOrEmpty(names[i]))\r
+                {\r
+                    paramsLabels[i].Text = GenerateFleetParamsForMission(i + 1);\r
+                    paramsLabels[i].Visible = true;\r
+                }\r
+                nameLabels[i].Text = names[i];\r
+            }\r
+            SetMissionLabel();\r
+        }\r
+\r
+        private void SetMissionLabel()\r
+        {\r
+            labelMission.Text = (_config.ShowEndTime & TimerKind.Mission) != 0 ? "遠征終了" : "遠征";\r
+        }\r
+\r
+        private string GenerateFleetParamsForMission(int fleetNumber)\r
+        {\r
+            var result = new List<string>();\r
+            var fleet = _sniffer.Fleets[fleetNumber];\r
+            var kira = fleet.Ships.Count(ship => ship.Cond > 49);\r
+            var plus = fleet.Ships[0].Cond > 49;\r
+            if (kira > 0)\r
+                result.Add($"キラ{kira}{(plus ? "+" : "")}");\r
+            var drums = fleet.Ships.SelectMany(ship => ship.Slot).Count(item => item.Spec.IsDrum);\r
+            var drumShips = fleet.Ships.Count(ship => ship.Slot.Any(item => item.Spec.IsDrum));\r
+            if (drums > 0)\r
+                result.Add($"ド{drums}({drumShips}隻)");\r
+            if (fleet.DaihatsuBonus > 0)\r
+                result.Add($"ダ{fleet.DaihatsuBonus * 100:f1}%");\r
+            return string.Join(" ", result);\r
         }\r
 \r
         private void labelMission_Click(object sender, EventArgs e)\r
         {\r
-            _missionFinishTimeMode = !_missionFinishTimeMode;\r
+            _config.ShowEndTime ^= TimerKind.Mission;\r
+            SetMissionLabel();\r
             UpdateTimers();\r
         }\r
 \r
         private void UpdateTimers()\r
         {\r
-            foreach (var entry in\r
-                new[] {labelMission1, labelMission2, labelMission3}.Zip(_sniffer.Missions,\r
-                    (label, mission) => new {label, mission.Name, mission.Timer}))\r
+            var mission = new[] {labelMission1, labelMission2, labelMission3};\r
+            for (var i = 0; i < mission.Length; i++)\r
             {\r
-                entry.Timer.Update();\r
-                SetTimerColor(entry.label, entry.Timer);\r
-                entry.label.Text = entry.Timer.ToString(_missionFinishTimeMode);\r
-                if (!entry.Timer.NeedRing)\r
-                    continue;\r
-                _notificationManager.Enqueue("遠征終了", entry.Name);\r
-                entry.Timer.NeedRing = false;\r
+                var entry = _sniffer.Missions[i];\r
+                SetTimerColor(mission[i], entry.Timer, _now);\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
-                entry.Timer.Update();\r
-                _shipLabels.SetNDockTimer(i, entry.Timer, _ndockFinishTimeMode);\r
-                if (!entry.Timer.NeedRing)\r
-                    continue;\r
-                _notificationManager.Enqueue("入渠終了", entry.Name);\r
-                entry.Timer.NeedRing = false;\r
+                _mainLabels.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
             {\r
                 var timer = _sniffer.KDock[i];\r
-                timer.Update();\r
-                SetTimerColor(kdock[i], timer);\r
-\r
-                kdock[i].Text = timer.EndTime == DateTime.MinValue ? "" : timer.Rest.ToString(@"hh\:mm\:ss");\r
-                if (!timer.NeedRing)\r
-                    continue;\r
-                _notificationManager.Enqueue("建造完了", $"第{i + 1:D}ドック");\r
-                timer.NeedRing = false;\r
+                SetTimerColor(kdock[i], timer, _now);\r
+                kdock[i].Text = timer.ToString(_now);\r
             }\r
             UpdateCondTimers();\r
             UpdateAkashiTimer();\r
+            _timerEnabled = true;\r
+        }\r
+\r
+        private void NotifyTimers()\r
+        {\r
+            for (var i = 0; i < _sniffer.Missions.Length; i++)\r
+            {\r
+                var entry = _sniffer.Missions[i];\r
+                if (entry.Name == "前衛支援任務" || entry.Name == "艦隊決戦支援任務")\r
+                    continue;\r
+                CheckAlarm("遠征終了", entry.Timer, i + 1, entry.Name);\r
+            }\r
+            for (var i = 0; i < _sniffer.NDock.Length; i++)\r
+            {\r
+                var entry = _sniffer.NDock[i];\r
+                CheckAlarm("入渠終了", entry.Timer, i, entry.Name);\r
+            }\r
+            for (var i = 0; i < _sniffer.KDock.Length; i++)\r
+            {\r
+                var timer = _sniffer.KDock[i];\r
+                CheckAlarm("建造完了", timer, i, "");\r
+            }\r
+            NotifyCondTimers();\r
+            NotifyAkashiTimer();\r
+            _notificationManager.Flash();\r
         }\r
 \r
-        private void SetTimerColor(Label label, RingTimer timer)\r
+        private void CheckAlarm(string key, AlarmTimer timer, int fleet, string subject)\r
         {\r
-            label.ForeColor = timer.IsFinished ? CUDColor.Red : Color.Black;\r
+            if (timer.CheckAlarm(_prev, _now))\r
+            {\r
+                SetNotification(key, fleet, subject);\r
+                return;\r
+            }\r
+            var pre = TimeSpan.FromSeconds(_config.Notifications[key].PreliminaryPeriod);\r
+            if (pre == TimeSpan.Zero)\r
+                return;\r
+            if (timer.CheckAlarm(_prev + pre, _now + pre))\r
+                SetPreNotification(key, fleet, subject);\r
+        }\r
+\r
+        private void SetTimerColor(Label label, AlarmTimer timer, DateTime now)\r
+        {\r
+            label.ForeColor = timer.IsFinished(now) ? CUDColors.Red : Color.Black;\r
         }\r
 \r
         private void UpdateCondTimers()\r
@@ -751,14 +953,13 @@ namespace KancolleSniffer
             {\r
                 timer = _sniffer.GetConditionTimer(_currentFleet);\r
             }\r
-            var now = DateTime.Now;\r
             if (timer == DateTime.MinValue)\r
             {\r
                 labelCondTimerTitle.Text = "";\r
                 labelCondTimer.Text = "";\r
                 return;\r
             }\r
-            var span = TimeSpan.FromSeconds(Ceiling((timer - now).TotalSeconds));\r
+            var span = TimeSpan.FromSeconds(Ceiling((timer - _now).TotalSeconds));\r
             if (span >= TimeSpan.FromMinutes(9))\r
             {\r
                 labelCondTimerTitle.Text = "cond40まで";\r
@@ -769,16 +970,27 @@ namespace KancolleSniffer
             {\r
                 labelCondTimerTitle.Text = "cond49まで";\r
                 labelCondTimer.Text = (span >= TimeSpan.Zero ? span : TimeSpan.Zero).ToString(@"mm\:ss");\r
-                labelCondTimer.ForeColor = span <= TimeSpan.Zero ? CUDColor.Red : DefaultForeColor;\r
+                labelCondTimer.ForeColor = span <= TimeSpan.Zero ? CUDColors.Red : DefaultForeColor;\r
             }\r
-            var notice = _sniffer.GetConditionNotice();\r
-            if (notice == null)\r
-                return;\r
+        }\r
+\r
+        private void NotifyCondTimers()\r
+        {\r
+            var notice = _sniffer.GetConditionNotice(_prev, _now);\r
+            var pre = TimeSpan.FromSeconds(_config.Notifications["疲労回復"].PreliminaryPeriod);\r
+            var preNotice = pre == TimeSpan.Zero\r
+                ? new int[ShipInfo.FleetCount]\r
+                : _sniffer.GetConditionNotice(_prev + pre, _now + pre);\r
             for (var i = 0; i < ShipInfo.FleetCount; i++)\r
             {\r
-                if (!_config.NotifyConditions.Contains(notice[i]))\r
-                    return;\r
-                _notificationManager.Enqueue("疲労回復" + notice[i], i, "cond" + notice[i]);\r
+                if (_config.NotifyConditions.Contains(notice[i]))\r
+                {\r
+                    SetNotification("疲労回復" + notice[i], i, "cond" + notice[i]);\r
+                }\r
+                else if (_config.NotifyConditions.Contains(preNotice[i]))\r
+                {\r
+                    SetPreNotification("疲労回復" + preNotice[i], i, "cond" + notice[i]);\r
+                }\r
             }\r
         }\r
 \r
@@ -786,20 +998,19 @@ namespace KancolleSniffer
         {\r
             if (_config.UsePresetAkashi)\r
                 UpdatePresetAkashiTimer();\r
-            _shipLabels.SetAkashiTimer(_sniffer.GetShipStatuses(_currentFleet),\r
-                _sniffer.AkashiTimer.GetTimers(_currentFleet));\r
-            NotifyAkashiTimer();\r
+            _mainLabels.SetAkashiTimer(_sniffer.Fleets[_currentFleet].ActualShips,\r
+                _sniffer.AkashiTimer.GetTimers(_currentFleet, _now));\r
         }\r
 \r
         private void UpdatePresetAkashiTimer()\r
         {\r
             var akashi = _sniffer.AkashiTimer;\r
-            var span = akashi.PresetDeckTimer;\r
-            var color = span == TimeSpan.Zero && akashi.CheckPresetReparing() ? CUDColor.Red : DefaultForeColor;\r
+            var span = akashi.GetPresetDeckTimer(_now);\r
+            var color = span == TimeSpan.Zero && akashi.CheckPresetRepairing() ? CUDColors.Red : DefaultForeColor;\r
             var text = span == TimeSpan.MinValue ? "" : span.ToString(@"mm\:ss");\r
             labelAkashiRepairTimer.ForeColor = color;\r
             labelAkashiRepairTimer.Text = text;\r
-            if (akashi.CheckPresetReparing() && !akashi.CheckReparing(_currentFleet))\r
+            if (akashi.CheckPresetRepairing() && !akashi.CheckRepairing(_currentFleet, _now))\r
             {\r
                 labelPresetAkashiTimer.ForeColor = color;\r
                 labelPresetAkashiTimer.Text = text;\r
@@ -811,6 +1022,61 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
+        private void NotifyAkashiTimer()\r
+        {\r
+            var akashi = _sniffer.AkashiTimer;\r
+            var msgs = akashi.GetNotice(_prev, _now);\r
+            if (msgs.Length == 0)\r
+            {\r
+                _notificationManager.StopRepeat("泊地修理");\r
+                return;\r
+            }\r
+            if (!akashi.CheckRepairing(_now) && !(akashi.CheckPresetRepairing() && _config.UsePresetAkashi))\r
+            {\r
+                _notificationManager.StopRepeat("泊地修理");\r
+                return;\r
+            }\r
+            var skipPreliminary = false;\r
+            if (msgs[0].Proceeded == "20分経過しました。")\r
+            {\r
+                SetNotification("泊地修理20分経過", msgs[0].Proceeded);\r
+                msgs[0].Proceeded = "";\r
+                skipPreliminary = true;\r
+                // 修理完了がいるかもしれないので続ける\r
+            }\r
+            for (var i = 0; i < ShipInfo.FleetCount; i++)\r
+            {\r
+                if (msgs[i].Proceeded != "")\r
+                    SetNotification("泊地修理進行", i, msgs[i].Proceeded);\r
+                if (msgs[i].Completed != "")\r
+                    SetNotification("泊地修理完了", i, msgs[i].Completed);\r
+            }\r
+            var pre = TimeSpan.FromSeconds(_config.Notifications["泊地修理20分経過"].PreliminaryPeriod);\r
+            if (skipPreliminary || pre == TimeSpan.Zero)\r
+                return;\r
+            if ((msgs = akashi.GetNotice(_prev + pre, _now + pre))[0].Proceeded == "20分経過しました。")\r
+                SetPreNotification("泊地修理20分経過", 0, msgs[0].Proceeded);\r
+        }\r
+\r
+        private void SetNotification(string key, string subject)\r
+        {\r
+            SetNotification(key, 0, subject);\r
+        }\r
+\r
+        private void SetNotification(string key, int fleet, string subject)\r
+        {\r
+            var spec = _config.Notifications[_notificationManager.KeyToName(key)];\r
+            _notificationManager.Enqueue(key, fleet, subject,\r
+                (spec.Flags & _config.NotificationFlags & NotificationType.Repeat) == 0 ? 0 : spec.RepeatInterval);\r
+        }\r
+\r
+        private void SetPreNotification(string key, int fleet, string subject)\r
+        {\r
+            var spec = _config.Notifications[_notificationManager.KeyToName(key)];\r
+            if ((spec.Flags & NotificationType.Preliminary) != 0)\r
+                _notificationManager.Enqueue(key, fleet, subject, 0, true);\r
+        }\r
+\r
         private void UpdateRepairList()\r
         {\r
             panelRepairList.SetRepairList(_sniffer.RepairList);\r
@@ -824,6 +1090,11 @@ namespace KancolleSniffer
                 labelQuestColor6\r
             };\r
             var name = new[] {labelQuest1, labelQuest2, labelQuest3, labelQuest4, labelQuest5, labelQuest6};\r
+            var count = new[]\r
+            {\r
+                labelQuestCount1, labelQuestCount2, labelQuestCount3, labelQuestCount4, labelQuestCount5,\r
+                labelQuestCount6\r
+            };\r
             var progress = new[]\r
                 {labelProgress1, labelProgress2, labelProgress3, labelProgress4, labelProgress5, labelProgress6};\r
             var quests = _sniffer.Quests;\r
@@ -834,37 +1105,62 @@ namespace KancolleSniffer
                     category[i].BackColor = quests[i].Color;\r
                     name[i].Text = quests[i].Name;\r
                     progress[i].Text = $"{quests[i].Progress:D}%";\r
+                    _toolTipQuest.SetToolTip(name[i], quests[i].ToToolTip());\r
+                    var c = quests[i].Count;\r
+                    if (c.Id == 0)\r
+                    {\r
+                        count[i].Text = "";\r
+                        count[i].ForeColor = Color.Black;\r
+                        _toolTip.SetToolTip(count[i], "");\r
+                        continue;\r
+                    }\r
+                    count[i].Text = " " + c;\r
+                    count[i].ForeColor = c.Cleared ? CUDColors.Green : Color.Black;\r
+                    _toolTip.SetToolTip(count[i], c.ToToolTip());\r
                 }\r
                 else\r
                 {\r
                     category[i].BackColor = DefaultBackColor;\r
-                    name[i].Text = progress[i].Text = "";\r
+                    name[i].Text = count[i].Text = progress[i].Text = "";\r
+                    _toolTipQuest.SetToolTip(name[i], "");\r
+                    _toolTip.SetToolTip(count[i], "");\r
                 }\r
             }\r
         }\r
 \r
-        private void Ring(string balloonTitle, string balloonMessage, string name)\r
+        private void Alarm(string balloonTitle, string balloonMessage, string name)\r
         {\r
-            if (_config.FlashWindow && (_config.Notifications[name] & NotificationType.FlashWindow) != 0)\r
+            var flags = _config.Notifications[name].Flags;\r
+            var effective = _config.NotificationFlags & _config.Notifications[name].Flags;\r
+            if ((effective & NotificationType.FlashWindow) != 0)\r
                 Win32API.FlashWindow(Handle);\r
-            if (_config.ShowBaloonTip && (_config.Notifications[name] & NotificationType.ShowBaloonTip) != 0)\r
+            if ((effective & NotificationType.ShowBaloonTip) != 0)\r
                 notifyIconMain.ShowBalloonTip(20000, balloonTitle, balloonMessage, ToolTipIcon.Info);\r
-            if (_config.PlaySound && (_config.Notifications[name] & NotificationType.PlaySound) != 0)\r
+            if ((effective & NotificationType.PlaySound) != 0)\r
                 PlaySound(_config.Sounds[name], _config.Sounds.Volume);\r
-            if (_config.Pushbullet.On && (_config.Notifications[name] & NotificationType.Pushbullet) != 0)\r
+            if (_config.Pushbullet.On && (flags & NotificationType.Push) != 0)\r
             {\r
                 Task.Run(() =>\r
                 {\r
-                    PushBullet.PushNote(_config.Pushbullet.Token, balloonTitle, balloonMessage);\r
+                    PushNotification.PushToPushbullet(_config.Pushbullet.Token, balloonTitle, balloonMessage);\r
+                });\r
+            }\r
+            if (_config.Pushover.On && (flags & NotificationType.Push) != 0)\r
+            {\r
+                Task.Run(() =>\r
+                {\r
+                    PushNotification.PushToPushover(_config.Pushover.ApiKey, _config.Pushover.UserKey,\r
+                        balloonTitle, balloonMessage);\r
                 });\r
             }\r
         }\r
 \r
         [DllImport("winmm.dll")]\r
         private static extern int mciSendString(String command,\r
-            StringBuilder buffer, int bufferSize, IntPtr hwndCallback);\r
+            StringBuilder buffer, int bufferSize, IntPtr hWndCallback);\r
 \r
 // ReSharper disable InconsistentNaming\r
+        // ReSharper disable once IdentifierTypo\r
         private const int MM_MCINOTIFY = 0x3B9;\r
 \r
         private const int MCI_NOTIFY_SUCCESSFUL = 1;\r
@@ -898,10 +1194,14 @@ namespace KancolleSniffer
             };\r
             foreach (var a in labels)\r
             {\r
-                for (var fleet = 0; fleet < labels[0].Length; fleet++)\r
+                a[0].Tag = 0;\r
+                a[0].Click += labelFleet1_Click;\r
+                a[0].DoubleClick += labelFleet1_DoubleClick;\r
+                for (var fleet = 1; fleet < labels[0].Length; fleet++)\r
                 {\r
                     a[fleet].Tag = fleet;\r
                     a[fleet].Click += labelFleet_Click;\r
+                    a[fleet].DoubleClick += labelFleet_DoubleClick;\r
                 }\r
             }\r
         }\r
@@ -912,29 +1212,81 @@ namespace KancolleSniffer
                 return;\r
             var fleet = (int)((Label)sender).Tag;\r
             if (_currentFleet == fleet)\r
-            {\r
-                if (fleet > 0)\r
-                    return;\r
-                _combinedFleet = _sniffer.CombinedFleetType > 0 && !_combinedFleet;\r
-                UpdatePanelShipInfo();\r
                 return;\r
-            }\r
             _combinedFleet = false;\r
             _currentFleet = fleet;\r
-            foreach (var label in _labelCheckFleets)\r
-                label.Visible = false;\r
-            _labelCheckFleets[fleet].Visible = true;\r
+            UpdatePanelShipInfo();\r
+        }\r
+\r
+        private readonly SemaphoreSlim _clickSemaphore = new SemaphoreSlim(1);\r
+        private readonly SemaphoreSlim _doubleClickSemaphore = new SemaphoreSlim(0);\r
+\r
+        private async void labelFleet1_Click(object sender, EventArgs e)\r
+        {\r
+            if (!_started)\r
+                return;\r
+            if (_currentFleet != 0)\r
+            {\r
+                labelFleet_Click(sender, e);\r
+                return;\r
+            }\r
+            if (!_clickSemaphore.Wait(0))\r
+                return;\r
+            try\r
+            {\r
+                if (await _doubleClickSemaphore.WaitAsync(SystemInformation.DoubleClickTime))\r
+                    return;\r
+            }\r
+            finally\r
+            {\r
+                _clickSemaphore.Release();\r
+            }\r
+            _combinedFleet = _sniffer.IsCombinedFleet && !_combinedFleet;\r
             UpdatePanelShipInfo();\r
         }\r
 \r
         private void labelFleet1_MouseHover(object sender, EventArgs e)\r
         {\r
-            labelFleet1.Text = _currentFleet == 0 && _sniffer.CombinedFleetType > 0 && !_combinedFleet ? "連合" : "第一";\r
+            labelFleet1.Text = _currentFleet == 0 && _sniffer.IsCombinedFleet && !_combinedFleet ? "連合" : "第一";\r
         }\r
 \r
         private void labelFleet1_MouseLeave(object sender, EventArgs e)\r
         {\r
-            labelFleet1.Text = _combinedFleet ? "連合" : "第一";\r
+            labelFleet1.Text = _combinedFleet ? CombinedName : "第一";\r
+        }\r
+\r
+        private void labelFleet_DoubleClick(object sender, EventArgs e)\r
+        {\r
+            if (!_started)\r
+                return;\r
+            var fleet = (int)((Label)sender).Tag;\r
+            var text = TextGenerator.GenerateFleetData(_sniffer, fleet);\r
+            CopyFleetText(text, (Label)sender);\r
+        }\r
+\r
+        private void labelFleet1_DoubleClick(object sender, EventArgs e)\r
+        {\r
+            if (!_started)\r
+                return;\r
+            _doubleClickSemaphore.Release();\r
+            var text = TextGenerator.GenerateFleetData(_sniffer, 0);\r
+            if (_combinedFleet)\r
+                text += TextGenerator.GenerateFleetData(_sniffer, 1);\r
+            CopyFleetText(text, (Label)sender);\r
+        }\r
+\r
+        private void CopyFleetText(string text, Label fleetButton)\r
+        {\r
+            if (string.IsNullOrEmpty(text))\r
+                return;\r
+            Clipboard.SetText(text);\r
+            _tooltipCopy.Active = true;\r
+            _tooltipCopy.Show("コピーしました。", fleetButton);\r
+            Task.Run(async () =>\r
+            {\r
+                await Task.Delay(1000);\r
+                _tooltipCopy.Active = false;\r
+            });\r
         }\r
 \r
         private void labelBucketHistoryButton_Click(object sender, EventArgs e)\r
@@ -948,7 +1300,7 @@ namespace KancolleSniffer
             {\r
                 labelBucketHistory.Visible = true;\r
                 labelBucketHistory.BringToFront();\r
-                labelBucketHistoryButton.BackColor = SystemColors.ActiveCaption;\r
+                labelBucketHistoryButton.BackColor = CustomColors.ActiveButtonColor;\r
             }\r
         }\r
 \r
@@ -969,7 +1321,7 @@ namespace KancolleSniffer
             {\r
                 panelMaterialHistory.Visible = true;\r
                 panelMaterialHistory.BringToFront();\r
-                labelMaterialHistoryButton.BackColor = SystemColors.ActiveCaption;\r
+                labelMaterialHistoryButton.BackColor = CustomColors.ActiveButtonColor;\r
             }\r
         }\r
 \r
@@ -979,7 +1331,7 @@ namespace KancolleSniffer
             labelMaterialHistoryButton.BackColor = DefaultBackColor;\r
         }\r
 \r
-        public void ResetAchievemnt()\r
+        public void ResetAchievement()\r
         {\r
             _sniffer.Achievement.Reset();\r
             UpdateItemInfo();\r
@@ -996,7 +1348,7 @@ namespace KancolleSniffer
             {\r
                 panelRepairList.Visible = true;\r
                 panelRepairList.BringToFront();\r
-                labelRepairListButton.BackColor = SystemColors.ActiveCaption;\r
+                labelRepairListButton.BackColor = CustomColors.ActiveButtonColor;\r
             }\r
         }\r
 \r
@@ -1020,6 +1372,37 @@ namespace KancolleSniffer
             Process.Start("http://localhost:" + _config.Proxy.Listen + "/");\r
         }\r
 \r
+        private void labelClearQuest_Click(object sender, EventArgs e)\r
+        {\r
+            _sniffer.ClearQuests();\r
+            UpdateQuestList();\r
+        }\r
+\r
+        private void labelClearQuest_MouseDown(object sender, MouseEventArgs e)\r
+        {\r
+            labelClearQuest.BackColor = CustomColors.ActiveButtonColor;\r
+        }\r
+\r
+        private void labelClearQuest_MouseUp(object sender, MouseEventArgs e)\r
+        {\r
+            labelClearQuest.BackColor = DefaultBackColor;\r
+        }\r
+\r
+        private void labelQuest_DoubleClick(object sender, EventArgs e)\r
+        {\r
+            var label = (Label)sender;\r
+            if (string.IsNullOrEmpty(label.Text))\r
+                return;\r
+            Clipboard.SetText(label.Text);\r
+            _tooltipCopy.Active = true;\r
+            _tooltipCopy.Show("コピーしました。", label);\r
+            Task.Run(async () =>\r
+            {\r
+                await Task.Delay(1000);\r
+                _tooltipCopy.Active = false;\r
+            });\r
+        }\r
+\r
         private void CaptureToolStripMenuItem_Click(object sender, EventArgs e)\r
         {\r
             try\r
@@ -1030,6 +1413,9 @@ namespace KancolleSniffer
             catch (FileNotFoundException)\r
             {\r
             }\r
+            catch (Win32Exception)\r
+            {\r
+            }\r
         }\r
     }\r
 }
\ No newline at end of file