FingersDance.Control.ListVideo

# HG changeset patch # User sarias # Date 1253205873 -7200 # Node ID 5af0f0a8706d55fd239e7db227685e168e8315e4 # Parent bda95242e600d4e38ac24aa091f7615020031faa# Parent 99d0037234746034650ed9f2a07a419fd12639d7 Merge diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/Butterfly.jpg Binary file src/FingersDance.Control.ListVideo/Butterfly.jpg has changed diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/FingersDance.Control.ListVideo.csproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.ListVideo/FingersDance.Control.ListVideo.csproj Thu Sep 17 18:44:33 2009 +0200 @@ -0,0 +1,107 @@ + + + Debug + AnyCPU + {072436EC-FCD5-4A55-96AA-0047BF25BD37} + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + FingersDance.Control.ListVideo + FingersDance.Control.ListVideo + v3.5 + 4 + Library + 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 + + + UserControlListVideo.xaml + + + + + + + + ResXFileCodeGenerator + Designer + Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + True + Resources.resx + + + True + True + Settings.settings + + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + \ No newline at end of file diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/FingersDance.Control.ListVideo.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.ListVideo/FingersDance.Control.ListVideo.xml Thu Sep 17 18:44:33 2009 +0200 @@ -0,0 +1,64 @@ + + + + + + FingersDance.Control.ListVideo + FingersDance.Control.ListVideo + FingersDance.Control.ListVideo.exe + + Resources\icon.png + + Resources\iconPreview.png + + + + + + + + + + + + + \ No newline at end of file diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/Lake.jpg Binary file src/FingersDance.Control.ListVideo/Lake.jpg has changed diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/Properties/AssemblyInfo.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.ListVideo/Properties/AssemblyInfo.cs Thu Sep 17 18:44:33 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.Control.ListVideo")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("FingersDance.Control.ListVideo")] +[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 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/Properties/Resources.Designer.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.ListVideo/Properties/Resources.Designer.cs Thu Sep 17 18:44:33 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.Control.ListVideo.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 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/Properties/Resources.resx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.ListVideo/Properties/Resources.resx Thu Sep 17 18:44:33 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 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/Properties/Settings.Designer.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.ListVideo/Properties/Settings.Designer.cs Thu Sep 17 18:44:33 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.Control.ListVideo.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 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/Properties/Settings.settings --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.ListVideo/Properties/Settings.settings Thu Sep 17 18:44:33 2009 +0200 @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/Resources/WindowBackground.jpg Binary file src/FingersDance.Control.ListVideo/Resources/WindowBackground.jpg has changed diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/Resources/icon.png Binary file src/FingersDance.Control.ListVideo/Resources/icon.png has changed diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/Resources/iconPreview.png Binary file src/FingersDance.Control.ListVideo/Resources/iconPreview.png has changed diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/UserControlListVideo.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.ListVideo/UserControlListVideo.xaml Thu Sep 17 18:44:33 2009 +0200 @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.ListVideo/UserControlListVideo.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.ListVideo/UserControlListVideo.xaml.cs Thu Sep 17 18:44:33 2009 +0200 @@ -0,0 +1,49 @@ +using System; +using System.IO; +using System.Net; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Navigation; + +namespace FingersDance.Control.ListVideo +{ + public partial class UserControlListVideo + { + + public event EventHandler EH_ItemVideo1_ContactDown; + public event EventHandler EH_ItemVideo2_ContactDown; + + public UserControlListVideo() + { + this.InitializeComponent(); + + // Insert code required on object creation below this point. + } + + private void ItemVideo1_ContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e) + { + if (EH_ItemVideo1_ContactDown != null) + EH_ItemVideo1_ContactDown(this, new EventArgs()); + } + + private void ItemVideo2_ContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e) + { + if (EH_ItemVideo2_ContactDown != null) + EH_ItemVideo2_ContactDown(this, new EventArgs()); + } + + private void ItemVideo1_Selected(object sender, RoutedEventArgs e) + { + + } + + private void ItemVideo1_ContactTapGesture(object sender, Microsoft.Surface.Presentation.ContactEventArgs e) + { + if (EH_ItemVideo1_ContactDown != null) + EH_ItemVideo1_ContactDown(this, new EventArgs()); + } + } +} \ No newline at end of file diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml --- a/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml Thu Sep 17 17:25:05 2009 +0200 +++ b/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml Thu Sep 17 18:44:33 2009 +0200 @@ -14,7 +14,7 @@ - + diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml.cs --- a/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml.cs Thu Sep 17 17:25:05 2009 +0200 +++ b/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml.cs Thu Sep 17 18:44:33 2009 +0200 @@ -12,11 +12,26 @@ { public partial class UserControlSessionInput { + public event EventHandler EH_SurfaceButtonSubmit_ContactDown; + public UserControlSessionInput() { this.InitializeComponent(); // Insert code required on object creation below this point. } + + private void SurfaceButtonSubmit_ContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e) + { + if (EH_SurfaceButtonSubmit_ContactDown != null) + EH_SurfaceButtonSubmit_ContactDown(this, new EventArgs()); + } + + private void SurfaceButtonSubmit_Click(object sender, RoutedEventArgs e) + { + if (EH_SurfaceButtonSubmit_ContactDown != null) + EH_SurfaceButtonSubmit_ContactDown(this, new EventArgs()); + } + } } \ No newline at end of file diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance.sln --- a/src/FingersDance.sln Thu Sep 17 17:25:05 2009 +0200 +++ b/src/FingersDance.sln Thu Sep 17 18:44:33 2009 +0200 @@ -35,6 +35,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control.SessionInput", "FingersDance.Control.SessionInput\FingersDance.Control.SessionInput.csproj", "{4C5C068F-7D41-4563-9109-7B57485F4BED}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control.ListVideo", "FingersDance.Control.ListVideo\FingersDance.Control.ListVideo.csproj", "{072436EC-FCD5-4A55-96AA-0047BF25BD37}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -163,6 +165,12 @@ {4C5C068F-7D41-4563-9109-7B57485F4BED}.Release|Any CPU.ActiveCfg = Release|Any CPU {4C5C068F-7D41-4563-9109-7B57485F4BED}.Release|Any CPU.Build.0 = Release|Any CPU {4C5C068F-7D41-4563-9109-7B57485F4BED}.Release|x86.ActiveCfg = Release|Any CPU + {072436EC-FCD5-4A55-96AA-0047BF25BD37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {072436EC-FCD5-4A55-96AA-0047BF25BD37}.Debug|Any CPU.Build.0 = Debug|Any CPU + {072436EC-FCD5-4A55-96AA-0047BF25BD37}.Debug|x86.ActiveCfg = Debug|Any CPU + {072436EC-FCD5-4A55-96AA-0047BF25BD37}.Release|Any CPU.ActiveCfg = Release|Any CPU + {072436EC-FCD5-4A55-96AA-0047BF25BD37}.Release|Any CPU.Build.0 = Release|Any CPU + {072436EC-FCD5-4A55-96AA-0047BF25BD37}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance/FingersDance.csproj --- a/src/FingersDance/FingersDance.csproj Thu Sep 17 17:25:05 2009 +0200 +++ b/src/FingersDance/FingersDance.csproj Thu Sep 17 18:44:33 2009 +0200 @@ -114,12 +114,17 @@ + + + Always + PreserveNewest PreserveNewest + Always @@ -142,6 +147,10 @@ {C7B905EA-0678-4DA0-8EF8-7F9CBD22818E} FingersDance.ActionFactory + + {072436EC-FCD5-4A55-96AA-0047BF25BD37} + FingersDance.Control.ListVideo + {0EC4C48C-132C-4926-9A09-A4135C58688C} FingersDance.Control.Pivot diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance/MainSurfaceWindow.xaml --- a/src/FingersDance/MainSurfaceWindow.xaml Thu Sep 17 17:25:05 2009 +0200 +++ b/src/FingersDance/MainSurfaceWindow.xaml Thu Sep 17 18:44:33 2009 +0200 @@ -5,7 +5,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" xmlns:FingersDance_Control_UserPanel="clr-namespace:FingersDance.Control.UserPanel;assembly=FingersDance.Control.UserPanel" xmlns:FingersDance_Control_Pivot="clr-namespace:FingersDance.Control.Pivot;assembly=FingersDance.Control.Pivot" - xmlns:FingersDance_Control_SessionInput="clr-namespace:FingersDance.Control.SessionInput;assembly=FingersDance.Control.SessionInput" x:Class="FingersDance.SurfaceWindow1" @@ -75,7 +74,5 @@ - - diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance/MainSurfaceWindow.xaml.cs --- a/src/FingersDance/MainSurfaceWindow.xaml.cs Thu Sep 17 17:25:05 2009 +0200 +++ b/src/FingersDance/MainSurfaceWindow.xaml.cs Thu Sep 17 18:44:33 2009 +0200 @@ -16,6 +16,8 @@ using Microsoft.Surface.Presentation.Controls; using FingersDance.Control.UserPanel; +using FingersDance.Control.ListVideo; +using FingersDance.Control.SessionInput; namespace FingersDance { @@ -169,12 +171,19 @@ private void UserControlPivot_EH_SurfaceButtonPlayer1_ContactDown(object sender, EventArgs e) { + if (!isCreatedP1) { + UserControlListVideo ListVideo1 = new UserControlListVideo(); + ListVideo1.Name = "ListVideo1"; + Grid1.Children.Add(ListVideo1); + ListVideo1.EH_ItemVideo1_ContactDown += new System.EventHandler(this.ListVideo1_EH_ItemVideo1_ContactDown); + ListVideo1.EH_ItemVideo2_ContactDown += new System.EventHandler(this.ListVideo1_EH_ItemVideo2_ContactDown); + /* UserControlUserPanel UserPanel1 = new UserControlUserPanel(); UserPanel1.Name = "UserPanel1"; Grid1.Children.Add(UserPanel1); - isCreatedP1 = true; + isCreatedP1 = true;*/ } } @@ -210,5 +219,45 @@ isCreatedP4 = true; } } + + private void ListVideo1_EH_ItemVideo1_ContactDown(object sender, EventArgs e) + { + //Creation d'une nouvelle seance. + + UserControlSessionInput SessionInput = new UserControlSessionInput(); + SessionInput.Name = "SessionInput"; + + try{ + Grid actualGrid = (Grid)(((UserControlListVideo)sender).Parent); + actualGrid.Children.Add(SessionInput); + + SessionInput.EH_SurfaceButtonSubmit_ContactDown += new System.EventHandler(this.SessionInput_EH_SurfaceButtonSubmit_ContactDown); + actualGrid.Children.Remove((UserControlListVideo)sender); + } + catch (Exception ex) { } + isCreatedP1 = true; + } + + private void ListVideo1_EH_ItemVideo2_ContactDown(object sender, EventArgs e) + { + //ToDo + } + + //Button Submit du control SessionInput + private void SessionInput_EH_SurfaceButtonSubmit_ContactDown(object sender, EventArgs e) + { + try + { + Grid actualGrid = (Grid)(((UserControlSessionInput)sender).Parent); + actualGrid.Children.Remove((UserControlSessionInput)sender); + //Creation du User Panel + UserControlUserPanel UserPanel1 = new UserControlUserPanel(); + UserPanel1.Name = "UserPanel1"; + actualGrid.Children.Add(UserPanel1); + + } + catch (Exception ex) { } + } + } } \ No newline at end of file diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance/Resources/Butterfly.jpg Binary file src/FingersDance/Resources/Butterfly.jpg has changed diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance/Resources/Butterfly.wmv Binary file src/FingersDance/Resources/Butterfly.wmv has changed diff -r 99d003723474 -r 5af0f0a8706d src/FingersDance/Resources/Lake.jpg Binary file src/FingersDance/Resources/Lake.jpg has changed