# HG changeset patch
# User totetm <>
# Date 1265986621 -3600
# Node ID ab3057b822603e460f6582d8951d15793bbfe592
# Parent  de06fa7242aee0c259b1e4429a6b2ee36c165903
Fixed|pas de chaise musical pour la fonction tetris
Fixed| pb d'affichage dans la liste des annotations (rafraichissement +champs vide ? )
Fixed|faire fonctionner le seek, même quand play n'est pas activer
Fixed| cacher le menu du bouton droit quand on le survole plus
Fixed| faire fonctionner le bouton collapse des zonnes d'affichage destimeline
Fixed|Hooked|bug du composant de selection de tranche de temps !

diff -r de06fa7242ae -r ab3057b82260 client/src/Iri.Modernisation.BaseMVVM/Commands/Commands.cs
--- a/client/src/Iri.Modernisation.BaseMVVM/Commands/Commands.cs	Fri Feb 12 12:24:46 2010 +0100
+++ b/client/src/Iri.Modernisation.BaseMVVM/Commands/Commands.cs	Fri Feb 12 15:57:01 2010 +0100
@@ -108,7 +108,14 @@
                 LeftTrim = new Command("LeftTrim");
                 RightTrim = new Command("RightTrim");
                 NewAnnotationFinished = new Command("NewAnnotationFinished");
+                FixAnnotationTime = new Command("FixAnnotationTime");
             }
