OSDN Git Service

タスクトレイからの復帰時に常に最前面に表示になるのを直す
[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / MainForm.cs
index 653dc28..89ea809 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2013, 2014 Kazuhiro Fujieda <fujieda@users.sourceforge.jp>\r
+// Copyright (C) 2013, 2014, 2015 Kazuhiro Fujieda <fujieda@users.osdn.me>\r
 // \r
 // This program is part of KancolleSniffer.\r
 //\r
 \r
 using System;\r
 using System.Collections.Generic;\r
+using System.Diagnostics;\r
 using System.Drawing;\r
 using System.IO;\r
 using System.Linq;\r
+using System.Runtime.InteropServices;\r
+using System.Text;\r
 using System.Windows.Forms;\r
 using Codeplex.Data;\r
 using Fiddler;\r
@@ -29,49 +32,37 @@ namespace KancolleSniffer
     public partial class MainForm : Form\r
     {\r
         private readonly Sniffer _sniffer = new Sniffer();\r
-        private readonly dynamic _wmp = Activator.CreateInstance(Type.GetTypeFromProgID("WMPlayer.OCX.7"));\r
         private readonly Config _config = new Config();\r
         private readonly ConfigDialog _configDialog;\r
         private int _currentFleet;\r
         private readonly Label[] _labelCheckFleets;\r
-        private readonly ShipLabel[][] _damagedShipList = new ShipLabel[14][];\r
-        private readonly Label[] _akashiTimers = new Label[ShipInfo.MemberCount];\r
-        private readonly ShipLabel[][] _ndockLabels = new ShipLabel[DockInfo.DockCount][];\r
-        private readonly ShipInfoLabels _shipInfoLabels;\r
+        private readonly ShipLabels _shipLabels;\r
         private readonly ShipListForm _shipListForm;\r
         private readonly NoticeQueue _noticeQueue;\r
         private bool _started;\r
-        private readonly SizeF _scaleFactor;\r
-        private string _logFile;\r
+        private string _debugLogFile;\r
         private IEnumerator<string> _playLog;\r
+        private LogServer _logServer;\r
+        private readonly ProxyConfig _prevProxy = new ProxyConfig();\r
 \r
         public MainForm()\r
         {\r
             InitializeComponent();\r
             FiddlerApplication.BeforeRequest += FiddlerApplication_BeforeRequest;\r
-            FiddlerApplication.BeforeResponse += FiddlerApplication_BeforeResponse;\r
-            _wmp.PlayStateChange += new EventHandler(_wmp_PlayStateChange);\r
+            FiddlerApplication.AfterSessionComplete += FiddlerApplication_AfterSessionComplete;\r
             _configDialog = new ConfigDialog(_config, this);\r
             _labelCheckFleets = new[] {labelCheckFleet1, labelCheckFleet2, labelCheckFleet3, labelCheckFleet4};\r
 \r
             // この時点でAutoScaleDimensions == CurrentAutoScaleDimensionsなので、\r
             // MainForm.Designer.csのAutoScaleDimensionsの6f,12fを使う。\r
-            _scaleFactor = new SizeF(CurrentAutoScaleDimensions.Width / 6f, CurrentAutoScaleDimensions.Height / 12f);\r
-            ShipLabel.ScaleFactor = _scaleFactor;\r
-\r
-            var labels = new[] {labelFleet1, labelFleet2, labelFleet3, labelFleet4};\r
-            for (var i = 0; i < labels.Length; i++)\r
-                labels[i].Tag = i;\r
-            _shipInfoLabels = new ShipInfoLabels(panelShipInfo);\r
-            for (var i = 0; i < ShipInfo.MemberCount; i++)\r
-            {\r
-                var label = _shipInfoLabels.GetNameLabel(i);\r
-                var tmp = i;\r
-                label.Click += (o, e) => ShowShipOnShipList(tmp);\r
-            }\r
-            CreateDamagedShipList();\r
-            CreateAkashiTimers();\r
-            CreateNDockLabels();\r
+            ShipLabel.ScaleFactor = new SizeF(CurrentAutoScaleDimensions.Width / 6f, CurrentAutoScaleDimensions.Height / 12f);\r
+\r
+            SetupFleetClick();\r
+            _shipLabels = new ShipLabels();\r
+            _shipLabels.CreateAkashiTimers(panelShipInfo);\r
+            _shipLabels.CreateLabels(panelShipInfo, ShowShipOnShipList);\r
+            _shipLabels.CreateDamagedShipList(panelDamagedShipList);\r
+            _shipLabels.CreateNDockLabels(panelDock);\r
             _shipListForm = new ShipListForm(_sniffer, _config) {Owner = this};\r
             _noticeQueue = new NoticeQueue(Ring);\r
         }\r
@@ -85,16 +76,10 @@ namespace KancolleSniffer
                                       path.StartsWith("/kcs/resources/") || path.StartsWith("/kcs/sound/")))\r
                 oSession["x-overrideGateway"] = string.Format("localhost:{0:D}", proxy.UpstreamPort); // 上流プロキシを設定する\r
             if (!path.StartsWith("/kcsapi/api_")) // 艦これのAPI以外は無視する\r
