Skip to content

Commit d228c52

Browse files
paulushubpaulushub
committed
Preparing Version 1.8.1
- Version updates - Documentation improvements
1 parent 58d0ddf commit d228c52

File tree

740 files changed

+33294
-32511
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

740 files changed

+33294
-32511
lines changed

‎Samples/GdiSvgTestBox/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.8.0.0")]
36-
[assembly: AssemblyFileVersion("1.8.0.0")]
35+
[assembly: AssemblyVersion("1.8.1.0")]
36+
[assembly: AssemblyFileVersion("1.8.1.0")]

‎Samples/GdiTestSvgControl/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.8.0.0")]
36-
[assembly: AssemblyFileVersion("1.8.0.0")]
35+
[assembly: AssemblyVersion("1.8.1.0")]
36+
[assembly: AssemblyFileVersion("1.8.1.0")]

‎Samples/GdiW3cSvgTestSuite/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.8.0.0")]
36-
[assembly: AssemblyFileVersion("1.8.0.0")]
35+
[assembly: AssemblyVersion("1.8.1.0")]
36+
[assembly: AssemblyFileVersion("1.8.1.0")]

‎Samples/WpfSvgTestBox/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.8.0.0")]
55-
[assembly: AssemblyFileVersion("1.8.0.0")]
54+
[assembly: AssemblyVersion("1.8.1.0")]
55+
[assembly: AssemblyFileVersion("1.8.1.0")]

‎Samples/WpfTestOtherSvg/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.8.0.0")]
55-
[assembly: AssemblyFileVersion("1.8.0.0")]
54+
[assembly: AssemblyVersion("1.8.1.0")]
55+
[assembly: AssemblyFileVersion("1.8.1.0")]

‎Samples/WpfTestResourceSvg/MainWindow.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
mc:Ignorable="d"
99
Title="SharpVector - Design Mode Tests" Height="720" Width="960" Icon="App.ico" WindowStartupLocation="CenterScreen">
1010
<DockPanel LastChildFill="True" Margin="3">
11-
<TextBlock DockPanel.Dock="Top" Margin="3" Height="32" Text="A sample to demonstrate support for SVG files in resources in Design-Mode."
11+
<TextBlock Visibility="Collapsed" DockPanel.Dock="Top" Margin="3" Height="32" Text="A sample to demonstrate support for SVG files in resources in Design-Mode."
1212
TextWrapping="Wrap" FontSize="18" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold"/>
13-
<TabControl>
13+
<TabControl SelectedIndex="5">
1414
<TabControl.Resources>
1515
<Style TargetType="TabItem">
1616
<Setter Property="Template">
@@ -38,7 +38,7 @@
3838
</Style>
3939
</TabControl.Resources>
4040

41-
<TabItem x:Name="tabSvgImage">
41+
<TabItem x:Name="tabSvgImage" Visibility="Collapsed">
4242
<TabItem.Header>
4343
<StackPanel Orientation="Horizontal">
4444
<Image Height="24px" Width="24px" Source="{svgc:SvgImage Source=/Images/SvgLogoBasic.svg, AppName=WpfTestResourceSvg}" />
@@ -122,7 +122,7 @@
122122
</DockPanel>
123123
</TabItem>
124124

125-
<TabItem x:Name="tabSvgImageConverter">
125+
<TabItem x:Name="tabSvgImageConverter" Visibility="Collapsed">
126126
<TabItem.Header>
127127
<StackPanel Orientation="Horizontal">
128128
<Image Height="24px" Width="24px" Source="{svgc:SvgImage Source=/Images/Output.svg, AppName=WpfTestResourceSvg}" />
@@ -154,7 +154,7 @@
154154
</UniformGrid>
155155
</TabItem>
156156

157-
<TabItem x:Name="tabSvgViewbox">
157+
<TabItem x:Name="tabSvgViewbox" Visibility="Collapsed">
158158
<TabItem.Header>
159159
<StackPanel Orientation="Horizontal">
160160
<Image Height="24px" Width="24px" Source="{svgc:SvgImage Source=/Images/Debug.svg, AppName=WpfTestResourceSvg}" />
@@ -171,7 +171,7 @@
171171
</UniformGrid>
172172
</TabItem>
173173

