From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sat, 12 Dec 2015 05:13:52 +0000 (+0900)
Subject: プリセット修理が可能なときは左上にもタイマーを表示する
X-Git-Tag: v7.11~8
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1ee51a90de801b8b8eaefa7b6aec620888ce303d;p=kancollesniffer%2FKancolleSniffer.git

プリセット修理が可能なときは左上にもタイマーを表示する
---

diff --git a/KancolleSniffer/MainForm.Designer.cs b/KancolleSniffer/MainForm.Designer.cs
index 3fe566b..f77f957 100644
--- a/KancolleSniffer/MainForm.Designer.cs
+++ b/KancolleSniffer/MainForm.Designer.cs
@@ -165,6 +165,7 @@ namespace KancolleSniffer
             this.labelFuelSq4 = new System.Windows.Forms.Label();
             this.toolTipAchievement = new System.Windows.Forms.ToolTip(this.components);
             this.labelAkashiRepair = new System.Windows.Forms.Label();
+            this.labelPresetAkashiTimer = new System.Windows.Forms.Label();
             this.panelHeadquarters.SuspendLayout();
             this.panelShipInfo.SuspendLayout();
             this.panelBattleInfo.SuspendLayout();
@@ -301,6 +302,7 @@ namespace KancolleSniffer
             // panelShipInfo
             // 
             this.panelShipInfo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panelShipInfo.Controls.Add(this.labelPresetAkashiTimer);
             this.panelShipInfo.Controls.Add(this.labelGuide);
             this.panelShipInfo.Controls.Add(this.panelCombinedFleet);
             this.panelShipInfo.Controls.Add(this.panelBattleInfo);
@@ -1261,6 +1263,13 @@ namespace KancolleSniffer
             this.labelAkashiRepair.TabIndex = 54;
             this.labelAkashiRepair.Text = "修理";
             // 
+            // labelPresetAkashiTimer
+            // 
+            this.labelPresetAkashiTimer.Location = new System.Drawing.Point(2, 3);
+            this.labelPresetAkashiTimer.Name = "labelPresetAkashiTimer";
+            this.labelPresetAkashiTimer.Size = new System.Drawing.Size(31, 12);
+            this.labelPresetAkashiTimer.TabIndex = 55;
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1452,6 +1461,7 @@ namespace KancolleSniffer
         private System.Windows.Forms.Label labelGuide;
         private System.Windows.Forms.Panel panelCombinedFleet;
         private System.Windows.Forms.Label labelAkashiRepair;
+        private System.Windows.Forms.Label labelPresetAkashiTimer;
     }
 }
 
diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index 5d5bb96..76b4225 100644
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -84,6 +84,7 @@ namespace KancolleSniffer
                 _ndockFinishTimeMode = !_ndockFinishTimeMode;
                 UpdateTimers();
             });
+            labelPresetAkashiTimer.BackColor = ShipLabels.ColumnColors[1];
             _shipListForm = new ShipListForm(_sniffer, _config) {Owner = this};
             _noticeQueue = new NoticeQueue(Ring);
         }
@@ -305,7 +306,8 @@ namespace KancolleSniffer
             _sniffer.Item.MarginShips = _config.MarginShips;
             _sniffer.Item.MarginEquips = _config.MarginEquips;
             _sniffer.Achievement.ResetHours = _config.ResetHours;
-            labelAkashiRepair.Visible = labelAkashiRepairTimer.Visible = _config.UsePresetAkashi;
+            labelAkashiRepair.Visible = labelAkashiRepairTimer.Visible =
+                labelPresetAkashiTimer.Visible = _config.UsePresetAkashi;
         }
 
         public void ApplyDebugLogSetting()
@@ -768,16 +770,31 @@ namespace KancolleSniffer
 
         private void UpdateAkashiTimer()
         {
+            if (_config.UsePresetAkashi)
+                UpdatePresetAkashiTimer();
+            _shipLabels.SetAkashiTimer(_sniffer.GetShipStatuses(_currentFleet),
+                _sniffer.AkashiTimer.GetTimers(_currentFleet));
+            NotifyAkashiTimer();
+        }
+
+        private void UpdatePresetAkashiTimer()
+        {
             var akashi = _sniffer.AkashiTimer;
             var span = akashi.PresetDeckTimer;
-            if (_config.UsePresetAkashi)
+            var color = span == TimeSpan.Zero && akashi.CheckPresetReparing() ? Color.Red : DefaultForeColor;
+            var text = span == TimeSpan.MinValue ? "" : span.ToString(@"mm\:ss");
+            labelAkashiRepairTimer.ForeColor = color;
+            labelAkashiRepairTimer.Text = text;
+            if (akashi.CheckPresetReparing() && !akashi.CheckReparing(_currentFleet))
             {
-                labelAkashiRepairTimer.ForeColor =
-                    span == TimeSpan.Zero && akashi.CheckPresetReparing() ? Color.Red : DefaultForeColor;
-                labelAkashiRepairTimer.Text = span == TimeSpan.MinValue ? "" : span.ToString(@"mm\:ss");
+                labelPresetAkashiTimer.ForeColor = color;
+                labelPresetAkashiTimer.Text = text;
+            }
+            else
+            {
+                labelPresetAkashiTimer.ForeColor = DefaultForeColor;
+                labelPresetAkashiTimer.Text = "";
             }
-            _shipLabels.SetAkashiTimer(_sniffer.GetShipStatuses(_currentFleet), akashi.GetTimers(_currentFleet));
-            NotifyAkashiTimer();
         }
 
         private void UpdateDamagedShipList()