-            {\r
                 oSession.Ignore();\r
-                return;\r
-            }\r
-            // 戦闘開始のタイミングのずれを防ぐためにバッファする\r
-            if (_sniffer.IsBattleAPI(path))\r
-                oSession.bBufferResponse = true;\r
         }\r
 \r
-        private void FiddlerApplication_BeforeResponse(Session oSession)\r
+        private void FiddlerApplication_AfterSessionComplete(Session oSession)\r
         {\r
             if (!oSession.bHasResponse || !oSession.uriContains("/kcsapi/api_"))\r
                 return;\r
@@ -109,9 +94,9 @@ namespace KancolleSniffer
             response = response.Remove(0, "svdata=".Length);\r
             var json = DynamicJson.Parse(response);\r
             var request = session.GetRequestBodyAsString();\r
-            if (_logFile != null)\r
+            if (_debugLogFile != null)\r
             {\r
-                File.AppendAllText(_logFile,\r
+                File.AppendAllText(_debugLogFile,\r
                     string.Format("url: {0}\nrequest: {1}\nresponse: {2}\n", session.url, request, json.ToString()));\r
             }\r
             UpdateInfo(_sniffer.Sniff(session.url, request, json));\r
@@ -146,14 +131,11 @@ namespace KancolleSniffer
         private void MainForm_Load(object sender, EventArgs e)\r
         {\r
             _config.Load();\r
-            if (!_config.AutoScale)\r
-            {\r
-                // DPIに応じて拡大したくないときはフォントを小さくする\r
-                Font = new Font(DefaultFont.Name, 9 / _scaleFactor.Height);\r
-                labelLogin.Font = new Font(DefaultFont.Name, 9.75f / _scaleFactor.Height);\r
-            }\r
             RestoreLocation();\r
+            if (_config.HideOnMinimized && WindowState == FormWindowState.Minimized)\r
+                ShowInTaskbar = false;\r
             ApplyConfig();\r
+            ApplyDebugLogSetting();\r
             ApplyLogSetting();\r
             _sniffer.LoadState();\r
             StartProxy();\r
@@ -165,6 +147,8 @@ namespace KancolleSniffer
                 FiddlerApplication.Startup(0, FiddlerCoreStartupFlags.RegisterAsSystemProxy);\r
             else\r
                 FiddlerApplication.Startup(_config.Proxy.Listen, FiddlerCoreStartupFlags.None);\r
+            _prevProxy.Auto = _config.Proxy.Auto;\r
+            _prevProxy.Listen = _config.Proxy.Listen;\r
         }\r
 \r
         private void MainForm_FormClosing(object sender, FormClosingEventArgs e)\r
@@ -172,8 +156,9 @@ namespace KancolleSniffer
             e.Cancel = false;\r
             _config.Location = (WindowState == FormWindowState.Normal ? Bounds : RestoreBounds).Location;\r
             _config.Save();\r
-            _sniffer.SaveState();\r
             ShutdownProxy();\r
+            if (_logServer != null)\r
+                _logServer.Stop();\r
         }\r
 \r
         private void ShutdownProxy()\r
@@ -183,8 +168,7 @@ namespace KancolleSniffer
 \r
         private void MainForm_Resize(object sender, EventArgs e)\r
         {\r
-            if (_config.HideOnMinimized && WindowState == FormWindowState.Minimized)\r
-                ShowInTaskbar = false;\r
+            ShowInTaskbar = !(_config.HideOnMinimized && WindowState == FormWindowState.Minimized);\r
         }\r
 \r
         private void notifyIconMain_MouseDoubleClick(object sender, MouseEventArgs e)\r
@@ -196,12 +180,13 @@ namespace KancolleSniffer
         {\r
             ShowInTaskbar = true;\r
             WindowState = FormWindowState.Normal;\r
+            TopMost = _config.TopMost; // 最前面に表示されなくなることがあるのを回避する\r
             Activate();\r
         }\r
 \r
         private void ExitToolStripMenuItem_Click(object sender, EventArgs e)\r
         {\r
-            Application.Exit();\r
+            Close();\r
         }\r
 \r
         private void ConfigToolStripMenuItem_Click(object sender, EventArgs e)\r
@@ -228,17 +213,38 @@ namespace KancolleSniffer
             _sniffer.Achievement.ResetHours = _config.ResetHours;\r
         }\r
 \r
