# HG changeset patch # User sarias # Date 1250539449 -7200 # Node ID ed77793b767a393d0d78516dbb7a6d7f588c0e8b # Parent 9e222810f5b5ef4480686c3d4e3847662fa3bec9 Control Pivot, Debut Control Screen SyncSource UserPanel diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.ActionFactory/ActionFactory.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.ActionFactory/ActionFactory.cs Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using FingersDance.Control.Player; + +namespace FingersDance.ActionFactory +{ + public class ActionFactory + { + private Dictionary actionDict = new Dictionary(); + + public ActionFactory() + { + //this.actionDict.Add("toto", ); + } + } +} diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.ActionFactory/FingersDance.ActionFactory.csproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.ActionFactory/FingersDance.ActionFactory.csproj Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,69 @@ + + + + Debug + AnyCPU + 9.0.21022 + 2.0 + {C7B905EA-0678-4DA0-8EF8-7F9CBD22818E} + Library + Properties + FingersDance.ActionFactory + FingersDance.ActionFactory + v3.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + {1E80D5A1-C45C-443B-8992-4A4D78D280FC} + FingersDance.Actions + + + {D5625AA4-362F-4E46-9916-65F3B173ECBE} + FingersDance.Control.Player + + + + + \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.ActionFactory/Properties/AssemblyInfo.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.ActionFactory/Properties/AssemblyInfo.cs Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 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.ActionFactory")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("FingersDance.ActionFactory")] +[assembly: AssemblyCopyright("Copyright © 2009")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("17172d3c-8b35-4aa4-b7e7-09ffdb212825")] + +// 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 Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Pivot/FingersDance.Control.Pivot.csproj --- a/src/FingersDance.Control.Pivot/FingersDance.Control.Pivot.csproj Sun Aug 09 18:29:41 2009 +0200 +++ b/src/FingersDance.Control.Pivot/FingersDance.Control.Pivot.csproj Mon Aug 17 22:04:09 2009 +0200 @@ -73,6 +73,13 @@ + + MSBuild:Compile + Designer + + + UserControlPivot.xaml + @@ -105,9 +112,6 @@ True Settings.settings - - SurfaceWindow1.xaml - @@ -122,11 +126,5 @@ - - - MSBuild:Compile - Designer - - \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Pivot/SurfaceWindow1.xaml --- a/src/FingersDance.Control.Pivot/SurfaceWindow1.xaml Sun Aug 09 18:29:41 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ - - - - - - - - - diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Pivot/SurfaceWindow1.xaml.cs --- a/src/FingersDance.Control.Pivot/SurfaceWindow1.xaml.cs Sun Aug 09 18:29:41 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +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 FingersDance.Control.Pivot -{ - /// - /// 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 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Pivot/UserControlPivot.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Pivot/UserControlPivot.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml.cs Mon Aug 17 22:04:09 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.Pivot +{ + public partial class UserControlPivot + { + public UserControlPivot() + { + this.InitializeComponent(); + + // Insert code required on object creation below this point. + } + } +} \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Player/App.xaml --- a/src/FingersDance.Control.Player/App.xaml Sun Aug 09 18:29:41 2009 +0200 +++ b/src/FingersDance.Control.Player/App.xaml Mon Aug 17 22:04:09 2009 +0200 @@ -1,7 +1,7 @@  diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Player/FingersDance.Control.Player.csproj --- a/src/FingersDance.Control.Player/FingersDance.Control.Player.csproj Sun Aug 09 18:29:41 2009 +0200 +++ b/src/FingersDance.Control.Player/FingersDance.Control.Player.csproj Mon Aug 17 22:04:09 2009 +0200 @@ -8,7 +8,7 @@ FingersDance.Control.Player v3.5 4 - winexe + WinExe true Web true @@ -23,6 +23,8 @@ true Publish\ OnBuildSuccess + + true @@ -67,9 +69,15 @@ - - - + + 3.0 + + + 3.0 + + + 3.0 + @@ -77,6 +85,10 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -96,6 +108,7 @@ + ResXFileCodeGenerator @@ -116,8 +129,8 @@ True Settings.settings - - SurfacePlayerTest.xaml + + SurfaceWindow1.xaml @@ -132,16 +145,17 @@ PreserveNewest + - - MSBuild:Compile - Designer - + + {1E80D5A1-C45C-443B-8992-4A4D78D280FC} + FingersDance.Actions + \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Player/PlayAction.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Player/PlayAction.cs Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using FingersDance.Actions; + +namespace FingersDance.Control.Player +{ + public class PlayAction : ActionBase + { + #region ActionBase Members + + public void Execute() + { + throw new NotImplementedException(); + } + + #endregion + } +} diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Player/Resources/SurfaceWindow1Background.jpg Binary file src/FingersDance.Control.Player/Resources/SurfaceWindow1Background.jpg has changed diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Player/SurfacePlayerTest.xaml --- a/src/FingersDance.Control.Player/SurfacePlayerTest.xaml Sun Aug 09 18:29:41 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Player/SurfacePlayerTest.xaml.cs --- a/src/FingersDance.Control.Player/SurfacePlayerTest.xaml.cs Sun Aug 09 18:29:41 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +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 FingersDance.Control.Player -{ - /// - /// 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 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Player/SurfaceWindow1.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Player/SurfaceWindow1.xaml Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Player/SurfaceWindow1.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Player/SurfaceWindow1.xaml.cs Mon Aug 17 22:04:09 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.Player +{ + /// + /// 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 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Player/UserControlPlayer.xaml --- a/src/FingersDance.Control.Player/UserControlPlayer.xaml Sun Aug 09 18:29:41 2009 +0200 +++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml Mon Aug 17 22:04:09 2009 +0200 @@ -6,18 +6,18 @@ mc:Ignorable="d" x:Class="FingersDance.Control.Player.UserControlPlayer" x:Name="UserControl" - Width="335.873" Height="228.096" xmlns:Custom="http://schemas.microsoft.com/surface/2008"> + Width="450" Height="334" xmlns:Custom="http://schemas.microsoft.com/surface/2008"> - - - - - - - - + + + + + + + + \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Screen/FingersDance.Control.Screen.csproj --- a/src/FingersDance.Control.Screen/FingersDance.Control.Screen.csproj Sun Aug 09 18:29:41 2009 +0200 +++ b/src/FingersDance.Control.Screen/FingersDance.Control.Screen.csproj Mon Aug 17 22:04:09 2009 +0200 @@ -73,6 +73,13 @@ + + MSBuild:Compile + Designer + + + UserControlScreen.xaml + @@ -105,9 +112,6 @@ True Settings.settings - - SurfaceWindow1.xaml - @@ -123,10 +127,14 @@ - - MSBuild:Compile - Designer - + + {0EC4C48C-132C-4926-9A09-A4135C58688C} + FingersDance.Control.Pivot + + + {E6A3A067-1CB4-43D2-BB9C-DC72361F7E22} + FingersDance.Control.UserPanel + \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Screen/SurfaceWindow1.xaml --- a/src/FingersDance.Control.Screen/SurfaceWindow1.xaml Sun Aug 09 18:29:41 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ - - - - - - - - - diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Screen/SurfaceWindow1.xaml.cs --- a/src/FingersDance.Control.Screen/SurfaceWindow1.xaml.cs Sun Aug 09 18:29:41 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +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 FingersDance.Control.Screen -{ - /// - /// 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 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Screen/UserControlScreen.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Screen/UserControlScreen.xaml Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.Screen/UserControlScreen.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.Screen/UserControlScreen.xaml.cs Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,68 @@ +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.Screen +{ + public partial class UserControlScreen + { + public UserControlScreen() + { + this.InitializeComponent(); + + // Insert code required on object creation below this point. + } + + + private void ScatterViewPivot_ContactChanged(object sender, Microsoft.Surface.Presentation.ContactEventArgs e) + { + try + { + + //myrect.Width = e.GetPosition(my_surfaceWindow).X; + //myrect.Height = e.GetPosition(my_surfaceWindow).Y; + + Grid1.Width = e.GetPosition(UserControl).X; + Grid1.Height = e.GetPosition(UserControl).Y; + + //Grid2.Width = 1024 - e.GetPosition(UserControl).X; + //Grid2.Height = 768 - e.GetPosition(UserControl).Y; + + //Grid3.Width = e.GetPosition(UserControl).X; + //Grid3.Height = 768 - e.GetPosition(UserControl).Y; + + //Grid4.Width = 1024 - e.GetPosition(UserControl).X; + //Grid4.Height = e.GetPosition(UserControl).Y; + + } + catch (Exception ex) { } + } + + private void ScatterViewItemPivot_ContactChanged(object sender, Microsoft.Surface.Presentation.ContactEventArgs e) + { + try + { + + Grid1.Width = e.GetPosition(UserControl).X; + Grid1.Height = e.GetPosition(UserControl).Y; + + Grid2.Width = 1024- e.GetPosition(UserControl).X; + Grid2.Height = e.GetPosition(UserControl).Y; + + Grid3.Width = e.GetPosition(UserControl).X; + Grid3.Height = 768 - e.GetPosition(UserControl).Y; + + Grid4.Width = 1024 - e.GetPosition(UserControl).X; + Grid4.Height = 768 - e.GetPosition(UserControl).Y; + + } + catch (Exception ex) { } + } + } +} \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/App.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/App.xaml Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,13 @@ + + + + + + + + + diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/App.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/App.xaml.cs Mon Aug 17 22:04:09 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.Control.SyncSource +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + + } +} \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/FingersDance.Control.SyncSource.csproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/FingersDance.Control.SyncSource.csproj Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,137 @@ + + + Debug + AnyCPU + {BE5AD2E7-8BC2-414A-AB92-34E4D7357740} + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + FingersDance.Control.SyncSource + FingersDance.Control.SyncSource + 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 + + + + + 3.0 + + + 3.0 + + + 3.0 + + + + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + UserControlSyncSource.xaml + + + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + + + + ResXFileCodeGenerator + Designer + Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + True + Resources.resx + + + True + True + Settings.settings + + + SurfaceWindow1.xaml + + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + {D5625AA4-362F-4E46-9916-65F3B173ECBE} + FingersDance.Control.Player + + + {2BCEE1BF-D3AC-478C-A26B-DFDB7420E965} + FingersDance.Control.TimeLine + + + + \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/FingersDance.Control.SyncSource.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/FingersDance.Control.SyncSource.xml Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,64 @@ + + + + + + FingersDance.Control.SyncSource + FingersDance.Control.SyncSource + FingersDance.Control.SyncSource.exe + + Resources\icon.png + + Resources\iconPreview.png + + + + + + + + + + + + + \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/Properties/AssemblyInfo.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/Properties/AssemblyInfo.cs Mon Aug 17 22:04:09 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.SyncSource")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("FingersDance.Control.SyncSource")] +[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 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/Properties/Resources.Designer.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/Properties/Resources.Designer.cs Mon Aug 17 22:04:09 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.SyncSource.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 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/Properties/Resources.resx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/Properties/Resources.resx Mon Aug 17 22:04:09 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 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/Properties/Settings.Designer.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/Properties/Settings.Designer.cs Mon Aug 17 22:04:09 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.SyncSource.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 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/Properties/Settings.settings --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/Properties/Settings.settings Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/Resources/SurfaceWindow1Background.jpg Binary file src/FingersDance.Control.SyncSource/Resources/SurfaceWindow1Background.jpg has changed diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/Resources/WindowBackground.jpg Binary file src/FingersDance.Control.SyncSource/Resources/WindowBackground.jpg has changed diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/Resources/icon.png Binary file src/FingersDance.Control.SyncSource/Resources/icon.png has changed diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/Resources/iconPreview.png Binary file src/FingersDance.Control.SyncSource/Resources/iconPreview.png has changed diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/SurfaceWindow1.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/SurfaceWindow1.xaml Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,18 @@ + + + + + + + + + + + diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/SurfaceWindow1.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/SurfaceWindow1.xaml.cs Mon Aug 17 22:04:09 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.SyncSource +{ + /// + /// 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 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,72 @@ +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.SyncSource +{ + public partial class UserControlSyncSource + { + public UserControlSyncSource() + { + this.InitializeComponent(); + + // Insert code required on object creation below this point. + } + + + #region player + private void UserControlPlayer_PlayerOpened(object sender, EventArgs e) + { + //Initialisation du Timer + UserControlTimeLine.initTimer(); + //Initialisation du slider + UserControlTimeLine.initslider(UserControlPlayer.TotalMilliseconds); + //Demarrage du Timer + UserControlTimeLine.timerStart(); + + } + #endregion + + #region TimeLine + + + private void UserControlTimeLine_DragStarted(object sender, EventArgs e) + { + UserControlPlayer.playerPause(); + } + + + private void UserControlTimeLine_DragCompleted(object sender, EventArgs e) + { + } + #endregion + + + #region SynSource pour chaque X milliseconds + private void UserControlTimeLine_TimerTick(object sender, EventArgs e) + { + if (!UserControlTimeLine.IsDragging) + { + UserControlTimeLine.Slider.Value = UserControlPlayer.Player.Position.TotalMilliseconds; + } + if (UserControlTimeLine.FinishedDragging) + { + int SliderValue = (int)UserControlTimeLine.Slider.Value; + TimeSpan ts = new TimeSpan(0, 0, 0, 0, SliderValue); + + UserControlPlayer.Player.Position = ts; + UserControlPlayer.playerPlay(); + + UserControlTimeLine.IsDragging = false; + UserControlTimeLine.FinishedDragging = false; + } + } + #endregion + } +} \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml --- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml Sun Aug 09 18:29:41 2009 +0200 +++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml Mon Aug 17 22:04:09 2009 +0200 @@ -6,9 +6,9 @@ mc:Ignorable="d" x:Class="FingersDance.Control.TimeLine.UserControlTimeLine" x:Name="UserControl" - d:DesignWidth="575" xmlns:Custom="http://schemas.microsoft.com/surface/2008" Height="Auto" Background="#FF898686"> + d:DesignWidth="383" xmlns:Custom="http://schemas.microsoft.com/surface/2008" Height="Auto" Background="#FF898686" d:DesignHeight="33"> - - - + + + \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.UserPanel/FingersDance.Control.UserPanel.csproj --- a/src/FingersDance.Control.UserPanel/FingersDance.Control.UserPanel.csproj Sun Aug 09 18:29:41 2009 +0200 +++ b/src/FingersDance.Control.UserPanel/FingersDance.Control.UserPanel.csproj Mon Aug 17 22:04:09 2009 +0200 @@ -73,6 +73,13 @@ + + MSBuild:Compile + Designer + + + UserControlUserPanel.xaml + @@ -129,13 +136,9 @@ - - {D5625AA4-362F-4E46-9916-65F3B173ECBE} - FingersDance.Control.Player - - - {2BCEE1BF-D3AC-478C-A26B-DFDB7420E965} - FingersDance.Control.TimeLine + + {BE5AD2E7-8BC2-414A-AB92-34E4D7357740} + FingersDance.Control.SyncSource diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.UserPanel/SurfaceUserPanelTest.xaml --- a/src/FingersDance.Control.UserPanel/SurfaceUserPanelTest.xaml Sun Aug 09 18:29:41 2009 +0200 +++ b/src/FingersDance.Control.UserPanel/SurfaceUserPanelTest.xaml Mon Aug 17 22:04:09 2009 +0200 @@ -2,18 +2,22 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="http://schemas.microsoft.com/surface/2008" - xmlns:FingersDance_Control_Player="clr-namespace:FingersDance.Control.Player;assembly=FingersDance.Control.Player" - xmlns:FingersDance_Control_TimeLine="clr-namespace:FingersDance.Control.TimeLine;assembly=FingersDance.Control.TimeLine" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + mc:Ignorable="d" + x:Class="FingersDance.Control.UserPanel.SurfaceWindow1" Title="FingersDance.Control.UserPanel" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" Activated="SurfaceWindow_Activated" + xmlns:FingersDance_Control_UserPanel="clr-namespace:FingersDance.Control.UserPanel" + xmlns:FingersDance_Control_SyncSource="clr-namespace:FingersDance.Control.SyncSource;assembly=FingersDance.Control.SyncSource" + > - - + + diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.UserPanel/SurfaceUserPanelTest.xaml.cs --- a/src/FingersDance.Control.UserPanel/SurfaceUserPanelTest.xaml.cs Sun Aug 09 18:29:41 2009 +0200 +++ b/src/FingersDance.Control.UserPanel/SurfaceUserPanelTest.xaml.cs Mon Aug 17 22:04:09 2009 +0200 @@ -100,47 +100,48 @@ //TODO: disable audio, animations here } - private void UserControlPlayer_PlayerOpened(object sender, EventArgs e) - { - //Initialisation du slider - UserControlTimeLine.initslider(UserControlPlayer.TotalMilliseconds); - //Demarrage du Timer - UserControlTimeLine.timerStart(); + //private void UserControlPlayer_PlayerOpened(object sender, EventArgs e) + //{ + // UserControlTimeLine.initTimer(); + // //Initialisation du slider + // UserControlTimeLine.initslider(UserControlPlayer.TotalMilliseconds); + // //Demarrage du Timer + // UserControlTimeLine.timerStart(); - } + //} - private void SurfaceWindow_Activated(object sender, EventArgs e) - { - //initialisation du Timer - UserControlTimeLine.initTimer(); - } + //private void SurfaceWindow_Activated(object sender, EventArgs e) + //{ + // //initialisation du Timer + // //UserControlTimeLine.initTimer(); + //} - private void UserControlTimeLine_DragStarted(object sender, EventArgs e) - { - UserControlPlayer.playerPause(); - } + //private void UserControlTimeLine_DragStarted(object sender, EventArgs e) + //{ + // UserControlPlayer.playerPause(); + //} - private void UserControlTimeLine_DragCompleted(object sender, EventArgs e) - { - } + //private void UserControlTimeLine_DragCompleted(object sender, EventArgs e) + //{ + //} - private void UserControlTimeLine_TimerTick(object sender, EventArgs e) - { - if (!UserControlTimeLine.IsDragging) - { - UserControlTimeLine.Slider.Value = UserControlPlayer.Player.Position.TotalMilliseconds; - } - if (UserControlTimeLine.FinishedDragging) - { - int SliderValue = (int)UserControlTimeLine.Slider.Value; - TimeSpan ts = new TimeSpan(0, 0, 0, 0, SliderValue); + //private void UserControlTimeLine_TimerTick(object sender, EventArgs e) + //{ + // if (!UserControlTimeLine.IsDragging) + // { + // UserControlTimeLine.Slider.Value = UserControlPlayer.Player.Position.TotalMilliseconds; + // } + // if (UserControlTimeLine.FinishedDragging) + // { + // int SliderValue = (int)UserControlTimeLine.Slider.Value; + // TimeSpan ts = new TimeSpan(0, 0, 0, 0, SliderValue); - UserControlPlayer.Player.Position = ts; - UserControlPlayer.playerPlay(); + // UserControlPlayer.Player.Position = ts; + // UserControlPlayer.playerPlay(); - UserControlTimeLine.IsDragging = false; - UserControlTimeLine.FinishedDragging = false; - } - } + // UserControlTimeLine.IsDragging = false; + // UserControlTimeLine.FinishedDragging = false; + // } + //} } } \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.UserPanel/SyncSource.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.UserPanel/SyncSource.cs Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace FingersDance.Control.UserPanel +{ + class SyncSource + { + } +} diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml Mon Aug 17 22:04:09 2009 +0200 @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs Mon Aug 17 22:04:09 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.UserPanel +{ + public partial class UserControlUserPanel + { + public UserControlUserPanel() + { + this.InitializeComponent(); + + // Insert code required on object creation below this point. + } + } +} \ No newline at end of file diff -r 9e222810f5b5 -r ed77793b767a src/FingersDance.sln --- a/src/FingersDance.sln Sun Aug 09 18:29:41 2009 +0200 +++ b/src/FingersDance.sln Mon Aug 17 22:04:09 2009 +0200 @@ -21,6 +21,10 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Actions", "FingersDance.Actions\FingersDance.Actions.csproj", "{1E80D5A1-C45C-443B-8992-4A4D78D280FC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control.SyncSource", "FingersDance.Control.SyncSource\FingersDance.Control.SyncSource.csproj", "{BE5AD2E7-8BC2-414A-AB92-34E4D7357740}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.ActionFactory", "FingersDance.ActionFactory\FingersDance.ActionFactory.csproj", "{C7B905EA-0678-4DA0-8EF8-7F9CBD22818E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -107,6 +111,18 @@ {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 {1E80D5A1-C45C-443B-8992-4A4D78D280FC}.Release|x86.ActiveCfg = Release|Any CPU + {BE5AD2E7-8BC2-414A-AB92-34E4D7357740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE5AD2E7-8BC2-414A-AB92-34E4D7357740}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE5AD2E7-8BC2-414A-AB92-34E4D7357740}.Debug|x86.ActiveCfg = Debug|Any CPU + {BE5AD2E7-8BC2-414A-AB92-34E4D7357740}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE5AD2E7-8BC2-414A-AB92-34E4D7357740}.Release|Any CPU.Build.0 = Release|Any CPU + {BE5AD2E7-8BC2-414A-AB92-34E4D7357740}.Release|x86.ActiveCfg = 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}.Debug|x86.ActiveCfg = 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 + {C7B905EA-0678-4DA0-8EF8-7F9CBD22818E}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE