現在の艦隊を示すマークをTriangleMarkに分離する

diff --git a/KancolleSniffer/KancolleSniffer.csproj b/KancolleSniffer/KancolleSniffer.csproj
index 80fc97b..ff7532f 100644 (file)
--- a/KancolleSniffer/KancolleSniffer.csproj
+++ b/KancolleSniffer/KancolleSniffer.csproj
@@ -93,6 +93,9 @@
     <Compile Include="View\ShipInfoPanel.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
+    <Compile Include="View\TriangleMark.cs">\r
+      <SubType>Component</SubType>\r
+    </Compile>\r
     <Compile Include="View\UpdateContext.cs" />\r
     <Compile Include="View\AntiAirPanel.cs">\r
       <SubType>Component</SubType>\r

diff --git a/KancolleSniffer/MainForm.Designer.cs b/KancolleSniffer/MainForm.Designer.cs
index 8d52f56..4037f25 100644 (file)
--- a/KancolleSniffer/MainForm.Designer.cs
+++ b/KancolleSniffer/MainForm.Designer.cs
@@ -72,10 +72,6 @@ namespace KancolleSniffer
             this.labelClearQuest = new System.Windows.Forms.Label();\r
             this.labelRepairListButton = new System.Windows.Forms.Label();\r
             this.labelMaterialHistoryButton = new System.Windows.Forms.Label();\r
-            this.labelCheckFleet2 = new System.Windows.Forms.Label();\r
-            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.labelQuestCount = new System.Windows.Forms.Label();\r
             this.kdockPanel = new KancolleSniffer.View.KDockPanel();\r
             this.panelRepairList = new KancolleSniffer.View.RepairListForMain();\r
@@ -89,6 +85,10 @@ namespace KancolleSniffer
             this.chargeStatus2 = new KancolleSniffer.View.ChargeStatus();\r
             this.chargeStatus3 = new KancolleSniffer.View.ChargeStatus();\r
             this.chargeStatus4 = new KancolleSniffer.View.ChargeStatus();\r
+            this.triangleMark1 = new KancolleSniffer.View.TriangleMark();\r
+            this.triangleMark2 = new KancolleSniffer.View.TriangleMark();\r
+            this.triangleMark3 = new KancolleSniffer.View.TriangleMark();\r
+            this.triangleMark4 = new KancolleSniffer.View.TriangleMark();\r
             this.contextMenuStripNotifyIcon.SuspendLayout();\r
             this.contextMenuStripMain.SuspendLayout();\r
             this.SuspendLayout();\r
@@ -315,41 +315,6 @@ namespace KancolleSniffer
             this.labelMaterialHistoryButton.Size = new System.Drawing.Size(14, 14);\r
             this.labelMaterialHistoryButton.TabIndex = 10;\r
             // \r
-            // labelCheckFleet2\r
-            // \r
-            this.labelCheckFleet2.Image = global::KancolleSniffer.Properties.Resources.arrow;\r
-            this.labelCheckFleet2.Location = new System.Drawing.Point(62, 42);\r
-            this.labelCheckFleet2.Name = "labelCheckFleet2";\r
-            this.labelCheckFleet2.Size = new System.Drawing.Size(5, 14);\r
-            this.labelCheckFleet2.TabIndex = 22;\r
-            this.labelCheckFleet2.Visible = false;\r
-            // \r
-            // labelCheckFleet3\r
-            // \r
-            this.labelCheckFleet3.Image = global::KancolleSniffer.Properties.Resources.arrow;\r
-            this.labelCheckFleet3.Location = new System.Drawing.Point(117, 42);\r
-            this.labelCheckFleet3.Name = "labelCheckFleet3";\r
-            this.labelCheckFleet3.Size = new System.Drawing.Size(5, 14);\r
-            this.labelCheckFleet3.TabIndex = 20;\r
-            this.labelCheckFleet3.Visible = false;\r
-            // \r
-            // labelCheckFleet4\r
-            // \r
-            this.labelCheckFleet4.Image = global::KancolleSniffer.Properties.Resources.arrow;\r
-            this.labelCheckFleet4.Location = new System.Drawing.Point(172, 42);\r
-            this.labelCheckFleet4.Name = "labelCheckFleet4";\r
-            this.labelCheckFleet4.Size = new System.Drawing.Size(5, 14);\r
-            this.labelCheckFleet4.TabIndex = 18;\r
-            this.labelCheckFleet4.Visible = false;\r
-            // \r
-            // labelCheckFleet1\r
-            // \r
-            this.labelCheckFleet1.Image = global::KancolleSniffer.Properties.Resources.arrow;\r
-            this.labelCheckFleet1.Location = new System.Drawing.Point(7, 42);\r
-            this.labelCheckFleet1.Name = "labelCheckFleet1";\r
-            this.labelCheckFleet1.Size = new System.Drawing.Size(5, 14);\r
-            this.labelCheckFleet1.TabIndex = 16;\r
-            // \r
             // labelQuestCount\r
             // \r
             this.labelQuestCount.AutoSize = true;\r
