OSDN Git Service

ログが壊れているときにグラフが表示されなくなったりするのを直す
[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / MainForm.cs
index 5c9ce36..dfb423c 100644 (file)
@@ -19,18 +19,13 @@ using System.Drawing;
 using System.Globalization;\r
 using System.IO;\r
 using System.Linq;\r
-using System.Net;\r
-using System.Net.Sockets;\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 Microsoft.CSharp.RuntimeBinder;\r
-using Microsoft.Win32;\r
 using static System.Math;\r
-using Timer = System.Windows.Forms.Timer;\r
 \r
 namespace KancolleSniffer\r
 {\r
@@ -39,18 +34,17 @@ namespace KancolleSniffer
         private readonly Sniffer _sniffer = new Sniffer();\r
         private readonly Config _config = new Config();\r
         private readonly ConfigDialog _configDialog;\r
+        private readonly ProxyManager _proxyManager;\r
         private int _currentFleet;\r
         private bool _combinedFleet;\r
         private readonly Label[] _labelCheckFleets;\r
         private readonly ShipLabels _shipLabels;\r
-        private readonly ShipListForm _shipListForm;\r
-        private readonly NoticeQueue _noticeQueue;\r
+        private readonly ListForm _listForm;\r
+        private readonly NotificationManager _notificationManager;\r
         private bool _started;\r
         private string _debugLogFile;\r
         private IEnumerator<string> _playLog;\r
-        private LogServer _logServer;\r
-        private int _prevProxyPort;\r
-        private readonly SystemProxy _systemProxy = new SystemProxy();\r
+\r
         private readonly ErrorDialog _errorDialog = new ErrorDialog();\r
         private bool _missionFinishTimeMode;\r
         private bool _ndockFinishTimeMode;\r
@@ -71,14 +65,17 @@ namespace KancolleSniffer
             SetupFleetClick();\r
             _shipLabels = new ShipLabels();\r
             _shipLabels.CreateAkashiTimers(panelShipInfo);\r
-            _shipLabels.CreateLabels(panelShipInfo, ShowShipOnShipList);\r
+            _shipLabels.CreateShipLabels(panelShipInfo, ShowShipOnShipList);\r
             _shipLabels.CreateCombinedShipLabels(panelCombinedFleet, ShowShipOnShipList);\r
-            _shipLabels.CreateDamagedShipList(panelDamagedShipList, panelDamagedShipList_Click);\r
             _shipLabels.CreateNDockLabels(panelDock, labelNDock_Click);\r
+            panelRepairList.CreateLabels(panelRepairList_Click);\r
             labelPresetAkashiTimer.BackColor = ShipLabels.ColumnColors[1];\r
-            _shipListForm = new ShipListForm(_sniffer, _config) {Owner = this};\r
-            _noticeQueue = new NoticeQueue(Ring);\r
+            _listForm = new ListForm(_sniffer, _config) {Owner = this};\r
+            _notificationManager = new NotificationManager(Ring);\r
             _config.Load();\r
+            _proxyManager = new ProxyManager(_config, this);\r
+            PerformZoom();\r
+            _shipLabels.AdjustAkashiTimers();\r
             _sniffer.LoadState();\r
         }\r
 \r
@@ -97,7 +94,6 @@ namespace KancolleSniffer
             if (response == null || !response.StartsWith("svdata="))\r
             {\r
                 WriteDebugLog(url, request, response);\r
-                ShowServerError(url, request, response);\r
                 return;\r
             }\r
             if (_config.KancolleDb.On)\r
@@ -106,17 +102,7 @@ namespace KancolleSniffer
             WriteDebugLog(url, request, response);\r
             try\r
             {\r
-                var update = _sniffer.Sniff(url, request, JsonParser.Parse(response));\r
-                if (update == Sniffer.Update.Error)\r
-                {\r
-                    ShowServerError(url, request, response);\r
-                    return;\r
-                }\r
-                UpdateInfo(update);\r
-            }\r
-            catch (FormatException e)\r
-            {\r
-                ShowServerError(url, request, response, e);\r
+                UpdateInfo(_sniffer.Sniff(url, request, JsonParser.Parse(response)));\r
             }\r
             catch (RuntimeBinderException e)\r
             {\r
@@ -126,6 +112,7 @@ namespace KancolleSniffer
             }\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
             }\r