-        public void ApplyLogSetting()\r
+        public void ApplyDebugLogSetting()\r
         {\r
-            _logFile = _config.Logging ? _config.LogFile : null;\r
+            _debugLogFile = _config.DebugLogging ? _config.DebugLogFile : null;\r
         }\r
 \r
         public void ApplyProxySetting()\r
         {\r
+            if (_config.Proxy.Auto == _prevProxy.Auto && _config.Proxy.Listen == _prevProxy.Listen)\r
+                return;\r
             ShutdownProxy();\r
             StartProxy();\r
         }\r
 \r
+        public void ApplyLogSetting()\r
+        {\r
+            if (_logServer != null && (!_config.Log.ServerOn || _config.Log.Listen != _logServer.Port))\r
+            {\r
+                _logServer.Stop();\r
+                _logServer = null;\r
+            }\r
+            if (_logServer == null && _config.Log.ServerOn)\r
+            {\r
+                _logServer = new LogServer(_config.Log.Listen);\r
+                _logServer.Start();\r
+            }\r
+            if (_logServer != null)\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
+        }\r
+\r
         public static bool IsVisibleOnAnyScreen(Rectangle rect)\r
         {\r
             return Screen.AllScreens.Any(screen => screen.WorkingArea.IntersectsWith(rect));\r
@@ -267,7 +273,10 @@ namespace KancolleSniffer
             foreach (var s in new[] {"url: ", "request: ", "response: "})\r
             {\r
                 if (!_playLog.MoveNext() || !_playLog.Current.StartsWith(s))\r
+                {\r
+                    labelPlayLog.Visible = false;\r
                     return;\r
+                }\r
                 lines.Add(_playLog.Current.Substring(s.Count()));\r
             }\r
             labelPlayLog.Visible = !labelPlayLog.Visible;\r
@@ -275,10 +284,11 @@ namespace KancolleSniffer
             UpdateInfo(_sniffer.Sniff(lines[0], lines[1], json));\r
         }\r
 \r
-        private void ShowShipOnShipList(int idx)\r
+        private void ShowShipOnShipList(object sender, EventArgs ev)\r
         {\r
             if (!_shipListForm.Visible)\r
                 return;\r
+            var idx = (int)((Control)sender).Tag;\r
             var statuses = _sniffer.GetShipStatuses(_currentFleet);\r
             if (statuses.Length <= idx)\r
                 return;\r
@@ -294,8 +304,11 @@ namespace KancolleSniffer
             var ac = _sniffer.Achievement.Value;\r
             if (ac >= 10000)\r
                 ac = 9999;\r
-            labelAchievement.Text = ac >= 1000 ? ac.ToString("D") : ac.ToString("F1");\r
+            labelAchievement.Text = ac >= 1000 ? ((int)ac).ToString("D") : ac.ToString("F1");\r
+            toolTipAchievement.SetToolTip(labelAchievement, "今月 " + _sniffer.Achievement.ValueOfMonth.ToString("F1"));\r
             UpdateMaterialHistry();\r
+            if (_shipListForm.Visible)\r
+                _shipListForm.UpdateList();\r
         }\r
 \r
         private void UpdateNumOfShips()\r
