diff --git a/Samples/.gitignore b/Samples/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..6a473ad2081de644a2587f1d33e7626a63d3f385 --- /dev/null +++ b/Samples/.gitignore @@ -0,0 +1,29 @@ +# added to support ignoring the build samples +[Bb]in/ +[Oo]bj/ +*.suo +*.user + +# Build results +[Dd]ebug/ +[Rr]elease/ +x64/ +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.log +*.vspscc +*.vssscc +.builds \ No newline at end of file diff --git a/Samples/SVGViewer/Backup/Program.cs b/Samples/SVGViewer/Backup/Program.cs deleted file mode 100644 index e2813cc6c865d0ac1851b4e6cb276a302870fca0..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/Backup/Program.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace SVGViewer -{ - static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new SVGViewer()); - } - } -} diff --git a/Samples/SVGViewer/Backup/Properties/AssemblyInfo.cs b/Samples/SVGViewer/Backup/Properties/AssemblyInfo.cs deleted file mode 100644 index d9a92d5d6d9283b51d806fa8418c1750f38e63ce..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/Backup/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("SVGViewer")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Avolites Ltd")] -[assembly: AssemblyProduct("SVGViewer")] -[assembly: AssemblyCopyright("Copyright © Avolites Ltd 2010")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d06bed1d-a4ef-430c-8278-13ae8b5ce985")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Samples/SVGViewer/Backup/Properties/Resources.Designer.cs b/Samples/SVGViewer/Backup/Properties/Resources.Designer.cs deleted file mode 100644 index d18661bb62a1674821484f6c6ded5c47fe929cca..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/Backup/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.3615 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace SVGViewer.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SVGViewer.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/Samples/SVGViewer/Backup/Properties/Resources.resx b/Samples/SVGViewer/Backup/Properties/Resources.resx deleted file mode 100644 index af7dbebbacef595e3089c01c05671016c21a8304..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/Backup/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Samples/SVGViewer/Backup/Properties/Settings.Designer.cs b/Samples/SVGViewer/Backup/Properties/Settings.Designer.cs deleted file mode 100644 index 53c8e83d9a69c6f3b3028d71893d52519fa41ce4..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/Backup/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.3615 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace SVGViewer.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/Samples/SVGViewer/Backup/Properties/Settings.settings b/Samples/SVGViewer/Backup/Properties/Settings.settings deleted file mode 100644 index 39645652af62950ebf3b28ec3a5400dcec30b1c4..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/Backup/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Samples/SVGViewer/Backup/SVGViewer.csproj b/Samples/SVGViewer/Backup/SVGViewer.csproj deleted file mode 100644 index 58f82358d5db18b65579293aea2503f583bd31df..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/Backup/SVGViewer.csproj +++ /dev/null @@ -1,99 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {1B8F3C8A-CCAC-474E-B09D-522FBA93DCFD} - WinExe - Properties - SVGViewer - SVGViewer - v3.5 - 512 - SAK - SAK - SAK - SAK - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - 3.5 - - - 3.5 - - - 3.5 - - - - - - - - - - Form - - - SvgViewer.cs - - - - - SvgViewer.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {886A98C5-37C0-4E8B-885E-30C1D2F98B47} - Svg - - - - - \ No newline at end of file diff --git a/Samples/SVGViewer/Backup/SvgViewer.Designer.cs b/Samples/SVGViewer/Backup/SvgViewer.Designer.cs deleted file mode 100644 index e6b8be9e888975b66fa161af9a3acd13a7c1dce7..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/Backup/SvgViewer.Designer.cs +++ /dev/null @@ -1,98 +0,0 @@ -namespace SVGViewer -{ - partial class SVGViewer - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SVGViewer)); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.open = new System.Windows.Forms.ToolStripButton(); - this.svgImage = new System.Windows.Forms.PictureBox(); - this.openSvgFile = new System.Windows.Forms.OpenFileDialog(); - this.toolStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.svgImage)).BeginInit(); - this.SuspendLayout(); - // - // toolStrip1 - // - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.open}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(527, 25); - this.toolStrip1.TabIndex = 0; - this.toolStrip1.Text = "toolStrip1"; - // - // open - // - this.open.Image = ((System.Drawing.Image)(resources.GetObject("open.Image"))); - this.open.ImageTransparentColor = System.Drawing.Color.Magenta; - this.open.Name = "open"; - this.open.Size = new System.Drawing.Size(53, 22); - this.open.Text = "Open"; - this.open.Click += new System.EventHandler(this.open_Click); - // - // svgImage - // - this.svgImage.Dock = System.Windows.Forms.DockStyle.Fill; - this.svgImage.Location = new System.Drawing.Point(0, 25); - this.svgImage.Name = "svgImage"; - this.svgImage.Size = new System.Drawing.Size(527, 449); - this.svgImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.svgImage.TabIndex = 1; - this.svgImage.TabStop = false; - // - // openSvgFile - // - this.openSvgFile.Filter = "Vector Graphics (*.svg)|*.svg"; - // - // SVGViewer - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(527, 474); - this.Controls.Add(this.svgImage); - this.Controls.Add(this.toolStrip1); - this.Name = "SVGViewer"; - this.Text = "SVG Viewer"; - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.svgImage)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripButton open; - private System.Windows.Forms.PictureBox svgImage; - private System.Windows.Forms.OpenFileDialog openSvgFile; - } -} - diff --git a/Samples/SVGViewer/Backup/SvgViewer.cs b/Samples/SVGViewer/Backup/SvgViewer.cs deleted file mode 100644 index 827c724fa3747ea4737e1577bcdd103a7fedba1d..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/Backup/SvgViewer.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; -using Svg; -using Svg.Transforms; - -namespace SVGViewer -{ - public partial class SVGViewer : Form - { - public SVGViewer() - { - InitializeComponent(); - } - - private void open_Click(object sender, EventArgs e) - { - if (openSvgFile.ShowDialog() == DialogResult.OK) - { - SvgDocument svgDoc = SvgDocument.Open(openSvgFile.FileName); - svgDoc.Transforms = new SvgTransformCollection(); - svgDoc.Transforms.Add(new SvgScale(2, 2)); - svgDoc.Width = new SvgUnit(svgDoc.Width.Type, svgDoc.Width * 2); - svgDoc.Height = new SvgUnit(svgDoc.Height.Type, svgDoc.Height * 2); - svgImage.Image = svgDoc.Draw(); - } - } - } -} diff --git a/Samples/SVGViewer/Backup/SvgViewer.resx b/Samples/SVGViewer/Backup/SvgViewer.resx deleted file mode 100644 index ed47b88a52623e3b6dc03f6ae70e31234386ba13..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/Backup/SvgViewer.resx +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL - U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI - VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ - QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4 - /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9 - cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j - 3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR - dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb - NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE - s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC - - - - 116, 17 - - \ No newline at end of file diff --git a/Samples/SVGViewer/NoImage.png b/Samples/SVGViewer/NoImage.png new file mode 100644 index 0000000000000000000000000000000000000000..7788df2d89c7bf914e9c8d35c9791f50259fdc9c Binary files /dev/null and b/Samples/SVGViewer/NoImage.png differ diff --git a/Samples/SVGViewer/SVGViewer.csproj.vspscc b/Samples/SVGViewer/SVGViewer.csproj.vspscc deleted file mode 100644 index feffdecaa492c865e333a42c6e995508aa9fabfd..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/SVGViewer.csproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Samples/SVGViewer/SVGViewer.suo b/Samples/SVGViewer/SVGViewer.suo deleted file mode 100644 index f184de08f0427fe5e3631bbd090a70eab1c98de3..0000000000000000000000000000000000000000 Binary files a/Samples/SVGViewer/SVGViewer.suo and /dev/null differ diff --git a/Samples/SVGViewer/UpgradeLog.XML b/Samples/SVGViewer/UpgradeLog.XML deleted file mode 100644 index bc85cde3a244b1132eaf153d000d85410a78396c..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/UpgradeLog.XML +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Samples/SVGViewer/_UpgradeReport_Files/UpgradeReport.css b/Samples/SVGViewer/_UpgradeReport_Files/UpgradeReport.css deleted file mode 100644 index fae98af0a8673fbeff0703f087b0e0912c95464a..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/_UpgradeReport_Files/UpgradeReport.css +++ /dev/null @@ -1,207 +0,0 @@ -BODY -{ - BACKGROUND-COLOR: white; - FONT-FAMILY: "Verdana", sans-serif; - FONT-SIZE: 100%; - MARGIN-LEFT: 0px; - MARGIN-TOP: 0px -} -P -{ - FONT-FAMILY: "Verdana", sans-serif; - FONT-SIZE: 70%; - LINE-HEIGHT: 12pt; - MARGIN-BOTTOM: 0px; - MARGIN-LEFT: 10px; - MARGIN-TOP: 10px -} -.note -{ - BACKGROUND-COLOR: #ffffff; - COLOR: #336699; - FONT-FAMILY: "Verdana", sans-serif; - FONT-SIZE: 100%; - MARGIN-BOTTOM: 0px; - MARGIN-LEFT: 0px; - MARGIN-TOP: 0px; - PADDING-RIGHT: 10px -} -.infotable -{ - BACKGROUND-COLOR: #f0f0e0; - BORDER-BOTTOM: #ffffff 0px solid; - BORDER-COLLAPSE: collapse; - BORDER-LEFT: #ffffff 0px solid; - BORDER-RIGHT: #ffffff 0px solid; - BORDER-TOP: #ffffff 0px solid; - FONT-SIZE: 70%; - MARGIN-LEFT: 10px -} -.issuetable -{ - BACKGROUND-COLOR: #ffffe8; - BORDER-COLLAPSE: collapse; - COLOR: #000000; - FONT-SIZE: 100%; - MARGIN-BOTTOM: 10px; - MARGIN-LEFT: 13px; - MARGIN-TOP: 0px -} -.issuetitle -{ - BACKGROUND-COLOR: #ffffff; - BORDER-BOTTOM: #dcdcdc 1px solid; - BORDER-TOP: #dcdcdc 1px; - COLOR: #003366; - FONT-WEIGHT: normal -} -.header -{ - BACKGROUND-COLOR: #cecf9c; - BORDER-BOTTOM: #ffffff 1px solid; - BORDER-LEFT: #ffffff 1px solid; - BORDER-RIGHT: #ffffff 1px solid; - BORDER-TOP: #ffffff 1px solid; - COLOR: #000000; - FONT-WEIGHT: bold -} -.issuehdr -{ - BACKGROUND-COLOR: #E0EBF5; - BORDER-BOTTOM: #dcdcdc 1px solid; - BORDER-TOP: #dcdcdc 1px solid; - COLOR: #000000; - FONT-WEIGHT: normal -} -.issuenone -{ - BACKGROUND-COLOR: #ffffff; - BORDER-BOTTOM: 0px; - BORDER-LEFT: 0px; - BORDER-RIGHT: 0px; - BORDER-TOP: 0px; - COLOR: #000000; - FONT-WEIGHT: normal -} -.content -{ - BACKGROUND-COLOR: #e7e7ce; - BORDER-BOTTOM: #ffffff 1px solid; - BORDER-LEFT: #ffffff 1px solid; - BORDER-RIGHT: #ffffff 1px solid; - BORDER-TOP: #ffffff 1px solid; - PADDING-LEFT: 3px -} -.issuecontent -{ - BACKGROUND-COLOR: #ffffff; - BORDER-BOTTOM: #dcdcdc 1px solid; - BORDER-TOP: #dcdcdc 1px solid; - PADDING-LEFT: 3px -} -A:link -{ - COLOR: #cc6633; - TEXT-DECORATION: underline -} -A:visited -{ - COLOR: #cc6633; -} -A:active -{ - COLOR: #cc6633; -} -A:hover -{ - COLOR: #cc3300; - TEXT-DECORATION: underline -} -H1 -{ - BACKGROUND-COLOR: #003366; - BORDER-BOTTOM: #336699 6px solid; - COLOR: #ffffff; - FONT-SIZE: 130%; - FONT-WEIGHT: normal; - MARGIN: 0em 0em 0em -20px; - PADDING-BOTTOM: 8px; - PADDING-LEFT: 30px; - PADDING-TOP: 16px -} -H2 -{ - COLOR: #000000; - FONT-SIZE: 80%; - FONT-WEIGHT: bold; - MARGIN-BOTTOM: 3px; - MARGIN-LEFT: 10px; - MARGIN-TOP: 20px; - PADDING-LEFT: 0px -} -H3 -{ - COLOR: #000000; - FONT-SIZE: 80%; - FONT-WEIGHT: bold; - MARGIN-BOTTOM: -5px; - MARGIN-LEFT: 10px; - MARGIN-TOP: 20px -} -H4 -{ - COLOR: #000000; - FONT-SIZE: 70%; - FONT-WEIGHT: bold; - MARGIN-BOTTOM: 0px; - MARGIN-TOP: 15px; - PADDING-BOTTOM: 0px -} -UL -{ - COLOR: #000000; - FONT-SIZE: 70%; - LIST-STYLE: square; - MARGIN-BOTTOM: 0pt; - MARGIN-TOP: 0pt -} -OL -{ - COLOR: #000000; - FONT-SIZE: 70%; - LIST-STYLE: square; - MARGIN-BOTTOM: 0pt; - MARGIN-TOP: 0pt -} -LI -{ - LIST-STYLE: square; - MARGIN-LEFT: 0px -} -.expandable -{ - CURSOR: hand -} -.expanded -{ - color: black -} -.collapsed -{ - DISPLAY: none -} -.foot -{ -BACKGROUND-COLOR: #ffffff; -BORDER-BOTTOM: #cecf9c 1px solid; -BORDER-TOP: #cecf9c 2px solid -} -.settings -{ -MARGIN-LEFT: 25PX; -} -.help -{ -TEXT-ALIGN: right; -margin-right: 10px; -} diff --git a/Samples/SVGViewer/_UpgradeReport_Files/UpgradeReport.xslt b/Samples/SVGViewer/_UpgradeReport_Files/UpgradeReport.xslt deleted file mode 100644 index 73c4e7af8a8459c8d768e7253fb41bc01ce6738a..0000000000000000000000000000000000000000 --- a/Samples/SVGViewer/_UpgradeReport_Files/UpgradeReport.xslt +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- Solution: - Project: - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - src - - - - - - - - - - - - -
FilenameStatusErrorsWarnings
- javascript:document.images[''].click()src - - - - Converted - - - - Converted - -
- - files - - - 1 file - - - Converted:
- Not converted: -
- - - - - - : - - - - - - - - - Conversion Report - <xsl:if test="Properties/Property[@Name='LogNumber']"> - <xsl:value-of select="Properties/Property[@Name='LogNumber']/@Value"/> - </xsl:if> - - - - -