@@ -145,14 +132,6 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        private void ShowServerError(string url, string request, string response, Exception e = null)\r
-        {\r
-            if (_errorDialog.ShowDialog(this, "サーバーからの応答が異常です。",\r
-                $"{(e == null ? "" : e + "\r\n")}url: {url}\r\nrequest: {request}\r\nresponse: {response ?? "(null)"}\r\n") ==\r
-                DialogResult.Abort)\r
-                Application.Exit();\r
-        }\r
-\r
         private string UnescapeString(string s)\r
         {\r
             try\r
@@ -203,65 +182,28 @@ namespace KancolleSniffer
             ApplyDebugLogSetting();\r
             ApplyLogSetting();\r
             ApplyProxySetting();\r
-            SystemEvents.PowerModeChanged += SystemEvents_PowerModeChanged;\r
             if (_config.KancolleDb.On)\r
                 _kancolleDb.Start(_config.KancolleDb.Token);\r
         }\r
 \r
-        private void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)\r
+        private void MainForm_FormClosing(object sender, FormClosingEventArgs e)\r
         {\r
-            if (e.Mode != PowerModes.Resume || !_config.Proxy.Auto)\r
-                return;\r
-            Task.Run(() =>\r
+            using (var dialog = new ConfirmDialog())\r
             {\r
-                for (var i = 0; i < 5; Thread.Sleep(10000), i++)\r
+                if (dialog.ShowDialog(this) != DialogResult.Yes)\r
                 {\r
-                    WebResponse res = null;\r
-                    SystemProxy.Refresh();\r
-                    var system = WebRequest.GetSystemWebProxy();\r
-                    if (!system.GetProxy(new Uri("http://125.6.184.16/")).IsLoopback)\r
-                    {\r
-                        File.AppendAllText("wakeup.log",\r
-                            $"[{DateTime.Now.ToString("g")}] proxy settings doesn't work.\r\n");\r
-                        continue;\r
-                    }\r
-                    try\r
-                    {\r
-                        var req = WebRequest.Create("http://kancollesniffer.osdn.jp/version");\r
-                        res = req.GetResponse();\r
-                        break;\r
-                    }\r
-                    catch\r
-                    {\r
-                        File.AppendAllText("wakeup.log",\r
-                            $"[{DateTime.Now.ToString("g")}] failed to connect internet.\r\n");\r
-                    }\r
-                    finally\r
-                    {\r
-                        res?.Close();\r
-                    }\r
+                    e.Cancel = true;\r
+                    return;\r
                 }\r
-            });\r
-        }\r
-\r
-        private void MainForm_FormClosing(object sender, FormClosingEventArgs e)\r
-        {\r
+            }\r
             e.Cancel = false;\r
+            _sniffer.FlashLog();\r
             _config.Location = (WindowState == FormWindowState.Normal ? Bounds : RestoreBounds).Location;\r
             _config.Save();\r
-            Task.Run(() => ShutdownProxy());\r
-            _logServer?.Stop();\r
-            if (_config.Proxy.Auto)\r
-                _systemProxy.RestoreSettings();\r
-            SystemEvents.PowerModeChanged -= SystemEvents_PowerModeChanged;\r
+            _proxyManager.Shutdown();\r
             _kancolleDb.Stop();\r
         }\r
 \r
-        private void ShutdownProxy()\r
-        {\r
-            HttpProxy.Shutdown();\r
-        }\r
-\r
         private void MainForm_Resize(object sender, EventArgs e)\r
         {\r
             ShowInTaskbar = !(_config.HideOnMinimized && WindowState == FormWindowState.Minimized);\r
@@ -291,6 +233,19 @@ namespace KancolleSniffer
                 ApplyConfig();\r
         }\r
 \r