@@ -355,18 +368,48 @@ namespace KancolleSniffer
 \r
         private void UpdateShipInfo()\r
         {\r
+            UpdatePanelShipInfo();\r
+            NotifyDamagedShip();\r
+            UpdateChargeInfo();\r
+            UpdateDamagedShipList();\r
+            if (_shipListForm.Visible)\r
+                _shipListForm.UpdateList();\r
+        }\r
+\r
+        private void UpdatePanelShipInfo()\r
+        {\r
             var statuses = _sniffer.GetShipStatuses(_currentFleet);\r
-            _shipInfoLabels.SetShipInfo(statuses);\r
+            _shipLabels.SetShipInfo(statuses);\r
+            labelFighterPower.Text = _sniffer.GetFighterPower(_currentFleet).ToString("D");\r
+            UpdateAkashiTimer();\r
+            UpdateLoS();\r
+            UpdateCondTimers();\r
+        }\r
+\r
+        private void NotifyDamagedShip()\r
+        {\r
             if (_sniffer.Battle.HasDamagedShip)\r
                 _noticeQueue.Enqueue("大破した艦娘がいます", string.Join(" ", _sniffer.Battle.DamagedShipNames),\r
                     _config.DamagedShipSoundFile);\r
-            labelAirSuperiority.Text = _sniffer.GetAirSuperiority(_currentFleet).ToString("D");\r
-            UpdateLoS();\r
-            UpdateChargeInfo();\r
-            UpdateCondTimers();\r
-            UpdateAkashiTimer();\r
-            UpdateDamagedShipList();\r
-            _shipListForm.UpdateList();\r
+        }\r
+\r
+        private void NotifyAkashiTimer()\r
+        {\r
+            var msgs = _sniffer.GetAkashiTimerNotice();\r
+            if (msgs.Length == 0)\r
+                return;\r
+            if (msgs[0] == "20分経過しました。")\r
+            {\r
+                _noticeQueue.Enqueue("泊地修理", msgs[0], _config.Akashi20MinSoundFile);\r
+                return;\r
+            }\r
+            var fn = new[] {"第一艦隊", "第二艦隊", "第三艦隊", "第四艦隊"};\r
+            for (var i = 0; i < fn.Length; i++)\r
+            {\r
+                if (msgs[i] == "")\r
+                    continue;\r
+                _noticeQueue.Enqueue("泊地修理 " + fn[i], msgs[i], _config.AkashiProgressSoundFile);\r
+            }\r
         }\r
 \r
         private void UpdateLoS()\r
@@ -377,54 +420,49 @@ namespace KancolleSniffer
         private void UpdateBattleInfo()\r
         {\r
             labelFormation.Text = "";\r
-            labelEnemyAirSuperiority.Text = "";\r
+            labelEnemyFighterPower.Text = "";\r
+            labelFighterPower.ForeColor = DefaultForeColor;\r
+            labelResultRank.Text = "判定";\r
             panelBattleInfo.Visible = _sniffer.Battle.InBattle;\r
             if (!_sniffer.Battle.InBattle)\r
                 return;\r
-            var t = new Timer {Interval = 2000}; // 艦隊が表示されるまで遅延させる\r
-            t.Tick += (sender, args) =>\r
-            {\r
-                labelFormation.Text = _sniffer.Battle.Formation;\r
-                labelEnemyAirSuperiority.Text = _sniffer.Battle.EnemyAirSuperiority.ToString("D");\r
-                t.Stop();\r
-            };\r
-            t.Start();\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.ToString("D");\r
+            labelFighterPower.ForeColor = color[battle.AirControlLevel + 1];\r
+            if (_config.AlwaysShowResultRank)\r
+                ShowResultRank();\r
         }\r
 \r
