タイマーと終了時刻の切り替えをわかりやすくする

diff --git a/KancolleSniffer/MainForm.Designer.cs b/KancolleSniffer/MainForm.Designer.cs
index 0dfdf22..3bf6fe6 100644 (file)
--- a/KancolleSniffer/MainForm.Designer.cs
+++ b/KancolleSniffer/MainForm.Designer.cs
@@ -49,6 +49,7 @@ namespace KancolleSniffer
             this.panelHeadquarters = new System.Windows.Forms.Panel();\r
             this.labelPlayLog = new System.Windows.Forms.Label();\r
             this.labelLogin = new System.Windows.Forms.Label();\r
+            this.labelBucketHistoryButton = new System.Windows.Forms.Label();\r
             this.labelAchievement = new System.Windows.Forms.Label();\r
             this.label28 = new System.Windows.Forms.Label();\r
             this.labelNumOfBuckets = new System.Windows.Forms.Label();\r
@@ -80,7 +81,7 @@ namespace KancolleSniffer
             this.labelBulletHistory = new System.Windows.Forms.Label();\r
             this.label35 = new System.Windows.Forms.Label();\r
             this.labelFuelHistory = new System.Windows.Forms.Label();\r
-            this.labelRepair = new System.Windows.Forms.Label();\r
+            this.labelNDock = new System.Windows.Forms.Label();\r
             this.panelDock = new System.Windows.Forms.Panel();\r
             this.label8 = new System.Windows.Forms.Label();\r
             this.label7 = new System.Windows.Forms.Label();\r
@@ -113,12 +114,6 @@ namespace KancolleSniffer
             this.label13 = new System.Windows.Forms.Label();\r
             this.timerMain = new System.Windows.Forms.Timer(this.components);\r
             this.panel3 = new System.Windows.Forms.Panel();\r
-            this.labelQuestCount1 = new KancolleSniffer.View.ShipLabel();\r
-            this.labelQuestCount2 = new KancolleSniffer.View.ShipLabel();\r
-            this.labelQuestCount3 = new KancolleSniffer.View.ShipLabel();\r
-            this.labelQuestCount4 = new KancolleSniffer.View.ShipLabel();\r
-            this.labelQuestCount5 = new KancolleSniffer.View.ShipLabel();\r
-            this.labelQuestCount6 = new KancolleSniffer.View.ShipLabel();\r
             this.labelQuestColor6 = new System.Windows.Forms.Label();\r
             this.labelQuestColor5 = new System.Windows.Forms.Label();\r
             this.labelQuestColor4 = new System.Windows.Forms.Label();\r
@@ -158,7 +153,6 @@ namespace KancolleSniffer
             this.imageListBullSq = new System.Windows.Forms.ImageList(this.components);\r
             this.labelAkashiRepair = new System.Windows.Forms.Label();\r
             this.labelClearQuest = new System.Windows.Forms.Label();\r
-            this.panelRepairList = new KancolleSniffer.View.RepairListForMain();\r
             this.labelBullSq4 = new System.Windows.Forms.Label();\r
             this.labelFuelSq4 = new System.Windows.Forms.Label();\r
             this.labelBullSq3 = new System.Windows.Forms.Label();\r
@@ -173,7 +167,13 @@ namespace KancolleSniffer
             this.labelCheckFleet3 = new System.Windows.Forms.Label();\r
             this.labelCheckFleet4 = new System.Windows.Forms.Label();\r
             this.labelCheckFleet1 = new System.Windows.Forms.Label();\r
-            this.labelBucketHistoryButton = new System.Windows.Forms.Label();\r
+            this.panelRepairList = new KancolleSniffer.View.RepairListForMain();\r
+            this.labelQuestCount1 = new KancolleSniffer.View.ShipLabel();\r
+            this.labelQuestCount2 = new KancolleSniffer.View.ShipLabel();\r
+            this.labelQuestCount3 = new KancolleSniffer.View.ShipLabel();\r
+            this.labelQuestCount4 = new KancolleSniffer.View.ShipLabel();\r
+            this.labelQuestCount5 = new KancolleSniffer.View.ShipLabel();\r
+            this.labelQuestCount6 = new KancolleSniffer.View.ShipLabel();\r
             this.panelHeadquarters.SuspendLayout();\r
             this.panelShipInfo.SuspendLayout();\r
             this.panelBattleInfo.SuspendLayout();\r
