ListFromのShipList用のヘッダをパネルに載せる

diff --git a/KancolleSniffer/Forms/ListForm.Designer.cs b/KancolleSniffer/Forms/ListForm.Designer.cs
index b65cb2d..97d505f 100644 (file)
--- a/KancolleSniffer/Forms/ListForm.Designer.cs
+++ b/KancolleSniffer/Forms/ListForm.Designer.cs
@@ -57,7 +57,7 @@ namespace KancolleSniffer.Forms
             this.labelHeaderHp = new System.Windows.Forms.Label();\r
             this.labelHeaderCond = new System.Windows.Forms.Label();\r
             this.labelHeaderExp = new System.Windows.Forms.Label();\r
-            this.label3 = new System.Windows.Forms.Label();\r
+            this.labelHeaderLv = new System.Windows.Forms.Label();\r
             this.panelGroupHeader = new System.Windows.Forms.Panel();\r
             this.label5 = new System.Windows.Forms.Label();\r
             this.label9 = new System.Windows.Forms.Label();\r
@@ -70,7 +70,7 @@ namespace KancolleSniffer.Forms
             this.panelRepairHeader = new System.Windows.Forms.Panel();\r
             this.label10 = new System.Windows.Forms.Label();\r
             this.label1RepairHp = new System.Windows.Forms.Label();\r
-            this.panelItemHeader = new System.Windows.Forms.Panel();\r
+            this.panelEmptyHeader = new System.Windows.Forms.Panel();\r
             this.richTextBoxMiscText = new System.Windows.Forms.RichTextBox();\r
             this.contextMenuStripFleetData = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.fleetTextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -99,6 +99,7 @@ namespace KancolleSniffer.Forms
             this.fleetPanel = new FleetDataPanel();\r
             this.itemTreeView = new ItemTreeView();\r
             this.shipListPanel = new KancolleSniffer.View.ShipListPanel.ShipListPanel();\r
+            this.panelShipHeader = new System.Windows.Forms.Panel();\r
             this.contextMenuStripShipList.SuspendLayout();\r
             this.contextMenuStripItemList.SuspendLayout();\r
             this.panelGroupHeader.SuspendLayout();\r
@@ -106,6 +107,7 @@ namespace KancolleSniffer.Forms
             this.contextMenuStripFleetData.SuspendLayout();\r
             this.panelFleetHeader.SuspendLayout();\r
             this.panelSType.SuspendLayout();\r
+            this.panelShipHeader.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // contextMenuStripShipList\r
@@ -158,7 +160,7 @@ namespace KancolleSniffer.Forms
             // \r
             this.labelHeaderHp.AutoSize = true;\r
             this.labelHeaderHp.Cursor = System.Windows.Forms.Cursors.Hand;\r
-            this.labelHeaderHp.Location = new System.Drawing.Point(113, 8);\r
+            this.labelHeaderHp.Location = new System.Drawing.Point(0, 5);\r
             this.labelHeaderHp.Name = "labelHeaderHp";\r
             this.labelHeaderHp.Size = new System.Drawing.Size(20, 12);\r
             this.labelHeaderHp.TabIndex = 13;\r
@@ -169,7 +171,7 @@ namespace KancolleSniffer.Forms
             // \r
             this.labelHeaderCond.AutoSize = true;\r
             this.labelHeaderCond.Cursor = System.Windows.Forms.Cursors.Hand;\r
-            this.labelHeaderCond.Location = new System.Drawing.Point(132, 8);\r
+            this.labelHeaderCond.Location = new System.Drawing.Point(19, 5);\r
             this.labelHeaderCond.Name = "labelHeaderCond";\r
             this.labelHeaderCond.Size = new System.Drawing.Size(29, 12);\r
             this.labelHeaderCond.TabIndex = 13;\r
@@ -180,21 +182,21 @@ namespace KancolleSniffer.Forms
             // \r
             this.labelHeaderExp.AutoSize = true;\r
             this.labelHeaderExp.Cursor = System.Windows.Forms.Cursors.Hand;\r
-            this.labelHeaderExp.Location = new System.Drawing.Point(200, 8);\r
+            this.labelHeaderExp.Location = new System.Drawing.Point(88, 5);\r
             this.labelHeaderExp.Name = "labelHeaderExp";\r
             this.labelHeaderExp.Size = new System.Drawing.Size(24, 12);\r
             this.labelHeaderExp.TabIndex = 14;\r
             this.labelHeaderExp.Text = "Exp";\r
             this.labelHeaderExp.Click += new System.EventHandler(this.labelHeaderExp_Click);\r
             // \r
-            // label3\r
+            // labelHeaderLv\r
             // \r
