--- a/src/FingersDance.Control.Screen/UserControlScreen.xaml.cs Wed Nov 04 13:36:30 2009 +0100
+++ b/src/FingersDance.Control.Screen/UserControlScreen.xaml.cs Wed Nov 04 16:28:01 2009 +0100
@@ -21,7 +21,7 @@
public int id = 0;
public event EventHandler UC_Screen_NewCutting;
public MainViewModel MainViewModel;
- public CuttingViewModel Cutting;
+ public CuttingViewModel CuttingVM;
private List<Project> existingProjects = new List<Project>();
User User = new User();
@@ -31,6 +31,7 @@
{
this.InitializeComponent();
this.id = id;
+ User.Name = "User " + id;
MainViewModel = mvmodel;
if (MainViewModel.Project.VideoPath.Equals(""))
{
@@ -47,7 +48,7 @@
}
catch (Exception)
{
- Cutting = null;
+ CuttingVM = null;
if (UC_Screen_NewCutting != null)
UC_Screen_NewCutting(this, new EventArgs());
}
@@ -75,7 +76,7 @@
}
catch (Exception ex)
{
- Cutting = null;
+ CuttingVM = null;
if (UC_Screen_NewCutting != null)
UC_Screen_NewCutting(this, new EventArgs());
}
@@ -93,7 +94,7 @@
}
catch (Exception)
{
- Cutting = null;
+ CuttingVM = null;
if (UC_Screen_NewCutting != null)
UC_Screen_NewCutting(this, new EventArgs());
}
@@ -139,7 +140,7 @@
}
catch (Exception)
{
- Cutting = null;
+ CuttingVM = null;
if (UC_Screen_NewCutting != null)
UC_Screen_NewCutting(this, new EventArgs());
}
@@ -154,13 +155,14 @@
MainViewModel.Project.Description = ((UserControlSessionInput)sender).Description;
MainViewModel.Project.Name = ((UserControlSessionInput)sender).SessionName;
+
//2-Suppression UCSession Input
LayoutRoot.Children.Remove((UserControlSessionInput)sender);
OpenProject();
}
catch (Exception ex)
{
- Cutting = null;
+ CuttingVM = null;
if (UC_Screen_NewCutting != null)
UC_Screen_NewCutting(this, new EventArgs());
}
@@ -177,7 +179,7 @@
}
catch (Exception)
{
- Cutting = null;
+ CuttingVM = null;
if (UC_Screen_NewCutting != null)
UC_Screen_NewCutting(this, new EventArgs());
}
@@ -193,14 +195,14 @@
UserControlNewProject newCutting = new UserControlNewProject(User);
newCutting.Name = "newCutting";
LayoutRoot.Children.Add(newCutting);
- newCutting.EH_NewCutting_ContactDown += new EventHandler(newCutting_EH_NewProject_ContactDown);
+ newCutting.EH_NewCutting_ContactDown += new EventHandler(newCutting_EH_ContactDown);
}
else
{
foreach(KeyValuePair<string, Cutting> elt in MainViewModel.Project.CuttingsDict)
if (elt.Key.Equals(((UserControlListProject)sender).SelectedItem))
{
- Cutting = new CuttingViewModel(elt.Value, 815);
+ CuttingVM = new CuttingViewModel(elt.Value, 815);
if (UC_Screen_NewCutting != null)
UC_Screen_NewCutting(this, new EventArgs());
return;
@@ -209,26 +211,25 @@
}
catch (Exception)
{
- Cutting = null;
+ CuttingVM = null;
if (UC_Screen_NewCutting != null)
UC_Screen_NewCutting(this, new EventArgs());
}
}
- void newCutting_EH_NewProject_ContactDown(object sender, EventArgs e)
+ void newCutting_EH_ContactDown(object sender, EventArgs e)
{
try
{
- Console.WriteLine("newCutting_EH_NewProject_ContactDown");
LayoutRoot.Children.Remove((UserControlNewProject)sender);
- Cutting = new CuttingViewModel(((UserControlNewProject)sender).Cutting, 850);
- MainViewModel.Project.CuttingsDict.Add(Cutting.Title, ((UserControlNewProject)sender).Cutting);
+ CuttingVM = new CuttingViewModel(((UserControlNewProject)sender).Cutting, 850);
+ MainViewModel.Project.CuttingsDict.Add(CuttingVM.Title, ((UserControlNewProject)sender).Cutting);
if (UC_Screen_NewCutting != null)
UC_Screen_NewCutting(this, new EventArgs());
}
catch (Exception)
{
- Cutting = null;
+ CuttingVM = null;
if (UC_Screen_NewCutting != null)
UC_Screen_NewCutting(this, new EventArgs());
}