awesomium support for html2pdf conversion beta

simonegli8 · May 31, 2013 · faa5202 · faa5202
1 parent b20f757
commit faa5202
Show file tree

Hide file tree

Showing 42 changed files with 249 additions and 317 deletions.
diff --git a/XamlImageConverter.Exe/Program.cs b/XamlImageConverter.Exe/Program.cs
@@ -22,7 +22,7 @@ public class Program {
  }
 
  if (a.Count == 0 || new[] { "-h", "help", "-help", "?", "/?", "-?" }.Any(s => a.Any(at => s == at.Trim().ToLower()))) {
- Console.WriteLine("XamlImageConverter 3.8 by Chris Cavanagh & Simon Egli");
+ Console.WriteLine("XamlImageConverter 3.9 by Chris Cavanagh & David Egli");
  Console.WriteLine("Creates snapshots, gif animations or html image maps from XAML, SVG & PSD images\n\r");
  Console.Error.WriteLine("XamlImageConverter [-x] [-w] [-1] [-s [running time]] [-r] [-v]");
  Console.Error.WriteLine(" [-l librarypath] [-p projectpath] configFile { configFile }");

diff --git a/XamlImageConverter.Exe/Properties/AssemblyInfo.cs b/XamlImageConverter.Exe/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "3.8.0.0" )]
-[assembly: AssemblyFileVersion( "3.8.0.0" )]
+[assembly: AssemblyVersion( "3.9.0.0" )]
+[assembly: AssemblyFileVersion( "3.9.0.0" )]
diff --git a/XamlImageConverter.Exe/XamlImageConverter.Exe.csproj b/XamlImageConverter.Exe/XamlImageConverter.Exe.csproj
@@ -122,7 +122,8 @@
  </ItemGroup>
  <ItemGroup>
  <Content Include="img\ImageMaps\Readme.aspx">
- <SubType>ASPXCodeBehind</SubType>
+ <SubType>
+ </SubType>
  </Content>
  <Content Include="img\ImageMaps\usa.map.html" />
  <Content Include="src\blog-banner.jpg" />

diff --git a/XamlImageConverter.Exe/src/MakeImages.xic.xaml b/XamlImageConverter.Exe/src/MakeImages.xic.xaml
@@ -99,11 +99,11 @@
  <xic:Snapshot File="usa.map.png" />
  <xic:Snapshot File="usa.map.xaml" />
 
- <xic:Map Image="usa.map.png" File="usa.map.html" ID="usa">
- <Areas Elements="WA;OR;CA;AK;ID;NV;AZ;UT;MT;WY;CO;NM;TX;OK;KS;NE;SD;ND;MN;IA;MO;AR;LA;WI;IL;TN;MS;MI;IN;KY;AL;FL;GA;SC;NC;VA;WV;OH;PA;MD;NJ;NY;CT;MA;VT;NH;ME;RI;DE,HI" onclick="alert('State %ID% clicked...');" />
+ <xic:Map Image="usa.map.png" File="Usa.Map.html" ID="usa">
+ <xic:Areas Elements="WA;OR;CA;AK;ID;NV;AZ;UT;MT;WY;CO;NM;TX;OK;KS;NE;SD;ND;MN;IA;MO;AR;LA;WI;IL;TN;MS;MI;IN;KY;AL;FL;GA;SC;NC;VA;WV;OH;PA;MD;NJ;NY;CT;MA;VT;NH;ME;RI;DE,HI" onclick="alert('State %ID% clicked...');" />
  </xic:Map>
  <xic:ImageMap Image="usa.map.png" File="Readme.aspx" ID="usa">
- <HotSpots Elements="WA;OR;CA;AK;ID;NV;AZ;UT;MT;WY;CO;NM;TX;OK;KS;NE;SD;ND;MN;IA;MO;AR;LA;WI;IL;TN;MS;MI;IN;KY;AL;FL;GA;SC;NC;VA;WV;OH;PA;MD;NJ;NY;CT;MA;VT;NH;ME;RI;DE,HI" PostBackValue="%ID%" />
+ <xic:HotSpots Elements="WA;OR;CA;AK;ID;NV;AZ;UT;MT;WY;CO;NM;TX;OK;KS;NE;SD;ND;MN;IA;MO;AR;LA;WI;IL;TN;MS;MI;IN;KY;AL;FL;GA;SC;NC;VA;WV;OH;PA;MD;NJ;NY;CT;MA;VT;NH;ME;RI;DE,HI" PostBackValue="%ID%" />
  </xic:ImageMap>
 
  </xic:Scene>
