Commandant TesteとGraf Zeppelin改の名前を適宜短縮する

diff --git a/KancolleSniffer.Test/ShipLabelTest.cs b/KancolleSniffer.Test/ShipLabelTest.cs
index bee2ddf..71edb08 100644 (file)
--- a/KancolleSniffer.Test/ShipLabelTest.cs
+++ b/KancolleSniffer.Test/ShipLabelTest.cs
@@ -26,7 +26,7 @@ namespace KancolleSniffer.Test
         /// 明石タイマー表示中の艦娘の名前を縮める\r
         /// </summary>\r
         [TestMethod]\r
-        public void TrancateNameForAkashiTimer()\r
+        public void TruncateNameForAkashiTimer()\r
         {\r
             var dict = new Dictionary<string, string>\r
             {\r
@@ -42,19 +42,14 @@ namespace KancolleSniffer.Test
                 {"Graf Zeppelin改", "Graf Zep"},\r
                 {"Libeccio改", "Libeccio"},\r
             };\r
-            var label = new ShipLabel {Parent = new Panel()};\r
-            foreach (var entry in dict)\r
-            {\r
-                label.SetName("", entry.Key, "", ShipNameWidth.AkashiTimer);\r
-                PAssert.That(() => label.Text == entry.Value, entry.Key);\r
-            }\r
+            TruncateNameSub(dict, ShipNameWidth.AkashiTimer);\r
         }\r
 \r
         /// <summary>\r
         /// 入渠中の艦娘名の名前を縮める\r
         /// </summary>\r
         [TestMethod]\r
-        public void TrancateNameForNDock()\r
+        public void TruncateNameForNDock()\r
         {\r
             var dict = new Dictionary<string, string>\r
             {\r
@@ -63,19 +58,14 @@ namespace KancolleSniffer.Test
                 {"Graf Zeppelin改", "Graf Zeppeli"},\r
                 {"千代田航改二", "千代田航改"}\r
             };\r
-            var label = new ShipLabel {Parent = new Panel()};\r
-            foreach (var entry in dict)\r
-            {\r
-                label.SetName("", entry.Key, "", ShipNameWidth.NDock);\r
-                PAssert.That(() => label.Text == entry.Value, entry.Key);\r
-            }\r
+            TruncateNameSub(dict, ShipNameWidth.NDock);\r
         }\r
 \r
         /// <summary>\r
         /// 一覧ウィンドウの要修復一覧の艦娘の名前を縮める\r
         /// </summary>\r
         [TestMethod]\r
-        public void TrancateNameForRepairList()\r
+        public void TruncateNameForRepairListFull()\r
         {\r
             var dict = new Dictionary<string, string>\r
             {\r
@@ -83,21 +73,51 @@ namespace KancolleSniffer.Test
                 {"Graf Zeppelin改", "Graf Zeppelin"},\r
                 {"千代田航改二", "千代田航改"}\r
             };\r
+            TruncateNameSub(dict, ShipNameWidth.RepairListFull);\r
+        }\r
+\r
+        /// <summary>\r
+        /// メインパネルの艦娘の名前を縮める\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void TruncateNameForMainPanel()\r
+        {\r
+            var dict = new Dictionary<string, string>\r
+            {\r
+                {"Commandant Teste", "Commandant Tes"}\r
+            };\r
+            TruncateNameSub(dict, ShipNameWidth.MainPanel);\r
+        }\r
+\r
+        [TestMethod]\r
+        public void TruncateNameForShipList()\r
+        {\r
+            var dict = new Dictionary<string, string>\r
+            {\r
+                {"Commandant Test", "Commandant T"},\r
+                {"Graf Zeppelin改", "Graf Zeppelin"}\r
+            };\r
+            TruncateNameSub(dict, ShipNameWidth.ShipList);\r
+        }\r
+\r
+        private void TruncateNameSub(Dictionary<string, string> dict, ShipNameWidth width)\r
+        {\r
             var label = new ShipLabel {Parent = new Panel()};\r
             foreach (var entry in dict)\r
             {\r
-                label.SetName("", entry.Key, "", ShipNameWidth.RepairListFull);\r
+                label.SetName("", entry.Key, "", width);\r
                 PAssert.That(() => label.Text == entry.Value, entry.Key);\r
             }\r
         }\r
 \r
+\r
         /// <summary>\r
         /// prefixとsuffixを加える\r
         /// </summary>\r
         [TestMethod]\r
         public void SetName()\r
         {\r
-            var label = new ShipLabel {Parent= new Panel()};\r
+            var label = new ShipLabel {Parent = new Panel()};\r
             label.SetName("[避]", "綾波改二", "▫");\r
             PAssert.That(() => label.Text == "[避]綾波改二▫");\r
             label.SetName("[避]", "朝潮改二丁", "▫", ShipNameWidth.AkashiTimer);\r

diff --git a/KancolleSniffer/ListForm.cs b/KancolleSniffer/ListForm.cs
index 4b9ac31..64ebd2a 100644 (file)
--- a/KancolleSniffer/ListForm.cs
+++ b/KancolleSniffer/ListForm.cs
@@ -375,7 +375,7 @@ namespace KancolleSniffer
             labels[1].SetCond(s);\r
             labels[2].SetLevel(s);\r
             labels[3].SetExpToNext(s);\r
-            labels[4].SetName(s);\r
+            labels[4].SetName(s, ShipNameWidth.ShipList);\r
             labels[5].SetFleet(s);\r
             lbp.Visible = true;\r
         }\r
@@ -411,7 +411,7 @@ namespace KancolleSniffer
                 cbp.Location = new Point(cbp.Left, (int)cbp.Tag + panelShipList.AutoScrollPosition.Y);\r
             var cfgl = _configLabelList[i];\r
             cfgl[0].SetLevel(s);\r
-            cfgl[1].SetName(s);\r
+            cfgl[1].SetName(s, ShipNameWidth.GroupConfig);\r
             cfgl[2].SetFleet(s);\r
             var cb = _checkBoxesList[i];\r
             for (var j = 0; j < cb.Length; j++)\r

diff --git a/KancolleSniffer/ShipLabels.cs b/KancolleSniffer/ShipLabels.cs
index 54490bf..60b4e0c 100644 (file)
--- a/KancolleSniffer/ShipLabels.cs
+++ b/KancolleSniffer/ShipLabels.cs
@@ -23,10 +23,13 @@ namespace KancolleSniffer
 {\r
     public enum ShipNameWidth\r
     {\r
+        MainPanel = 93,\r
         AkashiTimer = 53,\r
         NDock = 69,\r
         RepairList = NDock,\r
         RepairListFull = 75,\r
+        ShipList = 82,\r
+        GroupConfig = 82,\r
         Max = int.MaxValue\r
     }\r
 \r
@@ -108,7 +111,7 @@ namespace KancolleSniffer
                     labels[1].SetCond(s);\r
                     labels[2].SetLevel(s);\r
                     labels[3].SetExpToNext(s);\r
-                    labels[4].SetName(s);\r
+                    labels[4].SetName(s, ShipNameWidth.MainPanel);\r
                 }\r
                 else\r
                 {\r