Merge pull request #34 from codemonkey85/dev

Dev
codemonkey85 · May 31, 2014 · 779c052 · 779c052
2 parents ecbd22b + a4b18e9
commit 779c052
Show file tree

Hide file tree

Showing 8 changed files with 336 additions and 94 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,10 +3,13 @@
 	url = git://github.com/codemonkey85/PKMDS.git
 [submodule "externals/PKMDS-Win32-DLL"]
 	path = externals/PKMDS-Win32-DLL
-	url = git@github.com:codemonkey85/PKMDS-Win32-DLL.git
+	url = git@github.com:codemonkey85/PKMDS-Win32-DLL
 [submodule "externals/PKMDS-DB"]
 	path = externals/PKMDS-DB
 	url = git@github.com:codemonkey85/PKMDS-DB
 [submodule "PKMDS-Win32-DLL"]
 	path = PKMDS-Win32-DLL
 	url = git@github.com:codemonkey85/PKMDS-Win32-DLL.git
+[submodule "externals/PKMDS-Images"]
+	path = externals/PKMDS-Images
+	url = git@github.com:codemonkey85/PKMDS-Images
diff --git a/PKMDS-Save-Editor/PKMDS-Save-Editor/Properties/Settings.Designer.cs b/PKMDS-Save-Editor/PKMDS-Save-Editor/Properties/Settings.Designer.cs
diff --git a/PKMDS-Save-Editor/PKMDS-Save-Editor/Properties/Settings.settings b/PKMDS-Save-Editor/PKMDS-Save-Editor/Properties/Settings.settings
@@ -5,8 +5,5 @@
     <Setting Name="veekunpokedex" Type="System.String" Scope="User">
       <Value Profile="(Default)">veekun-pokedex.sqlite</Value>
     </Setting>
-    <Setting Name="imagedb" Type="System.String" Scope="User">
-      <Value Profile="(Default)">images.sqlite</Value>
-    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/PKMDS-Save-Editor/PKMDS-Save-Editor/app.config b/PKMDS-Save-Editor/PKMDS-Save-Editor/app.config
@@ -10,9 +10,6 @@
             <setting name="veekunpokedex" serializeAs="String">
                 <value>veekun-pokedex.sqlite</value>
             </setting>
-            <setting name="imagedb" serializeAs="String">
-                <value>images.sqlite</value>
-            </setting>
         </PKMDS_Save_Editor.Properties.Settings>
     </userSettings>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/PKMDS-Save-Editor/PKMDS-Save-Editor/frmMain.Designer.cs b/PKMDS-Save-Editor/PKMDS-Save-Editor/frmMain.Designer.cs