@@ -225,6 +225,16 @@ namespace KancolleSniffer
             this.labelLogin.Text = "艦これにログインしてください。\r\nログイン中ならログインし直してください。";\r
             this.labelLogin.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;\r
             // \r
+            // labelBucketHistoryButton\r
+            // \r
+            this.labelBucketHistoryButton.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.labelBucketHistoryButton.Image = ((System.Drawing.Image)(resources.GetObject("labelBucketHistoryButton.Image")));\r
+            this.labelBucketHistoryButton.Location = new System.Drawing.Point(146, 15);\r
+            this.labelBucketHistoryButton.Name = "labelBucketHistoryButton";\r
+            this.labelBucketHistoryButton.Size = new System.Drawing.Size(14, 14);\r
+            this.labelBucketHistoryButton.TabIndex = 9;\r
+            this.labelBucketHistoryButton.Click += new System.EventHandler(this.labelBucketHistoryButton_Click);\r
+            // \r
             // labelAchievement\r
             // \r
             this.labelAchievement.Location = new System.Drawing.Point(166, 18);\r
@@ -518,14 +528,16 @@ namespace KancolleSniffer
             this.labelFuelHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;\r
             this.labelFuelHistory.Click += new System.EventHandler(this.panelMaterialHistory_Click);\r
             // \r
-            // labelRepair\r
+            // labelNDock\r
             // \r
-            this.labelRepair.AutoSize = true;\r
-            this.labelRepair.Location = new System.Drawing.Point(8, 195);\r
-            this.labelRepair.Name = "labelRepair";\r
-            this.labelRepair.Size = new System.Drawing.Size(29, 12);\r
-            this.labelRepair.TabIndex = 3;\r
-            this.labelRepair.Text = "入渠";\r
+            this.labelNDock.AutoSize = true;\r
+            this.labelNDock.Cursor = System.Windows.Forms.Cursors.Hand;\r
+            this.labelNDock.Location = new System.Drawing.Point(8, 195);\r
+            this.labelNDock.Name = "labelNDock";\r
+            this.labelNDock.Size = new System.Drawing.Size(29, 12);\r
+            this.labelNDock.TabIndex = 3;\r
+            this.labelNDock.Text = "入渠";\r
+            this.labelNDock.Click += new System.EventHandler(this.labelNDock_Click);\r
             // \r
             // panelDock\r
             // \r
@@ -686,11 +698,13 @@ namespace KancolleSniffer
             // labelMission\r
             // \r
             this.labelMission.AutoSize = true;\r
+            this.labelMission.Cursor = System.Windows.Forms.Cursors.Hand;\r
             this.labelMission.Location = new System.Drawing.Point(8, 276);\r
             this.labelMission.Name = "labelMission";\r
             this.labelMission.Size = new System.Drawing.Size(29, 12);\r
             this.labelMission.TabIndex = 10;\r
             this.labelMission.Text = "遠征";\r
+            this.labelMission.Click += new System.EventHandler(this.labelMission_Click);\r
             // \r
             // panel2\r
             // \r
@@ -859,72 +873,6 @@ namespace KancolleSniffer
             this.panel3.Size = new System.Drawing.Size(220, 94);\r
             this.panel3.TabIndex = 13;\r
             // \r
