クラス名をリネームする

diff --git a/KancolleSniffer/Forms/HorizontalMainForm.Designer.cs b/KancolleSniffer/Forms/HorizontalMainForm.Designer.cs
index c60588d..5ff5982 100644 (file)
--- a/KancolleSniffer/Forms/HorizontalMainForm.Designer.cs
+++ b/KancolleSniffer/Forms/HorizontalMainForm.Designer.cs
@@ -66,7 +66,7 @@ namespace KancolleSniffer.Forms
             this.hqPanel = new KancolleSniffer.View.MainWindow.HqPanel();\r
             this.materialHistoryPanel = new KancolleSniffer.View.MainWindow.MaterialHistoryPanel();\r
             this.dropDownButtonMaterialHistory = new KancolleSniffer.View.DropDownButton();\r
-            this.mainFleetPanel = new KancolleSniffer.View.MainWindow.MainFleetPanel();\r
+            this.fleetPanel = new KancolleSniffer.View.MainWindow.FleetPanel();\r
             this.SuspendLayout();\r
             // \r
             // labelAkashiRepairTimer\r
@@ -236,11 +236,11 @@ namespace KancolleSniffer.Forms
             // \r
             // mainFleetPanel\r
             // \r
-            this.mainFleetPanel.Context = null;\r
-            this.mainFleetPanel.Location = new System.Drawing.Point(232, 3);\r
-            this.mainFleetPanel.Name = "mainFleetPanel";\r
-            this.mainFleetPanel.Size = new System.Drawing.Size(220, 148);\r
-            this.mainFleetPanel.TabIndex = 82;\r
+            this.fleetPanel.Context = null;\r
+            this.fleetPanel.Location = new System.Drawing.Point(232, 3);\r
+            this.fleetPanel.Name = "fleetPanel";\r
+            this.fleetPanel.Size = new System.Drawing.Size(220, 148);\r
+            this.fleetPanel.TabIndex = 82;\r
             // \r
             // HorizontalMainForm\r
             // \r
@@ -252,7 +252,7 @@ namespace KancolleSniffer.Forms
             this.Controls.Add(this.labelAkashiRepair);\r
             this.Controls.Add(this.labelAkashiRepairTimer);\r
             this.Controls.Add(this.missionPanel);\r
-            this.Controls.Add(this.mainFleetPanel);\r
+            this.Controls.Add(this.fleetPanel);\r
             this.Controls.Add(this.dropDownButtonMaterialHistory);\r
             this.Controls.Add(this.materialHistoryPanel);\r
             this.Controls.Add(this.hqPanel);\r
@@ -296,7 +296,7 @@ namespace KancolleSniffer.Forms
         private HqPanel hqPanel;\r
         private MaterialHistoryPanel materialHistoryPanel;\r
         private DropDownButton dropDownButtonMaterialHistory;\r
-        private MainFleetPanel mainFleetPanel;\r
+        private FleetPanel fleetPanel;\r
     }\r
 }\r
 \r

diff --git a/KancolleSniffer/Forms/VerticalMainForm.Designer.cs b/KancolleSniffer/Forms/VerticalMainForm.Designer.cs
index b89e90e..faaf35a 100644 (file)
--- a/KancolleSniffer/Forms/VerticalMainForm.Designer.cs
+++ b/KancolleSniffer/Forms/VerticalMainForm.Designer.cs
@@ -66,7 +66,7 @@ namespace KancolleSniffer.Forms
             this.hqPanel = new KancolleSniffer.View.MainWindow.HqPanel();\r
             this.materialHistoryPanel = new KancolleSniffer.View.MainWindow.MaterialHistoryPanel();\r
             this.dropDownButtonMaterialHistory = new KancolleSniffer.View.DropDownButton();\r
-            this.mainFleetPanel = new KancolleSniffer.View.MainWindow.MainFleetPanel();\r
+            this.fleetPanel = new KancolleSniffer.View.MainWindow.FleetPanel();\r
             this.SuspendLayout();\r
             // \r
             // labelAkashiRepairTimer\r
@@ -236,18 +236,18 @@ namespace KancolleSniffer.Forms
             // \r
             // mainFleetPanel\r
             // \r