@@ -123,5 +123,9 @@
  <xic:Snapshot File="button.scene.png" />
  <xic:Snapshot Element="Button" File="button.png" />
  </xic:Scene>
-
+
+ <xic:Scene Source="http:https://www.msn.com">
+ <xic:Snapshot File="~/img/msn.pdf" Page="A4" />
+ </xic:Scene>
+
 </xic:XamlImageConverter>
diff --git a/XamlImageConverter.ItemWizard/ItemWizard.cs b/XamlImageConverter.ItemWizard/ItemWizard.cs
@@ -280,6 +280,7 @@ public class ItemWizard: IWizard {
  Directory.CreateDirectory(binlazy);
  Files.Copy(Path.Combine(src, "XamlImageConverter.dll"), binlazy);
  Files.Copy(Path.Combine(src, "XamlImageConverter.pdb"), binlazy);
+ Files.Copy(Path.Combine(src, "Awesomium"), binlazy);
  Files.Copy(Path.Combine(src, "gxps"), binlazy);
  Files.Copy(Path.Combine(src, "html2xaml"), binlazy);
  Files.Copy(Path.Combine(src, "ImageMagick"), binlazy);
@@ -323,7 +324,7 @@ public class ItemWizard: IWizard {
  if (configSections == null) webconfig.AddFirst(configSections = new XElement("configSections"));
 
  //configSections.Elements().Where(x => ((string)x.Attribute("type") ?? "").Contains("PublicKeyToken=60c2ec984bc1bb45")).Remove();
- configSections.Add(XElement.Parse("<section name='XamlImageConverter' type='XamlImageConverter.Configuration, XamlImageConverters.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
+ configSections.Add(XElement.Parse("<section name='XamlImageConverter' type='XamlImageConverter.Configuration, XamlImageConverters.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
  // XamlImageConverter section
  if (webconfig.Element("XamlImageConverter") == null) configSections.AddAfterSelf(XElement.Parse("<XamlImageConverter Log='true' Cache='~/Images/Cache' />"));
  }
@@ -334,11 +335,11 @@ public class ItemWizard: IWizard {
  var handlers = server.Element("handlers");
  if (handlers == null) server.Add(handlers = new XElement("handlers"));
  handlers.Elements().Where(x => ((string)x.Attribute("type") ?? "").Contains("PublicKeyToken=60c2ec984bc1bb45")).Remove();
- handlers.Add(XElement.Parse("<add name='XamlImageConverter.Xaml' verb='*' path='*.xaml' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
- XElement.Parse("<add name='XamlImageConverter.Svg' verb='*' path='*.svg' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
- XElement.Parse("<add name='XamlImageConverter.Svgz' verb='*' path='*.svgz' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
- XElement.Parse("<add name='XamlImageConverter.Psd' verb='*' path='*.psd' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
- XElement.Parse("<add name='XamlImageConverter.Dynamic' verb='*' path='xic.axd' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
+ handlers.Add(XElement.Parse("<add name='XamlImageConverter.Xaml' verb='*' path='*.xaml' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
+ XElement.Parse("<add name='XamlImageConverter.Svg' verb='*' path='*.svg' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
+ XElement.Parse("<add name='XamlImageConverter.Svgz' verb='*' path='*.svgz' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
+ XElement.Parse("<add name='XamlImageConverter.Psd' verb='*' path='*.psd' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
+ XElement.Parse("<add name='XamlImageConverter.Dynamic' verb='*' path='xic.axd' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
 
  // system.web
  var web = webconfig.Element("system.web");
@@ -350,15 +351,15 @@ public class ItemWizard: IWizard {
  var assemblies = comp.Element("assemblies");
  if (assemblies == null) comp.Add(assemblies = new XElement("assemblies"));
  assemblies.Elements().Where(x => ((string)x.Attribute("assembly") ?? "").Contains("PublicKeyToken=60c2ec984bc1bb45")).Remove();
- assemblies.Add(XElement.Parse("<add assembly='XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45'/>"));
+ assemblies.Add(XElement.Parse("<add assembly='XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45'/>"));
 
  // pages
  var pages = web.Element("pages");
  if (pages == null) comp.AddAfterSelf(pages = new XElement("pages"));
  var controls = pages.Element("controls");
  if (controls == null) pages.Add(controls = new XElement("controls"));
  controls.Elements().Where(x => ((string)x.Attribute("assembly") ?? "").Contains("PublicKeyToken=60c2ec984bc1bb45")).Remove();
- controls.Add(XElement.Parse("<add tagPrefix='xic' namespace='XamlImageConverter.Web.UI' assembly='XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
+ controls.Add(XElement.Parse("<add tagPrefix='xic' namespace='XamlImageConverter.Web.UI' assembly='XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
 
  /*
  // httpHandlers

diff --git a/XamlImageConverter.Test.Web/Web.config b/XamlImageConverter.Test.Web/Web.config
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
  <configSections>
- <section name="XamlImageConverter" type="XamlImageConverter.Configuration, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <section name="XamlImageConverter" type="XamlImageConverter.Configuration, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
  </configSections>
  <XamlImageConverter log="true" cache="~/Images/Cache" separateDomain="false"/>
  <appSettings/>
@@ -23,12 +23,12 @@
  -->
  <compilation debug="true" targetFramework="4.5">
  <assemblies>
- <add assembly="XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add assembly="XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
  </assemblies>
  </compilation>
  <pages controlRenderingCompatibilityVersion="4.0">
  <controls>
- <add tagPrefix="xic" namespace="XamlImageConverter.Web.UI" assembly="XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add tagPrefix="xic" namespace="XamlImageConverter.Web.UI" assembly="XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
  </controls>
  </pages>
  <!--
@@ -46,11 +46,11 @@
  -->
  <system.webServer>
  <handlers>
- <add name="XamlImageConverterXaml" verb="*" path="*.xaml" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
- <add name="XamlImageConverterPsd" verb="*" path="*.svg" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
- <add name="XamlImageConverterSvg" verb="*" path="*.svgz" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
- <add name="XamlImageConverterSvgz" verb="*" path="*.psd" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
- <add name="XamlImageConverterDynamic" verb="*" path="xic.axd" preCondition="integratedMode" type="Silversite.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.8.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterXaml" verb="*" path="*.xaml" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterPsd" verb="*" path="*.svg" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterSvg" verb="*" path="*.svgz" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterSvgz" verb="*" path="*.psd" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterDynamic" verb="*" path="xic.axd" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
  </handlers>
  <validation validateIntegratedModeConfiguration="false" />
  </system.webServer>

diff --git a/XamlImageConverter.Test.Web/XamlImageConverter.Demo/CreateImages.xic.xaml b/XamlImageConverter.Test.Web/XamlImageConverter.Demo/CreateImages.xic.xaml
@@ -86,4 +86,8 @@
  <xic:Snapshot File="button.png" />
  </xic:Scene>
 
+ <xic:Scene Source="http:https://www.msn.com">
+ <xic:Snapshot File="msn.pdf" Page="A4" />
+ </xic:Scene>
+
 </xic:XamlImageConverter>
diff --git a/XamlImageConverter.Test.Web/XamlImageConverter.Demo/Readme.aspx b/XamlImageConverter.Test.Web/XamlImageConverter.Demo/Readme.aspx
@@ -18,12 +18,12 @@
 <body>
  <form id="form1" runat="server">
  <div>
-  
+
  <h3>A direct conversion of xaml =&gt; png</h3> 
  <pre><code>&lt;img src="Homepage.xaml?png" runat="server" /&gt;</code></pre>
  <img src="Homepage.xaml?png" runat="server" />
  <hr />
-
+ 
  <h3>A PDF of the above xaml</h3>
  <pre><code>&lt;a href="Homepage.xaml?pdf"&gt;Homepage PDF&lt;/a&gt;</code></pre>
  <a href="Homepage.xaml?pdf">Homepage PDF</a>
@@ -171,20 +171,20 @@
  </script>
 
  </div>
-
-  <%--<h3>Map Element for a selectable map:</h3>
+ 
+ <h3>Map Element for a selectable map:</h3>
 
-  <pre><code>
-  &lt;xic:Map runat="server" Source="Usa.Map.svg" Scale="0.5" Mode="Select" CssClass="map" Legend="true" SubmitText="Submit" 
-  IDs="WA,OR,CA,AK,ID,NV,AZ,UT,MT,WY,CO,NM,TX,OK,KS,NE,SD,ND,MN,IA,MO,AR,LA,WI,IL,TN,MS,MI,IN,KY,AL,FL,GA,SC,NC,VA,WV,OH,PA,MD,NJ,NY,CT,MA,VT,NH,ME,RI,DE,HI"
-  Regions="Washington,Oregon,California,Arkansas,Utah,Montana,Wyoming,Colorado,New Mexico,Texas,Oklahoma,Kansas,Nebraska,South Dakota,North Dakota,Minnesota,Iowa,Mississippi,Michigan,Indiana,Kentucky,Alabama,Florida,Georgia,South Carolina,North Carolina,Virginia,West Virginia,Ohio,Pennsylvania,Maryland,New Jersey,New York,Connecticut,Massachusetts,Vermont,New Hampshire,Maine,Rhode Island, Delaware,Hawaii" /&gt;
+ <pre><code>
+ &lt;xic:Map runat="server" Source="Usa.Map.svg" Scale="0.5" Mode="Select" CssClass="map" Legend="true" RepeatColumns="2" SubmitText="Submit" 
+ IDs="WA,OR,CA,AK,ID,NV,AZ,UT,MT,WY,CO,NM,TX,OK,KS,NE,SD,ND,MN,IA,MO,AR,LA,WI,IL,TN,MS,MI,IN,KY,AL,FL,GA,SC,NC,VA,WV,OH,PA,MD,NJ,NY,CT,MA,VT,NH,ME,RI,DE,HI"
+ Regions="Washington,Oregon,California,Arkansas,Utah,Montana,Wyoming,Colorado,New Mexico,Texas,Oklahoma,Kansas,Nebraska,South Dakota,North Dakota,Minnesota,Iowa,Mississippi,Michigan,Indiana,Kentucky,Alabama,Florida,Georgia,South Carolina,North Carolina,Virginia,West Virginia,Ohio,Pennsylvania,Maryland,New Jersey,New York,Connecticut,Massachusetts,Vermont,New Hampshire,Maine,Rhode Island, Delaware,Hawaii" /&gt;
 
-  </code></pre>
+ </code></pre>
 
-  <xic:Map runat="server" Source="Usa.Map.svg" Scale="0.5" Mode="Select" CssClass="map" Legend="true" SubmitText="Submit" 
-  IDs="WA,OR,CA,AK,ID,NV,AZ,UT,MT,WY,CO,NM,TX,OK,KS,NE,SD,ND,MN,IA,MO,AR,LA,WI,IL,TN,MS,MI,IN,KY,AL,FL,GA,SC,NC,VA,WV,OH,PA,MD,NJ,NY,CT,MA,VT,NH,ME,RI,DE,HI"
-  Regions="Washington,Oregon,California,Arkansas,Utah,Montana,Wyoming,Colorado,New Mexico,Texas,Oklahoma,Kansas,Nebraska,South Dakota,North Dakota,Minnesota,Iowa,Mississippi,Michigan,Indiana,Kentucky,Alabama,Florida,Georgia,South Carolina,North Carolina,Virginia,West Virginia,Ohio,Pennsylvania,Maryland,New Jersey,New York,Connecticut,Massachusetts,Vermont,New Hampshire,Maine,Rhode Island, Delaware,Hawaii" />
-  --%>
+ <xic:Map runat="server" Source="Usa.Map.svg" Scale="0.5" Mode="Select" CssClass="map" Legend="true" RepeatColumns="2" SubmitText="Submit" 
+ IDs="WA,OR,CA,AK,ID,NV,AZ,UT,MT,WY,CO,NM,TX,OK,KS,NE,SD,ND,MN,IA,MO,AR,LA,WI,IL,TN,MS,MI,IN,KY,AL,FL,GA,SC,NC,VA,WV,OH,PA,MD,NJ,NY,CT,MA,VT,NH,ME,RI,DE,HI"
+ Regions="Washington,Oregon,California,Arkansas,Utah,Montana,Wyoming,Colorado,New Mexico,Texas,Oklahoma,Kansas,Nebraska,South Dakota,North Dakota,Minnesota,Iowa,Mississippi,Michigan,Indiana,Kentucky,Alabama,Florida,Georgia,South Carolina,North Carolina,Virginia,West Virginia,Ohio,Pennsylvania,Maryland,New Jersey,New York,Connecticut,Massachusetts,Vermont,New Hampshire,Maine,Rhode Island, Delaware,Hawaii" />
+
  </form>
 </body>
 </html>
diff --git a/XamlImageConverter.Test.Web/XamlImageConverter.Demo/jquery.js b/XamlImageConverter.Test.Web/XamlImageConverter.Demo/jquery.js