+        private void PerformZoom()\r
+        {\r
+            if (_config.Zoom == 100)\r
+                return;\r
+            var prev = CurrentAutoScaleDimensions;\r
+            foreach (var control in new Control[] {this, _listForm, labelLogin, labelGuide})\r
+                control.Font = new Font(control.Font.FontFamily, control.Font.Size * _config.Zoom / 100);\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
+                ShipLabel.ScaleFactor.Height * cur.Height / prev.Height);\r
+        }\r
+\r
         private void RestoreLocation()\r
         {\r
             if (_config.Location.X == int.MinValue)\r
@@ -303,7 +258,7 @@ namespace KancolleSniffer
 \r
         private void ApplyConfig()\r
         {\r
-            _shipListForm.TopMost = TopMost = _config.TopMost;\r
+            _listForm.TopMost = TopMost = _config.TopMost;\r
             _sniffer.Item.MarginShips = _config.MarginShips;\r
             _sniffer.Item.MarginEquips = _config.MarginEquips;\r
             _sniffer.Achievement.ResetHours = _config.ResetHours;\r
@@ -320,103 +275,15 @@ namespace KancolleSniffer
 \r
         public bool ApplyProxySetting()\r
         {\r
-            if (!_config.Proxy.Auto)\r
-                _systemProxy.RestoreSettings();\r
-            if (_config.Proxy.UseUpstream)\r
-            {\r
-                HttpProxy.UpstreamProxyHost = "127.0.0.1";\r
-                HttpProxy.UpstreamProxyPort = _config.Proxy.UpstreamPort;\r
-            }\r
-            HttpProxy.IsEnableUpstreamProxy = _config.Proxy.UseUpstream;\r
-            var result = true;\r
-            if (!HttpProxy.IsInListening || _config.Proxy.Listen != _prevProxyPort)\r
-            {\r
-                ShutdownProxy();\r
-                result = StartProxy();\r
-            }\r
-            if (_config.Proxy.Auto && result)\r
-            {\r
-                _systemProxy.SetAutoProxyUrl(HttpProxy.LocalPort == 8080\r
-                    ? ProxyConfig.AutoConfigUrl\r
-                    : ProxyConfig.AutoConfigUrlWithPort + HttpProxy.LocalPort);\r
-            }\r
-            _prevProxyPort = _config.Proxy.Listen;\r
-            return result;\r
-        }\r
-\r
-        private bool StartProxy()\r
-        {\r
-            try\r
-            {\r
-                HttpProxy.Startup(_config.Proxy.Listen, false, false);\r
-            }\r
-            catch (SocketException e)\r
-            {\r
-                if (e.SocketErrorCode != SocketError.AddressAlreadyInUse)\r
-                    throw;\r
-                if (WarnConflictPortNumber("プロキシサーバー", _config.Proxy.Listen, _config.Proxy.Auto) == DialogResult.No ||\r
-                    !_config.Proxy.Auto)\r
-                {\r
-                    _systemProxy.RestoreSettings();\r
-                    return false;\r
-                }\r
-                HttpProxy.Startup(0, false, false);\r
-                _config.Proxy.Listen = HttpProxy.LocalPort;\r
-            }\r
-            return true;\r
+            return _proxyManager.ApplyConfig();\r
         }\r
 \r
-        private DialogResult WarnConflictPortNumber(string name, int port, bool auto)\r
+        public void ApplyLogSetting()\r
         {\r
-            var msg = $"{name}のポート番号{port}は他のアプリケーションが使用中です。";\r
-            var cap = "ポート番号の衝突";\r
-            return auto\r
-                ? MessageBox.Show(this, msg + "自動的に別の番号を割り当てますか?", cap,\r
-                    MessageBoxButtons.YesNo, MessageBoxIcon.Question)\r
-                : MessageBox.Show(this, msg + "設定ダイアログでポート番号を変更してください。", cap,\r
-                    MessageBoxButtons.OK, MessageBoxIcon.Exclamation);\r
-        }\r
-\r
-        public bool ApplyLogSetting()\r
-        {\r
-            var result = true;\r
-            if (_config.Log.ServerOn)\r
-            {\r
-                result = StartLogServer();\r
-            }\r
-            else\r
-            {\r
-                _logServer?.Stop();\r
-                _logServer = null;\r
-            }\r
+            LogServer.OutputDir = _config.Log.OutputDir;\r
             _sniffer.EnableLog(_config.Log.On ? LogType.All : LogType.None);\r
             _sniffer.MaterialLogInterval = _config.Log.MaterialLogInterval;\r
             _sniffer.LogOutputDir = _config.Log.OutputDir;\r
-            return result;\r
-        }\r
-\r
-        private bool StartLogServer()\r
-        {\r
-            var port = _config.Log.Listen;\r
-            if (_logServer?.Port == port)\r
-                return true;\r
-            _logServer?.Stop();\r
-            _logServer = null;\r
-            try\r
-            {\r
-                _logServer = new LogServer(port);\r
-                _logServer.Start();\r
-            }\r
-            catch (SocketException e) when (e.SocketErrorCode == SocketError.AddressAlreadyInUse)\r
-            {\r
-                if (WarnConflictPortNumber("閲覧サーバー", port, true) == DialogResult.No)\r
-                    return false;\r
-                _logServer = new LogServer(0);\r
-                _logServer.Start();\r
-                _config.Log.Listen = _logServer.Port;\r
-            }\r
-            _logServer.OutputDir = _config.Log.OutputDir;\r
-            return true;\r
         }\r
 \r
         public static bool IsVisibleOnAnyScreen(Rectangle rect)\r
@@ -427,7 +294,17 @@ namespace KancolleSniffer
         private void timerMain_Tick(object sender, EventArgs e)\r
         {\r
             if (_started)\r
-                UpdateTimers();\r
+            {\r
+                try\r
+                {\r
+                    UpdateTimers();\r
+                }\r
+                catch (Exception ex)\r
+                {\r
+                    if (_errorDialog.ShowDialog(this, "エラーが発生しました。", ex.ToString()) == DialogResult.Abort)\r
+                        Application.Exit();\r
+                }\r
+            }\r
             if (_playLog == null || _configDialog.Visible)\r
             {\r
                 labelPlayLog.Visible = false;\r
@@ -460,13 +337,13 @@ namespace KancolleSniffer
 \r
         private void ShowShipOnShipList(object sender, EventArgs ev)\r
         {\r
-            if (!_shipListForm.Visible)\r
+            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
-            _shipListForm.ShowShip(statuses[idx].Id);\r
+            _listForm.ShowShip(statuses[idx].Id);\r
         }\r
 \r
         private void UpdateItemInfo()\r
@@ -483,19 +360,19 @@ namespace KancolleSniffer
                 "今月 " + _sniffer.Achievement.ValueOfMonth.ToString("F1") + "\n" +\r
                 "EO " + _sniffer.ExMap.Achievement);\r
             UpdateMaterialHistry();\r
-            if (_shipListForm.Visible)\r
-                _shipListForm.UpdateList();\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 ? Color.Red : Color.Black;\r
+            labelNumOfShips.ForeColor = item.TooManyShips ? CUDColor.Red : Color.Black;\r
             if (item.RingShips)\r
             {\r
                 var message = $"残り{_sniffer.Item.MaxShips - _sniffer.Item.NowShips:D}隻";\r
-                _noticeQueue.Enqueue("艦娘が多すぎます", message, _config.Sounds["艦娘数超過"]);\r
+                _notificationManager.Enqueue("艦娘数超過", message);\r
                 item.RingShips = false;\r
             }\r
         }\r
@@ -504,11 +381,11 @@ namespace KancolleSniffer
         {\r
             var item = _sniffer.Item;\r
             labelNumOfEquips.Text = $"{item.NowEquips:D}/{item.MaxEquips:D}";\r
-            labelNumOfEquips.ForeColor = item.TooManyEquips ? Color.Red : Color.Black;\r
+            labelNumOfEquips.ForeColor = item.TooManyEquips ? CUDColor.Red : Color.Black;\r
             if (item.RingEquips)\r
             {\r
                 var message = $"残り{_sniffer.Item.MaxEquips - _sniffer.Item.NowEquips:D}個";\r
-                _noticeQueue.Enqueue("装備が多すぎます", message, _config.Sounds["装備数超過"]);\r
+                _notificationManager.Enqueue("装備数超過", message);\r
                 item.RingEquips = false;\r
             }\r
         }\r
@@ -516,12 +393,8 @@ namespace KancolleSniffer
         private void UpdateBucketHistory()\r
         {\r
             var count = _sniffer.Material.MaterialHistory[(int)Material.Bucket];\r
-            var day = count.Now - count.BegOfDay;\r
-            var week = count.Now - count.BegOfWeek;\r
-            if (day >= 1000)\r
-                day = 999;\r
-            if (week >= 1000)\r
-                week = 999;\r
+            var day = CutOverflow(count.Now - count.BegOfDay, 999);\r
+            var week = CutOverflow(count.Now - count.BegOfWeek, 999);\r
             labelBucketHistory.Text = $"{day:+#;-#;±0} 今日\n{week:+#;-#;±0} 今週";\r
         }\r
 \r
@@ -532,41 +405,44 @@ namespace KancolleSniffer
             for (var i = 0; i < labels.Length; i++)\r
             {\r
                 var count = _sniffer.Material.MaterialHistory[i];\r
-                var port = count.Now - _sniffer.Material.PrevPort[i];\r
-                if (port >= 100000)\r
-                    port = 99999;\r
-                var day = count.Now - count.BegOfDay;\r
-                if (day >= 100000)\r
-                    day = 99999;\r
-                var week = count.Now - count.BegOfWeek;\r
-                if (week >= 100000)\r
-                    week = 99999;\r
+                var port = CutOverflow(count.Now - _sniffer.Material.PrevPort[i], 99999);\r
+                var day = CutOverflow(count.Now - count.BegOfDay, 99999);\r
+                var week = CutOverflow(count.Now - count.BegOfWeek, 99999);\r
                 labels[i].Text = $"{text[i]}\n{port:+#;-#;±0}\n{day:+#;-#;±0}\n{week:+#;-#;±0}";\r
             }\r
         }\r
 \r
+        private int CutOverflow(int value, int limit)\r
+        {\r
+            if (value > limit)\r
+                return limit;\r
+            if (value < -limit)\r
+                return -limit;\r
+            return value;\r
+        }\r
+\r
         private void UpdateShipInfo()\r
         {\r
             UpdatePanelShipInfo();\r
             NotifyDamagedShip();\r
             UpdateChargeInfo();\r
-            UpdateDamagedShipList();\r
-            if (_shipListForm.Visible)\r
-                _shipListForm.UpdateList();\r
+            UpdateRepairList();\r
+            if (_listForm.Visible)\r
+                _listForm.UpdateList();\r
         }\r
 \r
         private void UpdatePanelShipInfo()\r
         {\r
             var statuses = _sniffer.GetShipStatuses(_currentFleet);\r
-            _shipLabels.SetShipInfo(statuses);\r
+            _shipLabels.SetShipLabels(statuses);\r
             if (_sniffer.CombinedFleetType == 0)\r
                 _combinedFleet = false;\r
             labelFleet1.Text = _combinedFleet ? "連合" : "第一";\r
             panelCombinedFleet.Visible = _combinedFleet;\r
             if (_combinedFleet)\r
-                _shipLabels.SetCombinedShipInfo(_sniffer.GetShipStatuses(0), _sniffer.GetShipStatuses(1));\r
+                _shipLabels.SetCombinedShipLabels(_sniffer.GetShipStatuses(0), _sniffer.GetShipStatuses(1));\r
             UpdateAkashiTimer();\r
-            UpdateFighterPower();\r
+            UpdateFighterPower(_combinedFleet);\r
             UpdateLoS();\r
             UpdateCondTimers();\r
         }\r
@@ -574,8 +450,7 @@ namespace KancolleSniffer
         private void NotifyDamagedShip()\r
         {\r
             if (_sniffer.BadlyDamagedShips.Any())\r
-                _noticeQueue.Enqueue("大破した艦娘がいます", string.Join(" ", _sniffer.BadlyDamagedShips),\r
-                    _config.Sounds["大破警告"]);\r
+                _notificationManager.Enqueue("大破警告", string.Join(" ", _sniffer.BadlyDamagedShips));\r
         }\r
 \r
         private void NotifyAkashiTimer()\r
@@ -588,58 +463,92 @@ namespace KancolleSniffer
                 return;\r
             if (msgs[0].Proceeded == "20分経過しました。")\r
             {\r
-                _noticeQueue.Enqueue("泊地修理", msgs[0].Proceeded, _config.Sounds["泊地修理20分経過"]);\r
+                _notificationManager.Enqueue("泊地修理20分経過", msgs[0].Proceeded);\r
                 msgs[0].Proceeded = "";\r
                 // 修理完了がいるかもしれないので続ける\r
             }\r
-            var fn = new[] {"第一艦隊", "第二艦隊", "第三艦隊", "第四艦隊"};\r
-            for (var i = 0; i < fn.Length; i++)\r
+            for (var i = 0; i < ShipInfo.FleetCount; i++)\r
             {\r
                 if (msgs[i].Proceeded != "")\r
-                    _noticeQueue.Enqueue("泊地修理 " + fn[i], "修理進行:" + msgs[i].Proceeded, _config.Sounds["泊地修理進行"]);\r
+                    _notificationManager.Enqueue("泊地修理進行", i, msgs[i].Proceeded);\r
                 if (msgs[i].Completed != "")\r
-                    _noticeQueue.Enqueue("泊地修理 " + fn[i], "修理完了:" + msgs[i].Completed, _config.Sounds["泊地修理完了"]);\r
+                    _notificationManager.Enqueue("泊地修理完了", i, msgs[i].Completed);\r
             }\r
         }\r
 \r