-            this.mainFleetPanel.Context = null;\r
-            this.mainFleetPanel.Location = new System.Drawing.Point(6, 42);\r
-            this.mainFleetPanel.Name = "mainFleetPanel";\r
-            this.mainFleetPanel.Size = new System.Drawing.Size(220, 149);\r
-            this.mainFleetPanel.TabIndex = 82;\r
+            this.fleetPanel.Context = null;\r
+            this.fleetPanel.Location = new System.Drawing.Point(6, 42);\r
+            this.fleetPanel.Name = "fleetPanel";\r
+            this.fleetPanel.Size = new System.Drawing.Size(220, 149);\r
+            this.fleetPanel.TabIndex = 82;\r
             // \r
             // VerticalMainForm\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, 455);\r
-            this.Controls.Add(this.mainFleetPanel);\r
+            this.Controls.Add(this.fleetPanel);\r
             this.Controls.Add(this.dropDownButtonMaterialHistory);\r
             this.Controls.Add(this.materialHistoryPanel);\r
             this.Controls.Add(this.hqPanel);\r
@@ -296,7 +296,7 @@ namespace KancolleSniffer.Forms
         private HqPanel hqPanel;\r
         private MaterialHistoryPanel materialHistoryPanel;\r
         private DropDownButton dropDownButtonMaterialHistory;\r
-        private MainFleetPanel mainFleetPanel;\r
+        private FleetPanel fleetPanel;\r
     }\r
 }\r
 \r

diff --git a/KancolleSniffer/KancolleSniffer.csproj b/KancolleSniffer/KancolleSniffer.csproj
index 6709467..b564ca5 100644 (file)
--- a/KancolleSniffer/KancolleSniffer.csproj
+++ b/KancolleSniffer/KancolleSniffer.csproj
@@ -111,7 +111,7 @@
     </Compile>\r
     <Compile Include="View\IUpdateable.cs" />\r
     <Compile Include="View\MainWindow\FighterPower.cs" />\r
-    <Compile Include="View\MainWindow\MainFleetPanel.cs">\r
+    <Compile Include="View\MainWindow\FleetPanel.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
     <Compile Include="View\MainWindow\MaterialHistoryPanel.cs">\r
@@ -210,7 +210,7 @@
     <Compile Include="View\MainWindow\RepairListPanel.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
-    <Compile Include="View\MainWindow\ShipPanels.cs" />\r
+    <Compile Include="View\MainWindow\ShipListPanels.cs" />\r
     <Compile Include="Forms\ListForm.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r

diff --git a/KancolleSniffer/MainWindow.cs b/KancolleSniffer/MainWindow.cs
index f6d2376..cdef84b 100644 (file)
--- a/KancolleSniffer/MainWindow.cs
+++ b/KancolleSniffer/MainWindow.cs
@@ -37,7 +37,7 @@ namespace KancolleSniffer
             // ReSharper disable UnusedAutoPropertyAccessor.Local\r
             public NotifyIcon notifyIconMain { get; set; }\r
             public HqPanel hqPanel { get; set; }\r
-            public MainFleetPanel mainFleetPanel { get; set; }\r
+            public FleetPanel fleetPanel { get; set; }\r
             public Label labelNDockCaption { get; set; }\r
             public NDockPanel ndockPanel { get; set; }\r
             public KDockPanel kdockPanel { get; set; }\r
@@ -94,8 +94,8 @@ namespace KancolleSniffer
             SetScaleFactorOfDpiScaling();\r
             SetupQuestPanel();\r
             SetEventHandlers();\r
-            _c.mainFleetPanel.AkashiRepairTimer = _c.labelAkashiRepairTimer;\r
-            _c.mainFleetPanel.ShowShipOnList = ShowShipOnShipList;\r
+            _c.fleetPanel.AkashiRepairTimer = _c.labelAkashiRepairTimer;\r
+            _c.fleetPanel.ShowShipOnList = ShowShipOnShipList;\r
             _c.panelRepairList.CreateLabels(panelRepairList_Click);\r
             _c.ndockPanel.SetClickHandler(_c.labelNDockCaption);\r
             _c.missionPanel.SetClickHandler(_c.labelMissionCaption);\r