-            // labelQuestCount1\r
-            // \r
-            this.labelQuestCount1.AnchorRight = true;\r
-            this.labelQuestCount1.AutoSize = true;\r
-            this.labelQuestCount1.Location = new System.Drawing.Point(191, 3);\r
-            this.labelQuestCount1.Name = "labelQuestCount1";\r
-            this.labelQuestCount1.PresetColor = System.Drawing.Color.Empty;\r
-            this.labelQuestCount1.Size = new System.Drawing.Size(0, 12);\r
-            this.labelQuestCount1.TabIndex = 54;\r
-            this.labelQuestCount1.UseMnemonic = false;\r
-            // \r
-            // labelQuestCount2\r
-            // \r
-            this.labelQuestCount2.AnchorRight = true;\r
-            this.labelQuestCount2.AutoSize = true;\r
-            this.labelQuestCount2.Location = new System.Drawing.Point(191, 18);\r
-            this.labelQuestCount2.Name = "labelQuestCount2";\r
-            this.labelQuestCount2.PresetColor = System.Drawing.Color.Empty;\r
-            this.labelQuestCount2.Size = new System.Drawing.Size(0, 12);\r
-            this.labelQuestCount2.TabIndex = 53;\r
-            this.labelQuestCount2.UseMnemonic = false;\r
-            // \r
-            // labelQuestCount3\r
-            // \r
-            this.labelQuestCount3.AnchorRight = true;\r
-            this.labelQuestCount3.AutoSize = true;\r
-            this.labelQuestCount3.Location = new System.Drawing.Point(191, 33);\r
-            this.labelQuestCount3.Name = "labelQuestCount3";\r
-            this.labelQuestCount3.PresetColor = System.Drawing.Color.Empty;\r
-            this.labelQuestCount3.Size = new System.Drawing.Size(0, 12);\r
-            this.labelQuestCount3.TabIndex = 52;\r
-            this.labelQuestCount3.UseMnemonic = false;\r
-            // \r
-            // labelQuestCount4\r
-            // \r
-            this.labelQuestCount4.AnchorRight = true;\r
-            this.labelQuestCount4.AutoSize = true;\r
-            this.labelQuestCount4.Location = new System.Drawing.Point(191, 48);\r
-            this.labelQuestCount4.Name = "labelQuestCount4";\r
-            this.labelQuestCount4.PresetColor = System.Drawing.Color.Empty;\r
-            this.labelQuestCount4.Size = new System.Drawing.Size(0, 12);\r
-            this.labelQuestCount4.TabIndex = 51;\r
-            this.labelQuestCount4.UseMnemonic = false;\r
-            // \r
-            // labelQuestCount5\r
-            // \r
-            this.labelQuestCount5.AnchorRight = true;\r
-            this.labelQuestCount5.AutoSize = true;\r
-            this.labelQuestCount5.Location = new System.Drawing.Point(191, 63);\r
-            this.labelQuestCount5.Name = "labelQuestCount5";\r
-            this.labelQuestCount5.PresetColor = System.Drawing.Color.Empty;\r
-            this.labelQuestCount5.Size = new System.Drawing.Size(0, 12);\r
-            this.labelQuestCount5.TabIndex = 50;\r
-            this.labelQuestCount5.UseMnemonic = false;\r
-            // \r
-            // labelQuestCount6\r
-            // \r
-            this.labelQuestCount6.AnchorRight = true;\r
-            this.labelQuestCount6.AutoSize = true;\r
-            this.labelQuestCount6.Location = new System.Drawing.Point(191, 78);\r
-            this.labelQuestCount6.Name = "labelQuestCount6";\r
-            this.labelQuestCount6.PresetColor = System.Drawing.Color.Empty;\r
-            this.labelQuestCount6.Size = new System.Drawing.Size(0, 12);\r
-            this.labelQuestCount6.TabIndex = 49;\r
-            this.labelQuestCount6.UseMnemonic = false;\r
-            // \r
             // labelQuestColor6\r
             // \r
             this.labelQuestColor6.Location = new System.Drawing.Point(2, 79);\r
@@ -1258,16 +1206,6 @@ namespace KancolleSniffer
             this.labelClearQuest.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelClearQuest_MouseDown);\r
             this.labelClearQuest.MouseUp += new System.Windows.Forms.MouseEventHandler(this.labelClearQuest_MouseUp);\r
             // \r
