# HG changeset patch # User totetm <> # Date 1263551465 -3600 # Node ID 36302cc9688ddb2c743106866f482897030e1654 # Parent 775d895e5d4d44fe6314cb5f46454db5bfe0aa1f Web InitParams diff -r 775d895e5d4d -r 36302cc9688d client/src/Iri.Modernisation.Data/Models/FactoryVideoLivre.cs --- a/client/src/Iri.Modernisation.Data/Models/FactoryVideoLivre.cs Fri Jan 15 11:30:56 2010 +0100 +++ b/client/src/Iri.Modernisation.Data/Models/FactoryVideoLivre.cs Fri Jan 15 11:31:05 2010 +0100 @@ -18,7 +18,7 @@ private static XDocument _configDoc; public static VideoChapterDescription[] VideoChapterDescriptions {get;private set;} public static PolemicTypeDescription[] AnnotationDescriptions { get; private set; } - + public static String VideoBookListPath; public static int NumberOfChapters { get @@ -57,6 +57,7 @@ List temp = new List(); List temp_an = new List(); int nb = 0; + VideoBookListPath = _configDoc.Root.Attribute("VideoBookList").Value; foreach (XElement XChapter in _configDoc.Root.Element("VideoBook").Elements()) { temp.Add(new VideoChapterDescription(nb, XChapter.Attribute("name").Value, XChapter.Attribute("color").Value)); diff -r 775d895e5d4d -r 36302cc9688d client/src/Iri.Modernisation.Data/Models/SettingsProject.cs --- a/client/src/Iri.Modernisation.Data/Models/SettingsProject.cs Fri Jan 15 11:30:56 2010 +0100 +++ b/client/src/Iri.Modernisation.Data/Models/SettingsProject.cs Fri Jan 15 11:31:05 2010 +0100 @@ -43,10 +43,8 @@ /// static void FactoryVideoLivre_FactoryReady(object sender, EventArgs e) { - /*Loader> LoaderVideoBook = new Loader>(VideoBook.LoadFromXml); - LoaderVideoBook.LoadAvailableVideoBooks("/Content/AvailableVideoBooks.xml"); - LoaderVideoBook.LoaderFinished += new EventHandler>>(LoaderVideoBook_LoaderFinished);*/ - VideoBookLoaderHelper LoaderVideoBook = new VideoBookLoaderHelper("/Content/AvailableVideoBooks.xml"); + + VideoBookLoaderHelper LoaderVideoBook = new VideoBookLoaderHelper(FactoryVideoLivre.VideoBookListPath); LoaderVideoBook.LoaderFinished += new EventHandler>>(LoaderVideoBook_LoaderFinished); } diff -r 775d895e5d4d -r 36302cc9688d client/src/Iri.Modernisation.Data/Models/VideoBook.cs --- a/client/src/Iri.Modernisation.Data/Models/VideoBook.cs Fri Jan 15 11:30:56 2010 +0100 +++ b/client/src/Iri.Modernisation.Data/Models/VideoBook.cs Fri Jan 15 11:31:05 2010 +0100 @@ -93,8 +93,6 @@ LoaderVideoBook.LoadAvailableVideoBooks(XVideoBook.Attribute("metafile").Value); - - nbOfBook++; } diff -r 775d895e5d4d -r 36302cc9688d client/test/WebTest/WebTest/WebTest.Web/ProjectConfig.xml --- a/client/test/WebTest/WebTest/WebTest.Web/ProjectConfig.xml Fri Jan 15 11:30:56 2010 +0100 +++ b/client/test/WebTest/WebTest/WebTest.Web/ProjectConfig.xml Fri Jan 15 11:31:05 2010 +0100 @@ -1,5 +1,8 @@ - + diff -r 775d895e5d4d -r 36302cc9688d client/test/WebTest/WebTest/WebTest.Web/WebTestTestPage.aspx --- a/client/test/WebTest/WebTest/WebTest.Web/WebTestTestPage.aspx Fri Jan 15 11:30:56 2010 +0100 +++ b/client/test/WebTest/WebTest/WebTest.Web/WebTestTestPage.aspx Fri Jan 15 11:31:05 2010 +0100 @@ -65,6 +65,10 @@ + + + + Get Microsoft Silverlight diff -r 775d895e5d4d -r 36302cc9688d client/test/WebTest/WebTest/WebTest/App.xaml.cs --- a/client/test/WebTest/WebTest/WebTest/App.xaml.cs Fri Jan 15 11:30:56 2010 +0100 +++ b/client/test/WebTest/WebTest/WebTest/App.xaml.cs Fri Jan 15 11:31:05 2010 +0100 @@ -37,7 +37,7 @@ FactoryVideoLivre.FactoryReady += new EventHandler(FactoryVideoLivre_FactoryReady); FactoryVideoLivre.LoadXMLFile("/ProjectConfig.xml");*/ SettingsProject.SettingsLoaded += new EventHandler(SettingsProject_SettingsLoaded); - SettingsProject.Load("/ProjectConfig.xml"); + SettingsProject.Load(e.InitParams["ConfigProjectFile"]); }