-        public void UpdateFighterPower()\r
+        public void UpdateFighterPower(bool combined)\r
         {\r
-            var fp = _sniffer.GetFighterPower(_currentFleet);\r
+            var fp = combined\r
+                ? _sniffer.GetFighterPower(0).Zip(_sniffer.GetFighterPower(1), (a, b) => a + b).ToArray()\r
+                : _sniffer.GetFighterPower(_currentFleet);\r
             labelFighterPower.Text = fp[0].ToString("D");\r
-            var cr = _sniffer.GetContactTriggerRate(_currentFleet) * 100;\r
+            var cr = combined\r
+                ? _sniffer.GetContactTriggerRate(0) + _sniffer.GetContactTriggerRate(1)\r
+                : _sniffer.GetContactTriggerRate(_currentFleet);\r
             var text = "制空: " + (fp[0] == fp[1] ? $"{fp[0]}" : $"{fp[0]}~{fp[1]}") +\r
-                       $" 触接: {cr:f1}";\r
+                       $" 触接: {cr * 100:f1}";\r
             toolTipFighterPower.SetToolTip(labelFighterPower, text);\r
             toolTipFighterPower.SetToolTip(labelFighterPowerCaption, text);\r
         }\r
 \r
         private void UpdateLoS()\r
         {\r
-            labelLoS.Text = _sniffer.GetFleetLineOfSights(_currentFleet).ToString("F1");\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
+        }\r
+\r
+        private double RoundDown(double number)\r
+        {\r
+            return Floor(number * 10) / 10.0;\r
         }\r
 \r
         private void UpdateBattleInfo()\r
         {\r
-            labelFormation.Text = "";\r
-            labelEnemyFighterPower.Text = "";\r
-            labelFighterPower.ForeColor = DefaultForeColor;\r
-            labelResultRank.Text = "判定";\r
-            panelBattleInfo.Visible = _sniffer.Battle.InBattle;\r
-            if (!_sniffer.Battle.InBattle)\r
+            ResetBattleInfo();\r
+            if (_sniffer.Battle.BattleState == BattleState.None)\r
                 return;\r
             panelBattleInfo.BringToFront();\r
             var battle = _sniffer.Battle;\r
-            var color = new[] {DefaultForeColor, DefaultForeColor, Color.Blue, Color.Green, Color.Orange, Color.Red};\r
             labelFormation.Text = battle.Formation;\r
-            labelEnemyFighterPower.Text = battle.EnemyFighterPower;\r
-            labelFighterPower.ForeColor = color[battle.AirControlLevel + 1];\r
+            UpdateBattleFighterPower();\r
             if (_config.AlwaysShowResultRank)\r
                 ShowResultRank();\r
+            if (_sniffer.Battle.BattleState == BattleState.Day)\r
+                _listForm.UpdateAirBattleResult();\r
+        }\r
+\r
+        private void ResetBattleInfo()\r
+        {\r
+            labelFormation.Text = "";\r
+            labelEnemyFighterPower.Text = "";\r
+            labelFighterPower.ForeColor = DefaultForeColor;\r
+            labelResultRank.Text = "判定";\r
+            panelBattleInfo.Visible = _sniffer.Battle.BattleState != BattleState.None;\r
+        }\r
+\r
+        private void UpdateBattleFighterPower()\r
+        {\r
+            var battle = _sniffer.Battle;\r
+            var power = battle.EnemyFighterPower;\r
+            labelEnemyFighterPower.Text = power.AirCombat + power.UnknownMark;\r
+            if (power.AirCombat != power.Interception)\r
+            {\r
+                var text = "防空: " + power.Interception + power.UnknownMark;\r
+                toolTipFighterPower.SetToolTip(labelEnemyFighterPower, text);\r
+                toolTipFighterPower.SetToolTip(labelEnemyFighterPowerCaption, text);\r
+            }\r
+            UpdateFighterPower(_sniffer.CombinedFleetType > 0 && battle.EnemyIsCombined);\r
+            labelFighterPower.ForeColor = new[]\r
+                {DefaultForeColor, DefaultForeColor, CUDColor.Blue, CUDColor.Green, CUDColor.Orange, CUDColor.Red}[\r
+                battle.AirControlLevel + 1];\r
         }\r
 \r
         private void ShowResultRank()\r
         {\r
-            var result = new[] {"完全S", "勝利S", "勝利A", "勝利B", "敗北C", "敗北D", "敗北E", "不明"};\r
+            var result = new[] {"完全S", "勝利S", "勝利A", "勝利B", "敗北C", "敗北D", "敗北E"};\r
             labelResultRank.Text = result[(int)_sniffer.Battle.ResultRank];\r
         }\r
 \r