174-
<TabItem x:Name="tabBitmap">
174+
<TabItem x:Name="tabBitmap" Visibility="Collapsed">
175175
<TabItem.Header>
176176
<StackPanel Orientation="Horizontal">
177177
<Image Height="24px" Width="24px" Source="{svgc:SvgImage Source=/Images/SvgLogoBasic.svg, AppName=WpfTestResourceSvg}" />
@@ -186,7 +186,7 @@
186186
</UniformGrid>
187187
</TabItem>
188188

189-
<TabItem x:Name="tabSvgIcon">
189+
<TabItem x:Name="tabSvgIcon" Visibility="Collapsed">
190190
<TabItem.Header>
191191
<StackPanel Orientation="Horizontal">
192192
<Image Height="24px" Width="24px" Source="{svgc:SvgImage Source=/Images/SvgLogoBasic.svg, AppName=WpfTestResourceSvg}" />
@@ -344,7 +344,7 @@
344344
</DockPanel>
345345
</TabItem>
346346

347-
<TabItem x:Name="tabExternal">
347+
<TabItem x:Name="tabExternal" Visibility="Collapsed">
348348
<TabItem.Header>
349349
<StackPanel Orientation="Horizontal">
350350
<Image Height="24px" Width="24px" Source="{svgc:SvgImage Source=/Images/SvgLogoBasic.svg, AppName=WpfTestResourceSvg}" />

‎Samples/WpfTestSvgControl/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.8.0.0")]
55-
[assembly: AssemblyFileVersion("1.8.0.0")]
54+
[assembly: AssemblyVersion("1.8.1.0")]
55+
[assembly: AssemblyFileVersion("1.8.1.0")]

‎Samples/WpfTestSvgSample/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.8.0.0")]
55-
[assembly: AssemblyFileVersion("1.8.0.0")]
54+
[assembly: AssemblyVersion("1.8.1.0")]
55+
[assembly: AssemblyFileVersion("1.8.1.0")]

‎Samples/WpfTestThreadSafety/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.8.0.0")]
55-
[assembly: AssemblyFileVersion("1.8.0.0")]
54+
[assembly: AssemblyVersion("1.8.1.0")]
55+
[assembly: AssemblyFileVersion("1.8.1.0")]

‎Samples/WpfW3cSvgTestSuite/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@
5050
//
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
53-
[assembly: AssemblyVersion("1.8.0.0")]
54-
[assembly: AssemblyFileVersion("1.8.0.0")]
53+
[assembly: AssemblyVersion("1.8.1.0")]
54+
[assembly: AssemblyFileVersion("1.8.1.0")]

‎Source/SharpVectorConvertersWpf/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
// You can specify all the values or you can default the Build and Revision Numbers
5656
// by using the '*' as shown below:
5757
// [assembly: AssemblyVersion("1.0.*")]
58-
[assembly: AssemblyVersion("1.8.0.0")]
59-
[assembly: AssemblyFileVersion("1.8.0.0")]
60-
[assembly: AssemblyInformationalVersion("1.8.0.0")]
58+
[assembly: AssemblyVersion("1.8.1.0")]
59+
[assembly: AssemblyFileVersion("1.8.1.0")]
60+
[assembly: AssemblyInformationalVersion("1.8.1.0")]
6161

6262
[assembly: XmlnsPrefix("http://sharpvectors.codeplex.com/svgc/", "svgc")]
6363
[assembly: XmlnsDefinition("http://sharpvectors.codeplex.com/svgc/", "SharpVectors.Converters")]

‎Source/SharpVectorConvertersWpf/SvgBitmap.cs

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@
2121
using SharpVectors.Renderers.Wpf;
2222
using SharpVectors.Converters.Utils;
2323