-            // panelRepairList\r
-            // \r
-            this.panelRepairList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.panelRepairList.Location = new System.Drawing.Point(6, 207);\r
-            this.panelRepairList.Name = "panelRepairList";\r
-            this.panelRepairList.Size = new System.Drawing.Size(129, 21);\r
-            this.panelRepairList.TabIndex = 4;\r
-            this.panelRepairList.Visible = false;\r
-            this.panelRepairList.Click += new System.EventHandler(this.panelRepairList_Click);\r
-            // \r
             // labelBullSq4\r
             // \r
             this.labelBullSq4.ImageIndex = 0;\r
@@ -1395,15 +1333,81 @@ namespace KancolleSniffer
             this.labelCheckFleet1.Size = new System.Drawing.Size(5, 14);\r
             this.labelCheckFleet1.TabIndex = 16;\r
             // \r
-            // labelBucketHistoryButton\r
+            // panelRepairList\r
             // \r
-            this.labelBucketHistoryButton.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.labelBucketHistoryButton.Image = ((System.Drawing.Image)(resources.GetObject("labelBucketHistoryButton.Image")));\r
-            this.labelBucketHistoryButton.Location = new System.Drawing.Point(146, 15);\r
-            this.labelBucketHistoryButton.Name = "labelBucketHistoryButton";\r
-            this.labelBucketHistoryButton.Size = new System.Drawing.Size(14, 14);\r
-            this.labelBucketHistoryButton.TabIndex = 9;\r
-            this.labelBucketHistoryButton.Click += new System.EventHandler(this.labelBucketHistoryButton_Click);\r
+            this.panelRepairList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.panelRepairList.Location = new System.Drawing.Point(6, 207);\r
+            this.panelRepairList.Name = "panelRepairList";\r
+            this.panelRepairList.Size = new System.Drawing.Size(129, 21);\r
+            this.panelRepairList.TabIndex = 4;\r
+            this.panelRepairList.Visible = false;\r
+            this.panelRepairList.Click += new System.EventHandler(this.panelRepairList_Click);\r
+            // \r
+            // labelQuestCount1\r
+            // \r
+            this.labelQuestCount1.AnchorRight = true;\r
+            this.labelQuestCount1.AutoSize = true;\r
+            this.labelQuestCount1.Location = new System.Drawing.Point(191, 3);\r
+            this.labelQuestCount1.Name = "labelQuestCount1";\r
+            this.labelQuestCount1.PresetColor = System.Drawing.Color.Empty;\r
+            this.labelQuestCount1.Size = new System.Drawing.Size(0, 12);\r
+            this.labelQuestCount1.TabIndex = 54;\r
+            this.labelQuestCount1.UseMnemonic = false;\r
+            // \r
+            // labelQuestCount2\r
+            // \r
+            this.labelQuestCount2.AnchorRight = true;\r
+            this.labelQuestCount2.AutoSize = true;\r
+            this.labelQuestCount2.Location = new System.Drawing.Point(191, 18);\r
+            this.labelQuestCount2.Name = "labelQuestCount2";\r
+            this.labelQuestCount2.PresetColor = System.Drawing.Color.Empty;\r
+            this.labelQuestCount2.Size = new System.Drawing.Size(0, 12);\r
+            this.labelQuestCount2.TabIndex = 53;\r
+            this.labelQuestCount2.UseMnemonic = false;\r
+            // \r
+            // labelQuestCount3\r
+            // \r
+            this.labelQuestCount3.AnchorRight = true;\r
+            this.labelQuestCount3.AutoSize = true;\r
+            this.labelQuestCount3.Location = new System.Drawing.Point(191, 33);\r
+            this.labelQuestCount3.Name = "labelQuestCount3";\r
+            this.labelQuestCount3.PresetColor = System.Drawing.Color.Empty;\r
+            this.labelQuestCount3.Size = new System.Drawing.Size(0, 12);\r
+            this.labelQuestCount3.TabIndex = 52;\r
+            this.labelQuestCount3.UseMnemonic = false;\r
+            // \r
+            // labelQuestCount4\r
+            // \r
+            this.labelQuestCount4.AnchorRight = true;\r
+            this.labelQuestCount4.AutoSize = true;\r
+            this.labelQuestCount4.Location = new System.Drawing.Point(191, 48);\r
+            this.labelQuestCount4.Name = "labelQuestCount4";\r
+            this.labelQuestCount4.PresetColor = System.Drawing.Color.Empty;\r
+            this.labelQuestCount4.Size = new System.Drawing.Size(0, 12);\r
+            this.labelQuestCount4.TabIndex = 51;\r
+            this.labelQuestCount4.UseMnemonic = false;\r
+            // \r
+            // labelQuestCount5\r
+            // \r
+            this.labelQuestCount5.AnchorRight = true;\r
+            this.labelQuestCount5.AutoSize = true;\r
+            this.labelQuestCount5.Location = new System.Drawing.Point(191, 63);\r
+            this.labelQuestCount5.Name = "labelQuestCount5";\r
+            this.labelQuestCount5.PresetColor = System.Drawing.Color.Empty;\r
+            this.labelQuestCount5.Size = new System.Drawing.Size(0, 12);\r
+            this.labelQuestCount5.TabIndex = 50;\r
+            this.labelQuestCount5.UseMnemonic = false;\r
+            // \r
+            // labelQuestCount6\r
+            // \r
+            this.labelQuestCount6.AnchorRight = true;\r
+            this.labelQuestCount6.AutoSize = true;\r
+            this.labelQuestCount6.Location = new System.Drawing.Point(191, 78);\r
+            this.labelQuestCount6.Name = "labelQuestCount6";\r
+            this.labelQuestCount6.PresetColor = System.Drawing.Color.Empty;\r
+            this.labelQuestCount6.Size = new System.Drawing.Size(0, 12);\r
+            this.labelQuestCount6.TabIndex = 49;\r
+            this.labelQuestCount6.UseMnemonic = false;\r
             // \r
             // MainForm\r
             // \r
