# HG changeset patch # User totetm <> # Date 1265297884 -3600 # Node ID bd33267300aa4f16469c7046df4ca988908a6950 # Parent beb938b4fb76bbdea28e5375c1281f44307d4d54 - FranceCulture Project - Ldt and Iri Parse Method - Bug MenuableUserControl diff -r beb938b4fb76 -r bd33267300aa .hgignore --- a/.hgignore Wed Jan 27 10:55:59 2010 +0100 +++ b/.hgignore Thu Feb 04 16:38:04 2010 +0100 @@ -6,7 +6,8 @@ glob:Backup/* glob:_UpgradeReport_Files/* glob:UpgradeLog.XML -glob:Content/* glob:ClientBin/* glob:bin/* glob:*.mp4 +glob:*.mp3 +glob:*.flv diff -r beb938b4fb76 -r bd33267300aa client/src/Iri.Modernisation.BaseMVVM/Commands/Commands.cs --- a/client/src/Iri.Modernisation.BaseMVVM/Commands/Commands.cs Wed Jan 27 10:55:59 2010 +0100 +++ b/client/src/Iri.Modernisation.BaseMVVM/Commands/Commands.cs Thu Feb 04 16:38:04 2010 +0100 @@ -107,6 +107,13 @@ Pause = new Command("Pause"); LeftTrim = new Command("LeftTrim"); RightTrim = new Command("RightTrim"); + NewAnnotationFinished = new Command("NewAnnotationFinished"); + } + + public static Command NewAnnotationFinished + { + get; + private set; } public static Command OkClick { @@ -297,9 +304,22 @@ PublishClick = new Command("PublishClick"); SaveClick = new Command("SaveClick"); + EditFinishedOk = new Command("EditFinishedOk"); + IndexFinishedOk = new Command("IndexFinishedOk"); + } - + public static Command EditFinishedOk + { + get; + private set; + } + public static Command IndexFinishedOk + { + get; + private set; + } + public static Command PublishClick { get; @@ -412,10 +432,17 @@ GoToTime = new Command("GoToTime"); ActivePart = new Command("ActivePart"); EscapeKeyPressed = new Command("EscapeKeyPressed"); + HttpSenderResponse = new Command("HttpSenderResponse"); // VideoPositionTimer.Tick += new EventHandler(Each_Tick); } + + public static Command HttpSenderResponse + { + get; + private set; + } public static Command EscapeKeyPressed { get; @@ -519,6 +546,26 @@ { } } + + public static class BookTimeLine + { + + static BookTimeLine() + { + SaveAnnotations = new Command("SaveAnnotations"); + + } + public static Command SaveAnnotations + { + get; + private set; + } + + public static void Initialize() + { + } + } + /// /// Ensure static fields are initialized /// @@ -536,6 +583,7 @@ VideoViewer.Initialize(); ProductionView.Initialize(); Commands.WebCamControl.Initialize(); + BookTimeLine.Initialize(); } } diff -r beb938b4fb76 -r bd33267300aa client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj --- a/client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj Wed Jan 27 10:55:59 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj Thu Feb 04 16:38:04 2010 +0100 @@ -161,6 +161,7 @@ ContextualBinderLayer.xaml + ButtonHeaderControl.xaml diff -r beb938b4fb76 -r bd33267300aa client/src/Iri.Modernisation.Controls/View/AnnotationMaker/AnnotationMaker.xaml.cs --- a/client/src/Iri.Modernisation.Controls/View/AnnotationMaker/AnnotationMaker.xaml.cs Wed Jan 27 10:55:59 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/View/AnnotationMaker/AnnotationMaker.xaml.cs Thu Feb 04 16:38:04 2010 +0100 @@ -8,6 +8,7 @@ using System.Windows.Media.Animation; using System.Windows.Shapes; using Iri.Modernisation.Data.Models; +using Iri.Modernisation.BaseMVVM.Commands; namespace Iri.Modernisation.Controls.View { public partial class AnnotationMaker : UserControl @@ -16,9 +17,14 @@ { InitializeComponent(); - + Commands.HttpSenderResponse.Executed += new EventHandler(HttpSenderResponse_Executed); } + + void HttpSenderResponse_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e) + { + this.Dispatcher.BeginInvoke(() => MessageBox.Show((String)e.Parameter)); + } } } \ No newline at end of file diff -r beb938b4fb76 -r bd33267300aa client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml --- a/client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml Wed Jan 27 10:55:59 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml Thu Feb 04 16:38:04 2010 +0100 @@ -2,14 +2,17 @@ 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:View="clr-namespace:Iri.Modernisation.Controls.View" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" + xmlns:Input="clr-namespace:SLExtensions.Input;assembly=SLExtensions" xmlns:Converter="clr-namespace:Iri.Modernisation.Controls.Converter" xmlns:SLExtensions_Data="clr-namespace:SLExtensions.Data;assembly=SLExtensions" x:Class="Iri.Modernisation.Controls.View.BookTimeLine" Height="272" Width="640" Background="Transparent"> + @@ -18,14 +21,16 @@ - +