diff --git a/Library/AssemblyCommentAttribute.cs b/Library/AssemblyCommentAttribute.cs index 90a2c6c..3dec478 100644 --- a/Library/AssemblyCommentAttribute.cs +++ b/Library/AssemblyCommentAttribute.cs @@ -1,15 +1,15 @@ -using System; - -namespace Jellyfish.Library -{ - [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)] - public sealed class AssemblyCommentAttribute : Attribute - { - public AssemblyCommentAttribute(string comment) - { - Comment = comment; - } - - public string Comment { get; private set; } - } -} +using System; + +namespace Jellyfish.Library +{ + [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)] + public sealed class AssemblyCommentAttribute : Attribute + { + public AssemblyCommentAttribute(string comment) + { + Comment = comment; + } + + public string Comment { get; private set; } + } +} diff --git a/Library/FrameRateCounter.xaml b/Library/FrameRateCounter.xaml index 86d9bc9..3064c94 100644 --- a/Library/FrameRateCounter.xaml +++ b/Library/FrameRateCounter.xaml @@ -1,9 +1,9 @@ - - - - - - - + + + + + + + diff --git a/Library/FrameRateCounter.xaml.cs b/Library/FrameRateCounter.xaml.cs index 1ccf20d..3a91b3d 100644 --- a/Library/FrameRateCounter.xaml.cs +++ b/Library/FrameRateCounter.xaml.cs @@ -1,42 +1,42 @@ -using System; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Media; - -namespace Jellyfish.Library -{ - public sealed partial class FrameRateCounter : UserControl - { - public FrameRateCounter() - { - InitializeComponent(); - - CompositionTarget.Rendering += OnCompositionTargetRendering; - } - - private void OnCompositionTargetRendering(object sender, EventArgs e) - { - _frameCount++; - - long time = DateTime.UtcNow.Ticks; - if (time - _lastTime >= TimeSpan.TicksPerSecond) - { - _lastTime = time; - FrameRate = _frameCount; - _frameCount = 0; - } - } - - public static readonly DependencyProperty FrameRateProperty = DependencyProperty.Register("FrameRate", typeof(int), typeof(FrameRateCounter), - new PropertyMetadata(0)); - - public int FrameRate - { - get { return (int)GetValue(FrameRateProperty); } - set { SetValue(FrameRateProperty, value); } - } - - private int _frameCount; - private long _lastTime; - } -} +using System; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Media; + +namespace Jellyfish.Library +{ + public sealed partial class FrameRateCounter : UserControl + { + public FrameRateCounter() + { + InitializeComponent(); + + CompositionTarget.Rendering += OnCompositionTargetRendering; + } + + private void OnCompositionTargetRendering(object sender, EventArgs e) + { + _frameCount++; + + long time = DateTime.UtcNow.Ticks; + if (time - _lastTime >= TimeSpan.TicksPerSecond) + { + _lastTime = time; + FrameRate = _frameCount; + _frameCount = 0; + } + } + + public static readonly DependencyProperty FrameRateProperty = DependencyProperty.Register("FrameRate", typeof(int), typeof(FrameRateCounter), + new PropertyMetadata(0)); + + public int FrameRate + { + get { return (int)GetValue(FrameRateProperty); } + set { SetValue(FrameRateProperty, value); } + } + + private int _frameCount; + private long _lastTime; + } +} diff --git a/Library/GlobalSuppressions.cs b/Library/GlobalSuppressions.cs index 7a792e7..22ad926 100644 --- a/Library/GlobalSuppressions.cs +++ b/Library/GlobalSuppressions.cs @@ -1,4 +1,4 @@ -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames")] [assembly: SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Scope = "member", Target = "Jellyfish.Library.FrameRateCounter.#frameRateControl")] diff --git a/Library/Silverlight/Phone/FrameRateCounter.xaml b/Library/Silverlight/Phone/FrameRateCounter.xaml index 1fd81ad..b116f0f 100644 --- a/Library/Silverlight/Phone/FrameRateCounter.xaml +++ b/Library/Silverlight/Phone/FrameRateCounter.xaml @@ -1,13 +1,13 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/Library/Silverlight/Phone/FrameRateCounter.xaml.cs b/Library/Silverlight/Phone/FrameRateCounter.xaml.cs index 1ccf20d..3a91b3d 100644 --- a/Library/Silverlight/Phone/FrameRateCounter.xaml.cs +++ b/Library/Silverlight/Phone/FrameRateCounter.xaml.cs @@ -1,42 +1,42 @@ -using System; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Media; - -namespace Jellyfish.Library -{ - public sealed partial class FrameRateCounter : UserControl - { - public FrameRateCounter() - { - InitializeComponent(); - - CompositionTarget.Rendering += OnCompositionTargetRendering; - } - - private void OnCompositionTargetRendering(object sender, EventArgs e) - { - _frameCount++; - - long time = DateTime.UtcNow.Ticks; - if (time - _lastTime >= TimeSpan.TicksPerSecond) - { - _lastTime = time; - FrameRate = _frameCount; - _frameCount = 0; - } - } - - public static readonly DependencyProperty FrameRateProperty = DependencyProperty.Register("FrameRate", typeof(int), typeof(FrameRateCounter), - new PropertyMetadata(0)); - - public int FrameRate - { - get { return (int)GetValue(FrameRateProperty); } - set { SetValue(FrameRateProperty, value); } - } - - private int _frameCount; - private long _lastTime; - } -} +using System; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Media; + +namespace Jellyfish.Library +{ + public sealed partial class FrameRateCounter : UserControl + { + public FrameRateCounter() + { + InitializeComponent(); + + CompositionTarget.Rendering += OnCompositionTargetRendering; + } + + private void OnCompositionTargetRendering(object sender, EventArgs e) + { + _frameCount++; + + long time = DateTime.UtcNow.Ticks; + if (time - _lastTime >= TimeSpan.TicksPerSecond) + { + _lastTime = time; + FrameRate = _frameCount; + _frameCount = 0; + } + } + + public static readonly DependencyProperty FrameRateProperty = DependencyProperty.Register("FrameRate", typeof(int), typeof(FrameRateCounter), + new PropertyMetadata(0)); + + public int FrameRate + { + get { return (int)GetValue(FrameRateProperty); } + set { SetValue(FrameRateProperty, value); } + } + + private int _frameCount; + private long _lastTime; + } +} diff --git a/Library/Silverlight/Phone/StringFormatConverter.cs b/Library/Silverlight/Phone/StringFormatConverter.cs index 99edc1c..ecb203a 100644 --- a/Library/Silverlight/Phone/StringFormatConverter.cs +++ b/Library/Silverlight/Phone/StringFormatConverter.cs @@ -1,41 +1,41 @@ -using System; -using System.Globalization; -using System.Windows; -using System.Windows.Data; - -namespace Jellyfish.Library -{ - public sealed class StringFormatConverter : IValueConverter // SL is missing Binding.StringFormat - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - if (targetType != typeof(string)) - { - return DependencyProperty.UnsetValue; - } - - if (value == null) - { - return string.Empty; - } - - string format = parameter as string; - if (!string.IsNullOrEmpty(format)) - { - if (format.IndexOf('{') < 0) - { - format = "{0:" + format + "}"; - } - - return string.Format(culture, format, value); - } - - return value.ToString(); - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - return DependencyProperty.UnsetValue; // one way only - } - } -} +using System; +using System.Globalization; +using System.Windows; +using System.Windows.Data; + +namespace Jellyfish.Library +{ + public sealed class StringFormatConverter : IValueConverter // SL is missing Binding.StringFormat + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (targetType != typeof(string)) + { + return DependencyProperty.UnsetValue; + } + + if (value == null) + { + return string.Empty; + } + + string format = parameter as string; + if (!string.IsNullOrEmpty(format)) + { + if (format.IndexOf('{') < 0) + { + format = "{0:" + format + "}"; + } + + return string.Format(culture, format, value); + } + + return value.ToString(); + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return DependencyProperty.UnsetValue; // one way only + } + } +} diff --git a/License.txt b/License.txt index 82fa1da..e60bc67 100644 --- a/License.txt +++ b/License.txt @@ -1,4 +1,4 @@ - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., diff --git a/Virtu/GlobalSuppressions.cs b/Virtu/GlobalSuppressions.cs index a4d634b..93c1eb8 100644 --- a/Virtu/GlobalSuppressions.cs +++ b/Virtu/GlobalSuppressions.cs @@ -1,3 +1,3 @@ -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames")] diff --git a/Virtu/NoSlotClock.cs b/Virtu/NoSlotClock.cs index 31774d8..528fc09 100644 --- a/Virtu/NoSlotClock.cs +++ b/Virtu/NoSlotClock.cs @@ -1,4 +1,4 @@ -namespace Jellyfish.Virtu +namespace Jellyfish.Virtu { public sealed class NoSlotClock { diff --git a/Virtu/Properties/Strings.Designer.cs b/Virtu/Properties/Strings.Designer.cs index 0398b8d..d162531 100644 --- a/Virtu/Properties/Strings.Designer.cs +++ b/Virtu/Properties/Strings.Designer.cs @@ -1,99 +1,99 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.1 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Jellyfish.Virtu.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Strings { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Strings() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Jellyfish.Virtu.Properties.Strings", typeof(Strings).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to Resource '{0}' invalid.. - /// - internal static string ResourceInvalid { - get { - return ResourceManager.GetString("ResourceInvalid", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Resource '{0}' not found.. - /// - internal static string ResourceNotFound { - get { - return ResourceManager.GetString("ResourceNotFound", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Service type '{0}' already present.. - /// - internal static string ServiceAlreadyPresent { - get { - return ResourceManager.GetString("ServiceAlreadyPresent", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Service type '{0}' must be assignable from service provider '{1}'.. - /// - internal static string ServiceMustBeAssignable { - get { - return ResourceManager.GetString("ServiceMustBeAssignable", resourceCulture); - } - } - } -} +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.1 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Jellyfish.Virtu.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Strings { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Strings() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Jellyfish.Virtu.Properties.Strings", typeof(Strings).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Resource '{0}' invalid.. + /// + internal static string ResourceInvalid { + get { + return ResourceManager.GetString("ResourceInvalid", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Resource '{0}' not found.. + /// + internal static string ResourceNotFound { + get { + return ResourceManager.GetString("ResourceNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Service type '{0}' already present.. + /// + internal static string ServiceAlreadyPresent { + get { + return ResourceManager.GetString("ServiceAlreadyPresent", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Service type '{0}' must be assignable from service provider '{1}'.. + /// + internal static string ServiceMustBeAssignable { + get { + return ResourceManager.GetString("ServiceMustBeAssignable", resourceCulture); + } + } + } +} diff --git a/Virtu/Properties/Strings.resx b/Virtu/Properties/Strings.resx index 1d6660e..3ca952f 100644 --- a/Virtu/Properties/Strings.resx +++ b/Virtu/Properties/Strings.resx @@ -1,132 +1,132 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Resource '{0}' not found. - - - Resource '{0}' invalid. - - - Service type '{0}' already present. - - - Service type '{0}' must be assignable from service provider '{1}'. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Resource '{0}' not found. + + + Resource '{0}' invalid. + + + Service type '{0}' already present. + + + Service type '{0}' must be assignable from service provider '{1}'. + \ No newline at end of file diff --git a/Virtu/Services/IsolatedStorageService.cs b/Virtu/Services/IsolatedStorageService.cs index e445e92..c5acf62 100644 --- a/Virtu/Services/IsolatedStorageService.cs +++ b/Virtu/Services/IsolatedStorageService.cs @@ -1,68 +1,68 @@ -using System; -using System.Diagnostics.CodeAnalysis; -using System.IO; -using System.IO.IsolatedStorage; - -namespace Jellyfish.Virtu.Services -{ - public class IsolatedStorageService : StorageService - { - public IsolatedStorageService(Machine machine) : - base(machine) - { - } - - public override void Load(string path, Action reader) - { - if (reader == null) - { - throw new ArgumentNullException("reader"); - } - - try - { - using (var store = GetStore()) - { - using (var stream = new IsolatedStorageFileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, store)) - { - reader(stream); - } - } - } - catch (FileNotFoundException) - { - } - catch (IsolatedStorageException) - { - } - } - - public override void Save(string path, Action writer) - { - if (writer == null) - { - throw new ArgumentNullException("writer"); - } - - try - { - using (var store = GetStore()) - { - using (var stream = new IsolatedStorageFileStream(path, FileMode.Create, FileAccess.Write, FileShare.None, store)) - { - writer(stream); - } - } - } - catch (IsolatedStorageException) - { - } - } - - [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")] - protected virtual IsolatedStorageFile GetStore() - { - return IsolatedStorageFile.GetUserStoreForApplication(); - } - } -} +using System; +using System.Diagnostics.CodeAnalysis; +using System.IO; +using System.IO.IsolatedStorage; + +namespace Jellyfish.Virtu.Services +{ + public class IsolatedStorageService : StorageService + { + public IsolatedStorageService(Machine machine) : + base(machine) + { + } + + public override void Load(string path, Action reader) + { + if (reader == null) + { + throw new ArgumentNullException("reader"); + } + + try + { + using (var store = GetStore()) + { + using (var stream = new IsolatedStorageFileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, store)) + { + reader(stream); + } + } + } + catch (FileNotFoundException) + { + } + catch (IsolatedStorageException) + { + } + } + + public override void Save(string path, Action writer) + { + if (writer == null) + { + throw new ArgumentNullException("writer"); + } + + try + { + using (var store = GetStore()) + { + using (var stream = new IsolatedStorageFileStream(path, FileMode.Create, FileAccess.Write, FileShare.None, store)) + { + writer(stream); + } + } + } + catch (IsolatedStorageException) + { + } + } + + [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")] + protected virtual IsolatedStorageFile GetStore() + { + return IsolatedStorageFile.GetUserStoreForApplication(); + } + } +} diff --git a/Virtu/Silverlight/Properties/OutOfBrowserSettings.xml b/Virtu/Silverlight/Properties/OutOfBrowserSettings.xml index 7c052f2..5d296c4 100644 --- a/Virtu/Silverlight/Properties/OutOfBrowserSettings.xml +++ b/Virtu/Silverlight/Properties/OutOfBrowserSettings.xml @@ -1,4 +1,4 @@ - + Apple IIe Emulator diff --git a/Virtu/Xna/MainApp.cs b/Virtu/Xna/MainApp.cs index 7f8fe51..c8772a8 100644 --- a/Virtu/Xna/MainApp.cs +++ b/Virtu/Xna/MainApp.cs @@ -1,4 +1,4 @@ -namespace Jellyfish.Virtu +namespace Jellyfish.Virtu { #if WINDOWS || XBOX static class MainApp diff --git a/Virtu/Xna/MainGame.cs b/Virtu/Xna/MainGame.cs index a87786f..db7ad38 100644 --- a/Virtu/Xna/MainGame.cs +++ b/Virtu/Xna/MainGame.cs @@ -1,4 +1,4 @@ -using Jellyfish.Library; +using Jellyfish.Library; using Jellyfish.Virtu.Services; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; diff --git a/Virtu/Xna/Properties/WMAppManifest.xml b/Virtu/Xna/Properties/WMAppManifest.xml index 2affdc8..9626b18 100644 --- a/Virtu/Xna/Properties/WMAppManifest.xml +++ b/Virtu/Xna/Properties/WMAppManifest.xml @@ -1,29 +1,29 @@ - - - - AppThumbnail.png - - - - - - - - - - - - - - - - - - AppThumbnail.png - 0 - Virtu - - - - - + + + + AppThumbnail.png + + + + + + + + + + + + + + + + + + AppThumbnail.png + 0 + Virtu + + + + +