@@ -698,7 +607,7 @@ namespace KancolleSniffer
                 entry.label.Text = entry.Timer.ToString(_missionFinishTimeMode);\r
                 if (!entry.Timer.NeedRing)\r
                     continue;\r
-                _noticeQueue.Enqueue("遠征が終わりました", entry.Name, _config.Sounds["遠征終了"]);\r
+                _notificationManager.Enqueue("遠征終了", entry.Name);\r
                 entry.Timer.NeedRing = false;\r
             }\r
             for (var i = 0; i < _sniffer.NDock.Length; i++)\r
@@ -708,7 +617,7 @@ namespace KancolleSniffer
                 _shipLabels.SetNDockTimer(i, entry.Timer, _ndockFinishTimeMode);\r
                 if (!entry.Timer.NeedRing)\r
                     continue;\r
-                _noticeQueue.Enqueue("入渠が終わりました", entry.Name, _config.Sounds["入渠終了"]);\r
+                _notificationManager.Enqueue("入渠終了", entry.Name);\r
                 entry.Timer.NeedRing = false;\r
             }\r
             var kdock = new[] {labelConstruct1, labelConstruct2, labelConstruct3, labelConstruct4};\r
@@ -721,7 +630,7 @@ namespace KancolleSniffer
                 kdock[i].Text = timer.EndTime == DateTime.MinValue ? "" : timer.Rest.ToString(@"hh\:mm\:ss");\r
                 if (!timer.NeedRing)\r
                     continue;\r
