# HG changeset patch # User PAMPHILE Jonathan # Date 1252259604 -7200 # Node ID fe84b5081ba2619612d234b700f74ae74e875a44 # Parent 513de10ba65a48d9d8060784c848f08fe153f9b8 Test des menus diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.ActionFactory/ActionFactory.cs --- a/src/FingersDance.ActionFactory/ActionFactory.cs Mon Aug 31 15:01:46 2009 +0200 +++ b/src/FingersDance.ActionFactory/ActionFactory.cs Sun Sep 06 19:53:24 2009 +0200 @@ -3,6 +3,7 @@ using System.Linq; using System.Text; using FingersDance.Control.Player; +using FingersDance.Actions; namespace FingersDance.ActionFactory { @@ -14,5 +15,17 @@ { actionDict.Add("ActionPlayMedia", Type.GetType("FingersDance.Actions.ActionPlayMedia")); } + + public ActionBase GetAction(string T, object Args) + { + try + { + return (ActionBase)Activator.CreateInstance(actionDict[T]); + } + catch (Exception) + { + return null; + } + } } } diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Actions/ActionGenerator.cs --- a/src/FingersDance.Actions/ActionGenerator.cs Mon Aug 31 15:01:46 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace FingersDance.Actions -{ - public class ActionGenerator - { - public Object GetAction(Type T, object Args) - { - return Activator.CreateInstance(T); - } - } -} diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Actions/ActionPlayMedia.cs --- a/src/FingersDance.Actions/ActionPlayMedia.cs Mon Aug 31 15:01:46 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace FingersDance.Actions -{ - class ActionPlayMedia : ActionBase - { - public void Execute() - { - - } - } -} diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Actions/FingersDance.Actions.csproj --- a/src/FingersDance.Actions/FingersDance.Actions.csproj Mon Aug 31 15:01:46 2009 +0200 +++ b/src/FingersDance.Actions/FingersDance.Actions.csproj Sun Sep 06 19:53:24 2009 +0200 @@ -69,8 +69,6 @@ - - ResXFileCodeGenerator diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/App.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Debug/App.xaml Sun Sep 06 19:53:24 2009 +0200 @@ -0,0 +1,13 @@ + + + + + + + + + diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/App.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Debug/App.xaml.cs Sun Sep 06 19:53:24 2009 +0200 @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Windows; + +namespace FingersDance.Debug +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + + } +} \ No newline at end of file diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/Debug.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Debug/Debug.xaml Sun Sep 06 19:53:24 2009 +0200 @@ -0,0 +1,15 @@ + + + + + + + + + + diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/Debug.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Debug/Debug.xaml.cs Sun Sep 06 19:53:24 2009 +0200 @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; +using System.Windows.Threading; +using Microsoft.Surface; +using Microsoft.Surface.Presentation; +using Microsoft.Surface.Presentation.Controls; + +namespace FingersDance.Debug +{ + /// + /// Interaction logic for SurfaceWindow1.xaml + /// + public partial class SurfaceWindow1 : SurfaceWindow + { + /// + /// Default constructor. + /// + public SurfaceWindow1() + { + InitializeComponent(); + + // Add handlers for Application activation events + AddActivationHandlers(); + } + + + /// + /// Occurs when the window is about to close. + /// + /// + protected override void OnClosed(EventArgs e) + { + base.OnClosed(e); + + // Remove handlers for Application activation events + RemoveActivationHandlers(); + } + + /// + /// Adds handlers for Application activation events. + /// + private void AddActivationHandlers() + { + // Subscribe to surface application activation events + ApplicationLauncher.ApplicationActivated += OnApplicationActivated; + ApplicationLauncher.ApplicationPreviewed += OnApplicationPreviewed; + ApplicationLauncher.ApplicationDeactivated += OnApplicationDeactivated; + } + + /// + /// Removes handlers for Application activation events. + /// + private void RemoveActivationHandlers() + { + // Unsubscribe from surface application activation events + ApplicationLauncher.ApplicationActivated -= OnApplicationActivated; + ApplicationLauncher.ApplicationPreviewed -= OnApplicationPreviewed; + ApplicationLauncher.ApplicationDeactivated -= OnApplicationDeactivated; + } + + /// + /// This is called when application has been activated. + /// + /// + /// + private void OnApplicationActivated(object sender, EventArgs e) + { + //TODO: enable audio, animations here + } + + /// + /// This is called when application is in preview mode. + /// + /// + /// + private void OnApplicationPreviewed(object sender, EventArgs e) + { + //TODO: Disable audio here if it is enabled + + //TODO: optionally enable animations here + } + + /// + /// This is called when application has been deactivated. + /// + /// + /// + private void OnApplicationDeactivated(object sender, EventArgs e) + { + //TODO: disable audio, animations here + } + } +} \ No newline at end of file diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/FingersDance.Debug.csproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Debug/FingersDance.Debug.csproj Sun Sep 06 19:53:24 2009 +0200 @@ -0,0 +1,115 @@ + + + Debug + AnyCPU + {148FE4AA-2C30-4D08-9291-BF22023F0AAA} + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + FingersDance.Debug + FingersDance.Debug + v3.5 + 4 + winexe + true + Web + true + Foreground + 7 + Days + false + false + false + 1.0.0.* + true + true + Publish\ + OnBuildSuccess + + + true + full + false + .\bin\Debug\ + DEBUG;TRACE + + + false + true + .\bin\Release\ + TRACE + + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + + + + ResXFileCodeGenerator + Designer + Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + True + Resources.resx + + + True + True + Settings.settings + + + Debug.xaml + + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + + MSBuild:Compile + Designer + + + + \ No newline at end of file diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/FingersDance.Debug.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Debug/FingersDance.Debug.xml Sun Sep 06 19:53:24 2009 +0200 @@ -0,0 +1,64 @@ + + + + + + FingersDance.Debug + FingersDance.Debug + FingersDance.Debug.exe + + Resources\icon.png + + Resources\iconPreview.png + + + + + + + + + + + + + \ No newline at end of file diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/Properties/AssemblyInfo.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Debug/Properties/AssemblyInfo.cs Sun Sep 06 19:53:24 2009 +0200 @@ -0,0 +1,62 @@ +#region Using directives + +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Resources; +using System.Globalization; +using System.Windows; +using System.Runtime.InteropServices; + +#endregion + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("FingersDance.Debug")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("FingersDance.Debug")] +[assembly: AssemblyCopyright("Copyright @ 2009")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +// Specifies the location in which theme dictionaries are stored for types in an assembly. +[assembly: ThemeInfo( + // Specifies the location of system theme-specific resource dictionaries for this project. + // The default setting in this project is "None" since this default project does not + // include these user-defined theme files: + // Themes\Aero.NormalColor.xaml + // Themes\Classic.xaml + // Themes\Luna.Homestead.xaml + // Themes\Luna.Metallic.xaml + // Themes\Luna.NormalColor.xaml + // Themes\Royale.NormalColor.xaml + ResourceDictionaryLocation.None, + + // Specifies the location of the system non-theme specific resource dictionary: + // Themes\generic.xaml + ResourceDictionaryLocation.SourceAssembly)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.*")] diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/Properties/Resources.Designer.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Debug/Properties/Resources.Designer.cs Sun Sep 06 19:53:24 2009 +0200 @@ -0,0 +1,72 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.3074 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace FingersDance.Debug.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", "2.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// 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("WPFAppTemplate.Properties.Resources", typeof(Resources).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; + } + } + } +} diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/Properties/Resources.resx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Debug/Properties/Resources.resx Sun Sep 06 19:53:24 2009 +0200 @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/Properties/Settings.Designer.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Debug/Properties/Settings.Designer.cs Sun Sep 06 19:53:24 2009 +0200 @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.3074 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace FingersDance.Debug.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/Properties/Settings.settings --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Debug/Properties/Settings.settings Sun Sep 06 19:53:24 2009 +0200 @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/Resources/WindowBackground.jpg Binary file src/FingersDance.Debug/Resources/WindowBackground.jpg has changed diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/Resources/icon.png Binary file src/FingersDance.Debug/Resources/icon.png has changed diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.Debug/Resources/iconPreview.png Binary file src/FingersDance.Debug/Resources/iconPreview.png has changed diff -r 513de10ba65a -r fe84b5081ba2 src/FingersDance.sln --- a/src/FingersDance.sln Mon Aug 31 15:01:46 2009 +0200 +++ b/src/FingersDance.sln Sun Sep 06 19:53:24 2009 +0200 @@ -25,6 +25,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.ActionFactory", "FingersDance.ActionFactory\FingersDance.ActionFactory.csproj", "{C7B905EA-0678-4DA0-8EF8-7F9CBD22818E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Debug", "FingersDance.Debug\FingersDance.Debug.csproj", "{148FE4AA-2C30-4D08-9291-BF22023F0AAA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -123,6 +125,12 @@ {C7B905EA-0678-4DA0-8EF8-7F9CBD22818E}.Release|Any CPU.ActiveCfg = Release|Any CPU {C7B905EA-0678-4DA0-8EF8-7F9CBD22818E}.Release|Any CPU.Build.0 = Release|Any CPU {C7B905EA-0678-4DA0-8EF8-7F9CBD22818E}.Release|x86.ActiveCfg = Release|Any CPU + {148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Debug|x86.ActiveCfg = Debug|Any CPU + {148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Release|Any CPU.Build.0 = Release|Any CPU + {148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff -r 513de10ba65a -r fe84b5081ba2 test/TestMenu/TestMenu.sln --- a/test/TestMenu/TestMenu.sln Mon Aug 31 15:01:46 2009 +0200 +++ b/test/TestMenu/TestMenu.sln Sun Sep 06 19:53:24 2009 +0200 @@ -3,6 +3,12 @@ # Visual Studio 2008 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestMenu", "TestMenu\TestMenu.csproj", "{2211F916-A6FF-40D4-BFC5-09AAB1088D3A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Debug", "..\..\src\FingersDance.Debug\FingersDance.Debug.csproj", "{148FE4AA-2C30-4D08-9291-BF22023F0AAA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Actions", "..\..\src\FingersDance.Actions\FingersDance.Actions.csproj", "{1E80D5A1-C45C-443B-8992-4A4D78D280FC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.ActionFactory", "..\..\src\FingersDance.ActionFactory\FingersDance.ActionFactory.csproj", "{C7B905EA-0678-4DA0-8EF8-7F9CBD22818E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -13,6 +19,18 @@ {2211F916-A6FF-40D4-BFC5-09AAB1088D3A}.Debug|Any CPU.Build.0 = Debug|Any CPU {2211F916-A6FF-40D4-BFC5-09AAB1088D3A}.Release|Any CPU.ActiveCfg = Release|Any CPU {2211F916-A6FF-40D4-BFC5-09AAB1088D3A}.Release|Any CPU.Build.0 = Release|Any CPU + {148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {148FE4AA-2C30-4D08-9291-BF22023F0AAA}.Release|Any CPU.Build.0 = Release|Any CPU + {1E80D5A1-C45C-443B-8992-4A4D78D280FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E80D5A1-C45C-443B-8992-4A4D78D280FC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E80D5A1-C45C-443B-8992-4A4D78D280FC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E80D5A1-C45C-443B-8992-4A4D78D280FC}.Release|Any CPU.Build.0 = Release|Any CPU + {C7B905EA-0678-4DA0-8EF8-7F9CBD22818E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C7B905EA-0678-4DA0-8EF8-7F9CBD22818E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C7B905EA-0678-4DA0-8EF8-7F9CBD22818E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C7B905EA-0678-4DA0-8EF8-7F9CBD22818E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff -r 513de10ba65a -r fe84b5081ba2 test/TestMenu/TestMenu.sln.cache --- a/test/TestMenu/TestMenu.sln.cache Mon Aug 31 15:01:46 2009 +0200 +++ b/test/TestMenu/TestMenu.sln.cache Sun Sep 06 19:53:24 2009 +0200 @@ -5,19 +5,46 @@ <_SolutionProjectCacheVersion>3.5 + <_SolutionProjectProjects Include="..\..\src\FingersDance.ActionFactory\FingersDance.ActionFactory.csproj" /> + <_SolutionProjectProjects Include="..\..\src\FingersDance.Actions\FingersDance.Actions.csproj" /> + <_SolutionProjectProjects Include="..\..\src\FingersDance.Debug\FingersDance.Debug.csproj" /> <_SolutionProjectProjects Include="TestMenu\TestMenu.csproj" /> - + + Debug + AnyCPU + + + Debug + AnyCPU + + Debug AnyCPU + + Debug + AnyCPU + - + + Release + AnyCPU + + Release AnyCPU + + Release + AnyCPU + + + Release + AnyCPU + @@ -31,11 +58,11 @@ $(Configuration) - C:\Users\Jonathan\Desktop\Développement\IRI\test\TestMenu\ + C:\Users\Jonathan.PIAF\Desktop\Développement\IRI\test\TestMenu\ .sln TestMenu.sln TestMenu - C:\Users\Jonathan\Desktop\Développement\IRI\test\TestMenu\TestMenu.sln + C:\Users\Jonathan.PIAF\Desktop\Développement\IRI\test\TestMenu\TestMenu.sln v2.0 @@ -45,6 +72,9 @@ Debug|AnyCPU + Debug|AnyCPU + Debug|AnyCPU + Debug|AnyCPU @@ -52,6 +82,9 @@ Release|AnyCPU + Release|AnyCPU + Release|AnyCPU + Release|AnyCPU @@ -63,7 +96,7 @@ - + @@ -71,11 +104,11 @@ - + - + @@ -83,21 +116,109 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -106,10 +227,26 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 513de10ba65a -r fe84b5081ba2 test/TestMenu/TestMenu/ActionOpenMedia.cs --- a/test/TestMenu/TestMenu/ActionOpenMedia.cs Mon Aug 31 15:01:46 2009 +0200 +++ b/test/TestMenu/TestMenu/ActionOpenMedia.cs Sun Sep 06 19:53:24 2009 +0200 @@ -17,7 +17,7 @@ namespace TestMenu { - class ActionOpenMedia : ActionBase + class ActionOpenMedia : FingersDance.Actions.ActionBase { string _Text = ""; diff -r 513de10ba65a -r fe84b5081ba2 test/TestMenu/TestMenu/ActionPlayMedia.cs --- a/test/TestMenu/TestMenu/ActionPlayMedia.cs Mon Aug 31 15:01:46 2009 +0200 +++ b/test/TestMenu/TestMenu/ActionPlayMedia.cs Sun Sep 06 19:53:24 2009 +0200 @@ -16,7 +16,7 @@ namespace TestMenu { - class ActionPlayMedia : ActionBase + class ActionPlayMedia : FingersDance.Actions.ActionBase { string _Text = ""; diff -r 513de10ba65a -r fe84b5081ba2 test/TestMenu/TestMenu/ActionShowMessage.cs --- a/test/TestMenu/TestMenu/ActionShowMessage.cs Mon Aug 31 15:01:46 2009 +0200 +++ b/test/TestMenu/TestMenu/ActionShowMessage.cs Sun Sep 06 19:53:24 2009 +0200 @@ -17,7 +17,7 @@ namespace TestMenu { - class ActionShowMessage : ActionBase + class ActionShowMessage : FingersDance.Actions.ActionBase { string _Text = ""; diff -r 513de10ba65a -r fe84b5081ba2 test/TestMenu/TestMenu/ActionStopMedia.cs --- a/test/TestMenu/TestMenu/ActionStopMedia.cs Mon Aug 31 15:01:46 2009 +0200 +++ b/test/TestMenu/TestMenu/ActionStopMedia.cs Sun Sep 06 19:53:24 2009 +0200 @@ -17,7 +17,7 @@ namespace TestMenu { - class ActionStopMedia : ActionBase + class ActionStopMedia : FingersDance.Actions.ActionBase { string _Text = ""; diff -r 513de10ba65a -r fe84b5081ba2 test/TestMenu/TestMenu/SurfaceWindow1.xaml.cs --- a/test/TestMenu/TestMenu/SurfaceWindow1.xaml.cs Mon Aug 31 15:01:46 2009 +0200 +++ b/test/TestMenu/TestMenu/SurfaceWindow1.xaml.cs Sun Sep 06 19:53:24 2009 +0200 @@ -28,7 +28,8 @@ /// Default constructor. /// - ActionFactory _Factory = new ActionFactory(); + FingersDance.ActionFactory.ActionFactory _Factory = new FingersDance.ActionFactory.ActionFactory(); + FingersDance.Debug.SurfaceWindow1 Debug = new FingersDance.Debug.SurfaceWindow1(); public SurfaceWindow1() { @@ -80,7 +81,7 @@ { try { - ActionBase action = _Factory.GenerateAction(Type.GetType("TestMenu.Action" + ((SurfaceMenuItem)sender).Header), "Tu as cliqué sur " + ((SurfaceMenuItem)sender).Header); + FingersDance.Actions.ActionBase action = _Factory.GetAction("TestMenu.Action" + ((SurfaceMenuItem)sender).Header, "Tu as cliqué sur " + ((SurfaceMenuItem)sender).Header); if (action != null) action.Execute(); } diff -r 513de10ba65a -r fe84b5081ba2 test/TestMenu/TestMenu/TestMenu.csproj --- a/test/TestMenu/TestMenu/TestMenu.csproj Mon Aug 31 15:01:46 2009 +0200 +++ b/test/TestMenu/TestMenu/TestMenu.csproj Sun Sep 06 19:53:24 2009 +0200 @@ -88,8 +88,6 @@ - - @@ -139,5 +137,22 @@ Designer + + + {C7B905EA-0678-4DA0-8EF8-7F9CBD22818E} + FingersDance.ActionFactory + + + {1E80D5A1-C45C-443B-8992-4A4D78D280FC} + FingersDance.Actions + + + {148FE4AA-2C30-4D08-9291-BF22023F0AAA} + FingersDance.Debug + + + + + \ No newline at end of file