FormのサブクラスをFormsに移動する

diff --git a/KancolleSniffer/Config.cs b/KancolleSniffer/Config.cs
index 8705af4..df215ac 100644 (file)
--- a/KancolleSniffer/Config.cs
+++ b/KancolleSniffer/Config.cs
@@ -18,6 +18,8 @@ using System.Drawing;
 using System.IO;\r
 using System.Linq;\r
 using System.Xml.Serialization;\r
+using KancolleSniffer.Forms;\r
+\r
 // ReSharper disable MemberCanBePrivate.Global\r
 // ReSharper disable AutoPropertyCanBeMadeGetOnly.Global\r
 // ReSharper disable FieldCanBeMadeReadOnly.Global\r

diff --git a/KancolleSniffer/ConfigDialog.Designer.cs b/KancolleSniffer/Forms/ConfigDialog.Designer.cs
similarity index 98%
rename from KancolleSniffer/ConfigDialog.Designer.cs
rename to KancolleSniffer/Forms/ConfigDialog.Designer.cs
index 55618d6..5f7d50f 100644 (file)
--- a/KancolleSniffer/ConfigDialog.Designer.cs
+++ b/KancolleSniffer/Forms/ConfigDialog.Designer.cs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Forms\r
 {\r
     partial class ConfigDialog\r
     {\r

diff --git a/KancolleSniffer/ConfigDialog.cs b/KancolleSniffer/Forms/ConfigDialog.cs
similarity index 97%
rename from KancolleSniffer/ConfigDialog.cs
rename to KancolleSniffer/Forms/ConfigDialog.cs
index a0b1e99..b82c5c0 100644 (file)
--- a/KancolleSniffer/ConfigDialog.cs
+++ b/KancolleSniffer/Forms/ConfigDialog.cs
@@ -22,7 +22,7 @@ using KancolleSniffer.Net;
 using KancolleSniffer.Util;\r
 using KancolleSniffer.View;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Forms\r
 {\r
     public partial class ConfigDialog : Form\r
     {\r

diff --git a/KancolleSniffer/ConfigDialog.resx b/KancolleSniffer/Forms/ConfigDialog.resx
similarity index 100%
rename from KancolleSniffer/ConfigDialog.resx
rename to KancolleSniffer/Forms/ConfigDialog.resx

diff --git a/KancolleSniffer/ConfirmDialog.Designer.cs b/KancolleSniffer/Forms/ConfirmDialog.Designer.cs
similarity index 96%
rename from KancolleSniffer/ConfirmDialog.Designer.cs
rename to KancolleSniffer/Forms/ConfirmDialog.Designer.cs
index a8c2e69..3e7f25e 100644 (file)
--- a/KancolleSniffer/ConfirmDialog.Designer.cs
+++ b/KancolleSniffer/Forms/ConfirmDialog.Designer.cs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Forms\r
 {\r
     partial class ConfirmDialog\r
     {\r

diff --git a/KancolleSniffer/ConfirmDialog.cs b/KancolleSniffer/Forms/ConfirmDialog.cs
similarity index 93%
rename from KancolleSniffer/ConfirmDialog.cs
rename to KancolleSniffer/Forms/ConfirmDialog.cs
index d83c91a..7958e1a 100644 (file)
--- a/KancolleSniffer/ConfirmDialog.cs
+++ b/KancolleSniffer/Forms/ConfirmDialog.cs
@@ -14,7 +14,7 @@
 \r
 using System.Windows.Forms;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Forms\r
 {\r
     public partial class ConfirmDialog : Form\r
     {\r

diff --git a/KancolleSniffer/ConfirmDialog.resx b/KancolleSniffer/Forms/ConfirmDialog.resx
similarity index 100%
rename from KancolleSniffer/ConfirmDialog.resx
rename to KancolleSniffer/Forms/ConfirmDialog.resx

diff --git a/KancolleSniffer/ErrorDialog.Designer.cs b/KancolleSniffer/Forms/ErrorDialog.Designer.cs
similarity index 97%
rename from KancolleSniffer/ErrorDialog.Designer.cs
rename to KancolleSniffer/Forms/ErrorDialog.Designer.cs
index 3596bae..ad55b13 100644 (file)
--- a/KancolleSniffer/ErrorDialog.Designer.cs
+++ b/KancolleSniffer/Forms/ErrorDialog.Designer.cs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Forms\r
 {\r
     partial class ErrorDialog\r
     {\r

diff --git a/KancolleSniffer/ErrorDialog.cs b/KancolleSniffer/Forms/ErrorDialog.cs
similarity index 95%
rename from KancolleSniffer/ErrorDialog.cs
rename to KancolleSniffer/Forms/ErrorDialog.cs
index 7028965..2f5a2b5 100644 (file)
--- a/KancolleSniffer/ErrorDialog.cs
+++ b/KancolleSniffer/Forms/ErrorDialog.cs
@@ -17,7 +17,7 @@ using System.Drawing;
 using System.Windows.Forms;\r
 using Clipboard = KancolleSniffer.Util.Clipboard;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Forms\r
 {\r
     public partial class ErrorDialog : Form\r
     {\r

diff --git a/KancolleSniffer/ErrorDialog.resx b/KancolleSniffer/Forms/ErrorDialog.resx
similarity index 100%
rename from KancolleSniffer/ErrorDialog.resx
rename to KancolleSniffer/Forms/ErrorDialog.resx

diff --git a/KancolleSniffer/ListForm.Designer.cs b/KancolleSniffer/Forms/ListForm.Designer.cs
similarity index 98%
rename from KancolleSniffer/ListForm.Designer.cs
rename to KancolleSniffer/Forms/ListForm.Designer.cs
index 8c8a936..b65cb2d 100644 (file)
--- a/KancolleSniffer/ListForm.Designer.cs
+++ b/KancolleSniffer/Forms/ListForm.Designer.cs
@@ -16,7 +16,7 @@ using KancolleSniffer.View;
 using KancolleSniffer.View.ListWindow;\r
 using KancolleSniffer.View.ShipListPanel;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Forms\r
 {\r
     partial class ListForm\r
     {\r

diff --git a/KancolleSniffer/ListForm.cs b/KancolleSniffer/Forms/ListForm.cs
similarity index 97%
rename from KancolleSniffer/ListForm.cs
rename to KancolleSniffer/Forms/ListForm.cs
index bf3691b..89dfd5d 100644 (file)
--- a/KancolleSniffer/ListForm.cs
+++ b/KancolleSniffer/Forms/ListForm.cs
@@ -21,7 +21,7 @@ using KancolleSniffer.View;
 using KancolleSniffer.View.ShipListPanel;\r
 using Clipboard = KancolleSniffer.Util.Clipboard;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Forms\r
 {\r
     public partial class ListForm : Form\r
     {\r

diff --git a/KancolleSniffer/ListForm.resx b/KancolleSniffer/Forms/ListForm.resx
similarity index 100%
rename from KancolleSniffer/ListForm.resx
rename to KancolleSniffer/Forms/ListForm.resx

diff --git a/KancolleSniffer/ListFormGroup.cs b/KancolleSniffer/Forms/ListFormGroup.cs
similarity index 95%
rename from KancolleSniffer/ListFormGroup.cs
rename to KancolleSniffer/Forms/ListFormGroup.cs
index 8046ce4..9e50147 100644 (file)
--- a/KancolleSniffer/ListFormGroup.cs
+++ b/KancolleSniffer/Forms/ListFormGroup.cs
@@ -18,7 +18,7 @@ using System.Drawing;
 using System.Linq;\r
 using System.Windows.Forms;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Forms\r
 {\r
     public class ListFormGroup\r
     {\r

diff --git a/KancolleSniffer/MainForm.Designer.cs b/KancolleSniffer/Forms/MainForm.Designer.cs
similarity index 97%
rename from KancolleSniffer/MainForm.Designer.cs
rename to KancolleSniffer/Forms/MainForm.Designer.cs
index f881e1d..8830e5f 100644 (file)
--- a/KancolleSniffer/MainForm.Designer.cs
+++ b/KancolleSniffer/Forms/MainForm.Designer.cs
@@ -13,10 +13,9 @@
 // limitations under the License.\r
 \r
 using KancolleSniffer.View;\r
-using KancolleSniffer.View.ListWindow;\r
 using KancolleSniffer.View.MainWindow;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Forms\r
 {\r
     partial class MainForm\r
     {\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/Forms/MainForm.cs
similarity index 93%
rename from KancolleSniffer/MainForm.cs
rename to KancolleSniffer/Forms/MainForm.cs
index f68310c..d82f105 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/Forms/MainForm.cs
@@ -15,7 +15,7 @@
 using System.Windows.Forms;\r
 using KancolleSniffer.Util;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Forms\r
 {\r
     public partial class MainForm : Form\r
     {\r

diff --git a/KancolleSniffer/MainForm.resx b/KancolleSniffer/Forms/MainForm.resx
similarity index 100%
rename from KancolleSniffer/MainForm.resx
rename to KancolleSniffer/Forms/MainForm.resx

diff --git a/KancolleSniffer/KancolleSniffer.csproj b/KancolleSniffer/KancolleSniffer.csproj
index 4eb4d62..51bd44e 100644 (file)
--- a/KancolleSniffer/KancolleSniffer.csproj
+++ b/KancolleSniffer/KancolleSniffer.csproj
@@ -61,7 +61,7 @@
   <ItemGroup>\r
     <Compile Include="Log\BattleLogger.cs" />\r
     <Compile Include="Main.cs" />\r
-    <Compile Include="ListFormGroup.cs" />\r
+    <Compile Include="Forms\ListFormGroup.cs" />\r
     <Compile Include="MainWindow.cs" />\r
     <Compile Include="Model\AirBattleResult.cs" />\r
     <Compile Include="Model\AirCorpsFighterPower.cs" />\r
@@ -126,16 +126,16 @@
     <Compile Include="Model\CellInfo.cs" />\r
     <Compile Include="ErrorLog.cs" />\r
     <Compile Include="Config.cs" />\r
-    <Compile Include="ConfigDialog.cs">\r
+    <Compile Include="Forms\ConfigDialog.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
-    <Compile Include="ConfigDialog.Designer.cs">\r
+    <Compile Include="Forms\ConfigDialog.Designer.cs">\r
       <DependentUpon>ConfigDialog.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="ConfirmDialog.cs">\r
+    <Compile Include="Forms\ConfirmDialog.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
-    <Compile Include="ConfirmDialog.Designer.cs">\r
+    <Compile Include="Forms\ConfirmDialog.Designer.cs">\r
       <DependentUpon>ConfirmDialog.cs</DependentUpon>\r
     </Compile>\r
     <Compile Include="View\ControlsArranger.cs" />\r
@@ -147,10 +147,10 @@
       <SubType>Component</SubType>\r
     </Compile>\r
     <Compile Include="Model\ExMapInfo.cs" />\r
-    <Compile Include="ErrorDialog.cs">\r
+    <Compile Include="Forms\ErrorDialog.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
-    <Compile Include="ErrorDialog.Designer.cs">\r
+    <Compile Include="Forms\ErrorDialog.Designer.cs">\r
       <DependentUpon>ErrorDialog.cs</DependentUpon>\r
     </Compile>\r
     <Compile Include="Net\HttpProxy.cs" />\r
@@ -200,16 +200,16 @@
       <SubType>Component</SubType>\r
     </Compile>\r
     <Compile Include="View\MainWindow\MainShipLabels.cs" />\r
-    <Compile Include="ListForm.cs">\r
+    <Compile Include="Forms\ListForm.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
-    <Compile Include="ListForm.Designer.cs">\r
+    <Compile Include="Forms\ListForm.Designer.cs">\r
       <DependentUpon>ListForm.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="MainForm.cs">\r
+    <Compile Include="Forms\MainForm.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
-    <Compile Include="MainForm.Designer.cs">\r
+    <Compile Include="Forms\MainForm.Designer.cs">\r
       <DependentUpon>MainForm.cs</DependentUpon>\r
     </Compile>\r
     <Compile Include="Model\MissionInfo.cs" />\r
@@ -240,19 +240,19 @@
     <Compile Include="Net\SystemProxy.cs" />\r
     <Compile Include="TextGenerator.cs" />\r
     <Compile Include="Util\Win32API.cs" />\r
-    <EmbeddedResource Include="ConfigDialog.resx">\r
+    <EmbeddedResource Include="Forms\ConfigDialog.resx">\r
       <DependentUpon>ConfigDialog.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="ConfirmDialog.resx">\r
+    <EmbeddedResource Include="Forms\ConfirmDialog.resx">\r
       <DependentUpon>ConfirmDialog.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="ErrorDialog.resx">\r
+    <EmbeddedResource Include="Forms\ErrorDialog.resx">\r
       <DependentUpon>ErrorDialog.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="ListForm.resx">\r
+    <EmbeddedResource Include="Forms\ListForm.resx">\r
       <DependentUpon>ListForm.cs</DependentUpon>\r
     </EmbeddedResource>\r
-    <EmbeddedResource Include="MainForm.resx">\r
+    <EmbeddedResource Include="Forms\MainForm.resx">\r
       <DependentUpon>MainForm.cs</DependentUpon>\r
     </EmbeddedResource>\r
     <EmbeddedResource Include="Notification\ConfigDialog.resx">\r

diff --git a/KancolleSniffer/Main.cs b/KancolleSniffer/Main.cs
index 47afbf6..191aa3e 100644 (file)
--- a/KancolleSniffer/Main.cs
+++ b/KancolleSniffer/Main.cs
@@ -9,6 +9,7 @@ using System.Net;
 using System.Text.RegularExpressions;\r
 using System.Windows.Forms;\r
 using DynaJson;\r
+using KancolleSniffer.Forms;\r
 using KancolleSniffer.Log;\r
 using KancolleSniffer.Net;\r
 using KancolleSniffer.Util;\r

diff --git a/KancolleSniffer/MainWindow.cs b/KancolleSniffer/MainWindow.cs
index 16daa14..bff0b83 100644 (file)
--- a/KancolleSniffer/MainWindow.cs
+++ b/KancolleSniffer/MainWindow.cs
@@ -4,6 +4,7 @@ using System.Drawing;
 using System.Linq;\r
 using System.Reflection;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Forms;\r
 using KancolleSniffer.Notification;\r
 using KancolleSniffer.Util;\r
 using KancolleSniffer.View;\r

diff --git a/KancolleSniffer/View/ListWindow/AntiAirPanel.cs b/KancolleSniffer/View/ListWindow/AntiAirPanel.cs
index 0c018da..768088d 100644 (file)
--- a/KancolleSniffer/View/ListWindow/AntiAirPanel.cs
+++ b/KancolleSniffer/View/ListWindow/AntiAirPanel.cs
@@ -16,6 +16,7 @@ using System.Collections.Generic;
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Forms;\r
 using KancolleSniffer.Model;\r
 \r
 namespace KancolleSniffer.View.ListWindow\r

diff --git a/KancolleSniffer/View/ListWindow/FleetDataPanel.cs b/KancolleSniffer/View/ListWindow/FleetDataPanel.cs
index fe498bc..4099b8f 100644 (file)
--- a/KancolleSniffer/View/ListWindow/FleetDataPanel.cs
+++ b/KancolleSniffer/View/ListWindow/FleetDataPanel.cs
@@ -17,6 +17,7 @@ using System.Collections.Generic;
 using System.Drawing;\r
 using System.Windows.Forms;\r
 using Clipboard = KancolleSniffer.Util.Clipboard;\r
+using KancolleSniffer.Forms;\r
 \r
 namespace KancolleSniffer.View.ListWindow\r
 {\r

diff --git a/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs b/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs
index 954801a..cd6540d 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs
@@ -17,6 +17,7 @@ using System.Collections.Generic;
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Forms;\r
 using KancolleSniffer.Model;\r
 \r
 // ReSharper disable CoVariantArrayConversion\r

diff --git a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
index b601059..9b1ea1f 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
@@ -16,6 +16,7 @@ using System.Collections.Generic;
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Forms;\r
 using KancolleSniffer.Model;\r
 \r
 namespace KancolleSniffer.View.ShipListPanel\r

diff --git a/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs b/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs
index 625fa9a..004ca62 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs
@@ -15,6 +15,7 @@
 using System.Collections.Generic;\r
 using System.Drawing;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Forms;\r
 \r
 namespace KancolleSniffer.View.ShipListPanel\r
 {\r

diff --git a/KancolleSniffer/View/ShipListPanel/ShipListPanel.cs b/KancolleSniffer/View/ShipListPanel/ShipListPanel.cs
index cc14042..f7a474a 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel/ShipListPanel.cs
+++ b/KancolleSniffer/View/ShipListPanel/ShipListPanel.cs
@@ -17,6 +17,7 @@ using System.Collections.Generic;
 using System.Linq;\r
 using System.Runtime.InteropServices;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Forms;\r
 using KancolleSniffer.Model;\r
 using static System.Math;\r
 \r