--- 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 @@
<Compile Include="ViewModel\ConsultationBookView\ConsultationBookViewVM.cs" />
<Compile Include="ViewModel\ConsultationView\ConsultationViewVM.cs" />
<Compile Include="ViewModel\ContextualBinderLayer\ContextualBinderLayerVM.cs" />
+ <Compile Include="ViewModel\HeaderProduction\HeaderProductionChapterVM.cs" />
<Compile Include="ViewModel\HeaderProduction\HeaderProductionVM.cs" />
<Compile Include="ViewModel\Main\MainVM.cs" />
<Compile Include="ViewModel\NavigationBar\ChutierVM.cs" />
@@ -133,6 +134,9 @@
<Compile Include="View\HeaderProduction\HeaderProduction.xaml.cs">
<DependentUpon>HeaderProduction.xaml</DependentUpon>
</Compile>
+ <Compile Include="View\HeaderProduction\HeaderProductionChapter.xaml.cs">
+ <DependentUpon>HeaderProductionChapter.xaml</DependentUpon>
+ </Compile>
<Compile Include="View\HeaderProduction\HeaderProductionPartControler.xaml.cs">
<DependentUpon>HeaderProductionPartControler.xaml</DependentUpon>
</Compile>
@@ -240,6 +244,10 @@
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
</Page>
+ <Page Include="View\HeaderProduction\HeaderProductionChapter.xaml">
+ <Generator>MSBuild:MarkupCompilePass1</Generator>
+ <SubType>Designer</SubType>
+ </Page>
<Page Include="View\HeaderProduction\HeaderProductionPartControler.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
--- /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 @@
+<UserControl
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ mc:Ignorable="d"
+ xmlns:Input="clr-namespace:SLExtensions.Input;assembly=SLExtensions"
+ xmlns:View="clr-namespace:Iri.Modernisation.Controls.View"
+ xmlns:Lang="clr-namespace:Iri.Modernisation.Lang;assembly=Iri.Modernisation.Lang"
+
+ x:Class="Iri.Modernisation.Controls.HeaderProductionChapter" d:DesignHeight="104">
+
+ <StackPanel x:Name="ChapterPanel_Modernisation" Width="176" RenderTransformOrigin="0.5,0.5">
+ <TextBlock Style="{StaticResource CommonTextBlock}" x:Name="ChapterTitleLabel" Text="Modernisation" TextWrapping="Wrap"/>
+ <StackPanel x:Name="ChapterPanel" Height="82" Margin="8,0,19,0">
+ <Grid x:Name="EPanel" Height="27" HorizontalAlignment="Left" Width="149">
+ <View:HeaderProductionPartControler x:Name="EditionController" Text="{Binding EditingLabel, Source={StaticResource LangLabels}}" d:LayoutOverrides="VerticalMargin"/>
+ </Grid>
+ <Grid x:Name="IPanel" Height="27" HorizontalAlignment="Left" Width="149">
+
+ <View:HeaderProductionPartControler IsActive="{Binding IsChap01IndexingEnable}" x:Name="IndexController" Text="Indexation"/>
+ </Grid>
+ <Grid x:Name="EnPanel" Height="28" HorizontalAlignment="Left" Width="149" RenderTransformOrigin="0.5,0.5">
+ <TextBlock Style="{StaticResource CommonTextBlock}" x:Name="EnLabel" Text="Enrichissement" TextWrapping="Wrap" d:LayoutOverrides="HorizontalAlignment"/>
+ </Grid>
+ </StackPanel>
+ </StackPanel>
+</UserControl>
\ No newline at end of file
--- /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
--- 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 @@
<Slider x:Name="ScaleTimeLine" Width="199" Margin="111,0,0,0" Minimum="600" Maximum="10000" Value="600"/>
</StackPanel>
<ScrollViewer x:Name="TimeLineScroller" VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Visible" Height="154" >
- <Grid>
+ <Grid Width="{Binding Value, ElementName=ScaleTimeLine, Mode=OneWay}" HorizontalAlignment="Left">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
--- 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;
}
}
--- /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()
+ {
+ }
+
+
+ }
+}
--- 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<HeaderProductionChapter> _productionChapters;
+
#region Avancement
--- 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;
--- 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 @@
/// </summary>
public class PolemicLink
{
+ public String Title { get; set; }
/// <summary>
/// Element d'origine du lien
/// </summary>