--- 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<VideoChapterDescription> temp = new List<VideoChapterDescription>();
List<PolemicTypeDescription> temp_an = new List<PolemicTypeDescription>();
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));
--- 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 @@
/// <param name="e"></param>
static void FactoryVideoLivre_FactoryReady(object sender, EventArgs e)
{
- /*Loader<List<VideoBook>> LoaderVideoBook = new Loader<List<VideoBook>>(VideoBook.LoadFromXml);
- LoaderVideoBook.LoadAvailableVideoBooks("/Content/AvailableVideoBooks.xml");
- LoaderVideoBook.LoaderFinished += new EventHandler<LoaderEventArgs<List<VideoBook>>>(LoaderVideoBook_LoaderFinished);*/
- VideoBookLoaderHelper LoaderVideoBook = new VideoBookLoaderHelper("/Content/AvailableVideoBooks.xml");
+
+ VideoBookLoaderHelper LoaderVideoBook = new VideoBookLoaderHelper(FactoryVideoLivre.VideoBookListPath);
LoaderVideoBook.LoaderFinished += new EventHandler<LoaderEventArgs<List<VideoBook>>>(LoaderVideoBook_LoaderFinished);
}
--- 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++;
}
--- 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 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ProjectConfig>
+<ProjectConfig
+ VideoBookList="/Content/AvailableVideoBooks2.xml"
+
+>
<VideoBook>
<VideoChapter name="Modernisation" color="#FFD6A382"/>
<VideoChapter name="Modernité" color="#FFBFA84E"/>
--- 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 @@
<param name="background" value="white" />
<param name="minRuntimeVersion" value="4.0.41108.0" />
<param name="autoUpgrade" value="true" />
+ <param name="culture" value="fr-FR" />
+ <param name="uiculture" value="fr-FR" />
+ <param name="initparams" value="ConfigProjectFile=/ProjectConfig.xml,test=toto"/>
+
<a href="http://go.microsoft.com/fwlink/?LinkID=149156&v=4.0.41108.0" style="text-decoration:none">
<img src="http://go.microsoft.com/fwlink/?LinkId=161376" alt="Get Microsoft Silverlight" style="border-style:none"/>
</a>
--- 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"]);
}