-        private void UpdateChargeInfo()\r
+        private void ShowResultRank()\r
         {\r
-            var fuel = new[] {labelFuel1, labelFuel2, labelFuel3, labelFuel4};\r
-            var bull = new[] {labelBull1, labelBull2, labelBull3, labelBull4};\r
+            var result = new[] { "完全S", "勝利S", "勝利A", "勝利B", "敗北C", "敗北D", "敗北E" };\r
+            labelResultRank.Text = result[(int)_sniffer.Battle.ResultRank];\r
+        }\r
 \r
-            for (var i = 0; i < fuel.Length; i++)\r
-            {\r
-                var stat = _sniffer.ChargeStatuses[i];\r
-                fuel[i].ImageIndex = stat.Fuel;\r
-                bull[i].ImageIndex = stat.Bull;\r
-            }\r
+        private void labelResultRank_Click(object sender, EventArgs e)\r
+        {\r
+            ShowResultRank();\r
         }\r
 \r
-        private void CreateNDockLabels()\r
+        private void UpdateChargeInfo()\r
         {\r
-            var parent = panelDock;\r
-            for (var i = 0; i < _ndockLabels.Length; i++)\r
+            var fuelSq = new[] {labelFuelSq1, labelFuelSq2, labelFuelSq3, labelFuelSq4};\r
+            var bullSq = new[] {labelBullSq1, labelBullSq2, labelBullSq3, labelBullSq4};\r
+\r
+            for (var i = 0; i < fuelSq.Length; i++)\r
             {\r
-                var y = 3 + i * 15;\r
-                parent.Controls.AddRange(\r
-                    _ndockLabels[i] = new[]\r
-                    {\r
-                        new ShipLabel {Location = new Point(106, y), AutoSize = true, Text = "00:00:00"},\r
-                        new ShipLabel {Location = new Point(30, y), AutoSize = true} // 名前のZ-orderを下に\r
-                    });\r
-                foreach (var label in _ndockLabels[i])\r
-                    label.Scale(_scaleFactor);\r
+                var stat = _sniffer.ChargeStatuses[i];\r
+                fuelSq[i].ImageIndex = stat.Fuel;\r
+                bullSq[i].ImageIndex = stat.Bull;\r
             }\r
         }\r
 \r
         private void UpdateNDocLabels()\r
         {\r
-            for (var i = 0; i < _ndockLabels.Length; i++)\r
-                _ndockLabels[i][1].SetName(_sniffer.NDock[i].Name);\r
+            _shipLabels.SetNDockLabels(_sniffer.NDock);\r
         }\r
 \r
         private void UpdateMissionLabels()\r
@@ -442,17 +480,19 @@ namespace KancolleSniffer
                     (label, mission) => new {label, mission.Name, mission.Timer}))\r
             {\r
                 entry.Timer.Update();\r
-                SetTimerLabel(entry.label, entry.Timer);\r
+                SetTimerColor(entry.label, entry.Timer);\r
+                var rest = entry.Timer.Rest;\r
+                entry.label.Text = rest.Days == 0 ? rest.ToString(@"hh\:mm\:ss") : rest.ToString(@"d\.hh\:mm");\r
                 if (!entry.Timer.NeedRing)\r
                     continue;\r
                 _noticeQueue.Enqueue("遠征が終わりました", entry.Name, _config.MissionSoundFile);\r
                 entry.Timer.NeedRing = false;\r
             }\r