@@ -1443,7 +1447,7 @@ namespace KancolleSniffer
             this.Controls.Add(this.panel1);\r
             this.Controls.Add(this.labelConstruct);\r
             this.Controls.Add(this.panelDock);\r
-            this.Controls.Add(this.labelRepair);\r
+            this.Controls.Add(this.labelNDock);\r
             this.Controls.Add(this.panelShipInfo);\r
             this.Controls.Add(this.labelFleet1);\r
             this.Controls.Add(this.panelHeadquarters);\r
@@ -1489,7 +1493,7 @@ namespace KancolleSniffer
         private System.Windows.Forms.Label labelNumOfShips;\r
         private System.Windows.Forms.Label label1;\r
         private System.Windows.Forms.Panel panelShipInfo;\r
-        private System.Windows.Forms.Label labelRepair;\r
+        private System.Windows.Forms.Label labelNDock;\r
         private System.Windows.Forms.Panel panelDock;\r
         private System.Windows.Forms.Label label8;\r
         private System.Windows.Forms.Label label7;\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index 056c906..be88edc 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -808,12 +808,18 @@ namespace KancolleSniffer
         private void UpdateNDocLabels()\r
         {\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
             _config.ShowEndTime ^= TimerKind.NDock;\r
+            SetNDockLabel();\r
             UpdateTimers();\r
         }\r
 \r
@@ -832,6 +838,12 @@ namespace KancolleSniffer
                 }\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
@@ -854,6 +866,7 @@ namespace KancolleSniffer
         private void labelMission_Click(object sender, EventArgs e)\r
         {\r
             _config.ShowEndTime ^= TimerKind.Mission;\r
+            SetMissionLabel();\r
             UpdateTimers();\r
         }\r
 \r