FingersDance.Control.Close

# HG changeset patch # User riley # Date 1253798908 -7200 # Node ID 6046961636641bf34cf6dc912324979ff85f1908 # Parent 9dfc0ee0ab177c5bc61f395b4209ecec77078bee# Parent 6eb5b39f8e9717a9124401a03d1685cf559a3614 Merge diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/FingersDance.Control.Close.csproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Close/FingersDance.Control.Close.csproj Thu Sep 24 15:28:28 2009 +0200 @@ -0,0 +1,114 @@ + + + Debug + AnyCPU + {D579FDB5-D412-4797-A0FF-C5873AE08BB8} + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + FingersDance.Control.Close + FingersDance.Control.Close + 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 + + + UserControlClose.xaml + + + + + + ResXFileCodeGenerator + Designer + Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + True + Resources.resx + + + True + True + Settings.settings + + + SurfaceWindow1.xaml + + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + + MSBuild:Compile + Designer + + + + \ No newline at end of file diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/FingersDance.Control.Close.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Close/FingersDance.Control.Close.xml Thu Sep 24 15:28:28 2009 +0200 @@ -0,0 +1,64 @@ + + + + + + FingersDance.Control.Close + FingersDance.Control.Close + FingersDance.Control.Close.exe + + Resources\icon.png + + Resources\iconPreview.png + + + + + + + + + + + + + \ No newline at end of file diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/Properties/AssemblyInfo.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Close/Properties/AssemblyInfo.cs Thu Sep 24 15:28:28 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.Close")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("FingersDance.Control.Close")] +[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 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/Properties/Resources.Designer.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Close/Properties/Resources.Designer.cs Thu Sep 24 15:28:28 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.Close.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 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/Properties/Resources.resx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Close/Properties/Resources.resx Thu Sep 24 15:28:28 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 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/Properties/Settings.Designer.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Close/Properties/Settings.Designer.cs Thu Sep 24 15:28:28 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.Close.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 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/Properties/Settings.settings --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Close/Properties/Settings.settings Thu Sep 24 15:28:28 2009 +0200 @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/Resources/WindowBackground.jpg Binary file src/FingersDance.Control.Close/Resources/WindowBackground.jpg has changed diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/Resources/icon.png Binary file src/FingersDance.Control.Close/Resources/icon.png has changed diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/Resources/iconPreview.png Binary file src/FingersDance.Control.Close/Resources/iconPreview.png has changed diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/SurfaceWindow1.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Close/SurfaceWindow1.xaml Thu Sep 24 15:28:28 2009 +0200 @@ -0,0 +1,14 @@ + + + + + + + + + diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/SurfaceWindow1.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Close/SurfaceWindow1.xaml.cs Thu Sep 24 15:28:28 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.Control.Close +{ + ///

+ /// 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 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/UserControlClose.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Close/UserControlClose.xaml Thu Sep 24 15:28:28 2009 +0200 @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Close/UserControlClose.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Close/UserControlClose.xaml.cs Thu Sep 24 15:28:28 2009 +0200 @@ -0,0 +1,22 @@ +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.Close +{ + public partial class UserControlClose + { + public UserControlClose() + { + this.InitializeComponent(); + + // Insert code required on object creation below this point. + } + } +} \ No newline at end of file diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.Player/UserControlPlayer.xaml --- a/src/FingersDance.Control.Player/UserControlPlayer.xaml Thu Sep 24 15:21:52 2009 +0200 +++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml Thu Sep 24 15:28:28 2009 +0200 @@ -129,9 +129,9 @@ - - - + + + diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml --- a/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml Thu Sep 24 15:21:52 2009 +0200 +++ b/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml Thu Sep 24 15:28:28 2009 +0200 @@ -11,7 +11,7 @@ - + diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml --- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml Thu Sep 24 15:21:52 2009 +0200 +++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml Thu Sep 24 15:28:28 2009 +0200 @@ -67,8 +67,17 @@ - - + + + + + + + + + + + diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs --- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs Thu Sep 24 15:21:52 2009 +0200 +++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs Thu Sep 24 15:28:28 2009 +0200 @@ -188,7 +188,7 @@ private void slider_ContactTapGesture(object sender, Microsoft.Surface.Presentation.ContactEventArgs e) { - addAnnotation(); + //addAnnotation(); } public void addAnnotation() diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance.sln --- a/src/FingersDance.sln Thu Sep 24 15:21:52 2009 +0200 +++ b/src/FingersDance.sln Thu Sep 24 15:28:28 2009 +0200 @@ -37,6 +37,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control.ListVideo", "FingersDance.Control.ListVideo\FingersDance.Control.ListVideo.csproj", "{072436EC-FCD5-4A55-96AA-0047BF25BD37}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control.Close", "FingersDance.Control.Close\FingersDance.Control.Close.csproj", "{D579FDB5-D412-4797-A0FF-C5873AE08BB8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -171,6 +173,12 @@ {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 + {D579FDB5-D412-4797-A0FF-C5873AE08BB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D579FDB5-D412-4797-A0FF-C5873AE08BB8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D579FDB5-D412-4797-A0FF-C5873AE08BB8}.Debug|x86.ActiveCfg = Debug|Any CPU + {D579FDB5-D412-4797-A0FF-C5873AE08BB8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D579FDB5-D412-4797-A0FF-C5873AE08BB8}.Release|Any CPU.Build.0 = Release|Any CPU + {D579FDB5-D412-4797-A0FF-C5873AE08BB8}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff -r 9dfc0ee0ab17 -r 604696163664 src/FingersDance/Resources/videos.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance/Resources/videos.xml Thu Sep 24 15:28:28 2009 +0200 @@ -0,0 +1,13 @@ + + + + Butterfly + C:\Users\Jonathan.PIAF\Desktop\IRI\src\FingersDance\Resources\Butterfly.wmv + C:\Users\Jonathan.PIAF\Desktop\IRI\src\FingersDance\Resources\Butterfly.jpg + + + Lake + C:\Users\Jonathan.PIAF\Desktop\IRI\src\FingersDance\Resources\Lake.wmv + C:\Users\Jonathan.PIAF\Desktop\IRI\src\FingersDance\Resources\Lake.jpg + + \ No newline at end of file