-            for (var i = 0; i < _ndockLabels.Length; i++)\r
+            for (var i = 0; i < _sniffer.NDock.Length; i++)\r
             {\r
                 var entry = _sniffer.NDock[i];\r
                 entry.Timer.Update();\r
-                SetTimerLabel(_ndockLabels[i][0], entry.Timer);\r
+                _shipLabels.SetNDockTimer(i, entry.Timer);\r
                 if (!entry.Timer.NeedRing)\r
                     continue;\r
                 _noticeQueue.Enqueue("入渠が終わりました", entry.Name, _config.NDockSoundFile);\r
@@ -463,7 +503,8 @@ namespace KancolleSniffer
             {\r
                 var timer = _sniffer.KDock[i];\r
                 timer.Update();\r
-                SetTimerLabel(kdock[i], timer);\r
+                SetTimerColor(kdock[i], timer);\r
+                kdock[i].Text = timer.Rest.ToString(@"hh\:mm\:ss");\r
                 if (!timer.NeedRing)\r
                     continue;\r
                 _noticeQueue.Enqueue("建造が終わりました", string.Format("第{0:D}ドック", i + 1), _config.KDockSoundFile);\r
@@ -473,10 +514,9 @@ namespace KancolleSniffer
             UpdateAkashiTimer();\r
         }\r
 \r
-        private void SetTimerLabel(Label label, RingTimer timer)\r
+        private void SetTimerColor(Label label, RingTimer timer)\r
         {\r
             label.ForeColor = timer.IsFinished ? Color.Red : Color.Black;\r
-            label.Text = timer.ToString();\r
         }\r
 \r
         private void UpdateCondTimers()\r
@@ -512,127 +552,45 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        private void CreateAkashiTimers()\r
-        {\r
-            var parent = panelShipInfo;\r
-            parent.SuspendLayout();\r
-            for (var i = 0; i < _akashiTimers.Length; i++)\r
-            {\r
-                const int x = 56;\r
-                var y = 20 + 16 * i;\r
-                parent.Controls.Add(\r
-                    _akashiTimers[i] = new Label {Location = new Point(x, y), AutoSize = true, Visible = false});\r
-                parent.Controls.SetChildIndex(_akashiTimers[i], 0);\r
-            }\r
-            foreach (var label in _akashiTimers)\r
-                label.Scale(_scaleFactor);\r
-            parent.ResumeLayout();\r
-        }\r
-\r
         private void UpdateAkashiTimer()\r
         {\r
-            var timers = _sniffer.GetAkashiTimers(_currentFleet);\r
-            var statuses = _sniffer.GetShipStatuses(_currentFleet);\r
-            for (var i = 0; i < _akashiTimers.Length; i++)\r
-            {\r
-                var label = _akashiTimers[i];\r
-                var labelHp = _shipInfoLabels.GetHpLabel(i);\r
-                if (timers == null || i >= timers.Length || timers[i].Span == TimeSpan.MinValue)\r
-                {\r
-                    label.Visible = false;\r
-                    labelHp.ForeColor = DefaultForeColor;\r
-                    continue;\r
-                }\r
-                var timer = timers[i];\r
-                var stat = statuses[i];\r
-                label.Visible = true;\r
-                label.Text = timer.Span.ToString(@"mm\:ss");\r
-                if (timer.Diff == 0)\r
-                {\r
-                    labelHp.ForeColor = DefaultForeColor;\r
-                    continue;\r
-                }\r
-                labelHp.ForeColor = Color.DimGray;\r
-                labelHp.SetHp(stat.NowHp + timer.Diff, stat.MaxHp);\r
-            }\r
-            var msgs = _sniffer.GetAkashiTimerNotice();\r
-            var fn = new[] {"第一艦隊", "第二艦隊", "第三艦隊", "第四艦隊"};\r
-            for (var i = 0; i < fn.Length; i++)\r
-            {\r
-                if (msgs[i] == "")\r
-                    continue;\r
-                var sound = msgs[i] == "20分経過しました。" ? _config.Akashi20MinSoundFile : _config.AkashiProgressSoundFile;\r
-                _noticeQueue.Enqueue("泊地修理 " + fn[i], msgs[i], sound);\r
-            }\r
-        }\r
-\r
-        public void CreateDamagedShipList()\r
-        {\r
-            var parent = panelDamagedShipList;\r
-            parent.SuspendLayout();\r
-            for (var i = 0; i < _damagedShipList.Length; i++)\r
-            {\r
-                var y = 3 + i * 16;\r
-                const int height = 12;\r
-                parent.Controls.AddRange(_damagedShipList[i] = new[]\r
-                {\r
-                    new ShipLabel {Location = new Point(1, y), Size = new Size(11, height)},\r
-                    new ShipLabel {Location = new Point(79, y), AutoSize = true},\r
-                    new ShipLabel {Location = new Point(123, y), Size = new Size(5, height - 1)},\r
-                    new ShipLabel {Location = new Point(10, y), AutoSize = true}\r
-                });\r
-                foreach (var label in _damagedShipList[i])\r
-                    label.Scale(_scaleFactor);\r
-            }\r
-            parent.ResumeLayout();\r
+            _shipLabels.SetAkashiTimer(_sniffer.GetShipStatuses(_currentFleet),\r
+                _sniffer.GetAkashiTimers(_currentFleet));\r
+            NotifyAkashiTimer();\r
         }\r
 \r
         private void UpdateDamagedShipList()\r
         {\r
-            const int fleet = 0, name = 3, time = 1, damage = 2;\r
-            var parent = panelDamagedShipList;\r
-            var list = _sniffer.DamagedShipList;\r
-            var num = Math.Min(list.Length, _damagedShipList.Length);\r
-            var width = (int)Math.Round(_scaleFactor.Width * 134);\r
-            if (num == 0)\r
-            {\r
-                parent.Size = new Size(width, (int)Math.Round(_scaleFactor.Height * 19));\r
-                var labels = _damagedShipList[0];\r
-                labels[fleet].Text = "";\r
-                labels[name].SetName("なし");\r
-                labels[time].Text = "";\r
-                labels[damage].BackColor = DefaultBackColor;\r
-                return;\r
-            }\r
-            parent.Size = new Size(width, (int)Math.Round(_scaleFactor.Height * (num * 16 + 3)));\r
-            var fn = new[] {"", "1", "2", "3", "4"};\r
-            var colors = new[] {DefaultBackColor, Color.FromArgb(255, 225, 225, 21), Color.Orange, Color.Red};\r
-            for (var i = 0; i < num; i++)\r
-            {\r
-                var e = list[i];\r
-                var labels = _damagedShipList[i];\r
-                labels[fleet].Text = fn[e.Fleet + 1];\r
-                labels[name].SetName(e.Name);\r
-                var t = e.RepairTime;\r
-                labels[time].Text = string.Format(@"{0:d2}:{1:mm\:ss}", (int)t.TotalHours, t);\r
-                labels[damage].BackColor = colors[(int)e.DamageLevel];\r
-            }\r
+            _shipLabels.SetDamagedShipList(_sniffer.DamagedShipList);\r
         }\r
 \r
         private void UpdateQuestList()\r
         {\r
-            var name = new[] {labelQuest1, labelQuest2, labelQuest3, labelQuest4, labelQuest5};\r
-            var progress = new[] {labelProgress1, labelProgress2, labelProgress3, labelProgress4, labelProgress5};\r
+            var category = new[]\r
+            {\r
+                labelQuestColor1, labelQuestColor2, labelQuestColor3, labelQuestColor4, labelQuestColor5, labelQuestColor6\r
+            };\r
+            var name = new[] {labelQuest1, labelQuest2, labelQuest3, labelQuest4, labelQuest5, labelQuest6};\r
+            var progress = new[] {labelProgress1, labelProgress2, labelProgress3, labelProgress4, labelProgress5, labelProgress6};\r
+            var color = new[]\r
+            {\r
+                Color.FromArgb(60, 141, 76), Color.FromArgb(232, 57, 41), Color.FromArgb(136, 204, 120),\r
+                Color.FromArgb(52, 147, 185), Color.FromArgb(220, 198, 126), Color.FromArgb(168, 111, 76),\r
+                Color.FromArgb(200, 148, 231)\r
+            };\r
 \r
+            var quests = _sniffer.Quests;\r
             for (var i = 0; i < name.Length; i++)\r
             {\r
-                if (i < _sniffer.Quests.Length)\r
+                if (i < quests.Length)\r
                 {\r
-                    name[i].Text = _sniffer.Quests[i].Name;\r
-                    progress[i].Text = string.Format("{0:D}%", _sniffer.Quests[i].Progress);\r
+                    category[i].BackColor = color[quests[i].Category - 1];\r
+                    name[i].Text = quests[i].Name;\r
+                    progress[i].Text = string.Format("{0:D}%", quests[i].Progress);\r
                 }\r
                 else\r
                 {\r
+                    category[i].BackColor = DefaultBackColor;\r
                     name[i].Text = progress[i].Text = "";\r
                 }\r
             }\r
@@ -685,19 +643,49 @@ namespace KancolleSniffer
                 PlaySound(soundFile, _config.SoundVolume);\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
+        private const int MCI_NOTIFY_SUCCESSFUL = 1;\r
+// ReSharper restore InconsistentNaming\r
+\r
         public void PlaySound(string file, int volume)\r
         {\r
             if (!File.Exists(file))\r
                 return;\r
-            _wmp.settings.volume = volume;\r
-            _wmp.URL = file;\r
-            _wmp.controls.play();\r
+            mciSendString("close sound", null, 0, IntPtr.Zero);\r
+            if (mciSendString("open \"" + file + "\" type mpegvideo alias sound", null, 0, IntPtr.Zero) != 0)\r
+                return;\r
+            mciSendString("setaudio sound volume to " + volume * 10, null, 0, IntPtr.Zero);\r
+            mciSendString("play sound notify", null, 0, Handle);\r
         }\r
 \r
-        private void _wmp_PlayStateChange(object sender, EventArgs e)\r
+        protected override void WndProc(ref Message m)\r
         {\r
-            if (_wmp.playState == 8) // MediaEnded\r
-                _wmp.URL = ""; // 再生したファイルが差し替えできなくなるのを防ぐ。\r
+            if (m.Msg == MM_MCINOTIFY && (int)m.WParam == MCI_NOTIFY_SUCCESSFUL)\r
+                mciSendString("close sound", null, 0, IntPtr.Zero);\r
+            base.WndProc(ref m);\r
+        }\r
+\r
+        private void SetupFleetClick()\r
+        {\r
+            var labels = new[]\r
+            {\r
+                new[] {labelFleet1, labelFleet2, labelFleet3, labelFleet4},\r
+                new[] {labelFuelSq1, labelFuelSq2, labelFuelSq3, labelFuelSq4},\r
+                new[] {labelBullSq1, labelBullSq2, labelBullSq3, labelBullSq4}\r
+            };\r
+            foreach (var a in labels)\r
+            {\r
+                for (var fleet = 0; fleet < labels[0].Length; fleet++)\r
+                {\r
+                    a[fleet].Tag = fleet;\r
+                    a[fleet].Click += labelFleet_Click;\r
+                }\r
+            }\r
         }\r
 \r
         private void labelFleet_Click(object sender, EventArgs e)\r
@@ -711,7 +699,7 @@ namespace KancolleSniffer
             _labelCheckFleets[fleet].Visible = true;\r
             if (!_started)\r
                 return;\r
-            UpdateShipInfo();\r
+            UpdatePanelShipInfo();\r
         }\r
 \r
         private void labelBucketHistoryButton_Click(object sender, EventArgs e)\r
@@ -724,6 +712,7 @@ namespace KancolleSniffer
             else\r
             {\r
                 labelBucketHistory.Visible = true;\r
+                labelBucketHistory.BringToFront();\r
                 labelBucketHistoryButton.BackColor = SystemColors.ActiveCaption;\r
             }\r
         }\r
