X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=KancolleSniffer%2FMainForm.cs;h=89ea80969c150936738387d3456bd4b9b37ac9b6;hb=0bda4d86e79cd12b4a99a31791c01a059a8ab330;hp=878fe7b3ac122fdf75116321cc84f81ff1524d43;hpb=cdeec7a0f472151097086b245abc62fc05bf0fb0;p=kancollesniffer%2FKancolleSniffer.git

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index 878fe7b..89ea809 100644
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -1,4 +1,4 @@
-// Copyright (C) 2013, 2014, 2015 Kazuhiro Fujieda <fujieda@users.sourceforge.jp>
+// Copyright (C) 2013, 2014, 2015 Kazuhiro Fujieda <fujieda@users.osdn.me>
 // 
 // This program is part of KancolleSniffer.
 //
@@ -180,6 +180,7 @@ namespace KancolleSniffer
         {
             ShowInTaskbar = true;
             WindowState = FormWindowState.Normal;
+            TopMost = _config.TopMost; // 最前面に表示されなくなることがあるのを回避する
             Activate();
         }
 
@@ -304,6 +305,7 @@ namespace KancolleSniffer
             if (ac >= 10000)
                 ac = 9999;
             labelAchievement.Text = ac >= 1000 ? ((int)ac).ToString("D") : ac.ToString("F1");
+            toolTipAchievement.SetToolTip(labelAchievement, "今月 " + _sniffer.Achievement.ValueOfMonth.ToString("F1"));
             UpdateMaterialHistry();
             if (_shipListForm.Visible)
                 _shipListForm.UpdateList();
@@ -378,7 +380,7 @@ namespace KancolleSniffer
         {
             var statuses = _sniffer.GetShipStatuses(_currentFleet);
             _shipLabels.SetShipInfo(statuses);
-            labelAirSuperiority.Text = _sniffer.GetAirSuperiority(_currentFleet).ToString("D");
+            labelFighterPower.Text = _sniffer.GetFighterPower(_currentFleet).ToString("D");
             UpdateAkashiTimer();
             UpdateLoS();
             UpdateCondTimers();
@@ -418,22 +420,31 @@ namespace KancolleSniffer
         private void UpdateBattleInfo()
         {
             labelFormation.Text = "";
-            labelEnemyAirSuperiority.Text = "";
-            labelAirSuperiority.ForeColor = DefaultForeColor;
+            labelEnemyFighterPower.Text = "";
+            labelFighterPower.ForeColor = DefaultForeColor;
+            labelResultRank.Text = "判定";
             panelBattleInfo.Visible = _sniffer.Battle.InBattle;
             if (!_sniffer.Battle.InBattle)
                 return;
             panelBattleInfo.BringToFront();
-            var color = new[] {DefaultForeColor, DefaultBackColor, Color.Blue, Color.Green, Color.Orange, Color.Red};
-            var t = new Timer {Interval = 2000}; // 艦隊が表示されるまで遅延させる
-            t.Tick += (sender, args) =>
-            {
-                labelFormation.Text = _sniffer.Battle.Formation;
-                labelEnemyAirSuperiority.Text = _sniffer.Battle.EnemyAirSuperiority.ToString("D");
-                labelAirSuperiority.ForeColor = color[_sniffer.Battle.AirBattleResult + 1];
-                t.Stop();
-            };
-            t.Start();
+            var battle = _sniffer.Battle;
+            var color = new[] { DefaultForeColor, DefaultForeColor, Color.Blue, Color.Green, Color.Orange, Color.Red };
+            labelFormation.Text = battle.Formation;
+            labelEnemyFighterPower.Text = battle.EnemyFighterPower.ToString("D");
+            labelFighterPower.ForeColor = color[battle.AirControlLevel + 1];
+            if (_config.AlwaysShowResultRank)
+                ShowResultRank();
+        }
+
+        private void ShowResultRank()
+        {
+            var result = new[] { "完全S", "勝利S", "勝利A", "勝利B", "敗北C", "敗北D", "敗北E" };
+            labelResultRank.Text = result[(int)_sniffer.Battle.ResultRank];
+        }
+
+        private void labelResultRank_Click(object sender, EventArgs e)
+        {
+            ShowResultRank();
         }
 
         private void UpdateChargeInfo()
@@ -555,18 +566,31 @@ namespace KancolleSniffer
 
         private void UpdateQuestList()
         {
-            var name = new[] {labelQuest1, labelQuest2, labelQuest3, labelQuest4, labelQuest5};
-            var progress = new[] {labelProgress1, labelProgress2, labelProgress3, labelProgress4, labelProgress5};
+            var category = new[]
+            {
+                labelQuestColor1, labelQuestColor2, labelQuestColor3, labelQuestColor4, labelQuestColor5, labelQuestColor6
+            };
+            var name = new[] {labelQuest1, labelQuest2, labelQuest3, labelQuest4, labelQuest5, labelQuest6};
+            var progress = new[] {labelProgress1, labelProgress2, labelProgress3, labelProgress4, labelProgress5, labelProgress6};
+            var color = new[]
+            {
+                Color.FromArgb(60, 141, 76), Color.FromArgb(232, 57, 41), Color.FromArgb(136, 204, 120),
+                Color.FromArgb(52, 147, 185), Color.FromArgb(220, 198, 126), Color.FromArgb(168, 111, 76),
+                Color.FromArgb(200, 148, 231)
+            };
 
+            var quests = _sniffer.Quests;
             for (var i = 0; i < name.Length; i++)
             {
-                if (i < _sniffer.Quests.Length)
+                if (i < quests.Length)
                 {
-                    name[i].Text = _sniffer.Quests[i].Name;
-                    progress[i].Text = string.Format("{0:D}%", _sniffer.Quests[i].Progress);
+                    category[i].BackColor = color[quests[i].Category - 1];
+                    name[i].Text = quests[i].Name;
+                    progress[i].Text = string.Format("{0:D}%", quests[i].Progress);
                 }
                 else
                 {
+                    category[i].BackColor = DefaultBackColor;
                     name[i].Text = progress[i].Text = "";
                 }
             }