diff -r 43bb1b8ed555 -r b6df6fce6e5d client/src/Iri.Modernisation.Data/Models/SettingsProject.cs --- 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 { + + /// /// /// @@ -19,12 +21,21 @@ { + + static public List ListVideoBook { get; set; } - + static public List ProductionVideo { get; set; } + static public Sync Synchronizer { get; set; } static SettingsProject() { - //_internalDictionary.Add(new Loader>(VideoBook.GetListVideoBook), - // new KeyValuePair("", null)); + Synchronizer = new Sync(); + Synchronizer.Completed += new EventHandler(Synchronizer_Completed); + } + + static void Synchronizer_Completed(object sender, EventArgs e) + { + if (SettingsLoaded != null) + SettingsLoaded(sender, e); } /// /// (Télé)Chargement des données; @@ -39,7 +50,7 @@ } /// - /// + /// Une fois que le fichier config du projet est chargé /// /// /// @@ -47,20 +58,34 @@ { Loader> loaderListVideoBook = new Loader>(VideoBook.GetListVideoBook); - loaderListVideoBook.LoaderFinished += new EventHandler>>(LoaderVideoBook_LoaderFinished); - loaderListVideoBook.Load(FactoryVideoLivre.VideoBookListPath); - // VideoBookLoaderHelper LoaderVideoBook = new VideoBookLoaderHelper(FactoryVideoLivre.VideoBookListPath); - // LoaderVideoBook.LoaderFinished += new EventHandler>>(LoaderVideoBook_LoaderFinished); + + loaderListVideoBook.LoaderFinished += new EventHandler(LoaderVideoBook_LoaderFinished); + Synchronizer.RegisterLoader(loaderListVideoBook); + + + Loader> loaderProductionVideo = new Loader>(VideoSequence.GetProductionVideo); + loaderProductionVideo.LoaderFinished += new EventHandler(loaderProductionVideo_LoaderFinished); + Synchronizer.RegisterLoader(loaderProductionVideo); + + loaderProductionVideo.Load(FactoryVideoLivre.ProductionVideoPath); + loaderListVideoBook.Load(FactoryVideoLivre.VideoBookListPath); + + + } + + static void loaderProductionVideo_LoaderFinished(object sender, EventArgs e) + { + SettingsProject.ProductionVideo = ((LoaderEventArgs>)e).CreatedObject; + } - static void LoaderVideoBook_LoaderFinished(object sender, LoaderEventArgs> e) + static void LoaderVideoBook_LoaderFinished(object sender, EventArgs e) { - SettingsProject.ListVideoBook = e.CreatedObject; - if (SettingsLoaded != null) - SettingsLoaded(sender, e); + SettingsProject.ListVideoBook = ((LoaderEventArgs>)e).CreatedObject; + } /// /// Evenement prévenant quand tout est pret