+            public static Command FixAnnotationTime
+            {
+                get;
+                private set;
+            }
+
 
             public static Command NewAnnotationFinished
             {
@@ -552,11 +559,12 @@
 
             static BookTimeLine()
             {
-               
+                
                 LeftClickOnElement = new Command("LeftClickOnElement");
                 CloseBookTimeLine = new Command("CloseBookTimeLine");
         
             }
+           
             public static Command CloseBookTimeLine
             {
                 get;
diff -r de06fa7242ae -r ab3057b82260 client/src/Iri.Modernisation.Controls/View/AnnotationMaker/AnnotationMaker.xaml.cs
--- a/client/src/Iri.Modernisation.Controls/View/AnnotationMaker/AnnotationMaker.xaml.cs	Fri Feb 12 12:24:46 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/AnnotationMaker/AnnotationMaker.xaml.cs	Fri Feb 12 15:57:01 2010 +0100
@@ -9,6 +9,7 @@
 using System.Windows.Shapes;
 using Iri.Modernisation.Data.Models;
 using Iri.Modernisation.BaseMVVM.Commands;
+using Iri.Modernisation.Controls.ViewModel;
 namespace Iri.Modernisation.Controls.View
 {
 	public partial class AnnotationMaker : UserControl
@@ -17,10 +18,19 @@
 		{
 
 			InitializeComponent();
+            Commands.AnnotationMaker.FixAnnotationTime.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(FixAnnotationTime_Executed);
             Commands.HttpSenderResponse.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(HttpSenderResponse_Executed);
-            
-            
-		}
+         }
+
+        void FixAnnotationTime_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
+        {
+            EditableAnnotation.UpperRangeValue = EditableAnnotation.Maximum;
+            EditableAnnotation.LowerRangeValue = EditableAnnotation.Minimum;
+        }
+
+      
+
+     
 
         void HttpSenderResponse_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
         {
diff -r de06fa7242ae -r ab3057b82260 client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml.cs
--- a/client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml.cs	Fri Feb 12 12:24:46 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml.cs	Fri Feb 12 15:57:01 2010 +0100
@@ -52,6 +52,7 @@
         private bool _saveVideoViewerState { get; set; }
         private void TimeSlider_ThumbDragCompleted(object sender, EventArgs e)
         {
+            //Commands.TimeChange.Execute(null, DataContext);
             if (_saveVideoViewerState)
             {
               
@@ -109,8 +110,9 @@
             int maxHi = 0;
             foreach (List<Annotation> LAnnotation in VM.Annotations)
             {
-                LAnnotation.Sort((a, b) => TimeSpan.Compare( b.Duration,a.Duration));
-                foreach (Annotation Annotation in LAnnotation)
+                List<Annotation> tempList = new List<Annotation>(LAnnotation);
+                tempList.Sort((a, b) => TimeSpan.Compare(b.Duration, a.Duration));
+                foreach (Annotation Annotation in tempList)
                 {
                     PolemicElementControl pol = new PolemicElementControl();
                     pol.SetValue(Canvas.ZIndexProperty, 10);
@@ -129,9 +131,9 @@
                         {
                             int actualTop = (int)Canvas.GetTop(lockedControl);
                             if (basi <= actualTop)
-                           {
-                                basi += 12;
-                           }
+                               {
+                                    basi += 12;
+                               }
                             
                         }
                     }
diff -r de06fa7242ae -r ab3057b82260 client/src/Iri.Modernisation.Controls/ViewModel/AnnotationMaker/AnnotationMakerVM.cs
--- a/client/src/Iri.Modernisation.Controls/ViewModel/AnnotationMaker/AnnotationMakerVM.cs	Fri Feb 12 12:24:46 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/AnnotationMaker/AnnotationMakerVM.cs	Fri Feb 12 15:57:01 2010 +0100
@@ -55,6 +55,7 @@
                 OnPropertyChanged(String.Empty);
                 //OnPropertyChanged("RefElement");
                 //OnPropertyChanged("IsControlEnable");
+                Commands.AnnotationMaker.FixAnnotationTime.Execute();
                 
             }
         }
@@ -481,17 +482,18 @@
         /// <param name="refAParam">Element référant</param>
         public AnnotationMakerVM(PolemicElement refAParam)
         {
-            RefElement = refAParam;
+            InitializeCommands();
+            _refElement = refAParam;
             _newAnnotation = new Annotation(RefElement.Chapter);
            
             _basicRelation = new PolemicLink() { FromElement = RefElement, ToElement = _newAnnotation, Type = null};
             _polemicRelation = new PolemicLink();
-            PolemicRelation.FromElement = _newAnnotation;
-            InitializeCommands();
-            Begin = RefElement.TimerIn.TotalMilliseconds;
-            End = RefElement.TimerOut.TotalMilliseconds;
-       
-           
+            _polemicRelation.FromElement = _newAnnotation;
+        
+           // _begin = RefElement.TimerIn;
+           // _end = RefElement.TimerOut;
+
+            OnPropertyChanged(String.Empty);
         }
 
 
diff -r de06fa7242ae -r ab3057b82260 client/src/Iri.Modernisation.Controls/ViewModel/ConsultationBookView/ConsultationBookViewVM.cs
--- a/client/src/Iri.Modernisation.Controls/ViewModel/ConsultationBookView/ConsultationBookViewVM.cs	Fri Feb 12 12:24:46 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/ConsultationBookView/ConsultationBookViewVM.cs	Fri Feb 12 15:57:01 2010 +0100
@@ -377,7 +377,7 @@
             Commands.TimeChange.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(TimeChange_Executed);
         }
 
-        void TimeChange_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
+        private void TimeChange_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
         {
             BookTimeLineVM BookTimeLineVM = (BookTimeLineVM)e.Source;
 
@@ -387,7 +387,7 @@
             }
         }
 
-        private void UpdateAnnotation()
+        public void UpdateAnnotation()
         {
             if (SelectedBook != null)
             {
@@ -409,8 +409,10 @@
 
         private void ActualVideoSourceVM_Tick(object sender, VideoViewerVMEventArgs e)
         {
-            SelectedBookVM.Position =  e.Position.TotalMilliseconds;
-            UpdateAnnotation();
+           
+                SelectedBookVM.Position =  e.Position.TotalMilliseconds;
+                UpdateAnnotation();
+            
         }
        
     }
diff -r de06fa7242ae -r ab3057b82260 client/src/Iri.Modernisation.Controls/ViewModel/ConsultationView/ConsultationViewVM.cs
--- a/client/src/Iri.Modernisation.Controls/ViewModel/ConsultationView/ConsultationViewVM.cs	Fri Feb 12 12:24:46 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/ConsultationView/ConsultationViewVM.cs	Fri Feb 12 15:57:01 2010 +0100
@@ -133,6 +133,7 @@
 
         void CloseBookTimeLine_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
         {
+            ((BookTimeLineVM)e.Parameter).ViewModelVideoViewer.Pause();
             SelectedVideoBooks.Remove((BookTimeLineVM)e.Parameter);
             BookDeleted(this,new ConsultationVieVMSelectBookArg(((BookTimeLineVM)e.Parameter).SelectedBook));
         }
@@ -210,8 +211,8 @@
         
         private void CreateNewTextualAnnotation_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
         {
-            ViewModelAnnotationMaker.RefElement=SelectedElement;
-            
+              ViewModelAnnotationMaker.RefElement=SelectedElement;
+            //ViewModelAnnotationMaker = new AnnotationMakerVM(SelectedElement);
         }
         public ConsultationViewVM()
         {
diff -r de06fa7242ae -r ab3057b82260 client/test/FranceCulture/FranceCulture/FranceCulture.Web/Content/iri_matinalefi28nov2009/iri_matinalefi28nov2009.iri
--- a/client/test/FranceCulture/FranceCulture/FranceCulture.Web/Content/iri_matinalefi28nov2009/iri_matinalefi28nov2009.iri	Fri Feb 12 12:24:46 2010 +0100
+++ b/client/test/FranceCulture/FranceCulture/FranceCulture.Web/Content/iri_matinalefi28nov2009/iri_matinalefi28nov2009.iri	Fri Feb 12 15:57:01 2010 +0100
@@ -832,7 +832,7 @@
 		<links/>
 		<medias>
 			<media id="video">
-				<video dur="7231314" begin="0" src="http://localhost:7375/Content/iri_matinalefi28nov2009/iri_matinalefi28nov2009.mp3" id="a1" q=""/>
+				<video dur="7231314" begin="0" src="http://localhost:2692/Content/iri_matinalefi28nov2009/iri_matinalefi28nov2009.mp3" id="a1" q=""/>
 			</media>
 		</medias>
 		<display>
diff -r de06fa7242ae -r ab3057b82260 client/test/FranceCulture/FranceCulture/FranceCulture.Web/Content/iri_matinalefi29nov2009/iri_matinalefi29nov2009.iri
--- a/client/test/FranceCulture/FranceCulture/FranceCulture.Web/Content/iri_matinalefi29nov2009/iri_matinalefi29nov2009.iri	Fri Feb 12 12:24:46 2010 +0100
+++ b/client/test/FranceCulture/FranceCulture/FranceCulture.Web/Content/iri_matinalefi29nov2009/iri_matinalefi29nov2009.iri	Fri Feb 12 15:57:01 2010 +0100
@@ -541,7 +541,7 @@
 		<links/>
 		<medias>
 			<media id="video">
-				<video dur="7209241" begin="0" src="http://localhost:7375/Content/iri_matinalefi29nov2009/iri_matinalefi29nov2009.mp3" id="a1" q="0"/>
+				<video dur="7209241" begin="0" src="http://localhost:2692/Content/iri_matinalefi29nov2009/iri_matinalefi29nov2009.mp3" id="a1" q="0"/>
 			</media>
 		</medias>
 		<display>
diff -r de06fa7242ae -r ab3057b82260 client/test/FranceCulture/FranceCulture/FranceCulture.Web/FranceCulture.Web.csproj
--- a/client/test/FranceCulture/FranceCulture/FranceCulture.Web/FranceCulture.Web.csproj	Fri Feb 12 12:24:46 2010 +0100
+++ b/client/test/FranceCulture/FranceCulture/FranceCulture.Web/FranceCulture.Web.csproj	Fri Feb 12 15:57:01 2010 +0100
@@ -87,7 +87,7 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>2692</DevelopmentServerPort>
+          <DevelopmentServerPort>1950</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>
           </IISUrl>
diff -r de06fa7242ae -r ab3057b82260 client/test/FranceCulture/FranceCulture/FranceCulture.Web/ProjectConfig.xml
--- a/client/test/FranceCulture/FranceCulture/FranceCulture.Web/ProjectConfig.xml	Fri Feb 12 12:24:46 2010 +0100
+++ b/client/test/FranceCulture/FranceCulture/FranceCulture.Web/ProjectConfig.xml	Fri Feb 12 15:57:01 2010 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProjectConfig 
 	VideoBookList="/Content/AvailableVideoBooks.xml"
-	UpdateBookService="http://localhost:7375/UpdateBookService.aspx"
+	UpdateBookService="http://localhost:2692/UpdateBookService.aspx"
 	ProductionVideo="/ProductionContent/ProductionVideo.xml"
 >
 	<VideoBook>