@@ -469,12 +434,51 @@ namespace KancolleSniffer
             this.chargeStatus4.TabIndex = 73;\r
             this.chargeStatus4.Text = "chargeStatus4";\r
             // \r
+            // triangleMark1\r
+            // \r
+            this.triangleMark1.Location = new System.Drawing.Point(7, 42);\r
+            this.triangleMark1.Name = "triangleMark1";\r
+            this.triangleMark1.Size = new System.Drawing.Size(5, 13);\r
+            this.triangleMark1.TabIndex = 75;\r
+            this.triangleMark1.Text = "triangleMark1";\r
+            // \r
+            // triangleMark2\r
+            // \r
+            this.triangleMark2.Location = new System.Drawing.Point(62, 42);\r
+            this.triangleMark2.Name = "triangleMark2";\r
+            this.triangleMark2.Size = new System.Drawing.Size(5, 13);\r
+            this.triangleMark2.TabIndex = 76;\r
+            this.triangleMark2.Text = "triangleMark2";\r
+            this.triangleMark2.Visible = false;\r
+            // \r
+            // triangleMark3\r
+            // \r
+            this.triangleMark3.Location = new System.Drawing.Point(117, 42);\r
+            this.triangleMark3.Name = "triangleMark3";\r
+            this.triangleMark3.Size = new System.Drawing.Size(5, 13);\r
+            this.triangleMark3.TabIndex = 77;\r
+            this.triangleMark3.Text = "triangleMark3";\r
+            this.triangleMark3.Visible = false;\r
+            // \r
+            // triangleMark4\r
+            // \r
+            this.triangleMark4.Location = new System.Drawing.Point(172, 42);\r
+            this.triangleMark4.Name = "triangleMark4";\r
+            this.triangleMark4.Size = new System.Drawing.Size(5, 13);\r
+            this.triangleMark4.TabIndex = 78;\r
+            this.triangleMark4.Text = "triangleMark4";\r
+            this.triangleMark4.Visible = false;\r
+            // \r
             // MainForm\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.ClientSize = new System.Drawing.Size(232, 456);\r
             this.ContextMenuStrip = this.contextMenuStripMain;\r
+            this.Controls.Add(this.triangleMark4);\r
+            this.Controls.Add(this.triangleMark3);\r
+            this.Controls.Add(this.triangleMark2);\r
+            this.Controls.Add(this.triangleMark1);\r
             this.Controls.Add(this.chargeStatus3);\r
             this.Controls.Add(this.chargeStatus4);\r
             this.Controls.Add(this.chargeStatus2);\r
@@ -495,13 +499,9 @@ namespace KancolleSniffer
             this.Controls.Add(this.label31);\r
             this.Controls.Add(this.labelMaterialHistoryButton);\r
             this.Controls.Add(this.labelMaterialCaption);\r
-            this.Controls.Add(this.labelCheckFleet2);\r
             this.Controls.Add(this.labelFleet2);\r
-            this.Controls.Add(this.labelCheckFleet3);\r
             this.Controls.Add(this.labelFleet3);\r
-            this.Controls.Add(this.labelCheckFleet4);\r
             this.Controls.Add(this.labelFleet4);\r
-            this.Controls.Add(this.labelCheckFleet1);\r
             this.Controls.Add(this.labelMissionCaption);\r
             this.Controls.Add(this.labelQuest);\r
             this.Controls.Add(this.labelConstruct);\r
@@ -534,12 +534,8 @@ namespace KancolleSniffer
         private System.Windows.Forms.ToolStripMenuItem ConfigToolStripMenuItem;\r
         private System.Windows.Forms.ToolStripMenuItem ExitToolStripMenuItem;\r
         private System.Windows.Forms.Label labelFleet1;\r