-                _noticeQueue.Enqueue("建造が終わりました", $"第{i + 1:D}ドック", _config.Sounds["建造完了"]);\r
+                _notificationManager.Enqueue("建造完了", $"第{i + 1:D}ドック");\r
                 timer.NeedRing = false;\r
             }\r
             UpdateCondTimers();\r
@@ -730,7 +639,7 @@ namespace KancolleSniffer
 \r
         private void SetTimerColor(Label label, RingTimer timer)\r
         {\r
-            label.ForeColor = timer.IsFinished ? Color.Red : Color.Black;\r
+            label.ForeColor = timer.IsFinished ? CUDColor.Red : Color.Black;\r
         }\r
 \r
         private void UpdateCondTimers()\r
@@ -767,12 +676,11 @@ namespace KancolleSniffer
             var notice = _sniffer.GetConditionNotice();\r
             if (notice == null)\r
                 return;\r
-            var fn = new[] {"第一艦隊", "第二艦隊", "第三艦隊", "第四艦隊"};\r
-            for (var i = 0; i < fn.Length; i++)\r
+            for (var i = 0; i < ShipInfo.FleetCount; i++)\r
             {\r
                 if (!_config.NotifyConditions.Contains(notice[i]))\r
                     return;\r
-                _noticeQueue.Enqueue("疲労が回復しました", fn[i] + " cond" + notice[i].ToString("D"), _config.Sounds["疲労回復"]);\r
+                _notificationManager.Enqueue("疲労回復" + notice[i], i, "cond" + notice[i]);\r
             }\r
         }\r
 \r
