# HG changeset patch # User Matthieu Totet # Date 1261495342 -3600 # Node ID 44a2dc869e2885da5ba3376266a90df9242a0eaf # Parent a9c815025a1b56839c31e0a5d00e3d986f287b22 Save before big changes on HeaderProduction diff -r a9c815025a1b -r 44a2dc869e28 client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj --- a/client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj Fri Dec 18 16:45:30 2009 +0100 +++ b/client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj Tue Dec 22 16:22:22 2009 +0100 @@ -76,6 +76,7 @@ + @@ -133,6 +134,9 @@ HeaderProduction.xaml + + HeaderProductionChapter.xaml + HeaderProductionPartControler.xaml @@ -240,6 +244,10 @@ MSBuild:MarkupCompilePass1 Designer + + MSBuild:MarkupCompilePass1 + Designer + MSBuild:MarkupCompilePass1 Designer diff -r a9c815025a1b -r 44a2dc869e28 client/src/Iri.Modernisation.Controls/View/HeaderProduction/HeaderProductionChapter.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/Iri.Modernisation.Controls/View/HeaderProduction/HeaderProductionChapter.xaml Tue Dec 22 16:22:22 2009 +0100 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r a9c815025a1b -r 44a2dc869e28 client/src/Iri.Modernisation.Controls/View/HeaderProduction/HeaderProductionChapter.xaml.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/Iri.Modernisation.Controls/View/HeaderProduction/HeaderProductionChapter.xaml.cs Tue Dec 22 16:22:22 2009 +0100 @@ -0,0 +1,21 @@ +using System; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Documents; +using System.Windows.Ink; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Shapes; + +namespace Iri.Modernisation.Controls +{ + public partial class HeaderProductionChapter : UserControl + { + public HeaderProductionChapter() + { + // Required to initialize variables + InitializeComponent(); + } + } +} \ No newline at end of file diff -r a9c815025a1b -r 44a2dc869e28 client/src/Iri.Modernisation.Controls/View/ProductionTimeLine/ProductionTimeLine.xaml --- a/client/src/Iri.Modernisation.Controls/View/ProductionTimeLine/ProductionTimeLine.xaml Fri Dec 18 16:45:30 2009 +0100 +++ b/client/src/Iri.Modernisation.Controls/View/ProductionTimeLine/ProductionTimeLine.xaml Tue Dec 22 16:22:22 2009 +0100 @@ -17,7 +17,7 @@ - + diff -r a9c815025a1b -r 44a2dc869e28 client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml.cs --- a/client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml.cs Fri Dec 18 16:45:30 2009 +0100 +++ b/client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml.cs Tue Dec 22 16:22:22 2009 +0100 @@ -52,8 +52,8 @@ void VideoScreen_MediaOpened(object sender, RoutedEventArgs e) { - VideoScreen.Play(); - VideoPositionTimer.Start(); + //VideoScreen.Play(); + //VideoPositionTimer.Start(); } @@ -66,10 +66,10 @@ { if (e.Source == DataContext && e.Source != null) { - + if(!VideoPositionTimer.IsEnabled) VideoPositionTimer.Start(); - VideoScreen.Position = new TimeSpan(((TimeSpan)e.Parameter).Ticks); + VideoScreen.Position = ((TimeSpan)e.Parameter); } @@ -99,10 +99,8 @@ VideoScreen.Pause(); _isPlayed = false; VideoPositionTimer.Stop(); - if (VideoPositionTimer.IsEnabled) - { - MessageBox.Show("Click Time IS NOT STOPPED"); - } + if(DataContext!=null) + ((VideoViewerVM)DataContext).AutoPlay = false; } } @@ -113,6 +111,7 @@ _isPlayed = true; VideoScreen.Play(); VideoPositionTimer.Start(); + ((VideoViewerVM)DataContext).AutoPlay = true; } } diff -r a9c815025a1b -r 44a2dc869e28 client/src/Iri.Modernisation.Controls/ViewModel/HeaderProduction/HeaderProductionChapterVM.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/Iri.Modernisation.Controls/ViewModel/HeaderProduction/HeaderProductionChapterVM.cs Tue Dec 22 16:22:22 2009 +0100 @@ -0,0 +1,75 @@ +using System; +using System.Net; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Documents; +using System.Windows.Ink; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Shapes; + +namespace Iri.Modernisation.Controls.ViewModel +{ + public class HeaderProductionChapterVM : BaseMVVM.ViewModel.ViewModel + { + private bool _isEnable; + public bool IsEnable + { + get + { + return _isEnable; + } + set + { + _isEnable = value; + OnPropertyChanged("IsEnable"); + } + } + + private bool _editing; + public bool Editing + { + get + { + return _editing; + } + set + { + _editing = value; + if (_next != null) + { + _next.Enable(); + } + OnPropertyChanged("Editing"); + } + } + + private bool _indexing; + public bool Indexing + { + get + { + return _indexing; + } + set + { + _indexing = value; + OnPropertyChanged("Indexing"); + } + } + + private HeaderProductionChapterVM _next; + + public void Enable() + { + IsEnable = true; + } + + public HeaderProductionChapterVM() + { + } + + + } +} diff -r a9c815025a1b -r 44a2dc869e28 client/src/Iri.Modernisation.Controls/ViewModel/HeaderProduction/HeaderProductionVM.cs --- a/client/src/Iri.Modernisation.Controls/ViewModel/HeaderProduction/HeaderProductionVM.cs Fri Dec 18 16:45:30 2009 +0100 +++ b/client/src/Iri.Modernisation.Controls/ViewModel/HeaderProduction/HeaderProductionVM.cs Tue Dec 22 16:22:22 2009 +0100 @@ -11,11 +11,14 @@ using Iri.Modernisation.Data.Models; using Iri.Modernisation.BaseMVVM.Commands; using Iri.Modernisation.BaseMVVM.ViewModel; +using System.Collections.Generic; namespace Iri.Modernisation.Controls.ViewModel { public class HeaderProductionVM : BaseMVVM.ViewModel.ViewModel { - + + private List _productionChapters; + #region Avancement diff -r a9c815025a1b -r 44a2dc869e28 client/src/Iri.Modernisation.Controls/ViewModel/ProductionView/ProductionViewVM.cs --- a/client/src/Iri.Modernisation.Controls/ViewModel/ProductionView/ProductionViewVM.cs Fri Dec 18 16:45:30 2009 +0100 +++ b/client/src/Iri.Modernisation.Controls/ViewModel/ProductionView/ProductionViewVM.cs Tue Dec 22 16:22:22 2009 +0100 @@ -163,6 +163,7 @@ }); } InitializeCommands(); + } private void ViewModelProductionTimeLine_SwitchVideo(object sender, ProductionTimeLineVMEventArgs e) @@ -178,6 +179,7 @@ { ViewModelProductionTimeLine.ActualVideoSequence = ViewModelProductionTimeLine.TimeLine[ViewModelProductionTimeLine.TimeLine.IndexOf(ViewModelProductionTimeLine.ActualVideoSequence) + 1]; ViewModelMasterVideoViewer.Source = ViewModelProductionTimeLine.ActualVideoSequence.Path; + ViewModelMasterVideoViewer.GoTo(ViewModelProductionTimeLine.ActualVideoSequence.BeginTrim); } ViewModelProductionTimeLine.Position = newPos; diff -r a9c815025a1b -r 44a2dc869e28 client/src/Iri.Modernisation.Data/Models/PolemicLink.cs --- a/client/src/Iri.Modernisation.Data/Models/PolemicLink.cs Fri Dec 18 16:45:30 2009 +0100 +++ b/client/src/Iri.Modernisation.Data/Models/PolemicLink.cs Tue Dec 22 16:22:22 2009 +0100 @@ -16,6 +16,7 @@ /// public class PolemicLink { + public String Title { get; set; } /// /// Element d'origine du lien ///