@@ -151,13 +151,13 @@ namespace KancolleSniffer
         {\r
             _updateable = new IUpdateContext[]\r
             {\r
-                _c.hqPanel, _c.missionPanel, _c.kdockPanel, _c.ndockPanel, _c.materialHistoryPanel, _c.mainFleetPanel,\r
+                _c.hqPanel, _c.missionPanel, _c.kdockPanel, _c.ndockPanel, _c.materialHistoryPanel, _c.fleetPanel,\r
                 Notifier\r
             };\r
             var context = new UpdateContext(Sniffer, Config, () => _main.Step);\r
             foreach (var updateable in _updateable)\r
                 updateable.Context = context;\r
-            _timers = new IUpdateTimers[] {_c.missionPanel, _c.kdockPanel, _c.ndockPanel, _c.mainFleetPanel};\r
+            _timers = new IUpdateTimers[] {_c.missionPanel, _c.kdockPanel, _c.ndockPanel, _c.fleetPanel};\r
         }\r
 \r
         private void SetScaleFactorOfDpiScaling()\r
@@ -179,7 +179,7 @@ namespace KancolleSniffer
             if (update == Sniffer.Update.Start)\r
             {\r
                 _c.hqPanel.Login.Visible = false;\r
-                _c.mainFleetPanel.Start();\r
+                _c.fleetPanel.Start();\r
                 Notifier.StopAllRepeat();\r
                 return;\r
             }\r
@@ -210,10 +210,10 @@ namespace KancolleSniffer
             if (Config.HideOnMinimized && Form.WindowState == FormWindowState.Minimized)\r
                 Form.ShowInTaskbar = false;\r
             if (Config.ShowHpInPercent)\r
-                _c.mainFleetPanel.ToggleHpPercent();\r
+                _c.fleetPanel.ToggleHpPercent();\r
             if (Config.ShipList.Visible)\r
                 _listFormGroup.Show();\r
-            _main.CheckVersionUpMain(_c.mainFleetPanel.Guide);\r
+            _main.CheckVersionUpMain(_c.fleetPanel.Guide);\r
         }\r
 \r
         private void MainForm_FormClosing(object sender, FormClosingEventArgs e)\r
@@ -229,7 +229,7 @@ namespace KancolleSniffer
             }\r
             _listFormGroup.Close();\r
             Config.Location = (Form.WindowState == FormWindowState.Normal ? Form.Bounds : Form.RestoreBounds).Location;\r
-            Config.ShowHpInPercent = _c.mainFleetPanel.ShowHpInPercent;\r
+            Config.ShowHpInPercent = _c.fleetPanel.ShowHpInPercent;\r
         }\r
 \r
         private void MainForm_Resize(object sender, EventArgs e)\r
