From c135afd8051d9dd5a9d9782d06daf237559a59d9 Mon Sep 17 00:00:00 2001 From: Ian C Date: Mon, 20 Feb 2012 23:16:28 +0000 Subject: Added some extra classes for the Spectrum itself, and redid some interface elements. --- wpspec.sln | 38 +++++++++- wpspec/wpspec/AboutPage.xaml | 15 ++++ wpspec/wpspec/App.xaml.cs | 5 ++ wpspec/wpspec/MainPage.xaml | 39 ++++++++++ wpspec/wpspec/Properties/AssemblyInfo.cs | 2 +- wpspec/wpspec/Resources/48.rom | Bin 0 -> 16384 bytes wpspec/wpspec/Resources/Strings.Designer.cs | 4 +- wpspec/wpspec/Resources/Strings.resx | 4 +- wpspec/wpspec/Settings.cs | 30 ++------ wpspec/wpspec/SettingsPage.xaml.cs | 8 +- wpspec/wpspec/Spectrum/Emulation.cs | 110 ++++++++++++++++++++++++++++ wpspec/wpspec/wpspec.csproj | 15 ++++ 12 files changed, 237 insertions(+), 33 deletions(-) create mode 100644 wpspec/wpspec/Resources/48.rom create mode 100644 wpspec/wpspec/Spectrum/Emulation.cs diff --git a/wpspec.sln b/wpspec.sln index 5c4295c..afcdbe1 100644 --- a/wpspec.sln +++ b/wpspec.sln @@ -5,7 +5,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wpspec", "wpspec\wpspec\wps EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wpspecLib", "wpspec\wpspecLib\wpspecLib.csproj", "{54C6C396-4BCE-4E3C-936C-846FFEFD44FB}" EndProject -Project("{96E2B04D-8817-42C6-938A-82C39BA4D311}") = "wpspecLibContent", "wpspec\wpspecLibContent\wpspecLibContent.contentproj", "{D1AEDB5A-7350-4E29-8F2F-5AFCFAD8D000}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wpspecLibContent", "wpspec\wpspecLibContent\wpspecLibContent.contentproj", "{D1AEDB5A-7350-4E29-8F2F-5AFCFAD8D000}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation", "..\Noddybox.Emulation\WindowsPhone\Noddybox.Emulation\Noddybox.Emulation.csproj", "{A2478066-4DFD-4042-BF98-963922DC97F8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation.EightBit", "..\Noddybox.Emulation\WindowsPhone\Noddybox.Emulation.EightBit\Noddybox.Emulation.EightBit.csproj", "{ADC7A871-4DED-4A92-A447-2D784AB60FAF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation.EightBit.Z80", "..\Noddybox.Emulation\WindowsPhone\Noddybox.Emulation.EightBit.Z80\Noddybox.Emulation.EightBit.Z80.csproj", "{7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -47,6 +53,36 @@ Global {D1AEDB5A-7350-4E29-8F2F-5AFCFAD8D000}.Release|Any CPU.ActiveCfg = Release|Windows Phone {D1AEDB5A-7350-4E29-8F2F-5AFCFAD8D000}.Release|Mixed Platforms.ActiveCfg = Release|Windows Phone {D1AEDB5A-7350-4E29-8F2F-5AFCFAD8D000}.Release|Windows Phone.ActiveCfg = Release|Windows Phone + {A2478066-4DFD-4042-BF98-963922DC97F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2478066-4DFD-4042-BF98-963922DC97F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2478066-4DFD-4042-BF98-963922DC97F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A2478066-4DFD-4042-BF98-963922DC97F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A2478066-4DFD-4042-BF98-963922DC97F8}.Debug|Windows Phone.ActiveCfg = Debug|Any CPU + {A2478066-4DFD-4042-BF98-963922DC97F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2478066-4DFD-4042-BF98-963922DC97F8}.Release|Any CPU.Build.0 = Release|Any CPU + {A2478066-4DFD-4042-BF98-963922DC97F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A2478066-4DFD-4042-BF98-963922DC97F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A2478066-4DFD-4042-BF98-963922DC97F8}.Release|Windows Phone.ActiveCfg = Release|Any CPU + {ADC7A871-4DED-4A92-A447-2D784AB60FAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ADC7A871-4DED-4A92-A447-2D784AB60FAF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADC7A871-4DED-4A92-A447-2D784AB60FAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {ADC7A871-4DED-4A92-A447-2D784AB60FAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {ADC7A871-4DED-4A92-A447-2D784AB60FAF}.Debug|Windows Phone.ActiveCfg = Debug|Any CPU + {ADC7A871-4DED-4A92-A447-2D784AB60FAF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ADC7A871-4DED-4A92-A447-2D784AB60FAF}.Release|Any CPU.Build.0 = Release|Any CPU + {ADC7A871-4DED-4A92-A447-2D784AB60FAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {ADC7A871-4DED-4A92-A447-2D784AB60FAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {ADC7A871-4DED-4A92-A447-2D784AB60FAF}.Release|Windows Phone.ActiveCfg = Release|Any CPU + {7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}.Debug|Windows Phone.ActiveCfg = Debug|Any CPU + {7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}.Release|Any CPU.Build.0 = Release|Any CPU + {7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7F257886-40D3-4E2A-BA9C-C5FEE93C08E9}.Release|Windows Phone.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/wpspec/wpspec/AboutPage.xaml b/wpspec/wpspec/AboutPage.xaml index 38ac6a8..07a07fa 100644 --- a/wpspec/wpspec/AboutPage.xaml +++ b/wpspec/wpspec/AboutPage.xaml @@ -32,7 +32,18 @@ + + + + + + + + + + @@ -47,6 +58,10 @@ + diff --git a/wpspec/wpspec/App.xaml.cs b/wpspec/wpspec/App.xaml.cs index f7d26ef..7c27124 100644 --- a/wpspec/wpspec/App.xaml.cs +++ b/wpspec/wpspec/App.xaml.cs @@ -121,6 +121,11 @@ namespace wpspec // An unhandled exception has occurred; break into the debugger System.Diagnostics.Debugger.Break(); } + else + { + MessageBox.Show(String.Format("{0}\n{1}", e.ExceptionObject.GetType(), e.ExceptionObject.Message), + "Fatal Error", MessageBoxButton.OK); + } } #region Phone application initialization diff --git a/wpspec/wpspec/MainPage.xaml b/wpspec/wpspec/MainPage.xaml index 8ec36b4..2020676 100644 --- a/wpspec/wpspec/MainPage.xaml +++ b/wpspec/wpspec/MainPage.xaml @@ -24,6 +24,42 @@ + + + + + + + + + + + + + + + + + @@ -47,16 +83,19 @@