diff -r 574041f3b2c9 -r 50e6fe2c2ea2 src/FingersDance.Control.Screen/UserControlScreen.xaml.cs --- a/src/FingersDance.Control.Screen/UserControlScreen.xaml.cs Thu Nov 19 09:29:15 2009 +0100 +++ b/src/FingersDance.Control.Screen/UserControlScreen.xaml.cs Thu Nov 19 12:15:12 2009 +0100 @@ -22,7 +22,7 @@ public int id = 0; public event EventHandler UC_Screen_NewCutting; private MainViewModel _mainViewModel; - private String AnnotationOrSearchMode; + public String AnnotationOrSearchMode; public Cutting Cutting; private String videoName; @@ -175,11 +175,8 @@ loadedProject.Cuttings.Add(new Cutting(cuttingNode.Attribute("id").Value,cuttingNode.Element("title").Value,la)); } // We define the loaded project as the current session's project. - if (AnnotationOrSearchMode == "Annotation") - { - _mainViewModel.Project = new ProjectViewModel(loadedProject); - OpenProject(); - } + _mainViewModel.Project = new ProjectViewModel(loadedProject); + OpenProject(); } } catch (Exception) @@ -216,11 +213,20 @@ { try { - // We display the list of cuttings available for the current project - UserControlListCutting listCuttings = new UserControlListCutting(_mainViewModel.Project.CuttingsDict); - listCuttings.Name = "listCuttings"; - LayoutRoot.Children.Add(listCuttings); - listCuttings.EH_Item_ContactDown += new EventHandler(listCuttings_EH_Item_ContactDown); + if (AnnotationOrSearchMode == "Annotation") + { + // We display the list of cuttings available for the current project + UserControlListCutting listCuttings = new UserControlListCutting(_mainViewModel.Project.CuttingsDict); + listCuttings.Name = "listCuttings"; + LayoutRoot.Children.Add(listCuttings); + listCuttings.EH_Item_ContactDown += new EventHandler(listCuttings_EH_Item_ContactDown); + } + else + { + Cutting = null; + if (UC_Screen_NewCutting != null) + UC_Screen_NewCutting(this, new EventArgs()); + } } catch (Exception) {