-            this.label3.AutoSize = true;\r
-            this.label3.Location = new System.Drawing.Point(168, 8);\r
-            this.label3.Name = "label3";\r
-            this.label3.Size = new System.Drawing.Size(17, 12);\r
-            this.label3.TabIndex = 13;\r
-            this.label3.Text = "Lv";\r
+            this.labelHeaderLv.AutoSize = true;\r
+            this.labelHeaderLv.Location = new System.Drawing.Point(56, 5);\r
+            this.labelHeaderLv.Name = "labelHeaderLv";\r
+            this.labelHeaderLv.Size = new System.Drawing.Size(17, 12);\r
+            this.labelHeaderLv.TabIndex = 13;\r
+            this.labelHeaderLv.Text = "Lv";\r
             // \r
             // panelGroupHeader\r
             // \r
@@ -205,7 +207,7 @@ namespace KancolleSniffer.Forms
             this.panelGroupHeader.Controls.Add(this.label6);\r
             this.panelGroupHeader.Location = new System.Drawing.Point(103, 3);\r
             this.panelGroupHeader.Name = "panelGroupHeader";\r
-            this.panelGroupHeader.Size = new System.Drawing.Size(127, 19);\r
+            this.panelGroupHeader.Size = new System.Drawing.Size(125, 19);\r
             this.panelGroupHeader.TabIndex = 16;\r
             // \r
             // label5\r
@@ -291,7 +293,7 @@ namespace KancolleSniffer.Forms
             this.panelRepairHeader.Controls.Add(this.label1RepairHp);\r
             this.panelRepairHeader.Location = new System.Drawing.Point(104, 3);\r
             this.panelRepairHeader.Name = "panelRepairHeader";\r
-            this.panelRepairHeader.Size = new System.Drawing.Size(126, 19);\r
+            this.panelRepairHeader.Size = new System.Drawing.Size(121, 19);\r
             this.panelRepairHeader.TabIndex = 2;\r
             // \r
             // label10\r
@@ -314,12 +316,13 @@ namespace KancolleSniffer.Forms
             this.label1RepairHp.Text = "HP";\r
             this.label1RepairHp.Click += new System.EventHandler(this.labelHeaderHp_Click);\r
             // \r
-            // panelItemHeader\r
+            // panelEmptyHeader\r
             // \r
-            this.panelItemHeader.Location = new System.Drawing.Point(58, 3);\r
-            this.panelItemHeader.Name = "panelItemHeader";\r
-            this.panelItemHeader.Size = new System.Drawing.Size(172, 19);\r
-            this.panelItemHeader.TabIndex = 0;\r
+            this.panelEmptyHeader.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
+            this.panelEmptyHeader.Location = new System.Drawing.Point(58, 3);\r
+            this.panelEmptyHeader.Name = "panelEmptyHeader";\r
+            this.panelEmptyHeader.Size = new System.Drawing.Size(167, 19);\r
+            this.panelEmptyHeader.TabIndex = 0;\r
             // \r
             // richTextBoxMiscText\r
             // \r
@@ -363,7 +366,7 @@ namespace KancolleSniffer.Forms
             this.panelFleetHeader.Controls.Add(this.labelFleet1);\r
             this.panelFleetHeader.Location = new System.Drawing.Point(58, 3);\r
             this.panelFleetHeader.Name = "panelFleetHeader";\r
-            this.panelFleetHeader.Size = new System.Drawing.Size(172, 19);\r
+            this.panelFleetHeader.Size = new System.Drawing.Size(167, 19);\r
             this.panelFleetHeader.TabIndex = 0;\r
             // \r
             // labelFleet4\r
@@ -536,14 +539,6 @@ namespace KancolleSniffer.Forms
             this.checkBoxSTypeBattleShip.UseVisualStyleBackColor = true;\r
             this.checkBoxSTypeBattleShip.Click += new System.EventHandler(this.checkBoxSType_Click);\r
             // \r
-            // dropDownButtonSType\r
-            // \r
-            this.dropDownButtonSType.Location = new System.Drawing.Point(58, 7);\r
-            this.dropDownButtonSType.Name = "dropDownButtonSType";\r
-            this.dropDownButtonSType.Size = new System.Drawing.Size(14, 14);\r
-            this.dropDownButtonSType.TabIndex = 19;\r
-            this.dropDownButtonSType.Click += new System.EventHandler(this.labelSTypeButton_Click);\r
-            // \r
             // labelSType\r
             // \r
             this.labelSType.AutoSize = true;\r
@@ -589,6 +584,15 @@ namespace KancolleSniffer.Forms
             this.antiAirPanel.Size = new System.Drawing.Size(238, 263);\r
             this.antiAirPanel.TabIndex = 17;\r
             // \r
+            // dropDownButtonSType\r
+            // \r
+            this.dropDownButtonSType.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.dropDownButtonSType.Location = new System.Drawing.Point(58, 7);\r
+            this.dropDownButtonSType.Name = "dropDownButtonSType";\r
+            this.dropDownButtonSType.Size = new System.Drawing.Size(14, 14);\r
+            this.dropDownButtonSType.TabIndex = 19;\r
+            this.dropDownButtonSType.Click += new System.EventHandler(this.labelSTypeButton_Click);\r
+            // \r
             // fleetPanel\r
             // \r
             this.fleetPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
