# HG changeset patch # User totetm <> # Date 1264408222 -3600 # Node ID 43bb1b8ed5552b6eb9c2ee9be92a2c623ba8918b # Parent 4d9ebc6fbbe810b8f8b10bc70a9c1ce359128291 IRIFiles Class Web Loader and Sender diff -r 4d9ebc6fbbe8 -r 43bb1b8ed555 client/src/Iri.Modernisation.BaseMVVM/Commands/Commands.cs --- a/client/src/Iri.Modernisation.BaseMVVM/Commands/Commands.cs Tue Jan 19 09:49:56 2010 +0100 +++ b/client/src/Iri.Modernisation.BaseMVVM/Commands/Commands.cs Mon Jan 25 09:30:22 2010 +0100 @@ -293,62 +293,13 @@ { static HeaderProduction() { - Chap01EditingOkClick = new Command("Chap01EditingOkClick"); - Chap01IndexingOkClick = new Command("Chap01IndexingOkClick"); - - Chap02EditingOkClick = new Command("Chap02EditingOkClick"); - Chap02IndexingOkClick = new Command("Chap02IndexingOkClick"); - - Chap03EditingOkClick = new Command("Chap03EditingOkClick"); - Chap03IndexingOkClick = new Command("Chap03IndexingOkClick"); - - Chap04EditingOkClick = new Command("Chap04EditingOkClick"); - Chap04IndexingOkClick = new Command("Chap04IndexingOkClick"); + PublishClick = new Command("PublishClick"); SaveClick = new Command("SaveClick"); } - public static Command Chap01EditingOkClick - { - get; - private set; - } - public static Command Chap01IndexingOkClick - { - get; - private set; - } - public static Command Chap02EditingOkClick - { - get; - private set; - } - public static Command Chap02IndexingOkClick - { - get; - private set; - } - public static Command Chap03EditingOkClick - { - get; - private set; - } - public static Command Chap03IndexingOkClick - { - get; - private set; - } - public static Command Chap04EditingOkClick - { - get; - private set; - } - public static Command Chap04IndexingOkClick - { - get; - private set; - } + public static Command PublishClick { get; @@ -460,11 +411,17 @@ FlipView = new Command("FlipView"); GoToTime = new Command("GoToTime"); ActivePart = new Command("ActivePart"); - + EscapeKeyPressed = new Command("EscapeKeyPressed"); // VideoPositionTimer.Tick += new EventHandler(Each_Tick); } + public static Command EscapeKeyPressed + { + get; + private set; + } + public static Command ActivePart { get; diff -r 4d9ebc6fbbe8 -r 43bb1b8ed555 client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj --- a/client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj Tue Jan 19 09:49:56 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj Mon Jan 25 09:30:22 2010 +0100 @@ -88,6 +88,7 @@ + diff -r 4d9ebc6fbbe8 -r 43bb1b8ed555 client/src/Iri.Modernisation.Controls/View/ContextualBinderLayer/ContextualBinderLayer.xaml.cs --- a/client/src/Iri.Modernisation.Controls/View/ContextualBinderLayer/ContextualBinderLayer.xaml.cs Tue Jan 19 09:49:56 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/View/ContextualBinderLayer/ContextualBinderLayer.xaml.cs Mon Jan 25 09:30:22 2010 +0100 @@ -27,6 +27,8 @@ InitializeComponent(); Commands.PolemicElement.ElementSelected.Executed += new EventHandler(ElementSelected_Executed); Commands.ContextualBinderLayer.EndBind.Executed += new EventHandler(EndBind_Executed); + Commands.EscapeKeyPressed.Executed += Commands.ContextualBinderLayer.EndBind.Execute; + MouseLeftButtonUp += new MouseButtonEventHandler(ContextualBinderLayer_MouseLeftButtonUp); MouseMove += new MouseEventHandler(ContextualBinderLayer_MouseMove); Commands.ContextualBinderLayer.BeginBind.Executed += new EventHandler(BeginBind_Executed); diff -r 4d9ebc6fbbe8 -r 43bb1b8ed555 client/src/Iri.Modernisation.Controls/View/Main/Main.xaml --- a/client/src/Iri.Modernisation.Controls/View/Main/Main.xaml Tue Jan 19 09:49:56 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/View/Main/Main.xaml Mon Jan 25 09:30:22 2010 +0100 @@ -6,8 +6,9 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="Iri.Modernisation.Controls.View.Main" d:DesignHeight="480" - xmlns:hsl="clr-namespace:HackingSilverlightLibrary;assembly=HackingSilverlightLibrary" + xmlns:hsl="clr-namespace:HackingSilverlightLibrary;assembly=HackingSilverlightLibrary" KeyDown="UserControl_KeyDown" > + diff -r 4d9ebc6fbbe8 -r 43bb1b8ed555 client/src/Iri.Modernisation.Controls/View/Main/Main.xaml.cs --- a/client/src/Iri.Modernisation.Controls/View/Main/Main.xaml.cs Tue Jan 19 09:49:56 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/View/Main/Main.xaml.cs Mon Jan 25 09:30:22 2010 +0100 @@ -26,5 +26,13 @@ Commands.VideoViewer.Pause.Execute(); FlipTest.ExecuteFlip(); } + + private void UserControl_KeyDown(object sender, System.Windows.Input.KeyEventArgs e) + { + if(e.Key == Key.Escape) + { + Commands.EscapeKeyPressed.Execute(); + } + } } } diff -r 4d9ebc6fbbe8 -r 43bb1b8ed555 client/src/Iri.Modernisation.Controls/View/ProductionEditor/ProductionEditor.xaml --- a/client/src/Iri.Modernisation.Controls/View/ProductionEditor/ProductionEditor.xaml Tue Jan 19 09:49:56 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/View/ProductionEditor/ProductionEditor.xaml Mon Jan 25 09:30:22 2010 +0100 @@ -14,7 +14,7 @@ - + diff -r 4d9ebc6fbbe8 -r 43bb1b8ed555 client/src/Iri.Modernisation.Controls/View/ProductionTimeLine/CustomableIndexElement.xaml.cs --- a/client/src/Iri.Modernisation.Controls/View/ProductionTimeLine/CustomableIndexElement.xaml.cs Tue Jan 19 09:49:56 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/View/ProductionTimeLine/CustomableIndexElement.xaml.cs Mon Jan 25 09:30:22 2010 +0100 @@ -15,9 +15,6 @@ public partial class CustomableIndexElement : UserControl { - - - public double TrimRight { get { return (double)GetValue(TrimRightProperty); } diff -r 4d9ebc6fbbe8 -r 43bb1b8ed555 client/src/Iri.Modernisation.Controls/View/ProductionTimeLine/ProductionTimeLine.xaml --- a/client/src/Iri.Modernisation.Controls/View/ProductionTimeLine/ProductionTimeLine.xaml Tue Jan 19 09:49:56 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/View/ProductionTimeLine/ProductionTimeLine.xaml Mon Jan 25 09:30:22 2010 +0100 @@ -21,7 +21,7 @@ - +