# HG changeset patch
# User cavaliet
# Date 1257423232 -3600
# Node ID b266af50744c96bc8e9212fdd661da2a3c0f9bef
# Parent  83615722dbaba1e61b7954fce91e8decfd34e12c
Change file and event names for code to be clearer and more coherent with the project and cuttings organisation

diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.Screen/UserControlScreen.xaml.cs
--- a/src/FingersDance.Control.Screen/UserControlScreen.xaml.cs	Wed Nov 04 16:28:01 2009 +0100
+++ b/src/FingersDance.Control.Screen/UserControlScreen.xaml.cs	Thu Nov 05 13:13:52 2009 +0100
@@ -87,10 +87,10 @@
             try
             {
                 existingProjects = LoadProjects(MainViewModel.Project.VideoPath);
-                UserControlListSession listProject = new UserControlListSession(existingProjects);
+                UserControlListProject listProject = new UserControlListProject(existingProjects);
                 listProject.Name = "ListProject";
                 LayoutRoot.Children.Add(listProject);
-                listProject.EH_List_ContactDown += new EventHandler(listProject_EH_List_ContactDown);
+                listProject.EH_ListProject_ContactDown += new EventHandler(listProject_EH_ListProject_ContactDown);
             }
             catch (Exception)
             {
@@ -113,23 +113,23 @@
             }
         }
 