-        private System.Windows.Forms.Label labelCheckFleet1;\r
-        private System.Windows.Forms.Label labelCheckFleet4;\r
         private System.Windows.Forms.Label labelFleet4;\r
-        private System.Windows.Forms.Label labelCheckFleet3;\r
         private System.Windows.Forms.Label labelFleet3;\r
-        private System.Windows.Forms.Label labelCheckFleet2;\r
         private System.Windows.Forms.Label labelFleet2;\r
         private System.Windows.Forms.Label labelMaterialCaption;\r
         private System.Windows.Forms.Label labelMaterialHistoryButton;\r
@@ -567,6 +563,10 @@ namespace KancolleSniffer
         private ChargeStatus chargeStatus2;\r
         private ChargeStatus chargeStatus3;\r
         private ChargeStatus chargeStatus4;\r
+        private TriangleMark triangleMark1;\r
+        private TriangleMark triangleMark2;\r
+        private TriangleMark triangleMark3;\r
+        private TriangleMark triangleMark4;\r
     }\r
 }\r
 \r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index d6f1454..8b78a1c 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -649,7 +649,7 @@ namespace KancolleSniffer
 \r
         private void ShowCurrentFleetNumber()\r
         {\r
-            var labels = new[] {labelCheckFleet1, labelCheckFleet2, labelCheckFleet3, labelCheckFleet4};\r
+            var labels = new[] {triangleMark1, triangleMark2, triangleMark3, triangleMark4};\r
             for (var i = 0; i < labels.Length; i++)\r
                 labels[i].Visible = shipInfoPanel.CurrentFleet == i;\r
         }\r

diff --git a/KancolleSniffer/Properties/Resources.Designer.cs b/KancolleSniffer/Properties/Resources.Designer.cs
index 15fb24b..cbdc9f0 100644 (file)
--- a/KancolleSniffer/Properties/Resources.Designer.cs
+++ b/KancolleSniffer/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace KancolleSniffer.Properties {
     // または Visual Studio のようなツールを使用して自動生成されました。\r
     // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に\r
     // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。\r
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]\r
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]\r
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
     internal class Resources {\r
@@ -63,16 +63,6 @@ namespace KancolleSniffer.Properties {
         /// <summary>\r
         ///   型 System.Drawing.Bitmap のローカライズされたリソースを検索します。\r
         /// </summary>\r
-        internal static System.Drawing.Bitmap arrow {\r
-            get {\r
-                object obj = ResourceManager.GetObject("arrow", resourceCulture);\r
-                return ((System.Drawing.Bitmap)(obj));\r
-            }\r
-        }\r
-        \r
-        /// <summary>\r
-        ///   型 System.Drawing.Bitmap のローカライズされたリソースを検索します。\r
-        /// </summary>\r
         internal static System.Drawing.Bitmap arrow_virtical {\r
             get {\r
                 object obj = ResourceManager.GetObject("arrow virtical", resourceCulture);\r

diff --git a/KancolleSniffer/Properties/Resources.resx b/KancolleSniffer/Properties/Resources.resx
index 9f3a3b0..b97004e 100644 (file)
--- a/KancolleSniffer/Properties/Resources.resx
+++ b/KancolleSniffer/Properties/Resources.resx
@@ -121,7 +121,4 @@
   <data name="arrow virtical" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\arrow virtical.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
 </root>
\ No newline at end of file

diff --git a/KancolleSniffer/View/TriangleMark.cs b/KancolleSniffer/View/TriangleMark.cs
new file mode 100644 (file)
index 0000000..94feb38
--- /dev/null
+++ b/KancolleSniffer/View/TriangleMark.cs
@@ -0,0 +1,28 @@
+// Copyright (C) 2020 Kazuhiro Fujieda <fujieda@users.osdn.me>\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//    http://www.apache.org/licenses/LICENSE-2.0\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+\r
+using System.Drawing;\r
+using System.Windows.Forms;\r
+\r
+namespace KancolleSniffer.View\r
+{\r
+    public class TriangleMark : Control\r
+    {\r
+        protected override void OnPaint(PaintEventArgs e)\r
+        {\r
+            e.Graphics.FillPolygon(Brushes.Black,\r
+                new[] {new PointF(0, 0), new PointF(Width, Height / 2.0f), new PointF(0, Height)});\r
+        }\r
+    }\r
+}
\ No newline at end of file