24-
using DpiScale = SharpVectors.Runtime.DpiScale;
25-
using DpiUtilities = SharpVectors.Runtime.DpiUtilities;
26-
2724
namespace SharpVectors.Converters
2825
{
26+
using DpiScale = SharpVectors.Runtime.DpiScale;
27+
using DpiUtilities = SharpVectors.Runtime.DpiUtilities;
28+
29+
/// <summary>
30+
/// This is an extension of the WPF <see cref="Image"/> control to provide SVG-based image sources.
31+
/// </summary>
32+
/// <seealso cref="SvgIcon"/>
2933
public class SvgBitmap : Image
3034
{
3135
#region Public Fields
@@ -63,6 +67,9 @@ public class SvgBitmap : Image
6367

6468
#region Constructors
6569

70+
/// <summary>
71+
/// Initializes a new instance of the <see cref="SvgBitmap"/> class.
72+
/// </summary>
6673
public SvgBitmap()
6774
{
6875
}
@@ -72,12 +79,13 @@ public SvgBitmap()
7279
#region Public Properties
7380

7481
/// <summary>
75-
/// The <c>AppName</c> for the element.
76-
/// If the value is of type <c>AppName</c>, then that is the <c>AppName</c> that will be used.
77-
/// If the value is of any other type, then that value will be used
78-
/// as the content for a <c>AppName</c> provided by the system. Refer to SvgObjectService
79-
/// for attached properties to customize the <c>AppName</c>.
82+
/// Gets or sets the <c>name</c> of the parent assembly for this element.
8083
/// </summary>
84+
/// <value>
85+
/// A string containing the name of the parent assembly or the name of the assembly containing <c>SVG</c> file
86+
/// referenced on this control in XAML, if the source type is <see cref="Uri"/>.
87+
/// </value>
88+
[Bindable(true), Category("Appearance")]
8189
public string AppName
8290
{
8391
get {
@@ -89,7 +97,7 @@ public string AppName
8997
}
9098

9199
/// <summary>
92-
/// Gets or sets the path to the SVG file to load into this <see cref="Canvas"/>.
100+
/// Gets or sets the path to the SVG file to load into this <see cref="SvgBitmap"/>.
93101
/// </summary>
94102
/// <value>
95103
/// A <see cref="System.Uri"/> specifying the path to the SVG source file.
@@ -116,7 +124,7 @@ public Uri UriSource
116124
}
117125

118126
/// <summary>
119-
/// Gets or sets the SVG contents to load into this <see cref="Canvas"/>.
127+
/// Gets or sets the SVG contents to load into this <see cref="SvgBitmap"/>.
120128
/// </summary>
121129
/// <value>
122130
/// A <see cref="System.String"/> specifying the embedded SVG contents.

‎Source/SharpVectorConvertersWpf/SvgCanvas.cs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,6 +1183,27 @@ public void Unload(bool displayMessage = false, string message = "")
11831183

11841184
#region Protected Methods
11851185

1186+
/// <summary>
1187+
/// Raises the Initialized event. This method is invoked whenever IsInitialized is set to true.
1188+
/// </summary>
1189+
/// <param name="e">Event data for the event.</param>
1190+
protected override void OnInitialized(EventArgs e)
1191+
{
1192+
base.OnInitialized(e);
1193+
1194+
if (_sourceUri != null || _sourceStream != null || !string.IsNullOrWhiteSpace(_sourceSvg))
1195+
{
1196+
if (_svgDrawing == null)
1197+
{
1198+
DrawingGroup drawing = this.CreateDrawing();
1199+
if (drawing != null)
1200+
{
1201+
this.OnLoadDrawing(drawing);
1202+
}
1203+
}
1204+
}
1205+
}
1206+
11861207
/// <summary>
11871208
/// Gets the rendering settings or options to be used in rendering the SVG in this control.
11881209
/// </summary>
@@ -1191,10 +1212,10 @@ public void Unload(bool displayMessage = false, string message = "")
11911212
/// </returns>
11921213
protected virtual WpfDrawingSettings GetDrawingSettings()
11931214
{
1194-
WpfDrawingSettings settings = new WpfDrawingSettings();
1215+
var settings = new WpfDrawingSettings();
11951216
settings.IncludeRuntime = _includeRuntime;
11961217
settings.TextAsGeometry = _textAsGeometry;
1197-
settings.OptimizePath = _optimizePath;
1218+
settings.OptimizePath = _optimizePath;
11981219

11991220
settings.IgnoreRootViewbox = _ignoreRootViewbox;
12001221
settings.EnsureViewboxSize = _ensureViewboxSize;
@@ -1208,27 +1229,6 @@ protected virtual WpfDrawingSettings GetDrawingSettings()
12081229
return settings;
12091230
}
12101231

1211-
/// <summary>
1212-
/// Raises the Initialized event. This method is invoked whenever IsInitialized is set to true.
1213-
/// </summary>
1214-
/// <param name="e">Event data for the event.</param>
1215-
protected override void OnInitialized(EventArgs e)
1216-
{
1217-
base.OnInitialized(e);
1218-
1219-
if (_sourceUri != null || _sourceStream != null || !string.IsNullOrWhiteSpace(_sourceSvg))
1220-
{
1221-
if (_svgDrawing == null)
1222-
{
1223-
DrawingGroup drawing = this.CreateDrawing();
1224-
if (drawing != null)
1225-
{
1226-
this.OnLoadDrawing(drawing);
1227-
}
1228-
}
1229-
}
1230-
}
1231-
12321232
/// <summary>
12331233
/// This handles changes in the rendering settings of this control.
12341234
/// </summary>

‎Source/SharpVectorConvertersWpf/SvgIcon.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,26 @@
1010

1111
namespace SharpVectors.Converters
1212
{
13+
/// <summary>
14+
/// This is an extension of the WPF <see cref="Image"/> control to provide SVG-based image sources.
15+
/// </summary>
1316
public sealed class SvgIcon : SvgBitmap
1417
{
18+
/// <summary>
19+
///
20+
/// </summary>
1521
public static readonly DependencyProperty FillProperty = DependencyProperty.Register("Fill",
1622
typeof(Brush), typeof(SvgIcon), new PropertyMetadata(Brushes.Black));
1723

24+
/// <summary>
25+
///
26+
/// </summary>
1827
public static readonly DependencyProperty StrokeProperty = DependencyProperty.Register("Stroke",
1928
typeof(Brush), typeof(SvgIcon), new PropertyMetadata(Brushes.Transparent));
2029

30+
/// <summary>
31+
/// Initializes a new instance of the <see cref="SvgIcon"/> class.
32+
/// </summary>
2133
public SvgIcon()
2234
{
2335
}
@@ -42,6 +54,8 @@ public Brush Stroke
4254
}
4355
}
4456

57+
#region Protected Methods
58+
4559
protected override void OnLoadDrawing(DrawingGroup drawing)
4660
{
4761
base.OnLoadDrawing(drawing);
@@ -65,6 +79,10 @@ protected override void OnUnloadDiagram()
6579
base.OnUnloadDiagram();
6680
}
6781

82+
#endregion
83+
84+
#region Private Methods
85+
6886
private void SetBindings(DrawingGroup group)
6987
{
7088
DrawingCollection drawings = group.Children;
@@ -128,5 +146,7 @@ private void ClearBindings(DrawingGroup group)
128146
}
129147
}
130148
}
149+
150+
#endregion
131151
}
132152
}

