From df24f996e9e8f34d0d22cae3a8d6127da76ee9e1 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 11 Aug 2013 13:42:19 +0000
Subject: [PATCH] Fiish data entry of new path stuff, and fix the vs2012 build

---
 .../BizHawk.MultiClient_v4.5.csproj           |   4 +-
 BizHawk.MultiClient/Config.cs                 | 111 ++++++++++++++++++
 BizHawk.MultiClient/config/NewPathConfig.cs   |   5 +
 3 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
index 09c109a83b..051e22ef36 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj
@@ -216,7 +216,9 @@
     <Compile Include="config\NewHotkeyWindow.Designer.cs">
       <DependentUpon>NewHotkeyWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="config\NewPathConfig.cs" />
+    <Compile Include="config\NewPathConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="config\NewPathConfig.Designer.cs">
       <DependentUpon>NewPathConfig.cs</DependentUpon>
     </Compile>
diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs
index 8809b15602..97e36d0938 100644
--- a/BizHawk.MultiClient/Config.cs
+++ b/BizHawk.MultiClient/Config.cs
@@ -167,6 +167,14 @@ namespace BizHawk.MultiClient
 			new PathEntry() { System = "Global", Type = "Firmware", Path = Path.Combine(".", "Firmware"), Ordinal = 6 },
 			new PathEntry() { System = "Global", Type = "Base ROM", Path = ".", Ordinal = 6 },
 
+			new PathEntry() { System = "INTV", Type = "Base", Path = Path.Combine(".", "Intellivision"), Ordinal = 0 },
+			new PathEntry() { System = "INTV", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "INTV", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "INTV", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "INTV", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "INTV", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+			new PathEntry() { System = "INTV", Type = "Palettes", Path = Path.Combine(".", "Palettes"),  Ordinal = 6 },
+
 			new PathEntry() { System = "NES", Type = "Base", Path = Path.Combine(".", "NES"), Ordinal = 0 },
 			new PathEntry() { System = "NES", Type = "ROM", Path = ".", Ordinal = 1 },
 			new PathEntry() { System = "NES", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
@@ -181,6 +189,109 @@ namespace BizHawk.MultiClient
 			new PathEntry() { System = "SNES", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
 			new PathEntry() { System = "SNES", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
 			new PathEntry() { System = "SNES", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "GBA", Type = "Base", Path= Path.Combine(".", "GBA"), Ordinal = 0 },
+			new PathEntry() { System = "GBA", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "GBA", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "GBA", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "GBA", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "GBA", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "SMS", Type = "Base", Path= Path.Combine(".", "SMS"), Ordinal = 0 },
+			new PathEntry() { System = "SMS", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "SMS", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "SMS", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "SMS", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "SMS", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "GG", Type = "Base", Path= Path.Combine(".", "Game Gear"), Ordinal = 0 },
+			new PathEntry() { System = "GG", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "GG", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "GG", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "GG", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "GG", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "SG", Type = "Base", Path= Path.Combine(".", "SG-1000"), Ordinal = 0 },
+			new PathEntry() { System = "SG", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "SG", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "SG", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "SG", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "SG", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "GEN", Type = "Base", Path= Path.Combine(".", "Genesis"), Ordinal = 0 },
+			new PathEntry() { System = "GEN", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "GEN", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "GEN", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "GEN", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "GEN", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "PCE", Type = "Base", Path= Path.Combine(".", "PC Engine"), Ordinal = 0 },
+			new PathEntry() { System = "PCE", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "PCE", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "PCE", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "PCE", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "PCE", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "GB", Type = "Base", Path= Path.Combine(".", "Gameboy"), Ordinal = 0 },
+			new PathEntry() { System = "GB", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "GB", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "GB", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "GB", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "GB", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+			new PathEntry() { System = "GB", Type = "Palettes", Path = Path.Combine(".", "Palettes"),  Ordinal = 6 },
+
+			new PathEntry() { System = "TI83", Type = "Base", Path= Path.Combine(".", "TI83"), Ordinal = 0 },
+			new PathEntry() { System = "TI83", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "TI83", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "TI83", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "TI83", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "TI83", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "A26", Type = "Base", Path= Path.Combine(".", "Atari 2600"), Ordinal = 0 },
+			new PathEntry() { System = "A26", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "A26", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "A26", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "A26", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "A78", Type = "Base", Path= Path.Combine(".", "Atari 7800"), Ordinal = 0 },
+			new PathEntry() { System = "A78", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "A78", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "A78", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "A78", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "A78", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "C64", Type = "Base", Path= Path.Combine(".", "C64"), Ordinal = 0 },
+			new PathEntry() { System = "C64", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "C64", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "C64", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "C64", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "PSX", Type = "Base", Path= Path.Combine(".", "PSX"), Ordinal = 0 },
+			new PathEntry() { System = "PSX", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "PSX", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "PSX", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "PSX", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "PSX", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "Coleco", Type = "Base", Path= Path.Combine(".", "Coleco"), Ordinal = 0 },
+			new PathEntry() { System = "Coleco", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "Coleco", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "Coleco", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "Coleco", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "N64", Type = "Base", Path= Path.Combine(".", "N64"), Ordinal = 0 },
+			new PathEntry() { System = "N64", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "N64", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "N64", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "N64", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "N64", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
+
+			new PathEntry() { System = "Saturn", Type = "Base", Path= Path.Combine(".", "Saturn"), Ordinal = 0 },
+			new PathEntry() { System = "Saturn", Type = "ROM", Path = ".", Ordinal = 1 },
+			new PathEntry() { System = "Saturn", Type = "Savestates",  Path= Path.Combine(".", "State"), Ordinal = 2 },
+			new PathEntry() { System = "Saturn", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
+			new PathEntry() { System = "Saturn", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
+			new PathEntry() { System = "Saturn", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
 		};
 
 		//BIOS Paths
diff --git a/BizHawk.MultiClient/config/NewPathConfig.cs b/BizHawk.MultiClient/config/NewPathConfig.cs
index 1628f0e2ac..31a785855a 100644
--- a/BizHawk.MultiClient/config/NewPathConfig.cs
+++ b/BizHawk.MultiClient/config/NewPathConfig.cs
@@ -11,6 +11,11 @@ namespace BizHawk.MultiClient
 {
 	public partial class NewPathConfig : Form
 	{
+		//TODO:
+		//System ID and preferred folder name do not match, needs new param
+		//FInish config entries
+		//Set tab focus based on system ID
+		//Remaining GUI items
 		public NewPathConfig()
 		{
 			InitializeComponent();