Conversion Report -

- -

- Time of Conversion:
-

- - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - -
- Conversion Settings -

- - - - diff --git a/Samples/SVGViewer/_UpgradeReport_Files/UpgradeReport_Minus.gif b/Samples/SVGViewer/_UpgradeReport_Files/UpgradeReport_Minus.gif deleted file mode 100644 index 17751cb2fd5c284dfe984adc4c769982f73a0a66..0000000000000000000000000000000000000000 Binary files a/Samples/SVGViewer/_UpgradeReport_Files/UpgradeReport_Minus.gif and /dev/null differ diff --git a/Samples/SVGViewer/_UpgradeReport_Files/UpgradeReport_Plus.gif b/Samples/SVGViewer/_UpgradeReport_Files/UpgradeReport_Plus.gif deleted file mode 100644 index f6009ca3f6bf6e8bc5a65f21d032a4e8ceb197f4..0000000000000000000000000000000000000000 Binary files a/Samples/SVGViewer/_UpgradeReport_Files/UpgradeReport_Plus.gif and /dev/null differ diff --git a/Source/Basic Shapes/SvgImage.cs b/Source/Basic Shapes/SvgImage.cs index 06259fe5dca9b51728b9d3809d670d34db2edffd..eeed03a6edd64081338ff11c84bbef32d31a6b19 100644 --- a/Source/Basic Shapes/SvgImage.cs +++ b/Source/Basic Shapes/SvgImage.cs @@ -97,6 +97,9 @@ namespace Svg /// protected override void Render(SvgRenderer renderer) { + if (!Visible || !Displayable) + return; + if (Width.Value > 0.0f && Height.Value > 0.0f && this.Href != null) { using (Image b = GetImage(this.Href)) diff --git a/Source/Basic Shapes/SvgVisualElement.cs b/Source/Basic Shapes/SvgVisualElement.cs index 8906ef31b4cfe47e87d0041da549aff2cf6c1692..39fcebf5f662e435bddb28aa0792acac3fb00417 100644 --- a/Source/Basic Shapes/SvgVisualElement.cs +++ b/Source/Basic Shapes/SvgVisualElement.cs @@ -94,7 +94,7 @@ namespace Svg /// The object to render to. protected override void Render(SvgRenderer renderer) { - if (this.Path != null && this.Visible) + if ((this.Path != null) && this.Visible && this.Displayable) { this.PushTransforms(renderer); this.SetClip(renderer); diff --git a/Source/Basic Shapes/SvgVisualElementStyle.cs b/Source/Basic Shapes/SvgVisualElementStyle.cs index 8bacd663f6c6e860b7a54b55ffae25f4b7cae7da..426d142c57b7ebf3964469ed9a8bed19e204f343 100644 --- a/Source/Basic Shapes/SvgVisualElementStyle.cs +++ b/Source/Basic Shapes/SvgVisualElementStyle.cs @@ -26,6 +26,30 @@ namespace Svg set { this.Attributes["visibility"] = value; } } + /// + /// Gets or sets a value to determine whether the element will be rendered. + /// Needed to support SVG attribute display="none" + /// + [SvgAttribute("display")] + public virtual string Display + { + get { return this.Attributes["display"] as string; } + set { this.Attributes["display"] = value; } + } + + // Displayable - false if attribute display="none", true otherwise + protected virtual bool Displayable + { + get + { + string checkForDisplayNone = this.Attributes["display"] as string; + if ((!string.IsNullOrEmpty(checkForDisplayNone)) && (checkForDisplayNone == "none")) + return false; + else + return true; + } + } + /// /// Gets or sets the fill of this element. /// diff --git a/Source/Document Structure/SvgGroup.cs b/Source/Document Structure/SvgGroup.cs index d93c51333432f67ced3247721cf4c5db99d69a35..b364f278943886ce4bee66a0cddc24c9707b94e8 100644 --- a/Source/Document Structure/SvgGroup.cs +++ b/Source/Document Structure/SvgGroup.cs @@ -68,6 +68,9 @@ namespace Svg /// The object to render to. protected override void Render(SvgRenderer renderer) { + if (!Visible || !Displayable) + return; + this.PushTransforms(renderer); this.SetClip(renderer); base.RenderChildren(renderer); diff --git a/Source/Document Structure/SvgUse.cs b/Source/Document Structure/SvgUse.cs index b7e1634643367b73b5602a5b311ecf2a6c4af3fe..1f1ccba2ed3e90b862d71f695248baf165d603f2 100644 --- a/Source/Document Structure/SvgUse.cs +++ b/Source/Document Structure/SvgUse.cs @@ -80,6 +80,9 @@ namespace Svg protected override void Render(SvgRenderer renderer) { + if (!Visible || !Displayable) + return; + this.PushTransforms(renderer); SvgVisualElement element = (SvgVisualElement)this.OwnerDocument.IdManager.GetElementById(this.ReferencedElement); diff --git a/Source/Painting/EnumConverters.cs b/Source/Painting/EnumConverters.cs index 96b7ba7701b982b583d9ead2134d4c8c88fc9370..f4780d11e8ff760c994ab6e1c9e3dcb5ced792ef 100644 --- a/Source/Painting/EnumConverters.cs +++ b/Source/Painting/EnumConverters.cs @@ -43,8 +43,14 @@ namespace Svg { throw new ArgumentOutOfRangeException("value must be a string."); } - - return (string)value == "visible" ? true : false; + + // Note: currently only used by SvgVisualElement.Visible but if + // conversion is used elsewhere these checks below will need to change + string visibility = (string)value; + if ((visibility == "hidden") || (visibility == "collapse")) + return false; + else + return true; } public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)