# HG changeset patch # User PAMPHILE Jonathan # Date 1252591468 -7200 # Node ID 9c6ea1f246dac2e9db1240c55084b4e8ed819083 # Parent e589f11636e656dbbe82a9444b860325bff484ec Correction tu TestMenu diff -r e589f11636e6 -r 9c6ea1f246da src/FingersDance.ActionFactory/ActionFactory.cs --- a/src/FingersDance.ActionFactory/ActionFactory.cs Thu Sep 10 08:36:04 2009 +0200 +++ b/src/FingersDance.ActionFactory/ActionFactory.cs Thu Sep 10 16:04:28 2009 +0200 @@ -13,7 +13,10 @@ public ActionFactory() { - actionDict.Add("ActionPlayMedia", Type.GetType("FingersDance.Actions.ActionPlayMedia")); + actionDict.Add("ActionPlayMedia", typeof(FingersDance.Actions.ActionPlayMedia)); + actionDict.Add("ActionShowMessage", typeof(FingersDance.Actions.ActionShowMessage)); + actionDict.Add("ActionOpenMedia", typeof(FingersDance.Actions.ActionOpenMedia)); + actionDict.Add("ActionStopMedia", typeof(FingersDance.Actions.ActionStopMedia)); } public ActionBase GetAction(string T, object Args) diff -r e589f11636e6 -r 9c6ea1f246da src/FingersDance.Actions/ActionOpenMedia.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Actions/ActionOpenMedia.cs Thu Sep 10 16:04:28 2009 +0200 @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace FingersDance.Actions +{ + public class ActionOpenMedia : FingersDance.Actions.ActionBase + { + string _Text = ""; + + public ActionOpenMedia() + { } + + public ActionOpenMedia(string text) + { + _Text = text; + } + + public void Execute() + { + } + } +} diff -r e589f11636e6 -r 9c6ea1f246da src/FingersDance.Actions/ActionPlayMedia.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Actions/ActionPlayMedia.cs Thu Sep 10 16:04:28 2009 +0200 @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace FingersDance.Actions +{ + public class ActionPlayMedia : FingersDance.Actions.ActionBase + { + string _Text = ""; + + public ActionPlayMedia() + { } + + public ActionPlayMedia(string text) + { + _Text = text; + } + + public void Execute() + { + } + } +} diff -r e589f11636e6 -r 9c6ea1f246da src/FingersDance.Actions/ActionShowMessage.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Actions/ActionShowMessage.cs Thu Sep 10 16:04:28 2009 +0200 @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace FingersDance.Actions +{ + public class ActionShowMessage : FingersDance.Actions.ActionBase + { + string _Text = ""; + + public ActionShowMessage() + { } + + public ActionShowMessage(string text) + { + _Text = text; + } + + public void Execute() + { + } + } +} diff -r e589f11636e6 -r 9c6ea1f246da src/FingersDance.Actions/ActionStopMedia.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Actions/ActionStopMedia.cs Thu Sep 10 16:04:28 2009 +0200 @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace FingersDance.Actions +{ + public class ActionStopMedia : FingersDance.Actions.ActionBase + { + string _Text = ""; + + public ActionStopMedia() + { } + + public ActionStopMedia(string text) + { + _Text = text; + } + + public void Execute() + { + } + } +} diff -r e589f11636e6 -r 9c6ea1f246da src/FingersDance.Actions/FingersDance.Actions.csproj --- a/src/FingersDance.Actions/FingersDance.Actions.csproj Thu Sep 10 08:36:04 2009 +0200 +++ b/src/FingersDance.Actions/FingersDance.Actions.csproj Thu Sep 10 16:04:28 2009 +0200 @@ -61,6 +61,10 @@ + + + + ResXFileCodeGenerator diff -r e589f11636e6 -r 9c6ea1f246da test/TestMenu/TestMenu/ActionOpenMedia.cs --- a/test/TestMenu/TestMenu/ActionOpenMedia.cs Thu Sep 10 08:36:04 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -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 TestMenu -{ - class ActionOpenMedia : FingersDance.Actions.ActionBase - { - string _Text = ""; - - public ActionOpenMedia(string text) - { - _Text = text; - } - - public void Execute() - { - MessageBox.Show(_Text); - } - } -} diff -r e589f11636e6 -r 9c6ea1f246da test/TestMenu/TestMenu/ActionPlayMedia.cs --- a/test/TestMenu/TestMenu/ActionPlayMedia.cs Thu Sep 10 08:36:04 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -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 TestMenu -{ - class ActionPlayMedia : FingersDance.Actions.ActionBase - { - string _Text = ""; - - public ActionPlayMedia(string text) - { - _Text = text; - } - - public void Execute() - { - MessageBox.Show(_Text); - } - } -} diff -r e589f11636e6 -r 9c6ea1f246da test/TestMenu/TestMenu/ActionShowMessage.cs --- a/test/TestMenu/TestMenu/ActionShowMessage.cs Thu Sep 10 08:36:04 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -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 TestMenu -{ - class ActionShowMessage : FingersDance.Actions.ActionBase - { - string _Text = ""; - - public ActionShowMessage(string text) - { - _Text = text; - } - - public void Execute() - { - MessageBox.Show(_Text); - } - } -} diff -r e589f11636e6 -r 9c6ea1f246da test/TestMenu/TestMenu/ActionStopMedia.cs --- a/test/TestMenu/TestMenu/ActionStopMedia.cs Thu Sep 10 08:36:04 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -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 TestMenu -{ - class ActionStopMedia : FingersDance.Actions.ActionBase - { - string _Text = ""; - - public ActionStopMedia(string text) - { - _Text = text; - } - - public void Execute() - { - MessageBox.Show(_Text); - } - } -} diff -r e589f11636e6 -r 9c6ea1f246da test/TestMenu/TestMenu/SurfaceWindow1.xaml.cs --- a/test/TestMenu/TestMenu/SurfaceWindow1.xaml.cs Thu Sep 10 08:36:04 2009 +0200 +++ b/test/TestMenu/TestMenu/SurfaceWindow1.xaml.cs Thu Sep 10 16:04:28 2009 +0200 @@ -82,14 +82,14 @@ { try { - FingersDance.Actions.ActionBase action = _Factory.GetAction("TestMenu.Action" + ((SurfaceMenuItem)sender).Header, "Tu as cliqué sur " + ((SurfaceMenuItem)sender).Header); + FingersDance.Actions.ActionBase action = _Factory.GetAction("Action" + ((SurfaceMenuItem)sender).Header, "Tu as cliqué sur " + ((SurfaceMenuItem)sender).Header); if (action != null) { //action.Execute(); this.debug.addToList(action.GetType().ToString()); } } - catch (Exception) { } + catch (Exception e) { } } /// diff -r e589f11636e6 -r 9c6ea1f246da test/TestMenu/TestMenu/TestMenu.csproj --- a/test/TestMenu/TestMenu/TestMenu.csproj Thu Sep 10 08:36:04 2009 +0200 +++ b/test/TestMenu/TestMenu/TestMenu.csproj Thu Sep 10 16:04:28 2009 +0200 @@ -88,10 +88,6 @@ - - - -