@@ -789,7 +697,7 @@ namespace KancolleSniffer
         {\r
             var akashi = _sniffer.AkashiTimer;\r
             var span = akashi.PresetDeckTimer;\r
-            var color = span == TimeSpan.Zero && akashi.CheckPresetReparing() ? Color.Red : DefaultForeColor;\r
+            var color = span == TimeSpan.Zero && akashi.CheckPresetReparing() ? CUDColor.Red : DefaultForeColor;\r
             var text = span == TimeSpan.MinValue ? "" : span.ToString(@"mm\:ss");\r
             labelAkashiRepairTimer.ForeColor = color;\r
             labelAkashiRepairTimer.Text = text;\r
@@ -805,9 +713,9 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        private void UpdateDamagedShipList()\r
+        private void UpdateRepairList()\r
         {\r
-            _shipLabels.SetDamagedShipList(_sniffer.DamagedShipList);\r
+            panelRepairList.SetRepairList(_sniffer.RepairList);\r
         }\r
 \r
         private void UpdateQuestList()\r
@@ -819,7 +727,7 @@ namespace KancolleSniffer
             };\r
             var name = new[] {labelQuest1, labelQuest2, labelQuest3, labelQuest4, labelQuest5, labelQuest6};\r
             var progress = new[]\r
-            {labelProgress1, labelProgress2, labelProgress3, labelProgress4, labelProgress5, labelProgress6};\r
+                {labelProgress1, labelProgress2, labelProgress3, labelProgress4, labelProgress5, labelProgress6};\r
             var quests = _sniffer.Quests;\r
             for (var i = 0; i < name.Length; i++)\r
             {\r
@@ -837,59 +745,30 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        private class NoticeQueue\r
+        private void Ring(string balloonTitle, string balloonMessage, string name)\r
         {\r
-            private readonly Action<string, string, string> _ring;\r
-            private readonly Queue<Tuple<string, string, string>> _queue = new Queue<Tuple<string, string, string>>();\r
-            private readonly Timer _timer = new Timer {Interval = 2000};\r
-\r
-            public NoticeQueue(Action<string, string, string> ring)\r
-            {\r
-                _ring = ring;\r
-                _timer.Tick += TimerOnTick;\r
-            }\r
-\r
-            private void TimerOnTick(object obj, EventArgs e)\r
-            {\r
-                if (_queue.Count == 0)\r
-                {\r
-                    _timer.Stop();\r
-                    return;\r
-                }\r
-                var notice = _queue.Dequeue();\r
-                _ring(notice.Item1, notice.Item2, notice.Item3);\r
-            }\r
-\r
-            public void Enqueue(string title, string message, string soundFile)\r
+            if (_config.FlashWindow && (_config.Notifications[name] & NotificationType.FlashWindow) != 0)\r
+                Win32API.FlashWindow(Handle);\r
+            if (_config.ShowBaloonTip && (_config.Notifications[name] & NotificationType.ShowBaloonTip) != 0)\r
+                notifyIconMain.ShowBalloonTip(20000, balloonTitle, balloonMessage, ToolTipIcon.Info);\r
+            if (_config.PlaySound && (_config.Notifications[name] & NotificationType.PlaySound) != 0)\r
+                PlaySound(_config.Sounds[name], _config.Sounds.Volume);\r
+            if (_config.Pushbullet.On && (_config.Notifications[name] & NotificationType.Pushbullet) != 0)\r
             {\r
-                if (_timer.Enabled)\r
-                {\r
-                    _queue.Enqueue(new Tuple<string, string, string>(title, message, soundFile));\r
-                }\r
-                else\r
+                Task.Run(() =>\r
                 {\r
-                    _ring(title, message, soundFile);\r
-                    _timer.Start();\r
-                }\r
+                    PushBullet.PushNote(_config.Pushbullet.Token, balloonTitle, balloonMessage);\r
+                });\r
             }\r
         }\r
 \r