@@ -626,6 +630,18 @@ namespace KancolleSniffer.Forms
             this.shipListPanel.Size = new System.Drawing.Size(238, 263);\r
             this.shipListPanel.TabIndex = 0;\r
             // \r
+            // panelShipHeader\r
+            // \r
+            this.panelShipHeader.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
+            this.panelShipHeader.Controls.Add(this.labelHeaderHp);\r
+            this.panelShipHeader.Controls.Add(this.labelHeaderCond);\r
+            this.panelShipHeader.Controls.Add(this.labelHeaderLv);\r
+            this.panelShipHeader.Controls.Add(this.labelHeaderExp);\r
+            this.panelShipHeader.Location = new System.Drawing.Point(114, 3);\r
+            this.panelShipHeader.Name = "panelShipHeader";\r
+            this.panelShipHeader.Size = new System.Drawing.Size(113, 19);\r
+            this.panelShipHeader.TabIndex = 21;\r
+            // \r
             // ListForm\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);\r
@@ -636,15 +652,12 @@ namespace KancolleSniffer.Forms
             this.Controls.Add(this.airBattleResultPanel);\r
             this.Controls.Add(this.battleResultPanel);\r
             this.Controls.Add(this.antiAirPanel);\r
-            this.Controls.Add(this.panelItemHeader);\r
+            this.Controls.Add(this.panelEmptyHeader);\r
             this.Controls.Add(this.panelRepairHeader);\r
             this.Controls.Add(this.panelGroupHeader);\r
             this.Controls.Add(this.labelSType);\r
             this.Controls.Add(this.dropDownButtonSType);\r
-            this.Controls.Add(this.labelHeaderExp);\r
-            this.Controls.Add(this.labelHeaderCond);\r
-            this.Controls.Add(this.label3);\r
-            this.Controls.Add(this.labelHeaderHp);\r
+            this.Controls.Add(this.panelShipHeader);\r
             this.Controls.Add(this.richTextBoxMiscText);\r
             this.Controls.Add(this.fleetPanel);\r
             this.Controls.Add(this.itemTreeView);\r
@@ -669,6 +682,8 @@ namespace KancolleSniffer.Forms
             this.panelFleetHeader.ResumeLayout(false);\r
             this.panelSType.ResumeLayout(false);\r
             this.panelSType.PerformLayout();\r
+            this.panelShipHeader.ResumeLayout(false);\r
+            this.panelShipHeader.PerformLayout();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -680,7 +695,7 @@ namespace KancolleSniffer.Forms
         private System.Windows.Forms.Label labelHeaderHp;\r
         private System.Windows.Forms.Label labelHeaderCond;\r
         private System.Windows.Forms.Label labelHeaderExp;\r
-        private System.Windows.Forms.Label label3;\r
+        private System.Windows.Forms.Label labelHeaderLv;\r
         private System.Windows.Forms.Panel panelGroupHeader;\r
         private System.Windows.Forms.Label label6;\r
         private System.Windows.Forms.Label label9;\r
@@ -693,7 +708,7 @@ namespace KancolleSniffer.Forms
         private System.Windows.Forms.Label label10;\r
         private System.Windows.Forms.Label label5;\r
         private System.Windows.Forms.Label label1RepairHp;\r
-        private System.Windows.Forms.Panel panelItemHeader;\r
+        private System.Windows.Forms.Panel panelEmptyHeader;\r
         private FleetDataPanel fleetPanel;\r
         private ItemTreeView itemTreeView;\r
         private System.Windows.Forms.RichTextBox richTextBoxMiscText;\r
@@ -727,5 +742,6 @@ namespace KancolleSniffer.Forms
         private System.Windows.Forms.Label labelSType;\r
         private System.Windows.Forms.CheckBox checkBoxSTypeDetails;\r
         private System.Windows.Forms.ToolStripMenuItem kantaiBunsekiToolStripMenuItem;\r
+        private System.Windows.Forms.Panel panelShipHeader;\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/Forms/ListForm.cs b/KancolleSniffer/Forms/ListForm.cs
index de8ed28..4fb8d2e 100644 (file)
--- a/KancolleSniffer/Forms/ListForm.cs
+++ b/KancolleSniffer/Forms/ListForm.cs
@@ -164,7 +164,8 @@ namespace KancolleSniffer.Forms
                     header.BringToFront();\r
             }\r
 \r
-            Set(panelItemHeader, InItemList || InAntiAir || InBattleResult || InMiscText);\r
+            Set(panelShipHeader, InShipStatus);\r
+            Set(panelEmptyHeader, InItemList || InAntiAir || InBattleResult || InMiscText);\r
             Set(panelGroupHeader, InGroupConfig);\r
             Set(panelRepairHeader, InRepairList);\r
             Set(panelFleetHeader, InFleetInfo);\r