@@ -307,7 +307,7 @@ namespace KancolleSniffer
             var prev = Form.CurrentAutoScaleDimensions;\r
             foreach (var control in new Control[]\r
             {\r
-                Form, _c.mainFleetPanel.Guide, _c.hqPanel.Login,\r
+                Form, _c.fleetPanel.Guide, _c.hqPanel.Login,\r
                 _contextMenuMain\r
             }.Concat(_main.Controls))\r
             {\r
@@ -376,7 +376,7 @@ namespace KancolleSniffer
 \r
         private void UpdateShipInfo()\r
         {\r
-            _c.mainFleetPanel.Update();\r
+            _c.fleetPanel.Update();\r
             Notifier.NotifyDamagedShip();\r
             UpdateChargeInfo();\r
             UpdateRepairList();\r
@@ -389,7 +389,7 @@ namespace KancolleSniffer
         {\r
             _listFormGroup.UpdateBattleResult();\r
             _listFormGroup.UpdateAirBattleResult();\r
-            _c.mainFleetPanel.UpdateBattleInfo();\r
+            _c.fleetPanel.UpdateBattleInfo();\r
         }\r
 \r
         private void UpdateCellInfo()\r
@@ -399,7 +399,7 @@ namespace KancolleSniffer
 \r
         private void UpdateChargeInfo()\r
         {\r
-            _c.mainFleetPanel.UpdateChargeInfo();\r
+            _c.fleetPanel.UpdateChargeInfo();\r
         }\r
 \r
         private void UpdateNDocLabels()\r

diff --git a/KancolleSniffer/View/MainWindow/MainFleetPanel.cs b/KancolleSniffer/View/MainWindow/FleetPanel.cs
similarity index 95%
rename from KancolleSniffer/View/MainWindow/MainFleetPanel.cs
rename to KancolleSniffer/View/MainWindow/FleetPanel.cs
index 167542a..bebec3f 100644 (file)
--- a/KancolleSniffer/View/MainWindow/MainFleetPanel.cs
+++ b/KancolleSniffer/View/MainWindow/FleetPanel.cs
@@ -8,7 +8,7 @@ using Clipboard = KancolleSniffer.Util.Clipboard;
 \r
 namespace KancolleSniffer.View.MainWindow\r
 {\r
-    public class MainFleetPanel : PanelWithToolTip, IUpdateTimers\r
+    public class FleetPanel : PanelWithToolTip, IUpdateTimers\r
     {\r
         private readonly ShipInfoPanel _shipInfoPanel = new ShipInfoPanel\r
         {\r
@@ -110,7 +110,7 @@ namespace KancolleSniffer.View.MainWindow
             }\r
         }\r
 \r
-        public MainFleetPanel()\r
+        public FleetPanel()\r
         {\r
             SetupFleetClick();\r
             _fleets[0].MouseHover += labelFleet1_MouseHover;\r

diff --git a/KancolleSniffer/View/MainWindow/ShipInfoPanel.cs b/KancolleSniffer/View/MainWindow/ShipInfoPanel.cs
index c5c14b6..d1dd26f 100644 (file)
--- a/KancolleSniffer/View/MainWindow/ShipInfoPanel.cs
+++ b/KancolleSniffer/View/MainWindow/ShipInfoPanel.cs
@@ -60,7 +60,7 @@ namespace KancolleSniffer.View.MainWindow
             Location = new Point(186, 117)\r
         };\r
 \r
-        private readonly ShipPanels _shipPanels;\r
+        private readonly ShipListPanels _shipPanels;\r
 \r
         private UpdateContext _context;\r
 \r
@@ -80,7 +80,7 @@ namespace KancolleSniffer.View.MainWindow
         {\r
             Controls.AddRange(new Control[] {Guide, _presetAkashiTimer});\r
             BorderStyle = BorderStyle.FixedSingle;\r
-            _shipPanels = new ShipPanels(this, ShipClickHandler);\r
+            _shipPanels = new ShipListPanels(this, ShipClickHandler);\r
             Controls.AddRange(new Control[]\r
             {\r
                 _battleInfo,\r

diff --git a/KancolleSniffer/View/MainWindow/ShipPanels.cs b/KancolleSniffer/View/MainWindow/ShipListPanels.cs
similarity index 96%
rename from KancolleSniffer/View/MainWindow/ShipPanels.cs
rename to KancolleSniffer/View/MainWindow/ShipListPanels.cs
index f7740eb..b4a8c1a 100644 (file)
--- a/KancolleSniffer/View/MainWindow/ShipPanels.cs
+++ b/KancolleSniffer/View/MainWindow/ShipListPanels.cs
@@ -20,7 +20,7 @@ using KancolleSniffer.Model;
 \r
 namespace KancolleSniffer.View.MainWindow\r
 {\r
-    public class ShipPanels\r
+    public class ShipListPanels\r
     {\r
         private const int PanelWidth = 220;\r
 \r
@@ -45,7 +45,7 @@ namespace KancolleSniffer.View.MainWindow
 \r
         public bool ShowHpInPercent => _hpToggle.InPercent;\r
 \r
-        public ShipPanels(Control parent, EventHandler onClick)\r
+        public ShipListPanels(Control parent, EventHandler onClick)\r
         {\r
             _shipLines = new ShipLabelLines(ShipInfo.MemberCount, 16);\r
             _shipLines7 = new ShipLabelLines(7, 14);\r