-        private void Ring(string baloonTitle, string baloonMessage, string soundFile)\r
-        {\r
-            if (_config.FlashWindow)\r
-                Win32API.FlashWindow(Handle);\r
-            if (_config.ShowBaloonTip)\r
-                notifyIconMain.ShowBalloonTip(20000, baloonTitle, baloonMessage, ToolTipIcon.Info);\r
-            if (_config.PlaySound)\r
-                PlaySound(soundFile, _config.Sounds.Volume);\r
-        }\r
-\r
         [DllImport("winmm.dll")]\r
         private static extern int mciSendString(String command,\r
             StringBuilder buffer, int bufferSize, IntPtr hwndCallback);\r
 \r
 // ReSharper disable InconsistentNaming\r
         private const int MM_MCINOTIFY = 0x3B9;\r
+\r
         private const int MCI_NOTIFY_SUCCESSFUL = 1;\r
 // ReSharper restore InconsistentNaming\r
 \r
@@ -1008,39 +887,39 @@ namespace KancolleSniffer
             UpdateItemInfo();\r
         }\r
 \r
-        private void labelDamgedShipListButton_Click(object sender, EventArgs e)\r
+        private void labelRepairListButton_Click(object sender, EventArgs e)\r
         {\r
-            if (panelDamagedShipList.Visible)\r
+            if (panelRepairList.Visible)\r
             {\r
-                panelDamagedShipList.Visible = false;\r
-                labelDamgedShipListButton.BackColor = DefaultBackColor;\r
+                panelRepairList.Visible = false;\r
+                labelRepairListButton.BackColor = DefaultBackColor;\r
             }\r
             else\r
             {\r
-                panelDamagedShipList.Visible = true;\r
-                panelDamagedShipList.BringToFront();\r
-                labelDamgedShipListButton.BackColor = SystemColors.ActiveCaption;\r
+                panelRepairList.Visible = true;\r
+                panelRepairList.BringToFront();\r
+                labelRepairListButton.BackColor = SystemColors.ActiveCaption;\r
             }\r
         }\r
 \r
-        private void panelDamagedShipList_Click(object sender, EventArgs e)\r
+        private void panelRepairList_Click(object sender, EventArgs e)\r
         {\r
-            panelDamagedShipList.Visible = false;\r
-            labelDamgedShipListButton.BackColor = DefaultBackColor;\r
+            panelRepairList.Visible = false;\r
+            labelRepairListButton.BackColor = DefaultBackColor;\r
         }\r
 \r
         private void ShipListToolStripMenuItem_Click(object sender, EventArgs e)\r
         {\r
-            _shipListForm.UpdateList();\r
-            _shipListForm.Show();\r
-            if (_shipListForm.WindowState == FormWindowState.Minimized)\r
-                _shipListForm.WindowState = FormWindowState.Normal;\r
-            _shipListForm.Activate();\r
+            _listForm.UpdateList();\r
+            _listForm.Show();\r
+            if (_listForm.WindowState == FormWindowState.Minimized)\r
+                _listForm.WindowState = FormWindowState.Normal;\r
+            _listForm.Activate();\r
         }\r
 \r
         private void LogToolStripMenuItem_Click(object sender, EventArgs e)\r
         {\r
-            Process.Start("http://localhost:" + _config.Log.Listen + "/");\r
+            Process.Start("http://localhost:" + _config.Proxy.Listen + "/");\r
         }\r
 \r
         private void CaptureToolStripMenuItem_Click(object sender, EventArgs e)\r