# HG changeset patch
# User Matthieu Totet
# Date 1259147186 -3600
# Node ID a48c44bc825bc03d7fcb17f9d5c54a0a8cfa7eed
# Parent b5ee436add3dd5027e733482f63c2fd1d11bdb24
Add Controls in ProductionView
diff -r b5ee436add3d -r a48c44bc825b client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj
--- 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 @@
ReferencesChutier.xaml
+
+ ProductionEditor.xaml
+
CustomableVideoElement.xaml
@@ -264,6 +267,10 @@
MSBuild:MarkupCompilePass1
Designer
+
+ Designer
+ MSBuild:MarkupCompilePass1
+
MSBuild:MarkupCompilePass1
Designer
diff -r b5ee436add3d -r a48c44bc825b client/src/Iri.Modernisation.Controls/View/ProductionEditor/ProductionEditor.xaml
--- /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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r b5ee436add3d -r a48c44bc825b client/src/Iri.Modernisation.Controls/View/ProductionEditor/ProductionEditor.xaml.cs
--- /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();
+ }
+ }
+}
diff -r b5ee436add3d -r a48c44bc825b client/src/Iri.Modernisation.Controls/View/ProductionView/ProductionView.xaml
--- 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">
-
-
+
+
+
+
+
+
+
+
diff -r b5ee436add3d -r a48c44bc825b client/test/mainInterface/Iri.Modernisation.Test.MainInterface/MainPage.xaml.cs
--- 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 SelectedVideoBooks = new List();
/*************** Content Demo ***************/
@@ -47,7 +48,7 @@
/********************************************/
/*************** Initialisation des commandes ***************/
- Commands.Initialize();
+
// Commands.FlipView.Executed += new EventHandler(FlipView_Executed);
/********************************************/
MainElement.DataContext = new MainVM(SelectedVideoBooks);