@@ -738,6 +727,7 @@ namespace KancolleSniffer
             else\r
             {\r
                 panelMaterialHistory.Visible = true;\r
+                panelMaterialHistory.BringToFront();\r
                 labelMaterialHistoryButton.BackColor = SystemColors.ActiveCaption;\r
             }\r
         }\r
@@ -758,15 +748,23 @@ namespace KancolleSniffer
             else\r
             {\r
                 panelDamagedShipList.Visible = true;\r
+                panelDamagedShipList.BringToFront();\r
                 labelDamgedShipListButton.BackColor = SystemColors.ActiveCaption;\r
             }\r
         }\r
 \r
         private void ShipListToolStripMenuItem_Click(object sender, EventArgs e)\r
         {\r
-            _shipListForm.Show();\r
             _shipListForm.UpdateList();\r
+            _shipListForm.Show();\r
+            if (_shipListForm.WindowState == FormWindowState.Minimized)\r
+                _shipListForm.WindowState = FormWindowState.Normal;\r
             _shipListForm.Activate();\r
         }\r
+\r
+        private void LogToolStripMenuItem_Click(object sender, EventArgs e)\r
+        {\r
+            Process.Start("http://localhost:" + _config.Log.Listen + "/");\r
+        }\r
     }\r
 }
\ No newline at end of file