Form1.designer.cs was not linked to Form1.cs

Created a new Main.cs to fix things. Note to self, don't code at 4am
PromoFaux · May 23, 2015 · 7121121 · 7121121
1 parent f431ff0
commit 7121121
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 34 deletions.
diff --git a/JourneymapImporter/JourneymapImporter.csproj b/JourneymapImporter/JourneymapImporter.csproj
@@ -47,13 +47,17 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Form1.cs">
+    <Compile Include="Main.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.cs" />
+    <Compile Include="Main.Designer.cs">
+      <DependentUpon>Main.cs</DependentUpon>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Form1.resx" />
+    <EmbeddedResource Include="Main.resx">
+      <DependentUpon>Main.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

diff --git a/JourneymapImporter/Form1.Designer.cs → JourneymapImporter/Main.Designer.cs b/JourneymapImporter/Form1.Designer.cs → JourneymapImporter/Main.Designer.cs
diff --git a/JourneymapImporter/Form1.cs → JourneymapImporter/Main.cs b/JourneymapImporter/Form1.cs → JourneymapImporter/Main.cs
@@ -3,18 +3,17 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
-using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace JourneymapWaypoinImporter
+namespace JourneymapImporter
 {
-    public partial class Form1 : Form
+    public partial class Main : Form
     {
-        public Form1()
+        public Main()
         {
             InitializeComponent();
         }
@@ -66,7 +65,7 @@ private void import(string vmFile, string jmFolder)
             string[] fileEntries = Directory.GetFiles(jmFolder, "*.json");
 
 
-           if (fileEntries != null)
+            if (fileEntries != null)
             {
                 foreach (string fileName in fileEntries)
                 {
@@ -102,32 +101,37 @@ private void import(string vmFile, string jmFolder)
                 //    //ProcessDirectory(subdirectory);
 
             }
-           else
+            else
             {
                 MessageBox.Show("No JourneyMap Files in this folder! Choose another path!");
             }
         }
-
 
+        private void Main_Load(object sender, EventArgs e)
+        {
+
+        }
     }
-}
 
-public class journeymapwaypoint
-{
-    public string name { get; set; }
-    public int x { get; set; }
-    public int y { get; set; }
-    public int z { get; set; }
-    public int r { get; set; }
-    public int g { get; set; }
-    public int b { get; set; }
-    public string enable { get; set; }
+    public class journeymapwaypoint
+    {
+        public string name { get; set; }
+        public int x { get; set; }
+        public int y { get; set; }
+        public int z { get; set; }
+        public int r { get; set; }
+        public int g { get; set; }
+        public int b { get; set; }
+        public string enable { get; set; }
 
-    public string type { get; set; }
-    public string origin { get; set; }
-    public List<string> dimensions { get; set; }
+        public string type { get; set; }
+        public string origin { get; set; }
+        public List<string> dimensions { get; set; }
 
 
 
 
+    }
 }
+
+
diff --git a/JourneymapImporter/Form1.resx → JourneymapImporter/Main.resx b/JourneymapImporter/Form1.resx → JourneymapImporter/Main.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/JourneymapImporter/Program.cs b/JourneymapImporter/Program.cs
@@ -1,4 +1,5 @@
-using System;
+using JourneymapImporter;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
@@ -15,7 +16,7 @@ static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Form1());
+            Application.Run(new Main());
         }
     }
 }