diff -r b37888f59cf2 -r 619ca3ae13c7 src/FingersDance.Control.Screen/UserControlScreen.xaml.cs --- a/src/FingersDance.Control.Screen/UserControlScreen.xaml.cs Fri Nov 06 17:50:40 2009 +0100 +++ b/src/FingersDance.Control.Screen/UserControlScreen.xaml.cs Mon Nov 09 12:11:42 2009 +0100 @@ -20,8 +20,8 @@ public String contexteGrid; public int id = 0; public event EventHandler UC_Screen_NewCutting; - public MainViewModel MainViewModel; - public CuttingViewModel CuttingVM; + private MainViewModel _mainViewModel; + public Cutting Cutting; private List existingProjects = new List(); User User = new User(); @@ -32,8 +32,8 @@ this.InitializeComponent(); this.id = id; User.Name = "User " + id; - MainViewModel = mvmodel; - if (MainViewModel.Project.VideoPath.Equals("")) + _mainViewModel = mvmodel; + if (_mainViewModel.Project.VideoPath.Equals("")) { //1-Creation de la ListVideo UserControlListVideo ListVideo = new UserControlListVideo(); @@ -48,7 +48,7 @@ } catch (Exception) { - CuttingVM = null; + Cutting = null; if (UC_Screen_NewCutting != null) UC_Screen_NewCutting(this, new EventArgs()); } @@ -69,14 +69,14 @@ try { //1 renseigner la video choisie au screen et créer un nouveau projet à partir de ce chemin vidéo - MainViewModel.CreateProject(((UserControlListVideo)sender).VideoName, ((UserControlListVideo)sender).path); + _mainViewModel.CreateProject(((UserControlListVideo)sender).VideoName, ((UserControlListVideo)sender).path); //2-Supression du UC List Video LayoutRoot.Children.Remove((UserControlListVideo)sender); OpenProjectList(); } catch (Exception ex) { - CuttingVM = null; + Cutting = null; if (UC_Screen_NewCutting != null) UC_Screen_NewCutting(this, new EventArgs()); } @@ -86,7 +86,7 @@ { try { - existingProjects = LoadProjects(MainViewModel.Project.VideoPath); + existingProjects = LoadProjects(_mainViewModel.Project.VideoPath); UserControlListProject listProject = new UserControlListProject(existingProjects); listProject.Name = "ListProject"; LayoutRoot.Children.Add(listProject); @@ -94,7 +94,7 @@ } catch (Exception) { - CuttingVM = null; + Cutting = null; if (UC_Screen_NewCutting != null) UC_Screen_NewCutting(this, new EventArgs()); } @@ -131,7 +131,7 @@ { if (elt.Name.Equals(((UserControlListProject)sender).SelectedItem)) { - MainViewModel.Project.Project = elt; + _mainViewModel.Project.Project = elt; OpenProject(); return; } @@ -140,7 +140,7 @@ } catch (Exception) { - CuttingVM = null; + Cutting = null; if (UC_Screen_NewCutting != null) UC_Screen_NewCutting(this, new EventArgs()); } @@ -152,8 +152,8 @@ { //MainViewModel.Project.Alias = ((UserControlNewProjectForm)sender).Alias; //MainViewModel.Project.Email = ((UserControlNewProjectForm)sender).Email; - MainViewModel.Project.Description = ((UserControlNewProjectForm)sender).Description; - MainViewModel.Project.Name = ((UserControlNewProjectForm)sender).SessionName; + _mainViewModel.Project.Description = ((UserControlNewProjectForm)sender).Description; + _mainViewModel.Project.Name = ((UserControlNewProjectForm)sender).SessionName; //2-Suppression UCSession Input @@ -162,7 +162,7 @@ } catch (Exception ex) { - CuttingVM = null; + Cutting = null; if (UC_Screen_NewCutting != null) UC_Screen_NewCutting(this, new EventArgs()); } @@ -172,14 +172,14 @@ { try { - UserControlListCutting listCuttings = new UserControlListCutting(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); } catch (Exception) { - CuttingVM = null; + Cutting = null; if (UC_Screen_NewCutting != null) UC_Screen_NewCutting(this, new EventArgs()); } @@ -199,10 +199,10 @@ } else { - foreach(KeyValuePair elt in MainViewModel.Project.CuttingsDict) + foreach(KeyValuePair elt in _mainViewModel.Project.CuttingsDict) if (elt.Key.Equals(((UserControlListCutting)sender).SelectedItem)) { - CuttingVM = new CuttingViewModel(elt.Value, 815); + Cutting = elt.Value; if (UC_Screen_NewCutting != null) UC_Screen_NewCutting(this, new EventArgs()); return; @@ -211,7 +211,7 @@ } catch (Exception) { - CuttingVM = null; + Cutting = null; if (UC_Screen_NewCutting != null) UC_Screen_NewCutting(this, new EventArgs()); } @@ -222,14 +222,13 @@ try { LayoutRoot.Children.Remove((UserControlNewCuttingForm)sender); - CuttingVM = new CuttingViewModel(((UserControlNewCuttingForm)sender).Cutting, 850); - MainViewModel.Project.CuttingsDict.Add(CuttingVM.Title, ((UserControlNewCuttingForm)sender).Cutting); + Cutting = ((UserControlNewCuttingForm)sender).Cutting; if (UC_Screen_NewCutting != null) UC_Screen_NewCutting(this, new EventArgs()); } catch (Exception) { - CuttingVM = null; + Cutting = null; if (UC_Screen_NewCutting != null) UC_Screen_NewCutting(this, new EventArgs()); }