-        void listProject_EH_List_ContactDown(object sender, EventArgs e)
+        void listProject_EH_ListProject_ContactDown(object sender, EventArgs e)
         {
             try
             {
-                LayoutRoot.Children.Remove((UserControlListSession)sender);
-                if (((UserControlListSession)sender).SelectedItem.Equals("New Project"))
+                LayoutRoot.Children.Remove((UserControlListProject)sender);
+                if (((UserControlListProject)sender).SelectedItem.Equals("New Project"))
                 {
-                    UserControlSessionInput ProjectInput = new UserControlSessionInput();
+                    UserControlNewProjectForm ProjectInput = new UserControlNewProjectForm();
                     ProjectInput.Name = "ProjectInput";
                     LayoutRoot.Children.Add(ProjectInput);
-                    ProjectInput.EH_SurfaceButtonSubmit_ContactDown += new System.EventHandler(this.ProjectInput_EH_SurfaceButtonSubmit_ContactDown);
+                    ProjectInput.EH_NewProjectForm_ContactDown += new System.EventHandler(this.ProjectInput_EH_NewProjectForm_ContactDown);
                 }
                 else
                 {
                     foreach (Project elt in existingProjects)
                     {
-                        if (elt.Name.Equals(((UserControlListSession)sender).SelectedItem))
+                        if (elt.Name.Equals(((UserControlListProject)sender).SelectedItem))
                         {
                             MainViewModel.Project.Project = elt;
                             OpenProject();
@@ -146,18 +146,18 @@
             }
         }
 
-        private void ProjectInput_EH_SurfaceButtonSubmit_ContactDown(object sender, EventArgs e)
+        private void ProjectInput_EH_NewProjectForm_ContactDown(object sender, EventArgs e)
         {
             try
             {
-                //MainViewModel.Project.Alias = ((UserControlSessionInput)sender).Alias;
-                //MainViewModel.Project.Email = ((UserControlSessionInput)sender).Email;
-                MainViewModel.Project.Description = ((UserControlSessionInput)sender).Description;
-                MainViewModel.Project.Name = ((UserControlSessionInput)sender).SessionName;
+                //MainViewModel.Project.Alias = ((UserControlNewProjectForm)sender).Alias;
+                //MainViewModel.Project.Email = ((UserControlNewProjectForm)sender).Email;
+                MainViewModel.Project.Description = ((UserControlNewProjectForm)sender).Description;
+                MainViewModel.Project.Name = ((UserControlNewProjectForm)sender).SessionName;
                 
                 
                 //2-Suppression UCSession Input
-                LayoutRoot.Children.Remove((UserControlSessionInput)sender);
+                LayoutRoot.Children.Remove((UserControlNewProjectForm)sender);
                 OpenProject();
             }
             catch (Exception ex) 
@@ -172,7 +172,7 @@
         {
             try
             {
-                UserControlListProject listCuttings = new UserControlListProject(MainViewModel.Project.CuttingsDict);
+                UserControlListCutting listCuttings = new UserControlListCutting(MainViewModel.Project.CuttingsDict);
                 listCuttings.Name = "listCuttings";
                 LayoutRoot.Children.Add(listCuttings);
                 listCuttings.EH_Item_ContactDown += new EventHandler(listCuttings_EH_Item_ContactDown);
@@ -189,18 +189,18 @@
         {
             try
             {
-                LayoutRoot.Children.Remove((UserControlListProject)sender);
-                if (((UserControlListProject)sender).SelectedItem.Equals("New Cutting"))
+                LayoutRoot.Children.Remove((UserControlListCutting)sender);
+                if (((UserControlListCutting)sender).SelectedItem.Equals("New Cutting"))
                 {
-                    UserControlNewProject newCutting = new UserControlNewProject(User);
+                    UserControlNewCuttingForm newCutting = new UserControlNewCuttingForm(User);
                     newCutting.Name = "newCutting";
                     LayoutRoot.Children.Add(newCutting);
-                    newCutting.EH_NewCutting_ContactDown += new EventHandler(newCutting_EH_ContactDown);
+                    newCutting.EH_NewCuttingForm_ContactDown += new EventHandler(newCutting_EH_ContactDown);
                 }
                 else
                 {
                     foreach(KeyValuePair<string, Cutting> elt in MainViewModel.Project.CuttingsDict)
-                        if (elt.Key.Equals(((UserControlListProject)sender).SelectedItem))
+                        if (elt.Key.Equals(((UserControlListCutting)sender).SelectedItem))
                         {
                             CuttingVM = new CuttingViewModel(elt.Value, 815);
                             if (UC_Screen_NewCutting != null)
@@ -221,9 +221,9 @@
         {
             try
             {
-                LayoutRoot.Children.Remove((UserControlNewProject)sender);
-                CuttingVM = new CuttingViewModel(((UserControlNewProject)sender).Cutting, 850);
-                MainViewModel.Project.CuttingsDict.Add(CuttingVM.Title, ((UserControlNewProject)sender).Cutting);
+                LayoutRoot.Children.Remove((UserControlNewCuttingForm)sender);
+                CuttingVM = new CuttingViewModel(((UserControlNewCuttingForm)sender).Cutting, 850);
+                MainViewModel.Project.CuttingsDict.Add(CuttingVM.Title, ((UserControlNewCuttingForm)sender).Cutting);
                 if (UC_Screen_NewCutting != null)
                     UC_Screen_NewCutting(this, new EventArgs());
             }
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/FingersDance.Control.SessionInput.csproj
--- a/src/FingersDance.Control.SessionInput/FingersDance.Control.SessionInput.csproj	Wed Nov 04 16:28:01 2009 +0100
+++ b/src/FingersDance.Control.SessionInput/FingersDance.Control.SessionInput.csproj	Thu Nov 05 13:13:52 2009 +0100
@@ -89,25 +89,22 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Resource>
+    <Page Include="UserControlListCutting.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UserControlListProject.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControlListSession.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="UserControlNewProject.xaml">
+    <Page Include="UserControlNewCuttingForm.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControlSessionInput.xaml">
+    <Page Include="UserControlNewProjectForm.xaml">
+      <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
     </Page>
-    <Compile Include="UserControlSessionInput.xaml.cs">
-      <DependentUpon>UserControlSessionInput.xaml</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -130,14 +127,17 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
+    <Compile Include="UserControlListCutting.xaml.cs">
+      <DependentUpon>UserControlListCutting.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UserControlListProject.xaml.cs">
       <DependentUpon>UserControlListProject.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControlListSession.xaml.cs">
-      <DependentUpon>UserControlListSession.xaml</DependentUpon>
+    <Compile Include="UserControlNewCuttingForm.xaml.cs">
+      <DependentUpon>UserControlNewCuttingForm.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControlNewProject.xaml.cs">
-      <DependentUpon>UserControlNewProject.xaml</DependentUpon>
+    <Compile Include="UserControlNewProjectForm.xaml.cs">
+      <DependentUpon>UserControlNewProjectForm.xaml</DependentUpon>
     </Compile>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlListCutting.xaml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/FingersDance.Control.SessionInput/UserControlListCutting.xaml	Thu Nov 05 13:13:52 2009 +0100
@@ -0,0 +1,25 @@
+<UserControl 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d"
+	xmlns:Custom="http://schemas.microsoft.com/surface/2008" xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic"
+    x:Class="FingersDance.Control.SessionInput.UserControlListCutting"
+    x:Name="UserControl_ListCutting"
+	Width="478" Height="200" Background="{x:Null}">
+    <Grid x:Name="LayoutRoot">
+        <Custom:SurfaceListBox IsSynchronizedWithCurrentItem="True" Background="{x:Null}" ScrollViewer.VerticalScrollBarVisibility="Disabled" x:Name="ListBoxVideos" VerticalAlignment="Top" Height="167.56" Margin="8,0" ScrollViewer.HorizontalScrollBarVisibility="Hidden" BorderBrush="#4CFFFFFF">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" x:Name="stackPanel" RenderTransformOrigin="0.5,0.5">
+                <StackPanel.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform/>
+                        <SkewTransform AngleY="-0.182"/>
+                        <RotateTransform/>
+                        <TranslateTransform Y="-0.497"/>
+                    </TransformGroup>
+                </StackPanel.RenderTransform>
+            </StackPanel>
+        </Custom:SurfaceListBox>
+    </Grid>
+</UserControl>
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlListCutting.xaml.cs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/FingersDance.Control.SessionInput/UserControlListCutting.xaml.cs	Thu Nov 05 13:13:52 2009 +0100
@@ -0,0 +1,67 @@
+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.Navigation;
+using System.Windows.Shapes;
+using FingersDance.Data;
+using FingersDance.Control;
+
+namespace FingersDance.Control.SessionInput
+{
+    /// <summary>
+    /// Interaction logic for UserControlListCutting.xaml
+    /// </summary>
+    public partial class UserControlListCutting : UserControl
+    {   
+        //Creation d'un Event pour Chaque Item Video
+        public event EventHandler EH_Item_ContactDown;
+        public string SelectedItem = "";
+
+        public UserControlListCutting(Dictionary<string, Cutting> cuttings)
+        {
+            InitializeComponent();
+            OpenSessions(cuttings);
+        }
+
+        private void OpenSessions(Dictionary<string, Cutting> cuttings)
+        {
+            try
+            {
+                CustomListBoxItem Contener = new CustomListBoxItem();
+                Contener.Name = "New Cutting";
+                UserControlCustomLabel l = new UserControlCustomLabel("New Cutting");
+                Contener.Content = l;
+                stackPanel.Children.Add(Contener);
+                Contener.ContactTapGesture += Item_ContactTapGesture;
+                foreach (KeyValuePair<string, Cutting> elt in cuttings)
+                {
+                    Contener = new CustomListBoxItem();
+                    Contener.Name = elt.Key;
+                    l = new UserControlCustomLabel(elt.Key);
+                    Contener.Content = l;
+                    stackPanel.Children.Add(Contener);
+                    Contener.ContactTapGesture += Item_ContactTapGesture;
+                }
+            }
+            catch (Exception) { }
+        }
+
+        //Event appelé lors de la selection d'un Item dans la Liste
+        private void Item_ContactTapGesture(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
+        {
+            SelectedItem = ((CustomListBoxItem)sender).Name;
+            if (EH_Item_ContactDown != null)
+                EH_Item_ContactDown(this, new EventArgs());
+        }
+
+
+    }
+}
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlListProject.xaml.cs
--- a/src/FingersDance.Control.SessionInput/UserControlListProject.xaml.cs	Wed Nov 04 16:28:01 2009 +0100
+++ b/src/FingersDance.Control.SessionInput/UserControlListProject.xaml.cs	Thu Nov 05 13:13:52 2009 +0100
@@ -19,47 +19,43 @@
     /// <summary>
     /// Interaction logic for UserControlListProject.xaml
     /// </summary>
-    public partial class UserControlListProject
+    public partial class UserControlListProject : UserControl
     {
         //Creation d'un Event pour Chaque Item Video
-        public event EventHandler EH_Item_ContactDown;
+        public event EventHandler EH_ListProject_ContactDown;
         public string SelectedItem = "";
 
-        public UserControlListProject(Dictionary<string, Cutting> cuttings)
+        public UserControlListProject(List<Project> projects)
         {
             InitializeComponent();
-            OpenSessions(cuttings);
+            OpenProjects(projects);
         }
 
-        private void OpenSessions(Dictionary<string, Cutting> cuttings)
+        private void OpenProjects(List<Project> projects)
         {
-            try
+            CustomListBoxItem Contener = new CustomListBoxItem();
+            Contener.Name = "New Project";
+            UserControlCustomLabel l = new UserControlCustomLabel("New Project");
+            Contener.Content = l;
+            stackPanel.Children.Add(Contener);
+            Contener.ContactTapGesture += Item_ContactTapGesture;
+            foreach (Project elt in projects)
             {
-                CustomListBoxItem Contener = new CustomListBoxItem();
-                Contener.Name = "New Cutting";
-                UserControlCustomLabel l = new UserControlCustomLabel("New Cutting");
+                Contener = new CustomListBoxItem();
+                Contener.Name = elt.Name;
+                l = new UserControlCustomLabel(elt.Name);
                 Contener.Content = l;
                 stackPanel.Children.Add(Contener);
                 Contener.ContactTapGesture += Item_ContactTapGesture;
-                foreach (KeyValuePair<string, Cutting> elt in cuttings)
-                {
-                    Contener = new CustomListBoxItem();
-                    Contener.Name = elt.Key;
-                    l = new UserControlCustomLabel(elt.Key);
-                    Contener.Content = l;
-                    stackPanel.Children.Add(Contener);
-                    Contener.ContactTapGesture += Item_ContactTapGesture;
-                }
             }
-            catch (Exception) { }
         }
 
         //Event appelé lors de la selection d'un Item dans la Liste
         private void Item_ContactTapGesture(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
         {
             SelectedItem = ((CustomListBoxItem)sender).Name;
-            if (EH_Item_ContactDown != null)
-                EH_Item_ContactDown(this, new EventArgs());
+            if (EH_ListProject_ContactDown != null)
+                EH_ListProject_ContactDown(this, new EventArgs());
         }
     }
 }
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlListSession.xaml
--- a/src/FingersDance.Control.SessionInput/UserControlListSession.xaml	Wed Nov 04 16:28:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<UserControl 
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	mc:Ignorable="d"
-	xmlns:Custom="http://schemas.microsoft.com/surface/2008" xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic"
-    x:Class="FingersDance.Control.SessionInput.UserControlListSession"
-    x:Name="UserControl_ListSession"
-	Width="478" Height="200" Background="{x:Null}">
-    <Grid x:Name="LayoutRoot">
-        <Custom:SurfaceListBox IsSynchronizedWithCurrentItem="True" Background="{x:Null}" ScrollViewer.VerticalScrollBarVisibility="Disabled" x:Name="ListBoxVideos" VerticalAlignment="Top" Height="167.56" Margin="8,0" ScrollViewer.HorizontalScrollBarVisibility="Hidden" BorderBrush="#4CFFFFFF">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" x:Name="stackPanel" RenderTransformOrigin="0.5,0.5">
-                <StackPanel.RenderTransform>
-                    <TransformGroup>
-                        <ScaleTransform/>
-                        <SkewTransform AngleY="-0.182"/>
-                        <RotateTransform/>
-                        <TranslateTransform Y="-0.497"/>
-                    </TransformGroup>
-                </StackPanel.RenderTransform>
-            </StackPanel>
-        </Custom:SurfaceListBox>
-    </Grid>
-</UserControl>
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlListSession.xaml.cs
--- a/src/FingersDance.Control.SessionInput/UserControlListSession.xaml.cs	Wed Nov 04 16:28:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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.Navigation;
-using System.Windows.Shapes;
-using FingersDance.Data;
-using FingersDance.Control;
-
-namespace FingersDance.Control.SessionInput
-{
-    /// <summary>
-    /// Interaction logic for UserControlListSession.xaml
-    /// </summary>
-    public partial class UserControlListSession
-    {
-        //Creation d'un Event pour Chaque Item Video
-        public event EventHandler EH_List_ContactDown;
-        public string SelectedItem = "";
-
-        public UserControlListSession(List<Project> projects)
-        {
-            InitializeComponent();
-            OpenProjects(projects);
-        }
-
-        private void OpenProjects(List<Project> projects)
-        {
-            CustomListBoxItem Contener = new CustomListBoxItem();
-            Contener.Name = "New Project";
-            UserControlCustomLabel l = new UserControlCustomLabel("New Project");
-            Contener.Content = l;
-            stackPanel.Children.Add(Contener);
-            Contener.ContactTapGesture += Item_ContactTapGesture;
-            foreach (Project elt in projects)
-            {
-                Contener = new CustomListBoxItem();
-                Contener.Name = elt.Name;
-                l = new UserControlCustomLabel(elt.Name);
-                Contener.Content = l;
-                stackPanel.Children.Add(Contener);
-                Contener.ContactTapGesture += Item_ContactTapGesture;
-            }
-        }
-
-        //Event appelé lors de la selection d'un Item dans la Liste
-        private void Item_ContactTapGesture(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
-        {
-            SelectedItem = ((CustomListBoxItem)sender).Name;
-            if (EH_List_ContactDown != null)
-                EH_List_ContactDown(this, new EventArgs());
-        }
-    }
-}
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlNewCuttingForm.xaml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/FingersDance.Control.SessionInput/UserControlNewCuttingForm.xaml	Thu Nov 05 13:13:52 2009 +0100
@@ -0,0 +1,341 @@
+<UserControl 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    xmlns:Custom="http://schemas.microsoft.com/surface/2008" 
+    xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic"
+    x:Class="FingersDance.Control.SessionInput.UserControlNewCuttingForm"
+    Background="#FFA09E9E" 
+    Width="256" 
+    Height="192"
+    x:Name="UserControlnewcuttingform">
+    <UserControl.Resources>
+        <Style x:Key="FingersDance.Control.SurfaceRadioButton" TargetType="{x:Type Custom:SurfaceRadioButton}">
+            <Setter Property="HorizontalContentAlignment" Value="Left"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Foreground" Value="Black"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="Padding" Value="5,0,0,0"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Custom:SurfaceRadioButton}">
+                        <ControlTemplate.Resources>
+                            <Storyboard x:Key="ThreeStateExit">
+                                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                    <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0"/>
+                                </DoubleAnimationUsingKeyFrames>
+                            </Storyboard>
+                            <Storyboard x:Key="Press">
+                                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
+                                </DoubleAnimationUsingKeyFrames>
+                                <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                    <SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-2"/>
+                                </ThicknessAnimationUsingKeyFrames>
+                            </Storyboard>
+                            <Storyboard x:Key="Checked">
+                                <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
+                            </Storyboard>
+                            <Storyboard x:Key="Release">
+                                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                    <SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
+                                    <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
+                                </DoubleAnimationUsingKeyFrames>
+                                <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                    <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-2"/>
+                                    <SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="2"/>
+                                </ThicknessAnimationUsingKeyFrames>
+                            </Storyboard>
+                            <Storyboard x:Key="Unchecked">
+                                <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
+                            </Storyboard>
+                            <Storyboard x:Key="ThreeStateEnter">
+                                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="0.9"/>
+                                </DoubleAnimationUsingKeyFrames>
+                            </Storyboard>
+                        </ControlTemplate.Resources>
+                        <BulletDecorator x:Name="bulletDecorator" MinHeight="30" MinWidth="30" Height="Auto" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Background="Transparent">
+                            <BulletDecorator.Bullet>
+                                <Grid MinHeight="30" MinWidth="30" Width="30" Height="30" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                    <Rectangle x:Name="Base" Fill="{TemplateBinding Background}" Stroke="Transparent" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                    <Rectangle x:Name="Button" Fill="{x:Null}" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Stroke="White"/>
+                                    <Rectangle x:Name="RenderOverlay" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="3" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Fill="{x:Null}" Stroke="{x:Null}"/>
+                                    <Microsoft_Surface_Presentation_Generic:SurfaceShadowChrome x:Name="GlowBorder" Margin="2" Opacity="0" Color="White" CornerRadius="{Binding ActualHeight, ElementName=GlowBorder}"/>
+                                    <Rectangle x:Name="Checkmark" Fill="{x:Null}" StrokeThickness="7" RadiusX="6" RadiusY="6" Margin="8" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                        <Rectangle.Stroke>
+                                            <LinearGradientBrush EndPoint="0.5,0" StartPoint="0.5,1">
+                                                <GradientStop Color="#FF292929" Offset="1"/>
+                                                <GradientStop Color="#FF1B1B1B" Offset="0.276"/>
+                                            </LinearGradientBrush>
+                                        </Rectangle.Stroke>
+                                    </Rectangle>
+                                    <Rectangle x:Name="ThreeStateMark" StrokeThickness="1" RadiusX="13" RadiusY="13" Margin="6" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                        <Rectangle.Stroke>
+                                            <LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
+                                                <GradientStop Color="#66000000" Offset="0"/>
+                                                <GradientStop Color="#33000000" Offset="1"/>
+                                            </LinearGradientBrush>
+                                        </Rectangle.Stroke>
+                                        <Rectangle.Fill>
+                                            <LinearGradientBrush EndPoint="0.5,0" StartPoint="0.5,1">
+                                                <GradientStop Color="#FF292929" Offset="0.5"/>
+                                                <GradientStop Color="#FF1B1B1B" Offset="0.196"/>
+                                            </LinearGradientBrush>
+                                        </Rectangle.Fill>
+                                    </Rectangle>
+                                </Grid>
+                            </BulletDecorator.Bullet>
+                            <Grid HorizontalAlignment="Stretch" Margin="5,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                <Grid x:Name="ContentBox" HorizontalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Background="Transparent">
+                                    <ContentPresenter x:Name="Content" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ClipToBounds="False" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
+                                </Grid>
+                            </Grid>
+                        </BulletDecorator>
+                        <ControlTemplate.Triggers>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsThreeState" Value="True"/>
+                                    <Condition Property="IsChecked" Value="{x:Null}"/>
+                                </MultiTrigger.Conditions>
+                                <MultiTrigger.ExitActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0"/>
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </MultiTrigger.ExitActions>
+                                <MultiTrigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="0.9"/>
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </MultiTrigger.EnterActions>
+                            </MultiTrigger>
+                            <Trigger Property="IsChecked" Value="False">
+                                <Trigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.EnterActions>
+                                <Trigger.ExitActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.ExitActions>
+                            </Trigger>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Trigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.EnterActions>
+                                <Trigger.ExitActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.ExitActions>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Trigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                                <SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-2"/>
+                                            </ThicknessAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.EnterActions>
+                                <Trigger.ExitActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
+                                                <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                                <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-2"/>
+                                                <SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="2"/>
+                                            </ThicknessAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.ExitActions>
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter Property="Fill" TargetName="Button" Value="#00000000"/>
+                                <Setter Property="Stroke" TargetName="Button" Value="#33000000"/>
+                                <Setter Property="Foreground" Value="#A5333333"/>
+                                <Setter Property="Fill" TargetName="RenderOverlay" Value="#00000000"/>
+                                <Setter Property="Stroke" TargetName="Checkmark" Value="#33000000"/>
+                                <Setter Property="Opacity" TargetName="RenderOverlay" Value="0.5"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.BasedOn>
+                <Style TargetType="{x:Type ButtonBase}">
+                    <Setter Property="SnapsToDevicePixels" Value="True"/>
+                    <Setter Property="FocusVisualStyle">
+                        <Setter.Value>
+                            <Style>
+                                <Setter Property="Control.Template">
+                                    <Setter.Value>
+                                        <ControlTemplate/>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </Setter.Value>
+                    </Setter>
+                    <Setter Property="FontFamily" Value="Segoe UI"/>
+                    <Setter Property="FontSize" Value="10"/>
+                    <Setter Property="Foreground" Value="Black"/>
+                    <Setter Property="Background" Value="#33A4B4BD"/>
+                    <Setter Property="BorderBrush">
+                        <Setter.Value>
+                            <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                <GradientStop Color="#7FFFFFFF" Offset="0"/>
+                                <GradientStop Color="#0CFFFFFF" Offset="1"/>
+                            </LinearGradientBrush>
+                        </Setter.Value>
+                    </Setter>
+                    <Setter Property="BorderThickness" Value="1"/>
+                    <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                    <Setter Property="VerticalContentAlignment" Value="Center"/>
+                    <Setter Property="Padding" Value="15,6"/>
+                    <Setter Property="IsTabStop" Value="False"/>
+                    <Setter Property="Focusable" Value="False"/>
+                    <Setter Property="MinWidth" Value="30"/>
+                    <Setter Property="MinHeight" Value="30"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type ButtonBase}">
+                                <ControlTemplate.Resources>
+                                    <Storyboard x:Key="Press">
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                            <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                            <SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-3"/>
+                                        </ThicknessAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <Storyboard x:Key="Release">
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                            <SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
+                                            <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                            <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-3"/>
+                                            <SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="1"/>
+                                        </ThicknessAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </ControlTemplate.Resources>
+                                <Grid x:Name="Grid" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                    <Border x:Name="Shadow" Margin="1,1,1,0" BorderBrush="#33000000" BorderThickness="0,0,0,1" CornerRadius="6" Padding="1"/>
+                                    <Rectangle x:Name="Base" Fill="{TemplateBinding Background}" StrokeThickness="1" RadiusX="5" RadiusY="5" Margin="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                        <Rectangle.Stroke>
+                                            <LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
+                                                <GradientStop Color="#66000000" Offset="0"/>
+                                                <GradientStop Color="#33000000" Offset="1"/>
+                                            </LinearGradientBrush>
+                                        </Rectangle.Stroke>
+                                    </Rectangle>
+                                    <Rectangle x:Name="RenderOverlay" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="1" RadiusX="4" RadiusY="4" Margin="2" Opacity="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                        <Rectangle.Fill>
+                                            <LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
+                                                <GradientStop Color="#26000000" Offset="0"/>
+                                                <GradientStop Color="#4CFFFFFF" Offset="1"/>
+                                            </LinearGradientBrush>
+                                        </Rectangle.Fill>
+                                    </Rectangle>
+                                    <Microsoft_Surface_Presentation_Generic:SurfaceShadowChrome x:Name="Glow" Margin="1" Opacity="0" Color="White" CornerRadius="4"/>
+                                    <ContentPresenter x:Name="Content" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}">
+                                        <ContentPresenter.RenderTransform>
+                                            <TranslateTransform X="0" Y="-1"/>
+                                        </ContentPresenter.RenderTransform>
+                                    </ContentPresenter>
+                                </Grid>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsPressed" Value="True">
+                                        <Trigger.EnterActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                        <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
+                                                    </DoubleAnimationUsingKeyFrames>
+                                                    <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                                        <SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-3"/>
+                                                    </ThicknessAnimationUsingKeyFrames>
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </Trigger.EnterActions>
+                                        <Trigger.ExitActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                        <SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
+                                                        <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
+                                                    </DoubleAnimationUsingKeyFrames>
+                                                    <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                                        <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-3"/>
+                                                        <SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="1"/>
+                                                    </ThicknessAnimationUsingKeyFrames>
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </Trigger.ExitActions>
+                                    </Trigger>
+                                    <Trigger Property="IsEnabled" Value="True"/>
+                                    <Trigger Property="IsEnabled" Value="False">
+                                        <Setter Property="Fill" TargetName="RenderOverlay" Value="#0CFFFFFF"/>
+                                        <Setter Property="Stroke" TargetName="RenderOverlay" Value="#33FFFFFF"/>
+                                        <Setter Property="Stroke" TargetName="Base" Value="#33000000"/>
+                                        <Setter Property="BorderBrush" TargetName="Shadow" Value="#00000000"/>
+                                        <Setter Property="Foreground" Value="#A5333333"/>
+                                        <Setter Property="Background" Value="Transparent"/>
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Style.BasedOn>
+        </Style>
+    </UserControl.Resources>
+
+    <Grid x:Name="LayoutRoot" Background="{DynamicResource SessionInput__Background_xaml}">
+        <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,17.818,8,0" x:Name="ST_CuttingName" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7EFFFFFF" Foreground="#FF000000"/>
+        <Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Cutting Name:" Margin="14.367,9.818,0,0" x:Name="LProjectName" Foreground="#FFBCB3B3"/>
+        <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" Margin="112,50.626,8,0" x:Name="ST_Date" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7EFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
+        <Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Date:" Margin="14.367,42.626,0,0" x:Name="LDate" Foreground="#FFBCB3B3"/>
+        <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,0,8,30.403" x:Name="ST_Desc" VerticalAlignment="Bottom" Text="" TextWrapping="Wrap" Background="#7EFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
+        <Label x:Name="LDescription" HorizontalAlignment="Left" VerticalAlignment="Bottom" Content="Description:" Margin="14.367,0,0,30.403" Width="74.321" Foreground="#FFBCB3B3"/>
+        <Custom:SurfaceRadioButton RenderTransformOrigin="0.46,0.243" Margin="70.688,0,0,3" VerticalAlignment="Bottom" Content="" Height="30.403" x:Name="SurfaceButtonSubmit" ContactDown="SurfaceButtonSubmit_ContactDown" Click="SurfaceButtonSubmit_Click" HorizontalAlignment="Left" Style="{DynamicResource FingersDance.Control.SurfaceRadioButton}" Width="33.312" Background="{DynamicResource ConfirmationTick_xaml}" BorderBrush="{x:Null}">
+            <Custom:SurfaceRadioButton.RenderTransform>
+                <TransformGroup>
+                    <ScaleTransform ScaleX="1" ScaleY="1"/>
+                    <SkewTransform AngleX="0" AngleY="0"/>
+                    <RotateTransform Angle="0"/>
+                    <TranslateTransform X="0" Y="0"/>
+                </TransformGroup>
+            </Custom:SurfaceRadioButton.RenderTransform>
+        </Custom:SurfaceRadioButton>
+    </Grid>
+</UserControl>
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlNewCuttingForm.xaml.cs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/FingersDance.Control.SessionInput/UserControlNewCuttingForm.xaml.cs	Thu Nov 05 13:13:52 2009 +0100
@@ -0,0 +1,55 @@
+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.Navigation;
+using System.Windows.Shapes;
+using FingersDance.Data;
+
+namespace FingersDance.Control.SessionInput
+{
+    /// <summary>
+    /// Interaction logic for UserControlNewCuttingForm.xaml
+    /// </summary>
+    public partial class UserControlNewCuttingForm : UserControl
+    {
+        public event EventHandler EH_NewCuttingForm_ContactDown;
+        public Cutting Cutting = new Cutting();
+        User _User = new User();
+
+        public UserControlNewCuttingForm(User u)
+        {
+            InitializeComponent();
+            ST_Date.Text = DateTime.Now.Day.ToString() + "/" + DateTime.Now.Month.ToString() + "/" + DateTime.Now.Year.ToString();
+            _User = u;
+
+
+        }
+
+        #region Actions
+
+        private void SurfaceButtonSubmit_ContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
+        {
+            Cutting = new Cutting(_User.Name, new List<Annotation>());   
+            if (EH_NewCuttingForm_ContactDown != null)
+                EH_NewCuttingForm_ContactDown(this, new EventArgs());
+        }
+
+        private void SurfaceButtonSubmit_Click(object sender, RoutedEventArgs e)
+        {
+            //Project = new Project(ST_ProjectName.Text, ST_Date.Text, ST_Desc.Text, _User, new Cutting());
+            Cutting = new Cutting(_User.Name, new List<Annotation>());
+            if (EH_NewCuttingForm_ContactDown != null)
+                EH_NewCuttingForm_ContactDown(this, new EventArgs());   
+        }
+
+        #endregion
+    }
+}
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlNewProject.xaml
--- a/src/FingersDance.Control.SessionInput/UserControlNewProject.xaml	Wed Nov 04 16:28:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,341 +0,0 @@
-<UserControl 
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    xmlns:Custom="http://schemas.microsoft.com/surface/2008" 
-    xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic"
-    x:Class="FingersDance.Control.SessionInput.UserControlNewProject"
-    Background="#FFA09E9E" 
-    Width="256" 
-    Height="192"
-    x:Name="UserControlnewproject">
-    <UserControl.Resources>
-        <Style x:Key="FingersDance.Control.SurfaceRadioButton" TargetType="{x:Type Custom:SurfaceRadioButton}">
-            <Setter Property="HorizontalContentAlignment" Value="Left"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Foreground" Value="Black"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
-            <Setter Property="Padding" Value="5,0,0,0"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type Custom:SurfaceRadioButton}">
-                        <ControlTemplate.Resources>
-                            <Storyboard x:Key="ThreeStateExit">
-                                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                    <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0"/>
-                                </DoubleAnimationUsingKeyFrames>
-                            </Storyboard>
-                            <Storyboard x:Key="Press">
-                                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                                </DoubleAnimationUsingKeyFrames>
-                                <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-                                    <SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-2"/>
-                                </ThicknessAnimationUsingKeyFrames>
-                            </Storyboard>
-                            <Storyboard x:Key="Checked">
-                                <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
-                            </Storyboard>
-                            <Storyboard x:Key="Release">
-                                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                    <SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
-                                    <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
-                                </DoubleAnimationUsingKeyFrames>
-                                <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-                                    <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-2"/>
-                                    <SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="2"/>
-                                </ThicknessAnimationUsingKeyFrames>
-                            </Storyboard>
-                            <Storyboard x:Key="Unchecked">
-                                <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
-                            </Storyboard>
-                            <Storyboard x:Key="ThreeStateEnter">
-                                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="0.9"/>
-                                </DoubleAnimationUsingKeyFrames>
-                            </Storyboard>
-                        </ControlTemplate.Resources>
-                        <BulletDecorator x:Name="bulletDecorator" MinHeight="30" MinWidth="30" Height="Auto" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Background="Transparent">
-                            <BulletDecorator.Bullet>
-                                <Grid MinHeight="30" MinWidth="30" Width="30" Height="30" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                                    <Rectangle x:Name="Base" Fill="{TemplateBinding Background}" Stroke="Transparent" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                    <Rectangle x:Name="Button" Fill="{x:Null}" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Stroke="White"/>
-                                    <Rectangle x:Name="RenderOverlay" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="3" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Fill="{x:Null}" Stroke="{x:Null}"/>
-                                    <Microsoft_Surface_Presentation_Generic:SurfaceShadowChrome x:Name="GlowBorder" Margin="2" Opacity="0" Color="White" CornerRadius="{Binding ActualHeight, ElementName=GlowBorder}"/>
-                                    <Rectangle x:Name="Checkmark" Fill="{x:Null}" StrokeThickness="7" RadiusX="6" RadiusY="6" Margin="8" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                                        <Rectangle.Stroke>
-                                            <LinearGradientBrush EndPoint="0.5,0" StartPoint="0.5,1">
-                                                <GradientStop Color="#FF292929" Offset="1"/>
-                                                <GradientStop Color="#FF1B1B1B" Offset="0.276"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Stroke>
-                                    </Rectangle>
-                                    <Rectangle x:Name="ThreeStateMark" StrokeThickness="1" RadiusX="13" RadiusY="13" Margin="6" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                                        <Rectangle.Stroke>
-                                            <LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
-                                                <GradientStop Color="#66000000" Offset="0"/>
-                                                <GradientStop Color="#33000000" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Stroke>
-                                        <Rectangle.Fill>
-                                            <LinearGradientBrush EndPoint="0.5,0" StartPoint="0.5,1">
-                                                <GradientStop Color="#FF292929" Offset="0.5"/>
-                                                <GradientStop Color="#FF1B1B1B" Offset="0.196"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                </Grid>
-                            </BulletDecorator.Bullet>
-                            <Grid HorizontalAlignment="Stretch" Margin="5,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                                <Grid x:Name="ContentBox" HorizontalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Background="Transparent">
-                                    <ContentPresenter x:Name="Content" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ClipToBounds="False" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                                </Grid>
-                            </Grid>
-                        </BulletDecorator>
-                        <ControlTemplate.Triggers>
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="IsThreeState" Value="True"/>
-                                    <Condition Property="IsChecked" Value="{x:Null}"/>
-                                </MultiTrigger.Conditions>
-                                <MultiTrigger.ExitActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </MultiTrigger.ExitActions>
-                                <MultiTrigger.EnterActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="0.9"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </MultiTrigger.EnterActions>
-                            </MultiTrigger>
-                            <Trigger Property="IsChecked" Value="False">
-                                <Trigger.EnterActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.EnterActions>
-                                <Trigger.ExitActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.ExitActions>
-                            </Trigger>
-                            <Trigger Property="IsChecked" Value="True">
-                                <Trigger.EnterActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.EnterActions>
-                                <Trigger.ExitActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.ExitActions>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Trigger.EnterActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-                                                <SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-2"/>
-                                            </ThicknessAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.EnterActions>
-                                <Trigger.ExitActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                <SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
-                                                <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-                                                <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-2"/>
-                                                <SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="2"/>
-                                            </ThicknessAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.ExitActions>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="Fill" TargetName="Button" Value="#00000000"/>
-                                <Setter Property="Stroke" TargetName="Button" Value="#33000000"/>
-                                <Setter Property="Foreground" Value="#A5333333"/>
-                                <Setter Property="Fill" TargetName="RenderOverlay" Value="#00000000"/>
-                                <Setter Property="Stroke" TargetName="Checkmark" Value="#33000000"/>
-                                <Setter Property="Opacity" TargetName="RenderOverlay" Value="0.5"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.BasedOn>
-                <Style TargetType="{x:Type ButtonBase}">
-                    <Setter Property="SnapsToDevicePixels" Value="True"/>
-                    <Setter Property="FocusVisualStyle">
-                        <Setter.Value>
-                            <Style>
-                                <Setter Property="Control.Template">
-                                    <Setter.Value>
-                                        <ControlTemplate/>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </Setter.Value>
-                    </Setter>
-                    <Setter Property="FontFamily" Value="Segoe UI"/>
-                    <Setter Property="FontSize" Value="10"/>
-                    <Setter Property="Foreground" Value="Black"/>
-                    <Setter Property="Background" Value="#33A4B4BD"/>
-                    <Setter Property="BorderBrush">
-                        <Setter.Value>
-                            <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                <GradientStop Color="#7FFFFFFF" Offset="0"/>
-                                <GradientStop Color="#0CFFFFFF" Offset="1"/>
-                            </LinearGradientBrush>
-                        </Setter.Value>
-                    </Setter>
-                    <Setter Property="BorderThickness" Value="1"/>
-                    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                    <Setter Property="VerticalContentAlignment" Value="Center"/>
-                    <Setter Property="Padding" Value="15,6"/>
-                    <Setter Property="IsTabStop" Value="False"/>
-                    <Setter Property="Focusable" Value="False"/>
-                    <Setter Property="MinWidth" Value="30"/>
-                    <Setter Property="MinHeight" Value="30"/>
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="{x:Type ButtonBase}">
-                                <ControlTemplate.Resources>
-                                    <Storyboard x:Key="Press">
-                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                            <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-                                            <SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-3"/>
-                                        </ThicknessAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <Storyboard x:Key="Release">
-                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                            <SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
-                                            <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-                                            <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-3"/>
-                                            <SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="1"/>
-                                        </ThicknessAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </ControlTemplate.Resources>
-                                <Grid x:Name="Grid" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                                    <Border x:Name="Shadow" Margin="1,1,1,0" BorderBrush="#33000000" BorderThickness="0,0,0,1" CornerRadius="6" Padding="1"/>
-                                    <Rectangle x:Name="Base" Fill="{TemplateBinding Background}" StrokeThickness="1" RadiusX="5" RadiusY="5" Margin="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                                        <Rectangle.Stroke>
-                                            <LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
-                                                <GradientStop Color="#66000000" Offset="0"/>
-                                                <GradientStop Color="#33000000" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Stroke>
-                                    </Rectangle>
-                                    <Rectangle x:Name="RenderOverlay" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="1" RadiusX="4" RadiusY="4" Margin="2" Opacity="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                                        <Rectangle.Fill>
-                                            <LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
-                                                <GradientStop Color="#26000000" Offset="0"/>
-                                                <GradientStop Color="#4CFFFFFF" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Rectangle.Fill>
-                                    </Rectangle>
-                                    <Microsoft_Surface_Presentation_Generic:SurfaceShadowChrome x:Name="Glow" Margin="1" Opacity="0" Color="White" CornerRadius="4"/>
-                                    <ContentPresenter x:Name="Content" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}">
-                                        <ContentPresenter.RenderTransform>
-                                            <TranslateTransform X="0" Y="-1"/>
-                                        </ContentPresenter.RenderTransform>
-                                    </ContentPresenter>
-                                </Grid>
-                                <ControlTemplate.Triggers>
-                                    <Trigger Property="IsPressed" Value="True">
-                                        <Trigger.EnterActions>
-                                            <BeginStoryboard>
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                        <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-                                                        <SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-3"/>
-                                                    </ThicknessAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </BeginStoryboard>
-                                        </Trigger.EnterActions>
-                                        <Trigger.ExitActions>
-                                            <BeginStoryboard>
-                                                <Storyboard>
-                                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                        <SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
-                                                        <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
-                                                    </DoubleAnimationUsingKeyFrames>
-                                                    <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-                                                        <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-3"/>
-                                                        <SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="1"/>
-                                                    </ThicknessAnimationUsingKeyFrames>
-                                                </Storyboard>
-                                            </BeginStoryboard>
-                                        </Trigger.ExitActions>
-                                    </Trigger>
-                                    <Trigger Property="IsEnabled" Value="True"/>
-                                    <Trigger Property="IsEnabled" Value="False">
-                                        <Setter Property="Fill" TargetName="RenderOverlay" Value="#0CFFFFFF"/>
-                                        <Setter Property="Stroke" TargetName="RenderOverlay" Value="#33FFFFFF"/>
-                                        <Setter Property="Stroke" TargetName="Base" Value="#33000000"/>
-                                        <Setter Property="BorderBrush" TargetName="Shadow" Value="#00000000"/>
-                                        <Setter Property="Foreground" Value="#A5333333"/>
-                                        <Setter Property="Background" Value="Transparent"/>
-                                    </Trigger>
-                                </ControlTemplate.Triggers>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </Style.BasedOn>
-        </Style>
-    </UserControl.Resources>
-
-    <Grid x:Name="LayoutRoot" Background="{DynamicResource SessionInput__Background_xaml}">
-        <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,17.818,8,0" x:Name="ST_ProjectName" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7EFFFFFF" Foreground="#FF000000"/>
-        <Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Cutting Name:" Margin="14.367,9.818,0,0" x:Name="LProjectName" Foreground="#FFBCB3B3"/>
-        <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" Margin="112,50.626,8,0" x:Name="ST_Date" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7EFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
-        <Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Date:" Margin="14.367,42.626,0,0" x:Name="LDate" Foreground="#FFBCB3B3"/>
-        <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,0,8,30.403" x:Name="ST_Desc" VerticalAlignment="Bottom" Text="" TextWrapping="Wrap" Background="#7EFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
-        <Label x:Name="LDescription" HorizontalAlignment="Left" VerticalAlignment="Bottom" Content="Description:" Margin="14.367,0,0,30.403" Width="74.321" Foreground="#FFBCB3B3"/>
-        <Custom:SurfaceRadioButton RenderTransformOrigin="0.46,0.243" Margin="70.688,0,0,3" VerticalAlignment="Bottom" Content="" Height="30.403" x:Name="SurfaceButtonSubmit" ContactDown="SurfaceButtonSubmit_ContactDown" Click="SurfaceButtonSubmit_Click" HorizontalAlignment="Left" Style="{DynamicResource FingersDance.Control.SurfaceRadioButton}" Width="33.312" Background="{DynamicResource ConfirmationTick_xaml}" BorderBrush="{x:Null}">
-            <Custom:SurfaceRadioButton.RenderTransform>
-                <TransformGroup>
-                    <ScaleTransform ScaleX="1" ScaleY="1"/>
-                    <SkewTransform AngleX="0" AngleY="0"/>
-                    <RotateTransform Angle="0"/>
-                    <TranslateTransform X="0" Y="0"/>
-                </TransformGroup>
-            </Custom:SurfaceRadioButton.RenderTransform>
-        </Custom:SurfaceRadioButton>
-    </Grid>
-</UserControl>
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlNewProject.xaml.cs
--- a/src/FingersDance.Control.SessionInput/UserControlNewProject.xaml.cs	Wed Nov 04 16:28:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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.Navigation;
-using System.Windows.Shapes;
-using FingersDance.Data;
-
-namespace FingersDance.Control.SessionInput
-{
-    /// <summary>
-    /// Interaction logic for UserControlNewProject.xaml
-    /// </summary>
-    public partial class UserControlNewProject : UserControl
-    {
-        public event EventHandler EH_NewCutting_ContactDown;
-        public Cutting Cutting = new Cutting();
-        User _User = new User();
-
-        public UserControlNewProject(User u)
-        {
-            InitializeComponent();
-            ST_Date.Text = DateTime.Now.Day.ToString() + "/" + DateTime.Now.Month.ToString() + "/" + DateTime.Now.Year.ToString();
-            _User = u;
-
-
-        }
-
-        #region Actions
-
-        private void SurfaceButtonSubmit_ContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
-        {
-            Cutting = new Cutting(_User.Name, new List<Annotation>());   
-            if (EH_NewCutting_ContactDown != null)
-                EH_NewCutting_ContactDown(this, new EventArgs());
-        }
-
-        private void SurfaceButtonSubmit_Click(object sender, RoutedEventArgs e)
-        {
-            //Project = new Project(ST_ProjectName.Text, ST_Date.Text, ST_Desc.Text, _User, new Cutting());
-            Cutting = new Cutting(_User.Name, new List<Annotation>());
-            if (EH_NewCutting_ContactDown != null)
-                EH_NewCutting_ContactDown(this, new EventArgs());   
-        }
-
-        #endregion
-    }
-}
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlNewProjectForm.xaml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/FingersDance.Control.SessionInput/UserControlNewProjectForm.xaml	Thu Nov 05 13:13:52 2009 +0100
@@ -0,0 +1,346 @@
+<UserControl
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d"
+	xmlns:Custom="http://schemas.microsoft.com/surface/2008" 
+    xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic"
+	x:Class="FingersDance.Control.SessionInput.UserControlNewProjectForm"
+	x:Name="UserControlnewprojectform"
+	Background="#FFA09E9E" 
+    Width="256" 
+    Height="192">
+
+    <UserControl.Resources>
+        <Style x:Key="FingersDance.Control.SurfaceRadioButton" TargetType="{x:Type Custom:SurfaceRadioButton}">
+            <Setter Property="HorizontalContentAlignment" Value="Left"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Foreground" Value="Black"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="Padding" Value="5,0,0,0"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Custom:SurfaceRadioButton}">
+                        <ControlTemplate.Resources>
+                            <Storyboard x:Key="ThreeStateExit">
+                                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                    <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0"/>
+                                </DoubleAnimationUsingKeyFrames>
+                            </Storyboard>
+                            <Storyboard x:Key="Press">
+                                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
+                                </DoubleAnimationUsingKeyFrames>
+                                <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                    <SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-2"/>
+                                </ThicknessAnimationUsingKeyFrames>
+                            </Storyboard>
+                            <Storyboard x:Key="Checked">
+                                <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
+                            </Storyboard>
+                            <Storyboard x:Key="Release">
+                                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                    <SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
+                                    <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
+                                </DoubleAnimationUsingKeyFrames>
+                                <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                    <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-2"/>
+                                    <SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="2"/>
+                                </ThicknessAnimationUsingKeyFrames>
+                            </Storyboard>
+                            <Storyboard x:Key="Unchecked">
+                                <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
+                            </Storyboard>
+                            <Storyboard x:Key="ThreeStateEnter">
+                                <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                    <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="0.9"/>
+                                </DoubleAnimationUsingKeyFrames>
+                            </Storyboard>
+                        </ControlTemplate.Resources>
+                        <BulletDecorator x:Name="bulletDecorator" MinHeight="30" MinWidth="30" Height="Auto" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Background="Transparent">
+                            <BulletDecorator.Bullet>
+                                <Grid MinHeight="30" MinWidth="30" Width="30" Height="30" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                    <Rectangle x:Name="Base" Fill="{TemplateBinding Background}" Stroke="Transparent" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                    <Rectangle x:Name="Button" Fill="{x:Null}" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Stroke="White"/>
+                                    <Rectangle x:Name="RenderOverlay" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="3" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Fill="{x:Null}" Stroke="{x:Null}"/>
+                                    <Microsoft_Surface_Presentation_Generic:SurfaceShadowChrome x:Name="GlowBorder" Margin="2" Opacity="0" Color="White" CornerRadius="{Binding ActualHeight, ElementName=GlowBorder}"/>
+                                    <Rectangle x:Name="Checkmark" Fill="{x:Null}" StrokeThickness="7" RadiusX="6" RadiusY="6" Margin="8" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                        <Rectangle.Stroke>
+                                            <LinearGradientBrush EndPoint="0.5,0" StartPoint="0.5,1">
+                                                <GradientStop Color="#FF292929" Offset="1"/>
+                                                <GradientStop Color="#FF1B1B1B" Offset="0.276"/>
+                                            </LinearGradientBrush>
+                                        </Rectangle.Stroke>
+                                    </Rectangle>
+                                    <Rectangle x:Name="ThreeStateMark" StrokeThickness="1" RadiusX="13" RadiusY="13" Margin="6" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                        <Rectangle.Stroke>
+                                            <LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
+                                                <GradientStop Color="#66000000" Offset="0"/>
+                                                <GradientStop Color="#33000000" Offset="1"/>
+                                            </LinearGradientBrush>
+                                        </Rectangle.Stroke>
+                                        <Rectangle.Fill>
+                                            <LinearGradientBrush EndPoint="0.5,0" StartPoint="0.5,1">
+                                                <GradientStop Color="#FF292929" Offset="0.5"/>
+                                                <GradientStop Color="#FF1B1B1B" Offset="0.196"/>
+                                            </LinearGradientBrush>
+                                        </Rectangle.Fill>
+                                    </Rectangle>
+                                </Grid>
+                            </BulletDecorator.Bullet>
+                            <Grid HorizontalAlignment="Stretch" Margin="5,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                <Grid x:Name="ContentBox" HorizontalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Background="Transparent">
+                                    <ContentPresenter x:Name="Content" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ClipToBounds="False" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
+                                </Grid>
+                            </Grid>
+                        </BulletDecorator>
+                        <ControlTemplate.Triggers>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsThreeState" Value="True"/>
+                                    <Condition Property="IsChecked" Value="{x:Null}"/>
+                                </MultiTrigger.Conditions>
+                                <MultiTrigger.ExitActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0"/>
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </MultiTrigger.ExitActions>
+                                <MultiTrigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="0.9"/>
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </MultiTrigger.EnterActions>
+                            </MultiTrigger>
+                            <Trigger Property="IsChecked" Value="False">
+                                <Trigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.EnterActions>
+                                <Trigger.ExitActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.ExitActions>
+                            </Trigger>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Trigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.EnterActions>
+                                <Trigger.ExitActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.ExitActions>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Trigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                                <SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-2"/>
+                                            </ThicknessAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.EnterActions>
+                                <Trigger.ExitActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                <SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
+                                                <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                                <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-2"/>
+                                                <SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="2"/>
+                                            </ThicknessAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.ExitActions>
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter Property="Fill" TargetName="Button" Value="#00000000"/>
+                                <Setter Property="Stroke" TargetName="Button" Value="#33000000"/>
+                                <Setter Property="Foreground" Value="#A5333333"/>
+                                <Setter Property="Fill" TargetName="RenderOverlay" Value="#00000000"/>
+                                <Setter Property="Stroke" TargetName="Checkmark" Value="#33000000"/>
+                                <Setter Property="Opacity" TargetName="RenderOverlay" Value="0.5"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.BasedOn>
+                <Style TargetType="{x:Type ButtonBase}">
+                    <Setter Property="SnapsToDevicePixels" Value="True"/>
+                    <Setter Property="FocusVisualStyle">
+                        <Setter.Value>
+                            <Style>
+                                <Setter Property="Control.Template">
+                                    <Setter.Value>
+                                        <ControlTemplate/>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </Setter.Value>
+                    </Setter>
+                    <Setter Property="FontFamily" Value="Segoe UI"/>
+                    <Setter Property="FontSize" Value="10"/>
+                    <Setter Property="Foreground" Value="Black"/>
+                    <Setter Property="Background" Value="#33A4B4BD"/>
+                    <Setter Property="BorderBrush">
+                        <Setter.Value>
+                            <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                <GradientStop Color="#7FFFFFFF" Offset="0"/>
+                                <GradientStop Color="#0CFFFFFF" Offset="1"/>
+                            </LinearGradientBrush>
+                        </Setter.Value>
+                    </Setter>
+                    <Setter Property="BorderThickness" Value="1"/>
+                    <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                    <Setter Property="VerticalContentAlignment" Value="Center"/>
+                    <Setter Property="Padding" Value="15,6"/>
+                    <Setter Property="IsTabStop" Value="False"/>
+                    <Setter Property="Focusable" Value="False"/>
+                    <Setter Property="MinWidth" Value="30"/>
+                    <Setter Property="MinHeight" Value="30"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type ButtonBase}">
+                                <ControlTemplate.Resources>
+                                    <Storyboard x:Key="Press">
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                            <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                            <SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-3"/>
+                                        </ThicknessAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <Storyboard x:Key="Release">
+                                        <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                            <SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
+                                            <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                            <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-3"/>
+                                            <SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="1"/>
+                                        </ThicknessAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </ControlTemplate.Resources>
+                                <Grid x:Name="Grid" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                    <Border x:Name="Shadow" Margin="1,1,1,0" BorderBrush="#33000000" BorderThickness="0,0,0,1" CornerRadius="6" Padding="1"/>
+                                    <Rectangle x:Name="Base" Fill="{TemplateBinding Background}" StrokeThickness="1" RadiusX="5" RadiusY="5" Margin="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                        <Rectangle.Stroke>
+                                            <LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
+                                                <GradientStop Color="#66000000" Offset="0"/>
+                                                <GradientStop Color="#33000000" Offset="1"/>
+                                            </LinearGradientBrush>
+                                        </Rectangle.Stroke>
+                                    </Rectangle>
+                                    <Rectangle x:Name="RenderOverlay" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="1" RadiusX="4" RadiusY="4" Margin="2" Opacity="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                        <Rectangle.Fill>
+                                            <LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
+                                                <GradientStop Color="#26000000" Offset="0"/>
+                                                <GradientStop Color="#4CFFFFFF" Offset="1"/>
+                                            </LinearGradientBrush>
+                                        </Rectangle.Fill>
+                                    </Rectangle>
+                                    <Microsoft_Surface_Presentation_Generic:SurfaceShadowChrome x:Name="Glow" Margin="1" Opacity="0" Color="White" CornerRadius="4"/>
+                                    <ContentPresenter x:Name="Content" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}">
+                                        <ContentPresenter.RenderTransform>
+                                            <TranslateTransform X="0" Y="-1"/>
+                                        </ContentPresenter.RenderTransform>
+                                    </ContentPresenter>
+                                </Grid>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsPressed" Value="True">
+                                        <Trigger.EnterActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                        <SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
+                                                    </DoubleAnimationUsingKeyFrames>
+                                                    <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                                        <SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-3"/>
+                                                    </ThicknessAnimationUsingKeyFrames>
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </Trigger.EnterActions>
+                                        <Trigger.ExitActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
+                                                        <SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
+                                                        <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
+                                                    </DoubleAnimationUsingKeyFrames>
+                                                    <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                                                        <SplineThicknessKeyFrame KeyTime="00:00:00" Value="-3"/>
+                                                        <SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="1"/>
+                                                    </ThicknessAnimationUsingKeyFrames>
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </Trigger.ExitActions>
+                                    </Trigger>
+                                    <Trigger Property="IsEnabled" Value="True"/>
+                                    <Trigger Property="IsEnabled" Value="False">
+                                        <Setter Property="Fill" TargetName="RenderOverlay" Value="#0CFFFFFF"/>
+                                        <Setter Property="Stroke" TargetName="RenderOverlay" Value="#33FFFFFF"/>
+                                        <Setter Property="Stroke" TargetName="Base" Value="#33000000"/>
+                                        <Setter Property="BorderBrush" TargetName="Shadow" Value="#00000000"/>
+                                        <Setter Property="Foreground" Value="#A5333333"/>
+                                        <Setter Property="Background" Value="Transparent"/>
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Style.BasedOn>
+        </Style>
+    </UserControl.Resources>
+
+    <Grid x:Name="LayoutRoot" Background="{DynamicResource SessionInput__Background_xaml}">
+        <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="92.688,17.818,8,0" x:Name="ST_Name" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Foreground="#FF000000" Background="#7FFFFFFF"/>
+        <Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Name:" Margin="14.367,9.818,0,0" x:Name="LName" Foreground="#FFBCB3B3"/>
+        <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" Margin="92.688,50.626,8,0" x:Name="ST_Date" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7FFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
+        <Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Date:" Margin="14.367,42.626,0,0" x:Name="LDate" Foreground="#FFBCB3B3"/>
+        <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="92.688,82.586,8,0" x:Name="ST_Alias" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7EFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
+        <Label HorizontalAlignment="Left" Content="Alias:" Margin="14.367,74.586,0,91.454" x:Name="LAlias" Foreground="#FFBCB3B3" d:LayoutOverrides="Height"/>
+        <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="92.688,113.677,8,0" x:Name="ST_Email" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7FFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
+        <Label HorizontalAlignment="Left" Content="Email:" Margin="14.367,0,0,59.494" x:Name="LEmail" VerticalAlignment="Bottom" Foreground="#FFBCB3B3"/>
+        <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="92.688,0,8,30.403" x:Name="ST_Desc" VerticalAlignment="Bottom" Text="" TextWrapping="Wrap" Background="#7FFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
+        <Label x:Name="LDescription" HorizontalAlignment="Left" VerticalAlignment="Bottom" Content="Description:" Margin="14.367,0,0,30.403" Width="74.321" Foreground="#FFBCB3B3"/>
+        <Custom:SurfaceRadioButton RenderTransformOrigin="0.46,0.243" Margin="70.688,0,0,3" VerticalAlignment="Bottom" Content="" Height="30.403" x:Name="SurfaceButtonSubmit" ContactDown="SurfaceButtonSubmit_ContactDown" Click="SurfaceButtonSubmit_Click" HorizontalAlignment="Left" Style="{DynamicResource FingersDance.Control.SurfaceRadioButton}" Width="33.312" Background="{DynamicResource ConfirmationTick_xaml}" BorderBrush="{x:Null}">
+            <Custom:SurfaceRadioButton.RenderTransform>
+                <TransformGroup>
+                    <ScaleTransform ScaleX="1" ScaleY="1"/>
+                    <SkewTransform AngleX="0" AngleY="0"/>
+                    <RotateTransform Angle="0"/>
+                    <TranslateTransform X="0" Y="0"/>
+                </TransformGroup>
+            </Custom:SurfaceRadioButton.RenderTransform>
+        </Custom:SurfaceRadioButton>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlNewProjectForm.xaml.cs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/FingersDance.Control.SessionInput/UserControlNewProjectForm.xaml.cs	Thu Nov 05 13:13:52 2009 +0100
@@ -0,0 +1,63 @@
+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;
+using FingersDance.Data;
+
+namespace FingersDance.Control.SessionInput
+{
+    /// <summary>
+    /// Interaction logic for UserControlNewProjectForm.xaml
+    /// </summary>
+    public partial class UserControlNewProjectForm : UserControl
+    {
+        public event EventHandler EH_NewProjectForm_ContactDown;
+        public string SessionName = "";
+        public string Email = "";
+        public string Alias = "";
+        public string Description = "";
+
+		public UserControlNewProjectForm()
+		{
+			this.InitializeComponent();
+            ST_Date.Text = DateTime.Now.Day.ToString() + "/" + DateTime.Now.Month.ToString() + "/" + DateTime.Now.Year.ToString();
+        }
+
+        #region Actions
+
+        private void SurfaceButtonSubmit_ContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
+        {
+            //if (!ST_Alias.Text.Equals("") && !ST_Date.Text.Equals("") && !ST_Email.Text.Equals("") && !ST_Name.Text.Equals(""))
+            if (!ST_Name.Text.Equals(""))
+            {
+                SessionName = ST_Name.Text;
+                Email= ST_Email.Text;
+                Alias = ST_Alias.Text;
+                Description = ST_Desc.Text;
+                if (EH_NewProjectForm_ContactDown != null)
+                    EH_NewProjectForm_ContactDown(this, new EventArgs());
+            }
+        }
+
+        private void SurfaceButtonSubmit_Click(object sender, RoutedEventArgs e)
+        {
+            //if (!ST_Alias.Text.Equals("") && !ST_Date.Text.Equals("") && !ST_Email.Text.Equals("") && !ST_Name.Text.Equals(""))
+            if (!ST_Name.Text.Equals(""))
+            {
+                SessionName = ST_Name.Text;
+                Email = ST_Email.Text;
+                Alias = ST_Alias.Text;
+                Description = ST_Desc.Text;
+                if (EH_NewProjectForm_ContactDown != null)
+                    EH_NewProjectForm_ContactDown(this, new EventArgs());
+            }
+        }
+
+        #endregion
+    }
+}
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml
--- a/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml	Wed Nov 04 16:28:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,346 +0,0 @@
-<UserControl
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	mc:Ignorable="d"
-	xmlns:Custom="http://schemas.microsoft.com/surface/2008" 
-    xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic"
-	x:Class="FingersDance.Control.SessionInput.UserControlSessionInput"
-	x:Name="UserControl"
-	Background="#FFA09E9E" 
-    Width="256" 
-    Height="192">
-
-	<UserControl.Resources>
-		<Style x:Key="FingersDance.Control.SurfaceRadioButton" TargetType="{x:Type Custom:SurfaceRadioButton}">
-			<Setter Property="HorizontalContentAlignment" Value="Left"/>
-			<Setter Property="Background" Value="Transparent"/>
-			<Setter Property="Foreground" Value="Black"/>
-			<Setter Property="BorderBrush" Value="Transparent"/>
-			<Setter Property="Padding" Value="5,0,0,0"/>
-			<Setter Property="Template">
-				<Setter.Value>
-					<ControlTemplate TargetType="{x:Type Custom:SurfaceRadioButton}">
-						<ControlTemplate.Resources>
-							<Storyboard x:Key="ThreeStateExit">
-								<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
-									<SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0"/>
-								</DoubleAnimationUsingKeyFrames>
-							</Storyboard>
-							<Storyboard x:Key="Press">
-								<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-									<SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-								</DoubleAnimationUsingKeyFrames>
-								<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-									<SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-2"/>
-								</ThicknessAnimationUsingKeyFrames>
-							</Storyboard>
-							<Storyboard x:Key="Checked">
-								<DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
-							</Storyboard>
-							<Storyboard x:Key="Release">
-								<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-									<SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
-									<SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
-								</DoubleAnimationUsingKeyFrames>
-								<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-									<SplineThicknessKeyFrame KeyTime="00:00:00" Value="-2"/>
-									<SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="2"/>
-								</ThicknessAnimationUsingKeyFrames>
-							</Storyboard>
-							<Storyboard x:Key="Unchecked">
-								<DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
-							</Storyboard>
-							<Storyboard x:Key="ThreeStateEnter">
-								<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
-									<SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="0.9"/>
-								</DoubleAnimationUsingKeyFrames>
-							</Storyboard>
-						</ControlTemplate.Resources>
-						<BulletDecorator x:Name="bulletDecorator" MinHeight="30" MinWidth="30" Height="Auto" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Background="Transparent">
-							<BulletDecorator.Bullet>
-								<Grid MinHeight="30" MinWidth="30" Width="30" Height="30" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-									<Rectangle x:Name="Base" Fill="{TemplateBinding Background}" Stroke="Transparent" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-									<Rectangle x:Name="Button" Fill="{x:Null}" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Stroke="White"/>
-									<Rectangle x:Name="RenderOverlay" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="3" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Fill="{x:Null}" Stroke="{x:Null}"/>
-									<Microsoft_Surface_Presentation_Generic:SurfaceShadowChrome x:Name="GlowBorder" Margin="2" Opacity="0" Color="White" CornerRadius="{Binding ActualHeight, ElementName=GlowBorder}"/>
-									<Rectangle x:Name="Checkmark" Fill="{x:Null}" StrokeThickness="7" RadiusX="6" RadiusY="6" Margin="8" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-										<Rectangle.Stroke>
-											<LinearGradientBrush EndPoint="0.5,0" StartPoint="0.5,1">
-												<GradientStop Color="#FF292929" Offset="1"/>
-												<GradientStop Color="#FF1B1B1B" Offset="0.276"/>
-											</LinearGradientBrush>
-										</Rectangle.Stroke>
-									</Rectangle>
-									<Rectangle x:Name="ThreeStateMark" StrokeThickness="1" RadiusX="13" RadiusY="13" Margin="6" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-										<Rectangle.Stroke>
-											<LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
-												<GradientStop Color="#66000000" Offset="0"/>
-												<GradientStop Color="#33000000" Offset="1"/>
-											</LinearGradientBrush>
-										</Rectangle.Stroke>
-										<Rectangle.Fill>
-											<LinearGradientBrush EndPoint="0.5,0" StartPoint="0.5,1">
-												<GradientStop Color="#FF292929" Offset="0.5"/>
-												<GradientStop Color="#FF1B1B1B" Offset="0.196"/>
-											</LinearGradientBrush>
-										</Rectangle.Fill>
-									</Rectangle>
-								</Grid>
-							</BulletDecorator.Bullet>
-							<Grid HorizontalAlignment="Stretch" Margin="5,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-								<Grid x:Name="ContentBox" HorizontalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Background="Transparent">
-									<ContentPresenter x:Name="Content" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ClipToBounds="False" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-								</Grid>
-							</Grid>
-						</BulletDecorator>
-						<ControlTemplate.Triggers>
-							<MultiTrigger>
-								<MultiTrigger.Conditions>
-									<Condition Property="IsThreeState" Value="True"/>
-									<Condition Property="IsChecked" Value="{x:Null}"/>
-								</MultiTrigger.Conditions>
-								<MultiTrigger.ExitActions>
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
-												<SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0"/>
-											</DoubleAnimationUsingKeyFrames>
-										</Storyboard>
-									</BeginStoryboard>
-								</MultiTrigger.ExitActions>
-								<MultiTrigger.EnterActions>
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
-												<SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="0.9"/>
-											</DoubleAnimationUsingKeyFrames>
-										</Storyboard>
-									</BeginStoryboard>
-								</MultiTrigger.EnterActions>
-							</MultiTrigger>
-							<Trigger Property="IsChecked" Value="False">
-								<Trigger.EnterActions>
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
-										</Storyboard>
-									</BeginStoryboard>
-								</Trigger.EnterActions>
-								<Trigger.ExitActions>
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
-										</Storyboard>
-									</BeginStoryboard>
-								</Trigger.ExitActions>
-							</Trigger>
-							<Trigger Property="IsChecked" Value="True">
-								<Trigger.EnterActions>
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
-										</Storyboard>
-									</BeginStoryboard>
-								</Trigger.EnterActions>
-								<Trigger.ExitActions>
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
-										</Storyboard>
-									</BeginStoryboard>
-								</Trigger.ExitActions>
-							</Trigger>
-							<Trigger Property="IsPressed" Value="True">
-								<Trigger.EnterActions>
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-												<SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-											</DoubleAnimationUsingKeyFrames>
-											<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-												<SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-2"/>
-											</ThicknessAnimationUsingKeyFrames>
-										</Storyboard>
-									</BeginStoryboard>
-								</Trigger.EnterActions>
-								<Trigger.ExitActions>
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
-												<SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
-												<SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
-											</DoubleAnimationUsingKeyFrames>
-											<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-												<SplineThicknessKeyFrame KeyTime="00:00:00" Value="-2"/>
-												<SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="2"/>
-											</ThicknessAnimationUsingKeyFrames>
-										</Storyboard>
-									</BeginStoryboard>
-								</Trigger.ExitActions>
-							</Trigger>
-							<Trigger Property="IsEnabled" Value="False">
-								<Setter Property="Fill" TargetName="Button" Value="#00000000"/>
-								<Setter Property="Stroke" TargetName="Button" Value="#33000000"/>
-								<Setter Property="Foreground" Value="#A5333333"/>
-								<Setter Property="Fill" TargetName="RenderOverlay" Value="#00000000"/>
-								<Setter Property="Stroke" TargetName="Checkmark" Value="#33000000"/>
-								<Setter Property="Opacity" TargetName="RenderOverlay" Value="0.5"/>
-							</Trigger>
-						</ControlTemplate.Triggers>
-					</ControlTemplate>
-				</Setter.Value>
-			</Setter>
-			<Style.BasedOn>
-				<Style TargetType="{x:Type ButtonBase}">
-					<Setter Property="SnapsToDevicePixels" Value="True"/>
-					<Setter Property="FocusVisualStyle">
-						<Setter.Value>
-							<Style>
-								<Setter Property="Control.Template">
-									<Setter.Value>
-										<ControlTemplate/>
-									</Setter.Value>
-								</Setter>
-							</Style>
-						</Setter.Value>
-					</Setter>
-					<Setter Property="FontFamily" Value="Segoe UI"/>
-					<Setter Property="FontSize" Value="10"/>
-					<Setter Property="Foreground" Value="Black"/>
-					<Setter Property="Background" Value="#33A4B4BD"/>
-					<Setter Property="BorderBrush">
-						<Setter.Value>
-							<LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-								<GradientStop Color="#7FFFFFFF" Offset="0"/>
-								<GradientStop Color="#0CFFFFFF" Offset="1"/>
-							</LinearGradientBrush>
-						</Setter.Value>
-					</Setter>
-					<Setter Property="BorderThickness" Value="1"/>
-					<Setter Property="HorizontalContentAlignment" Value="Center"/>
-					<Setter Property="VerticalContentAlignment" Value="Center"/>
-					<Setter Property="Padding" Value="15,6"/>
-					<Setter Property="IsTabStop" Value="False"/>
-					<Setter Property="Focusable" Value="False"/>
-					<Setter Property="MinWidth" Value="30"/>
-					<Setter Property="MinHeight" Value="30"/>
-					<Setter Property="Template">
-						<Setter.Value>
-							<ControlTemplate TargetType="{x:Type ButtonBase}">
-								<ControlTemplate.Resources>
-									<Storyboard x:Key="Press">
-										<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
-											<SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-										</DoubleAnimationUsingKeyFrames>
-										<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-											<SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-3"/>
-										</ThicknessAnimationUsingKeyFrames>
-									</Storyboard>
-									<Storyboard x:Key="Release">
-										<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
-											<SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
-											<SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
-										</DoubleAnimationUsingKeyFrames>
-										<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-											<SplineThicknessKeyFrame KeyTime="00:00:00" Value="-3"/>
-											<SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="1"/>
-										</ThicknessAnimationUsingKeyFrames>
-									</Storyboard>
-								</ControlTemplate.Resources>
-								<Grid x:Name="Grid" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-									<Border x:Name="Shadow" Margin="1,1,1,0" BorderBrush="#33000000" BorderThickness="0,0,0,1" CornerRadius="6" Padding="1"/>
-									<Rectangle x:Name="Base" Fill="{TemplateBinding Background}" StrokeThickness="1" RadiusX="5" RadiusY="5" Margin="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-										<Rectangle.Stroke>
-											<LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
-												<GradientStop Color="#66000000" Offset="0"/>
-												<GradientStop Color="#33000000" Offset="1"/>
-											</LinearGradientBrush>
-										</Rectangle.Stroke>
-									</Rectangle>
-									<Rectangle x:Name="RenderOverlay" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="1" RadiusX="4" RadiusY="4" Margin="2" Opacity="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-										<Rectangle.Fill>
-											<LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
-												<GradientStop Color="#26000000" Offset="0"/>
-												<GradientStop Color="#4CFFFFFF" Offset="1"/>
-											</LinearGradientBrush>
-										</Rectangle.Fill>
-									</Rectangle>
-									<Microsoft_Surface_Presentation_Generic:SurfaceShadowChrome x:Name="Glow" Margin="1" Opacity="0" Color="White" CornerRadius="4"/>
-									<ContentPresenter x:Name="Content" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}">
-										<ContentPresenter.RenderTransform>
-											<TranslateTransform X="0" Y="-1"/>
-										</ContentPresenter.RenderTransform>
-									</ContentPresenter>
-								</Grid>
-								<ControlTemplate.Triggers>
-									<Trigger Property="IsPressed" Value="True">
-										<Trigger.EnterActions>
-											<BeginStoryboard>
-												<Storyboard>
-													<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
-														<SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
-													</DoubleAnimationUsingKeyFrames>
-													<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-														<SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-3"/>
-													</ThicknessAnimationUsingKeyFrames>
-												</Storyboard>
-											</BeginStoryboard>
-										</Trigger.EnterActions>
-										<Trigger.ExitActions>
-											<BeginStoryboard>
-												<Storyboard>
-													<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
-														<SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
-														<SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
-													</DoubleAnimationUsingKeyFrames>
-													<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-														<SplineThicknessKeyFrame KeyTime="00:00:00" Value="-3"/>
-														<SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="1"/>
-													</ThicknessAnimationUsingKeyFrames>
-												</Storyboard>
-											</BeginStoryboard>
-										</Trigger.ExitActions>
-									</Trigger>
-									<Trigger Property="IsEnabled" Value="True"/>
-									<Trigger Property="IsEnabled" Value="False">
-										<Setter Property="Fill" TargetName="RenderOverlay" Value="#0CFFFFFF"/>
-										<Setter Property="Stroke" TargetName="RenderOverlay" Value="#33FFFFFF"/>
-										<Setter Property="Stroke" TargetName="Base" Value="#33000000"/>
-										<Setter Property="BorderBrush" TargetName="Shadow" Value="#00000000"/>
-										<Setter Property="Foreground" Value="#A5333333"/>
-										<Setter Property="Background" Value="Transparent"/>
-									</Trigger>
-								</ControlTemplate.Triggers>
-							</ControlTemplate>
-						</Setter.Value>
-					</Setter>
-				</Style>
-			</Style.BasedOn>
-		</Style>
-	</UserControl.Resources>
-
-	<Grid x:Name="LayoutRoot" Background="{DynamicResource SessionInput__Background_xaml}">
-		<Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="92.688,17.818,8,0" x:Name="ST_Name" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Foreground="#FF000000" Background="#7FFFFFFF"/>
-		<Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Name:" Margin="14.367,9.818,0,0" x:Name="LName" Foreground="#FFBCB3B3"/>
-		<Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" Margin="92.688,50.626,8,0" x:Name="ST_Date" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7FFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
-		<Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Date:" Margin="14.367,42.626,0,0" x:Name="LDate" Foreground="#FFBCB3B3"/>
-		<Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="92.688,82.586,8,0" x:Name="ST_Alias" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7EFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
-		<Label HorizontalAlignment="Left" Content="Alias:" Margin="14.367,74.586,0,91.454" x:Name="LAlias" Foreground="#FFBCB3B3" d:LayoutOverrides="Height"/>
-		<Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="92.688,113.677,8,0" x:Name="ST_Email" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7FFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
-		<Label HorizontalAlignment="Left" Content="Email:" Margin="14.367,0,0,59.494" x:Name="LEmail" VerticalAlignment="Bottom" Foreground="#FFBCB3B3"/>
-		<Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="92.688,0,8,30.403" x:Name="ST_Desc" VerticalAlignment="Bottom" Text="" TextWrapping="Wrap" Background="#7FFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
-		<Label x:Name="LDescription" HorizontalAlignment="Left" VerticalAlignment="Bottom" Content="Description:" Margin="14.367,0,0,30.403" Width="74.321" Foreground="#FFBCB3B3"/>
-		<Custom:SurfaceRadioButton RenderTransformOrigin="0.46,0.243" Margin="70.688,0,0,3" VerticalAlignment="Bottom" Content="" Height="30.403" x:Name="SurfaceButtonSubmit" ContactDown="SurfaceButtonSubmit_ContactDown" Click="SurfaceButtonSubmit_Click" HorizontalAlignment="Left" Style="{DynamicResource FingersDance.Control.SurfaceRadioButton}" Width="33.312" Background="{DynamicResource ConfirmationTick_xaml}" BorderBrush="{x:Null}">
-			<Custom:SurfaceRadioButton.RenderTransform>
-				<TransformGroup>
-					<ScaleTransform ScaleX="1" ScaleY="1"/>
-					<SkewTransform AngleX="0" AngleY="0"/>
-					<RotateTransform Angle="0"/>
-					<TranslateTransform X="0" Y="0"/>
-				</TransformGroup>
-			</Custom:SurfaceRadioButton.RenderTransform>
-		</Custom:SurfaceRadioButton>
-	</Grid>
-</UserControl>
\ No newline at end of file
diff -r 83615722dbab -r b266af50744c src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml.cs
--- a/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml.cs	Wed Nov 04 16:28:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-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;
-using FingersDance.Data;
-
-namespace FingersDance.Control.SessionInput
-{
-	public partial class UserControlSessionInput
-	{
-        public event EventHandler EH_SurfaceButtonSubmit_ContactDown;
-        public string SessionName = "";
-        public string Email = "";
-        public string Alias = "";
-        public string Description = "";
-
-		public UserControlSessionInput()
-		{
-			this.InitializeComponent();
-            ST_Date.Text = DateTime.Now.Day.ToString() + "/" + DateTime.Now.Month.ToString() + "/" + DateTime.Now.Year.ToString();
-        }
-
-        #region Actions
-
-        private void SurfaceButtonSubmit_ContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
-        {
-            //if (!ST_Alias.Text.Equals("") && !ST_Date.Text.Equals("") && !ST_Email.Text.Equals("") && !ST_Name.Text.Equals(""))
-            if (!ST_Name.Text.Equals(""))
-            {
-                SessionName = ST_Name.Text;
-                Email= ST_Email.Text;
-                Alias = ST_Alias.Text;
-                Description = ST_Desc.Text;
-                if (EH_SurfaceButtonSubmit_ContactDown != null)
-                    EH_SurfaceButtonSubmit_ContactDown(this, new EventArgs());
-            }
-        }
-
-        private void SurfaceButtonSubmit_Click(object sender, RoutedEventArgs e)
-        {
-            //if (!ST_Alias.Text.Equals("") && !ST_Date.Text.Equals("") && !ST_Email.Text.Equals("") && !ST_Name.Text.Equals(""))
-            if (!ST_Name.Text.Equals(""))
-            {
-                SessionName = ST_Name.Text;
-                Email = ST_Email.Text;
-                Alias = ST_Alias.Text;
-                Description = ST_Desc.Text;
-                if (EH_SurfaceButtonSubmit_ContactDown != null)
-                    EH_SurfaceButtonSubmit_ContactDown(this, new EventArgs());
-            }
-        }
-
-        #endregion
-
-	}
-}
\ No newline at end of file