--- a/client/src/Iri.Modernisation.Controls/Converter/PolemicTypeColorConverter.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/Converter/PolemicTypeColorConverter.cs Wed Jan 27 10:37:39 2010 +0100
@@ -22,55 +22,9 @@
public static Brush Convert(object value)
{
SolidColorBrush returnBrush = new SolidColorBrush(new Color() { A = 255, R = 255, G = 255, B = 255 });
- if (value is PolemicElementType)
- {
- PolemicElementType dt = (PolemicElementType)value;
-
- switch (dt)
- {
- case PolemicElementType.Basic:
- returnBrush = new SolidColorBrush(new Color() { A = 255, R = 255, G = 255, B = 255 });
- break;
- case PolemicElementType.Polemic:
- returnBrush = new SolidColorBrush(new Color() { A = 255, R = 255, G = 0, B = 0 });
- break;
- case PolemicElementType.Adhesion:
- returnBrush = new SolidColorBrush(new Color() { A = 255, R = 0, G = 255, B = 0 });
- break;
- case PolemicElementType.Reference:
- returnBrush = new SolidColorBrush(new Color() { A = 255, R = 0, G = 0, B = 255 });
- break;
- case PolemicElementType.Question:
- returnBrush = new SolidColorBrush(new Color() { A = 255, R = 255, G = 255, B = 0 });
- break;
- default:
- returnBrush = new SolidColorBrush(new Color() { A = 255, R = 255, G = 255, B = 255 });
- break;
- }
-
- }
- else if(value is VideoChapterType)
- {
- VideoChapterType dt = (VideoChapterType)value;
- switch (dt)
- {
- case VideoChapterType.Modernite:
- returnBrush = new SolidColorBrush(new Color() { A = 255, R = 0xBF, G = 0xA8, B = 0x4E });
- break;
- case VideoChapterType.Modernisation:
- returnBrush = new SolidColorBrush(new Color() { A = 255, R = 0xD6, G = 0xA3, B = 0x82 });
- break;
- case VideoChapterType.Postmodernite:
- returnBrush = new SolidColorBrush(new Color() { A = 255, R = 0xB5, G = 0xCB, B = 0x29 });
- break;
- case VideoChapterType.Ouverture:
- returnBrush = new SolidColorBrush(new Color() { A = 255, R = 0x5B, G = 0xCC, B = 0x5B });
- break;
- default:
- break;
- }
+
- }
+
return returnBrush;
}
--- a/client/src/Iri.Modernisation.Controls/View/AnnotationMaker/AnnotationMaker.xaml.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/AnnotationMaker/AnnotationMaker.xaml.cs Wed Jan 27 10:37:39 2010 +0100
@@ -14,12 +14,9 @@
{
public AnnotationMaker()
{
- // Required to initialize variables
+
InitializeComponent();
- //RectPolemic.Resources.Add("PolemicType", PolemicElementType.Polemic);
- //RectAdhesion.Resources.Add("PolemicType", PolemicElementType.Adhesion);
- //RectQuestion.Resources.Add("PolemicType", PolemicElementType.Question);
- //RectReferences.Resources.Add("PolemicType", PolemicElementType.Reference);
+
}
--- a/client/src/Iri.Modernisation.Controls/View/ClickMenu/ClickMenuPanelContextualiser.xaml Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/ClickMenu/ClickMenuPanelContextualiser.xaml Wed Jan 27 10:37:39 2010 +0100
@@ -12,7 +12,7 @@
</UserControl.Resources>
<Grid x:Name="Panel" Background="#00842B2B" Canvas.ZIndex="4" MouseLeave="Grid_MouseLeave">
<local:ClickMenuItem Orientation="Up" Title="Contextualiser" x:Name="_contextualiserItem" HorizontalAlignment="Left" Margin="1,0,0,0" Width="32" Canvas.ZIndex="10" VerticalAlignment="Top" d:LayoutOverrides="Height" MouseEnter="Grid_MouseEnter"/>
- <Grid x:Name="Hidden" HorizontalAlignment="Left" Width="80" Background="#0041024D" Height="56" VerticalAlignment="Top">
+ <Grid x:Name="Hidden" HorizontalAlignment="Left" Width="80" Background="#0041024D" Height="56" VerticalAlignment="Top" Visibility="Collapsed">
<local:ClickMenuItem Orientation="Down" Title="Polemic" x:Name="_polemicItem" HorizontalAlignment="Left" Margin="1,24,0,0" Width="32" Canvas.ZIndex="5" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Top" d:LayoutOverrides="HorizontalAlignment"/>
<local:ClickMenuItem Title="Adhesion" Orientation="Up" x:Name="_adhesionItem" Margin="23,17,28,0" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.5" Canvas.ZIndex="5"/>
--- a/client/src/Iri.Modernisation.Controls/View/ConsultationBookView/ConsultationBookView.xaml.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/ConsultationBookView/ConsultationBookView.xaml.cs Wed Jan 27 10:37:39 2010 +0100
@@ -17,7 +17,7 @@
{
// Required to initialize variables
InitializeComponent();
- // VideoViewer.DataContext = new VideoViewerVM();
+ // VideoViewer.DataContext = new VideoViewerVM();
Commands.TimeChange.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(TimeChange_Executed);
}
--- a/client/src/Iri.Modernisation.Controls/View/HeaderProduction/HeaderProduction.xaml.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/HeaderProduction/HeaderProduction.xaml.cs Wed Jan 27 10:37:39 2010 +0100
@@ -20,256 +20,21 @@
// Required to initialize variables
InitializeComponent();
- /* ModernisationEditionController.Active();
-
- ModernisationEditionController.Text = Iri.Modernisation.Lang.LangResource.EditingLabel;
- ModernisationIndexController.Text = Iri.Modernisation.Lang.LangResource.IndexingLabel;
-
- ModerniteEditionController.Text = Iri.Modernisation.Lang.LangResource.EditingLabel;
- ModerniteIndexController.Text = Iri.Modernisation.Lang.LangResource.IndexingLabel;
-
-
- PostModerniteEditionController.Text = Iri.Modernisation.Lang.LangResource.EditingLabel;
- PostModerniteIndexController.Text = Iri.Modernisation.Lang.LangResource.IndexingLabel;
-
-
- OuvertureEditionController.Text = Iri.Modernisation.Lang.LangResource.EditingLabel;
- OuvertureIndexController.Text = Iri.Modernisation.Lang.LangResource.IndexingLabel;*/
-
- /////////////////////////--
- /*ModernisationEditionController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(HeaderProductionPartSelected);
- ModernisationIndexController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(HeaderProductionPartSelected);
-
- ModerniteEditionController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(HeaderProductionPartSelected);
- ModerniteIndexController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(HeaderProductionPartSelected);
-
- PostModerniteEditionController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(HeaderProductionPartSelected);
- PostModerniteIndexController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(HeaderProductionPartSelected);
-
- OuvertureEditionController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(HeaderProductionPartSelected);
- OuvertureIndexController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(HeaderProductionPartSelected);
- //////////////////////
- ModernisationEditionController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(ModernisationEditionController_HeaderProductionPartSelected);
- ModernisationIndexController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(ModernisationIndexController_HeaderProductionPartSelected);
-
- ModerniteEditionController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(ModerniteEditionController_HeaderProductionPartSelected);
- ModerniteIndexController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(ModerniteIndexController_HeaderProductionPartSelected);
-
- PostModerniteEditionController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(PostModerniteEditionController_HeaderProductionPartSelected);
- PostModerniteIndexController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(PostModerniteIndexController_HeaderProductionPartSelected);
-
- OuvertureEditionController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(OuvertureEditionController_HeaderProductionPartSelected);
- OuvertureIndexController.HeaderProductionPartSelected += new EventHandler<HeaderProductionPartControlerEventArgs>(OuvertureIndexController_HeaderProductionPartSelected);
- //////////////////////
- ModernisationEditionController.HeaderProductionPartFinished += new EventHandler<HeaderProductionPartControlerEventArgs>(ModernisationEditionControler_HeaderProductionPartFinished);
- ModernisationIndexController.HeaderProductionPartFinished += new EventHandler<HeaderProductionPartControlerEventArgs>(ModernisationIndexControl_HeaderProductionPartFinished);
-
- ModerniteEditionController.HeaderProductionPartFinished += new EventHandler<HeaderProductionPartControlerEventArgs>(ModerniteEditionControler_HeaderProductionPartFinished);
- ModerniteIndexController.HeaderProductionPartFinished += new EventHandler<HeaderProductionPartControlerEventArgs>(ModerniteIndexController_HeaderProductionPartFinished);
-
- PostModerniteEditionController.HeaderProductionPartFinished += new EventHandler<HeaderProductionPartControlerEventArgs>(PostModerniteEditionController_HeaderProductionPartFinished);
- PostModerniteIndexController.HeaderProductionPartFinished += new EventHandler<HeaderProductionPartControlerEventArgs>(PostModerniteIndexController_HeaderProductionPartFinished);
-
- OuvertureEditionController.HeaderProductionPartFinished += new EventHandler<HeaderProductionPartControlerEventArgs>(OuvertureEditionController_HeaderProductionPartFinished);
- OuvertureIndexController.HeaderProductionPartFinished += new EventHandler<HeaderProductionPartControlerEventArgs>(OuvertureIndexController_HeaderProductionPartFinished);
- */
- }
-
- /* void OuvertureIndexController_HeaderProductionPartSelected(object sender, HeaderProductionPartControlerEventArgs e)
- {
- if (SelectedPart != null)
- {
- InstructionText.Text = Iri.Modernisation.Lang.LangResource.IndexationMessage.Replace("{0}", "Ouverture");
- SelectedPart(sender, new HeaderProductionEventArgs(VideoChapterType.Ouverture, true));
- }
- }
-
- void OuvertureEditionController_HeaderProductionPartSelected(object sender, HeaderProductionPartControlerEventArgs e)
- {
- if (SelectedPart != null)
- {
- InstructionText.Text = Iri.Modernisation.Lang.LangResource.EditionSecondMessage;
- SelectedPart(sender, new HeaderProductionEventArgs(VideoChapterType.Ouverture, false));
- }
- }
-
- void PostModerniteIndexController_HeaderProductionPartSelected(object sender, HeaderProductionPartControlerEventArgs e)
- {
- if (SelectedPart != null)
- {
- InstructionText.Text = Iri.Modernisation.Lang.LangResource.IndexationMessage.Replace("{0}", "Post-Modernité");
- SelectedPart(sender, new HeaderProductionEventArgs(VideoChapterType.Postmodernite, true));
- }
- }
-
- void PostModerniteEditionController_HeaderProductionPartSelected(object sender, HeaderProductionPartControlerEventArgs e)
- {
- if (SelectedPart != null)
- {
- InstructionText.Text = Iri.Modernisation.Lang.LangResource.EditionSecondMessage;
- SelectedPart(sender, new HeaderProductionEventArgs(VideoChapterType.Postmodernite, false));
- }
- }
-
- void ModerniteIndexController_HeaderProductionPartSelected(object sender, HeaderProductionPartControlerEventArgs e)
- {
- if (SelectedPart != null)
- {
- InstructionText.Text = Iri.Modernisation.Lang.LangResource.IndexationMessage.Replace("{0}", "Modernité");
- SelectedPart(sender, new HeaderProductionEventArgs(VideoChapterType.Modernite, true));
- }
- }
-
- void ModerniteEditionController_HeaderProductionPartSelected(object sender, HeaderProductionPartControlerEventArgs e)
- {
- if (SelectedPart!=null)
- {
- InstructionText.Text = Iri.Modernisation.Lang.LangResource.EditionSecondMessage;
-
- SelectedPart(sender,new HeaderProductionEventArgs(VideoChapterType.Modernite,false));
- }
}
- void ModernisationIndexController_HeaderProductionPartSelected(object sender, HeaderProductionPartControlerEventArgs e)
- {
- if (SelectedPart!=null)
- {
- if (MessageBoxResult.OK == MessageBox.Show("Voulez Vous passer à l'indexation ?", "Question", MessageBoxButton.OKCancel))
- {
- InstructionText.Text = Iri.Modernisation.Lang.LangResource.IndexationMessage.Replace("{0}", "Modernisation");
- SelectedPart(sender, new HeaderProductionEventArgs(VideoChapterType.Modernisation, true));
- }
- else
- {
- UnselectAll();
- }
- }
- }
-
- void ModernisationEditionController_HeaderProductionPartSelected(object sender, HeaderProductionPartControlerEventArgs e)
- {
- if (SelectedPart!=null)
- {
- InstructionText.Text = Iri.Modernisation.Lang.LangResource.EditionFirstMessage;
- SelectedPart(sender,new HeaderProductionEventArgs(VideoChapterType.Modernisation,false));
- }
- }
-
- void OuvertureIndexController_HeaderProductionPartFinished(object sender, HeaderProductionPartControlerEventArgs e)
- {
- Commands.HeaderProduction.Chap04IndexingOkClick.Execute();
- if (FinishedPart != null)
- {
- FinishedPart(sender,new HeaderProductionEventArgs());
- }
-
- }
-
- void PostModerniteIndexController_HeaderProductionPartFinished(object sender, HeaderProductionPartControlerEventArgs e)
- {
- Commands.HeaderProduction.Chap03IndexingOkClick.Execute();
- if (FinishedPart != null)
- {
- FinishedPart(sender, new HeaderProductionEventArgs());
- }
- }
-
- void ModerniteIndexController_HeaderProductionPartFinished(object sender, HeaderProductionPartControlerEventArgs e)
- {
- Commands.HeaderProduction.Chap02IndexingOkClick.Execute();
- if (FinishedPart != null)
- {
- FinishedPart(sender, new HeaderProductionEventArgs());
- }
- }
-
- void OuvertureEditionController_HeaderProductionPartFinished(object sender, HeaderProductionPartControlerEventArgs e)
- {
- Commands.HeaderProduction.Chap04EditingOkClick.Execute();
- OuvertureIndexController.Active();
- if (FinishedPart != null)
- {
- FinishedPart(sender, new HeaderProductionEventArgs());
- }
- }
-
- void PostModerniteEditionController_HeaderProductionPartFinished(object sender, HeaderProductionPartControlerEventArgs e)
- {
- Commands.HeaderProduction.Chap03EditingOkClick.Execute();
- PostModerniteIndexController.Active();
- OuvertureEditionController.Active();
- if (FinishedPart != null)
- {
- FinishedPart(sender, new HeaderProductionEventArgs());
- }
- }
-
- void ModerniteEditionControler_HeaderProductionPartFinished(object sender, HeaderProductionPartControlerEventArgs e)
- {
-
- Commands.HeaderProduction.Chap02EditingOkClick.Execute();
- ModerniteIndexController.Active();
- PostModerniteEditionController.Active();
- if (FinishedPart != null)
- {
- FinishedPart(sender, new HeaderProductionEventArgs());
- }
- }
-
- void ModernisationIndexControl_HeaderProductionPartFinished(object sender, HeaderProductionPartControlerEventArgs e)
- {
- Commands.HeaderProduction.Chap01IndexingOkClick.Execute();
- if (FinishedPart != null)
- {
- FinishedPart(sender, new HeaderProductionEventArgs());
- }
- }
- private void UnselectAll()
- {
- ModernisationEditionController.UnSelect();
- ModernisationIndexController.UnSelect();
-
- ModerniteEditionController.UnSelect();
- ModerniteIndexController.UnSelect();
-
- PostModerniteEditionController.UnSelect();
- PostModerniteIndexController.UnSelect();
-
- OuvertureEditionController.UnSelect();
- OuvertureIndexController.UnSelect();
- }
- private void HeaderProductionPartSelected(object sender, HeaderProductionPartControlerEventArgs e)
- {
- UnselectAll();
- ((HeaderProductionPartControler)sender).Select();
- }
-
- void ModernisationEditionControler_HeaderProductionPartFinished(object sender, HeaderProductionPartControlerEventArgs e)
- {
- Commands.HeaderProduction.Chap01EditingOkClick.Execute();
- ModernisationIndexController.Active();
- ModerniteEditionController.Active();
- if (FinishedPart != null)
- {
- FinishedPart(sender, new HeaderProductionEventArgs());
- }
-
- }
- public event EventHandler<HeaderProductionEventArgs> SelectedPart;
- public event EventHandler<HeaderProductionEventArgs> FinishedPart;
-*/
+
}
public class HeaderProductionEventArgs : EventArgs
{
- public VideoChapterType ChapterType;
+
public bool IsIndexPart;
public HeaderProductionEventArgs()
{
}
- public HeaderProductionEventArgs(VideoChapterType chapterType,bool isIndexpPrt)
+ public HeaderProductionEventArgs(bool isIndexpPrt)
{
- ChapterType = chapterType;
+
IsIndexPart = isIndexpPrt;
}
--- a/client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml.cs Wed Jan 27 10:37:39 2010 +0100
@@ -56,7 +56,10 @@
void VideoScreen_MediaOpened(object sender, RoutedEventArgs e)
{
-
+ /*
+ * In Order to begin
+ */
+ VideoScreen.Position = ((VideoViewerVM)DataContext).BeginIn;
//VideoScreen.Play();
//VideoPositionTimer.Start();
--- a/client/src/Iri.Modernisation.Controls/ViewModel/AnnotationMaker/AnnotationMakerVM.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/AnnotationMaker/AnnotationMakerVM.cs Wed Jan 27 10:37:39 2010 +0100
@@ -386,7 +386,8 @@
new KeyValuePair<string, string>("newAnnotation", newfile.ToString()),
new KeyValuePair<string, string>("msg", "303"));
helper.ResponseComplete += new HttpResponseCompleteEventHandler(helper_ResponseComplete);
- helper.Execute();
+ // helper.Execute();
+ MessageBox.Show(newfile.ToString());
_refElement = null;
OnPropertyChanged("IsControlEnable");
--- a/client/src/Iri.Modernisation.Controls/ViewModel/ConsultationView/ConsultationViewVM.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/ConsultationView/ConsultationViewVM.cs Wed Jan 27 10:37:39 2010 +0100
@@ -142,7 +142,7 @@
{
//Préparation du loader
_loaderVideoBook = new Loader<VideoBook>(LDTFileReader.ConvertToVideoBook);
- _loaderVideoBook.LoaderFinished += new EventHandler<LoaderEventArgs<VideoBook>>(LoaderVideoBook_LoaderFinished);
+ _loaderVideoBook.LoaderFinished += new EventHandler<EventArgs>(LoaderVideoBook_LoaderFinished);
_loaderVideoBook.Load(((VideoBook)e.Parameter).LdtPath);
}
@@ -154,9 +154,9 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void LoaderVideoBook_LoaderFinished(object sender, LoaderEventArgs<VideoBook> e)
+ private void LoaderVideoBook_LoaderFinished(object sender, EventArgs e)
{
- VideoBook addedVideoBook = e.CreatedObject;
+ VideoBook addedVideoBook = ((LoaderEventArgs<VideoBook>)e).CreatedObject;
///------- ///
addedVideoBook.LdtPath = _loaderVideoBook.Path;
///-----------------///
--- a/client/src/Iri.Modernisation.Controls/ViewModel/Main/MainVM.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/Main/MainVM.cs Wed Jan 27 10:37:39 2010 +0100
@@ -12,6 +12,7 @@
using Iri.Modernisation.Data.Models;
using Iri.Modernisation.BaseMVVM.Commands;
using Iri.Modernisation.BaseMVVM.ViewModel;
+using System.Collections.ObjectModel;
namespace Iri.Modernisation.Controls.ViewModel
{
/// <summary>
@@ -87,15 +88,16 @@
}
}
- public MainVM(List<VideoBook> videoBooks)
+ public MainVM()
{
InitializeCommands();
- List<VideoBook> SelectedVideoBooks = videoBooks;
+ List<VideoBook> SelectedVideoBooks = new List<VideoBook>();
+ SelectedVideoBooks = SettingsProject.ListVideoBook;
// Initialisation des Components //
- ViewModelProductionView = new ProductionViewVM();
+ ViewModelProductionView = new ProductionViewVM() { RecordedVideoSequences = new ObservableCollection<VideoSequence>(SettingsProject.ProductionVideo) };
ViewModelConsultationView = new ConsultationViewVM();
ViewModelNavigationBar = new NavigationBarVM() { ConsultMenuViewModel = new ConsultMenuVM(SelectedVideoBooks) };
ViewModelHeaderControl = new HeaderControlVM();
--- a/client/src/Iri.Modernisation.Controls/ViewModel/ProductionTimeLine/CustomableIndexElementVM.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/ProductionTimeLine/CustomableIndexElementVM.cs Wed Jan 27 10:37:39 2010 +0100
@@ -70,7 +70,7 @@
{
get
{
- //MessageBox.Show(((TimeSpan)(TimerOut - TimerIn)).TotalMilliseconds.ToString());
+
return ((TimeSpan)(TimerOut - TimerIn)).TotalMilliseconds * ProductionTimeLine.ScaleTime;
}
--- a/client/src/Iri.Modernisation.Controls/ViewModel/ProductionTimeLine/CustomableVideoElementVM.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/ProductionTimeLine/CustomableVideoElementVM.cs Wed Jan 27 10:37:39 2010 +0100
@@ -92,19 +92,7 @@
}
- private VideoChapterType _chapter;
- public VideoChapterType Chapter
- {
- get
- {
- return _chapter;
- }
- set
- {
- _chapter = value;
- OnPropertyChanged("Chapter");
- }
- }
+
private Color _chapterColor;
public Color ChapterColor
--- a/client/src/Iri.Modernisation.Controls/ViewModel/ProductionTimeLine/ProductionTimeLineVM.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/ProductionTimeLine/ProductionTimeLineVM.cs Wed Jan 27 10:37:39 2010 +0100
@@ -240,23 +240,9 @@
}
}
- private VideoChapterType _selectedChapterType;
+
- /// <summary>
- /// Chapitre en cours
- /// </summary>
- public VideoChapterType SelectedChapterType
- {
- get
- {
- return _selectedChapterType;
- }
- set
- {
- _selectedChapterType = value;
- OnPropertyChanged("SelectedChapterType");
- }
- }
+
private void InitializeCommands()
{
@@ -304,7 +290,7 @@
InitializeCommands();
}
-
+
private void TimeChange_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
{
double newValue = ((double)e.Parameter);
@@ -317,15 +303,19 @@
if (Vs.TimerIn.TotalMilliseconds <= newValue && Vs.TimerOut.TotalMilliseconds > newValue)
{
ActualVideoSequence = Vs;
- ViewModelVideoViewer.Source = ActualVideoSequence.Path;
- ViewModelVideoViewer.GoTo(TimeSpan.FromMilliseconds(newValue) - Vs.TimerIn +Vs.BeginTrim);
+
+ /**/
+ ViewModelVideoViewer.BeginIn = TimeSpan.FromMilliseconds(newValue)+ Vs.BeginTrim;
+ ViewModelVideoViewer.Source = ActualVideoSequence.Path;
+ ViewModelVideoViewer.GoTo(TimeSpan.FromMilliseconds(newValue) - Vs.TimerIn + Vs.BeginTrim);
+ ViewModelVideoViewer.BeginIn = Vs.BeginTrim;
}
}
}
else
{
- ViewModelVideoViewer.GoTo(TimeSpan.FromMilliseconds(newValue) - ActualVideoSequence.TimerIn);
+ ViewModelVideoViewer.GoTo(TimeSpan.FromMilliseconds(newValue) - ActualVideoSequence.TimerIn + ActualVideoSequence.BeginTrim);
}
@@ -378,12 +368,12 @@
private void EditorPartSelected_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
{
- SelectedChapter = (int)((HeaderProductionEventArgs)e.Source).ChapterType;
- SelectedChapterType = ((HeaderProductionEventArgs)e.Source).ChapterType ;
+
+
IsIndexing = ((HeaderProductionEventArgs)e.Source).IsIndexPart;
}
- public event EventHandler<ProductionTimeLineVMEventArgs> SwitchVideo;
+
}
public class ProductionTimeLineVMEventArgs : EventArgs
--- a/client/src/Iri.Modernisation.Controls/ViewModel/ProductionView/ProductionViewVM.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/ProductionView/ProductionViewVM.cs Wed Jan 27 10:37:39 2010 +0100
@@ -132,7 +132,7 @@
private void InitializeCommands()
{
Commands.ProductionView.ClickAddSelectedRecord.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(ClickAddSelectedRecord_Executed);
- ViewModelProductionTimeLine.SwitchVideo += new EventHandler<ProductionTimeLineVMEventArgs>(ViewModelProductionTimeLine_SwitchVideo);
+
ViewModelMasterVideoViewer.Tick += new EventHandler<VideoViewerVMEventArgs>(ViewModelMasterVideoViewer_Tick);
ViewModelHeaderProduction.Change += new EventHandler<HeaderProductionVMArgs>(ViewModelHeaderProduction_Change);
Commands.HeaderProduction.PublishClick.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(PublishClick_Executed);
@@ -147,24 +147,9 @@
ViewModelMasterVideoViewer = new VideoViewerVM(true, false);
ViewModelProductionTimeLine.ViewModelVideoViewer = ViewModelMasterVideoViewer;
- Random rndNumbers = new Random();
- _recordedVideoSequences.Add(new VideoSequence()
- {
- Path = Application.Current.Host.Source.Host.ToString() + "/test.wmv",
- RunTime = new TimeSpan(0, rndNumbers.Next(10, 60), 0),
- BeginTrim = new TimeSpan(0, 0, 0),
- EndTrim = new TimeSpan(0, 0, 0),
- });
-
-
- _recordedVideoSequences.Add(new VideoSequence()
- {
- Path = "/video.mp4",
- RunTime = new TimeSpan(0, rndNumbers.Next(10, 60), 0),
- BeginTrim = new TimeSpan(0, 0, 0),
- EndTrim = new TimeSpan(0, 0, 0),
- });
+
+
InitializeCommands();
OnPropertyChanged(String.Empty);
@@ -234,20 +219,24 @@
ViewModelProductionTimeLine.SelectedChapter = e.ChapterHeader.ChapterDescription.Id ;
}
- private void ViewModelProductionTimeLine_SwitchVideo(object sender, ProductionTimeLineVMEventArgs e)
- {
- ViewModelMasterVideoViewer.Source = (e.VideoSequence.Path);
- ViewModelMasterVideoViewer.GoTo(e.BeginAt);
- }
+
private void ViewModelMasterVideoViewer_Tick(object sender, VideoViewerVMEventArgs e)
{
- double newPos = ViewModelProductionTimeLine.ActualVideoSequence.TimerIn.TotalMilliseconds+e.Position.TotalMilliseconds;
+ double newPos = ViewModelProductionTimeLine.ActualVideoSequence.TimerIn.TotalMilliseconds + e.Position.TotalMilliseconds;
if (ViewModelProductionTimeLine.ActualVideoSequence.TimerOut.TotalMilliseconds <= newPos)
{
- ViewModelProductionTimeLine.ActualVideoSequence = ViewModelProductionTimeLine.TimeLine[ViewModelProductionTimeLine.TimeLine.IndexOf(ViewModelProductionTimeLine.ActualVideoSequence) + 1];
- ViewModelMasterVideoViewer.Source = ViewModelProductionTimeLine.ActualVideoSequence.Path;
- ViewModelMasterVideoViewer.GoTo(ViewModelProductionTimeLine.ActualVideoSequence.BeginTrim);
+ if (ViewModelProductionTimeLine.TimeLine.IndexOf(ViewModelProductionTimeLine.ActualVideoSequence) + 1 < ViewModelProductionTimeLine.TimeLine.Count)
+ {
+ ViewModelProductionTimeLine.ActualVideoSequence = ViewModelProductionTimeLine.TimeLine[ViewModelProductionTimeLine.TimeLine.IndexOf(ViewModelProductionTimeLine.ActualVideoSequence) + 1];
+ ViewModelMasterVideoViewer.BeginIn = ViewModelProductionTimeLine.ActualVideoSequence.BeginTrim;
+ ViewModelMasterVideoViewer.Source = ViewModelProductionTimeLine.ActualVideoSequence.Path;
+ ViewModelMasterVideoViewer.GoTo(ViewModelProductionTimeLine.ActualVideoSequence.BeginTrim);
+ }
+ else
+ {
+ ViewModelMasterVideoViewer.Pause();
+ }
}
ViewModelProductionTimeLine.Position = newPos;
}
--- a/client/src/Iri.Modernisation.Controls/ViewModel/VideoViewer/VideoViewerVM.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/VideoViewer/VideoViewerVM.cs Wed Jan 27 10:37:39 2010 +0100
@@ -117,13 +117,12 @@
{
_playControl = playControl;
_recordControl = recordControl;
-
InitializeCommands();
AutoPlay = false;
}
-
+ public TimeSpan BeginIn { get; set; }
public event EventHandler<VideoViewerVMEventArgs> Tick;
private void InitializeCommands()
@@ -147,7 +146,7 @@
{
if(Tick!=null)
{
- Tick(this, new VideoViewerVMEventArgs(Pos));
+ Tick(this, new VideoViewerVMEventArgs(Pos-BeginIn));
}
}
--- a/client/src/Iri.Modernisation.Data/Iri.Modernisation.Data.csproj Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Data/Iri.Modernisation.Data.csproj Wed Jan 27 10:37:39 2010 +0100
@@ -109,6 +109,7 @@
<Compile Include="Models\SegmentElement.cs" />
<Compile Include="Models\SegmentIndex.cs" />
<Compile Include="Models\SettingsProject.cs" />
+ <Compile Include="Models\Sync.cs" />
<Compile Include="Models\User.cs" />
<Compile Include="Models\VideoBook.cs" />
<Compile Include="Models\VideoChapter.cs" />
--- a/client/src/Iri.Modernisation.Data/Models/FactoryVideoLivre.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Data/Models/FactoryVideoLivre.cs Wed Jan 27 10:37:39 2010 +0100
@@ -15,10 +15,11 @@
public static class FactoryVideoLivre
{
public static WebClient xmlClient = new WebClient();
- private static XDocument _configDoc;
+ private static XDocument _configDoc;
public static VideoChapterDescription[] VideoChapterDescriptions {get;private set;}
public static PolemicTypeDescription[] AnnotationDescriptions { get; private set; }
public static String VideoBookListPath;
+ public static String ProductionVideoPath;
public static int NumberOfChapters
{
get
@@ -58,6 +59,7 @@
List<PolemicTypeDescription> temp_an = new List<PolemicTypeDescription>();
int nb = 0;
VideoBookListPath = _configDoc.Root.Attribute("VideoBookList").Value;
+ ProductionVideoPath = _configDoc.Root.Attribute("ProductionVideo").Value;
foreach (XElement XChapter in _configDoc.Root.Element("VideoBook").Elements())
{
temp.Add(new VideoChapterDescription(nb, XChapter.Attribute("name").Value, XChapter.Attribute("color").Value));
--- a/client/src/Iri.Modernisation.Data/Models/Loader.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Data/Models/Loader.cs Wed Jan 27 10:37:39 2010 +0100
@@ -14,17 +14,20 @@
using System.Threading;
namespace Iri.Modernisation.Data.Models
{
-
+ /// <summary>
+ /// Interface permettant une utilisation dans la classe Sync
+ /// </summary>
public interface ILoader
{
- event EventHandler<LoaderEventArgs<ILoader>> LoaderFinished;
+
+ event EventHandler<EventArgs> LoaderFinished;
}
/// <summary>
/// Classe permettant de charger un XML et de convertir son contenu en un type ReturnType désiré
/// </summary>
/// <typeparam name="ReturnType">Type Désiré</typeparam>
- public class Loader<ResultType>
+ public class Loader<ResultType> : ILoader
{
private AutoResetEvent Are { get; set; }
@@ -95,7 +98,7 @@
Load(this.Path);
}
- public event EventHandler<LoaderEventArgs<ResultType>> LoaderFinished;
+ public event EventHandler<EventArgs> LoaderFinished;
}
--- a/client/src/Iri.Modernisation.Data/Models/PolemicElement.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Data/Models/PolemicElement.cs Wed Jan 27 10:37:39 2010 +0100
@@ -12,18 +12,7 @@
namespace Iri.Modernisation.Data.Models
{
- /// <summary>
- /// Types Polémique
- /// </summary>
- public enum PolemicElementType
- {
- Basic=0,
- Polemic=1,
- Adhesion,
- Reference,
- Question
-
- };
+
/// <summary>
/// Classe PolemicElement
--- a/client/src/Iri.Modernisation.Data/Models/SettingsProject.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Data/Models/SettingsProject.cs Wed Jan 27 10:37:39 2010 +0100
@@ -12,6 +12,8 @@
using System.Threading;
namespace Iri.Modernisation.Data.Models
{
+
+
/// <summary>
///
/// </summary>
@@ -19,12 +21,21 @@
{
+
+
static public List<VideoBook> ListVideoBook { get; set; }
-
+ static public List<VideoSequence> ProductionVideo { get; set; }
+ static public Sync Synchronizer { get; set; }
static SettingsProject()
{
- //_internalDictionary.Add(new Loader<List<VideoBook>>(VideoBook.GetListVideoBook),
- // new KeyValuePair<string, object>("", null));
+ Synchronizer = new Sync();
+ Synchronizer.Completed += new EventHandler<EventArgs>(Synchronizer_Completed);
+ }
+
+ static void Synchronizer_Completed(object sender, EventArgs e)
+ {
+ if (SettingsLoaded != null)
+ SettingsLoaded(sender, e);
}
/// <summary>
/// (Télé)Chargement des données;
@@ -39,7 +50,7 @@
}
/// <summary>
- ///
+ /// Une fois que le fichier config du projet est chargé
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -47,20 +58,34 @@
{
Loader<List<VideoBook>> loaderListVideoBook = new Loader<List<VideoBook>>(VideoBook.GetListVideoBook);
- loaderListVideoBook.LoaderFinished += new EventHandler<LoaderEventArgs<List<VideoBook>>>(LoaderVideoBook_LoaderFinished);
- loaderListVideoBook.Load(FactoryVideoLivre.VideoBookListPath);
- // VideoBookLoaderHelper LoaderVideoBook = new VideoBookLoaderHelper(FactoryVideoLivre.VideoBookListPath);
- // LoaderVideoBook.LoaderFinished += new EventHandler<LoaderEventArgs<List<VideoBook>>>(LoaderVideoBook_LoaderFinished);
+
+ loaderListVideoBook.LoaderFinished += new EventHandler<EventArgs>(LoaderVideoBook_LoaderFinished);
+ Synchronizer.RegisterLoader(loaderListVideoBook);
+
+
+ Loader<List<VideoSequence>> loaderProductionVideo = new Loader<List<VideoSequence>>(VideoSequence.GetProductionVideo);
+ loaderProductionVideo.LoaderFinished += new EventHandler<EventArgs>(loaderProductionVideo_LoaderFinished);
+ Synchronizer.RegisterLoader(loaderProductionVideo);
+
+ loaderProductionVideo.Load(FactoryVideoLivre.ProductionVideoPath);
+ loaderListVideoBook.Load(FactoryVideoLivre.VideoBookListPath);
+
+
+ }
+
+ static void loaderProductionVideo_LoaderFinished(object sender, EventArgs e)
+ {
+ SettingsProject.ProductionVideo = ((LoaderEventArgs<List<VideoSequence>>)e).CreatedObject;
+
}
- static void LoaderVideoBook_LoaderFinished(object sender, LoaderEventArgs<List<VideoBook>> e)
+ static void LoaderVideoBook_LoaderFinished(object sender, EventArgs e)
{
- SettingsProject.ListVideoBook = e.CreatedObject;
- if (SettingsLoaded != null)
- SettingsLoaded(sender, e);
+ SettingsProject.ListVideoBook = ((LoaderEventArgs<List<VideoBook>>)e).CreatedObject;
+
}
/// <summary>
/// Evenement prévenant quand tout est pret
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/Iri.Modernisation.Data/Models/Sync.cs Wed Jan 27 10:37:39 2010 +0100
@@ -0,0 +1,54 @@
+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.Data.Models
+{
+ /// <summary>
+ /// Classe servant à synchroniser les Loaders
+ /// On créé la classe, on enregistre les Loader a synchroniser.
+ /// /* Utilisation */
+ /// Attention /!\ Il faut enregistrer le loader APRES s'êtres abonnée à son event LoaderFinished.
+ /// </summary>
+ public class Sync
+ {
+ /// <summary>
+ /// Constructeur par défaut
+ /// </summary>
+ public Sync()
+ { _registeredLoader = 0; }
+ private int _registeredLoader { get; set; }
+
+ /// <summary>
+ /// Méthode permettant d'enregistrer les Loader au sein d'un même Sync
+ /// </summary>
+ /// <param name="loader">Loader à enregistrer</param>
+ public void RegisterLoader(ILoader loader)
+ {
+ _registeredLoader++;
+ loader.LoaderFinished += new EventHandler<EventArgs>(loader_LoaderFinished);
+ }
+
+ private void loader_LoaderFinished(object sender, EventArgs e)
+ {
+ _registeredLoader--;
+ if (_registeredLoader == 0)
+ {
+ Completed(this, new EventArgs());
+ }
+ }
+
+ /// <summary>
+ /// Evenement déclanché une fois tous les Loader fini
+ /// </summary>
+ public event EventHandler<EventArgs> Completed;
+
+ }
+}
--- a/client/src/Iri.Modernisation.Data/Models/VideoBook.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Data/Models/VideoBook.cs Wed Jan 27 10:37:39 2010 +0100
@@ -110,19 +110,19 @@
{
_iriFile = new Loader<IRIFile>(IRIFile.FromXML);
_ldtFile = new Loader<LDTFile>(LDTFile.FromXML);
- _ldtFile.LoaderFinished += new EventHandler<LoaderEventArgs<LDTFile>>(_ldtFile_LoaderFinished);
- _iriFile.LoaderFinished += new EventHandler<LoaderEventArgs<IRIFile>>(_iriFile_LoaderFinished);
+ _ldtFile.LoaderFinished += new EventHandler<EventArgs>(_ldtFile_LoaderFinished);
+ _iriFile.LoaderFinished += new EventHandler<EventArgs>(_iriFile_LoaderFinished);
}
- void _iriFile_LoaderFinished(object sender, LoaderEventArgs<IRIFile> e)
+ void _iriFile_LoaderFinished(object sender, EventArgs e)
{
- _loadedIriFile = e.CreatedObject;
+ _loadedIriFile = ((LoaderEventArgs<IRIFile>)e).CreatedObject;
LoaderFinished(this,new LoaderEventArgs<VideoBook>(LDTFileReader.ConvertToVideoBook(_loadedLdtFile,_loadedIriFile)));
}
- void _ldtFile_LoaderFinished(object sender, LoaderEventArgs<LDTFile> e)
+ void _ldtFile_LoaderFinished(object sender, EventArgs e)
{
- _loadedLdtFile = e.CreatedObject;
+ _loadedLdtFile = ((LoaderEventArgs<LDTFile>)e).CreatedObject;
_iriFile.Load(_loadedLdtFile.Medias[0].Src);
}
--- a/client/src/Iri.Modernisation.Data/Models/VideoChapter.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Data/Models/VideoChapter.cs Wed Jan 27 10:37:39 2010 +0100
@@ -11,13 +11,7 @@
using System.Collections.Generic;
namespace Iri.Modernisation.Data.Models
{
- public enum VideoChapterType
- {
- Modernisation = 0,
- Modernite=1,
- Postmodernite=2,
- Ouverture=3
- }
+
/// <summary>
/// Chapitre d'un VideoLivre
@@ -29,10 +23,6 @@
/// </summary>
public VideoBook Book {get;set;}
- /// <summary>
- /// Chapitre
- /// </summary>
- public VideoChapterType Type { get; set; }
/// <summary>
/// Titre du chapitre
--- a/client/src/Iri.Modernisation.Data/Models/VideoSequence.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation.Data/Models/VideoSequence.cs Wed Jan 27 10:37:39 2010 +0100
@@ -8,7 +8,8 @@
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Shapes;
-
+using System.Xml.Linq;
+using System.Collections.Generic;
namespace Iri.Modernisation.Data.Models
{
/// <summary>
@@ -73,7 +74,26 @@
return TimerIn + Duration;
}
}
-
+
+ static public List<VideoSequence> GetProductionVideo(XDocument xdoc)
+ {
+ List<VideoSequence> returnList = new List<VideoSequence>();
+ foreach (XElement XVideo in xdoc.Root.Elements())
+ {
+
+ returnList.Add(
+ new VideoSequence()
+ {
+ Path = XVideo.Attribute("mediafile").Value,
+ RunTime = TimeSpan.FromMilliseconds(double.Parse(XVideo.Attribute("dur").Value)),
+ BeginTrim = new TimeSpan(0, 0, 0),
+ EndTrim = new TimeSpan(0, 0, 0),
+ }
+ );
+ }
+ return returnList;
+ }
+
}
}
--- a/client/src/Iri.Modernisation/MainPage.xaml.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/src/Iri.Modernisation/MainPage.xaml.cs Wed Jan 27 10:37:39 2010 +0100
@@ -30,7 +30,7 @@
FactoryVideoLivre.Load("ProjectConfig.xml");
InitializeComponent();
- MainElement.DataContext = new MainVM(new List<VideoBook>());
+ MainElement.DataContext = new MainVM();
}
void xmlClient_DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/client/test/WebTest/WebTest/WebTest.Web/ProductionContent/ProductionVideo.xml Wed Jan 27 10:37:39 2010 +0100
@@ -0,0 +1,11 @@
+<ProductionVideo BasePath="">
+ <!--
+
+ metafile = Lien du fichier de méta donnée
+ title = Titre du VideoLivre
+ -->
+ <Video mediafile="http://localhost:5979/ProductionContent/video.mp4" dur="600000"/>
+ <Video mediafile="http://localhost:5979/ProductionContent/video2.mp4" dur="241000"/>
+
+
+</ProductionVideo>
--- a/client/test/WebTest/WebTest/WebTest.Web/ProjectConfig.xml Mon Jan 25 09:30:22 2010 +0100
+++ b/client/test/WebTest/WebTest/WebTest.Web/ProjectConfig.xml Wed Jan 27 10:37:39 2010 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ProjectConfig
VideoBookList="/Content/AvailableVideoBooks.xml"
-
+ ProductionVideo="/ProductionContent/ProductionVideo.xml"
>
<VideoBook>
<VideoChapter name="Modernisation" color="#FFD6A382"/>
--- a/client/test/WebTest/WebTest/WebTest.Web/WebTest.Web.csproj Mon Jan 25 09:30:22 2010 +0100
+++ b/client/test/WebTest/WebTest/WebTest.Web/WebTest.Web.csproj Wed Jan 27 10:37:39 2010 +0100
@@ -75,7 +75,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
- <DevelopmentServerPort>2222</DevelopmentServerPort>
+ <DevelopmentServerPort>5979</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>
--- a/client/test/WebTest/WebTest/WebTest/MainPage.xaml.cs Mon Jan 25 09:30:22 2010 +0100
+++ b/client/test/WebTest/WebTest/WebTest/MainPage.xaml.cs Wed Jan 27 10:37:39 2010 +0100
@@ -25,8 +25,7 @@
//FactoryVideoLivre.xmlClient.DownloadStringCompleted += new DownloadStringCompletedEventHandler(xmlClient_DownloadStringCompleted);
- List<VideoBook> SelectedVideoBooks = new List<VideoBook>();
- SelectedVideoBooks = SettingsProject.ListVideoBook;
+
//Loader<VideoBook>.RegisterType("ldt", LDTFileReader.ConvertToVideoBook);
@@ -37,7 +36,7 @@
// SelectedVideoBooks = Loader.ListVideoBook;
InitializeComponent();
- MainElement.DataContext = new MainVM(SelectedVideoBooks);
+ MainElement.DataContext = new MainVM();
@@ -45,18 +44,7 @@
}
- void xmlClient_DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e)
- {
- if (e.Error == null)
- {
-
-
- }
- else
- {
- //MessageBox.Show(e.Error.InnerException.Message);
- }
- }
+