--- a/client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj Wed Nov 25 09:39:26 2009 +0100
+++ b/client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj Wed Nov 25 12:06:26 2009 +0100
@@ -158,6 +158,9 @@
<Compile Include="View\NavigationBar\ReferencesChutier.xaml.cs">
<DependentUpon>ReferencesChutier.xaml</DependentUpon>
</Compile>
+ <Compile Include="View\ProductionEditor\ProductionEditor.xaml.cs">
+ <DependentUpon>ProductionEditor.xaml</DependentUpon>
+ </Compile>
<Compile Include="View\ProductionTimeLine\CustomableVideoElement.xaml.cs">
<DependentUpon>CustomableVideoElement.xaml</DependentUpon>
</Compile>
@@ -264,6 +267,10 @@
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
</Page>
+ <Page Include="View\ProductionEditor\ProductionEditor.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:MarkupCompilePass1</Generator>
+ </Page>
<Page Include="View\ProductionTimeLine\CustomableVideoElement.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/ProductionEditor/ProductionEditor.xaml Wed Nov 25 12:06:26 2009 +0100
@@ -0,0 +1,19 @@
+<UserControl x:Class="Iri.Modernisation.Controls.View.ProductionEditor"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:View="clr-namespace:Iri.Modernisation.Controls.View">
+ <StackPanel x:Name="ProductionViewerPanel">
+ <StackPanel x:Name="ProductionViewerControlPanel" Height="29" Orientation="Horizontal">
+ <Button x:Name="ProductionViewerDisplayChutierButton" Width="75" Content="Chutier"/>
+ <Button x:Name="ProductionViewerDisplayWebcamButton" Width="75" Content="Webcam"/>
+ </StackPanel>
+ <View:VideoViewer Margin="0,0,24,0" Height="227"/>
+ <StackPanel x:Name="DescriptionSegmentPanel" Height="114">
+ <TextBlock Style="{StaticResource CommonTextBlock}" x:Name="TitleSegmentLabel" Text="Title Segment" TextWrapping="Wrap" Height="16" Margin="0,0,8,0"/>
+ <ScrollViewer x:Name="DescriptionSegmentScroller" Height="73" Margin="0,0,8,0">
+ <TextBlock Style="{StaticResource CommonTextBlock}" x:Name="DescriptionSegmentLabel" Text="Desc Segment" TextWrapping="Wrap" Height="130"/>
+ </ScrollViewer>
+ <TextBlock Style="{StaticResource CommonTextBlock}" x:Name="KeyWordLabel" Text="KeyWord Segment" TextWrapping="Wrap" Height="21" Margin="0,0,8,0"/>
+ </StackPanel>
+ </StackPanel>
+</UserControl>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/Iri.Modernisation.Controls/View/ProductionEditor/ProductionEditor.xaml.cs Wed Nov 25 12:06:26 2009 +0100
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace Iri.Modernisation.Controls.View
+{
+ public partial class ProductionEditor : UserControl
+ {
+ public ProductionEditor()
+ {
+ InitializeComponent();
+ }
+ }
+}
--- a/client/src/Iri.Modernisation.Controls/View/ProductionView/ProductionView.xaml Wed Nov 25 09:39:26 2009 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/ProductionView/ProductionView.xaml Wed Nov 25 12:06:26 2009 +0100
@@ -2,11 +2,17 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:View="clr-namespace:Iri.Modernisation.Controls.View"
- xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" x:Class="Iri.Modernisation.Controls.View.ProductionView" mc:Ignorable="d" Height="352">
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" x:Class="Iri.Modernisation.Controls.View.ProductionView" mc:Ignorable="d" Height="688">
<Grid x:Name="LayoutRoot">
- <View:HeaderProduction HorizontalAlignment="Left" VerticalAlignment="Top" d:LayoutOverrides="VerticalAlignment, Width"/>
- <View:ProductionTimeLine HorizontalAlignment="Left" Height="176" VerticalAlignment="Bottom"/>
+ <View:HeaderProduction HorizontalAlignment="Left" VerticalAlignment="Top" d:LayoutOverrides="VerticalAlignment"/>
+ <View:ProductionTimeLine Height="176" VerticalAlignment="Bottom"/>
+ <View:ProductionEditor Margin="272,115,0,0" HorizontalAlignment="Left" Height="369" VerticalAlignment="Top"/>
+ <View:VideoViewer HorizontalAlignment="Right" Margin="0,115,8,204" Width="404"/>
+ <StackPanel x:Name="RecordsPanel" HorizontalAlignment="Left" Margin="8,288,0,216" Width="248">
+ <TextBlock x:Name="RecordLabel" Text="Records" TextWrapping="Wrap"/>
+ <ListBox x:Name="RecordsList" Height="168"/>
+ </StackPanel>
</Grid>
</UserControl>
--- a/client/test/mainInterface/Iri.Modernisation.Test.MainInterface/MainPage.xaml.cs Wed Nov 25 09:39:26 2009 +0100
+++ b/client/test/mainInterface/Iri.Modernisation.Test.MainInterface/MainPage.xaml.cs Wed Nov 25 12:06:26 2009 +0100
@@ -21,6 +21,7 @@
{
public MainPage()
{
+ Commands.Initialize();
InitializeComponent();
List<VideoBook> SelectedVideoBooks = new List<VideoBook>();
/*************** Content Demo ***************/
@@ -47,7 +48,7 @@
/********************************************/
/*************** Initialisation des commandes ***************/
- Commands.Initialize();
+
// Commands.FlipView.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(FlipView_Executed);
/********************************************/
MainElement.DataContext = new MainVM(SelectedVideoBooks);