‎Source/SharpVectorCore/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
//
3030
// You can specify all the values or you can default the Revision and Build Numbers
3131
// by using the '*' as shown below:
32-
[assembly: AssemblyVersion("1.8.0.0")]
33-
[assembly: AssemblyFileVersion("1.8.0.0")]
34-
[assembly: AssemblyInformationalVersion("1.8.0.0")]
32+
[assembly: AssemblyVersion("1.8.1.0")]
33+
[assembly: AssemblyFileVersion("1.8.1.0")]
34+
[assembly: AssemblyInformationalVersion("1.8.1.0")]
3535

3636
//
3737
// In order to sign your assembly you must specify a key to use. Refer to the

‎Source/SharpVectorCss/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
//
3131
// You can specify all the values or you can default the Revision and Build Numbers
3232
// by using the '*' as shown below:
33-
[assembly: AssemblyVersion("1.8.0.0")]
34-
[assembly: AssemblyFileVersion("1.8.0.0")]
35-
[assembly: AssemblyInformationalVersion("1.8.0.0")]
33+
[assembly: AssemblyVersion("1.8.1.0")]
34+
[assembly: AssemblyFileVersion("1.8.1.0")]
35+
[assembly: AssemblyInformationalVersion("1.8.1.0")]
3636

3737
//
3838
// In order to sign your assembly you must specify a key to use. Refer to the

‎Source/SharpVectorDom/AccessExternalResourcesMode.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)