This commit is contained in:
Mahdi Hosseini committed 2020-06-27 15:29:14 +04:30
1 parent 4bdaa5676e
commit 2d9b6bb8ad
17 files changed
+126 -11

No files matched your search

@@ -412,6 +412,9 @@
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\MainMenuControl_16x.png"> <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\MainMenuControl_16x.png">
<Link>Resources\Img\LeftMainContent\MainMenuControl_16x.png</Link> <Link>Resources\Img\LeftMainContent\MainMenuControl_16x.png</Link>
</Resource> </Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Geometry_16x.png">
<Link>Resources\Img\LeftMainContent\Geometry_16x.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf"> <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf">
<Link>Resources\fabric-icons.ttf</Link> <Link>Resources\fabric-icons.ttf</Link>
</Resource> </Resource>
@@ -411,6 +411,9 @@
</Resource> </Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\MainMenuControl_16x.png"> <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\MainMenuControl_16x.png">
<Link>Resources\Img\LeftMainContent\MainMenuControl_16x.png</Link> <Link>Resources\Img\LeftMainContent\MainMenuControl_16x.png</Link>
</Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\Geometry_16x.png">
<Link>Resources\Img\LeftMainContent\Geometry_16x.png</Link>
</Resource> </Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf"> <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf">
<Link>Resources\fabric-icons.ttf</Link> <Link>Resources\fabric-icons.ttf</Link>
@@ -32,7 +32,8 @@
[ "Border", "BorderDemoCtl", "BorderElement_16x", "" ], [ "Border", "BorderDemoCtl", "BorderElement_16x", "" ],
[ "Label", "LabelDemoCtl", "Label_16x", "" ], [ "Label", "LabelDemoCtl", "Label_16x", "" ],
[ "Frame", "FrameDemoCtl", "frame_16xLG", "1" ], [ "Frame", "FrameDemoCtl", "frame_16xLG", "1" ],
[ "Window", "NativeWindowDemoCtl", "WindowsForm_16x", "1" ] [ "Window", "NativeWindowDemoCtl", "WindowsForm_16x", "1" ],
[ "Geometry", "GeometryDemoCtl", "Geometry_16x", "1" ]
] ]
}, },
{ {
@@ -315,6 +315,9 @@
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\FrameDemoCtl.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\FrameDemoCtl.xaml.cs">
<DependentUpon>FrameDemoCtl.xaml</DependentUpon> <DependentUpon>FrameDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\GeometryDemoCtl.xaml.cs">
<DependentUpon>GeometryDemoCtl.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\GroupBoxDemoCtl.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\GroupBoxDemoCtl.xaml.cs">
<DependentUpon>GroupBoxDemoCtl.xaml</DependentUpon> <DependentUpon>GroupBoxDemoCtl.xaml</DependentUpon>
@@ -862,6 +865,10 @@
<Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\FrameDemoCtl.xaml"> <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\FrameDemoCtl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\GeometryDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\GroupBoxDemoCtl.xaml"> <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\GroupBoxDemoCtl.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
@@ -672,6 +672,14 @@ namespace HandyControlDemo.Properties.Langs {
} }
} }
public static string Geometry
{
get
{
return ResourceManager.GetString("Geometry", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 Gif图片 的本地化字符串。 /// 查找类似 Gif图片 的本地化字符串。
/// </summary> /// </summary>
@@ -756,4 +756,7 @@
<data name="ImageSelector" xml:space="preserve"> <data name="ImageSelector" xml:space="preserve">
<value>ImageSelector</value> <value>ImageSelector</value>
</data> </data>
<data name="Geometry" xml:space="preserve">
<value>Geometry</value>
</data>
</root> </root>
@@ -756,4 +756,7 @@
<data name="ImageSelector" xml:space="preserve"> <data name="ImageSelector" xml:space="preserve">
<value>ImageSelector</value> <value>ImageSelector</value>
</data> </data>
<data name="Geometry" xml:space="preserve">
<value>Geometry</value>
</data>
</root> </root>
@@ -756,4 +756,7 @@
<data name="ImageSelector" xml:space="preserve"> <data name="ImageSelector" xml:space="preserve">
<value>ImageSelector</value> <value>ImageSelector</value>
</data> </data>
<data name="Geometry" xml:space="preserve">
<value>Geometry</value>
</data>
</root> </root>
@@ -756,4 +756,7 @@
<data name="ImageSelector" xml:space="preserve"> <data name="ImageSelector" xml:space="preserve">
<value>ImageSelector</value> <value>ImageSelector</value>
</data> </data>
<data name="Geometry" xml:space="preserve">
<value>Geometry</value>
</data>
</root> </root>
@@ -3,7 +3,7 @@
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 1.3 Version 2.0
The primary goals of this format is to allow a simple XML format The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the that is mostly human readable. The generation and parsing of the
@@ -14,16 +14,17 @@
... ado.net/XML headers & schema ... ... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">1.3</resheader> <resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1">this is my long string</data> <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
[base64 mime encoded serialized .NET Framework object] <value>[base64 mime encoded serialized .NET Framework object]</value>
</data> </data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
[base64 mime encoded string representing a byte array form of the .NET Framework object] <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data> </data>
There are any number of "resheader" rows that contain simple There are any number of "resheader" rows that contain simple
@@ -45,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64 mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
@@ -59,18 +60,37 @@
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
--> -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType> <xsd:complexType>
<xsd:choice maxOccurs="unbounded"> <xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data"> <xsd:element name="data">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="resheader"> <xsd:element name="resheader">
@@ -89,13 +109,13 @@
<value>text/microsoft-resx</value> <value>text/microsoft-resx</value>
</resheader> </resheader>
<resheader name="version"> <resheader name="version">
<value>1.3</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="About" xml:space="preserve"> <data name="About" xml:space="preserve">
<value>Sobre</value> <value>Sobre</value>
@@ -736,4 +756,7 @@
<data name="Window" xml:space="preserve"> <data name="Window" xml:space="preserve">
<value>Janela</value> <value>Janela</value>
</data> </data>
<data name="Geometry" xml:space="preserve">
<value>Geometry</value>
</data>
</root> </root>
@@ -756,4 +756,7 @@
<data name="ImageSelector" xml:space="preserve"> <data name="ImageSelector" xml:space="preserve">
<value>图片选择器</value> <value>图片选择器</value>
</data> </data>
<data name="Geometry" xml:space="preserve">
<value>Geometry</value>
</data>
</root> </root>
@@ -756,4 +756,7 @@
<data name="ImageSelector" xml:space="preserve"> <data name="ImageSelector" xml:space="preserve">
<value>ImageSelector</value> <value>ImageSelector</value>
</data> </data>
<data name="Geometry" xml:space="preserve">
<value>Geometry</value>
</data>
</root> </root>
@@ -756,4 +756,7 @@
<data name="ImageSelector" xml:space="preserve"> <data name="ImageSelector" xml:space="preserve">
<value>ImageSelector</value> <value>ImageSelector</value>
</data> </data>
<data name="Geometry" xml:space="preserve">
<value>Geometry</value>
</data>
</root> </root>
@@ -105,6 +105,7 @@ namespace HandyControlDemo.Properties.Langs
OnPropertyChanged(nameof(FlowDocumentReader)); OnPropertyChanged(nameof(FlowDocumentReader));
OnPropertyChanged(nameof(FlowDocumentScrollViewer)); OnPropertyChanged(nameof(FlowDocumentScrollViewer));
OnPropertyChanged(nameof(Frame)); OnPropertyChanged(nameof(Frame));
OnPropertyChanged(nameof(Geometry));
OnPropertyChanged(nameof(GifImage)); OnPropertyChanged(nameof(GifImage));
OnPropertyChanged(nameof(GotoTop)); OnPropertyChanged(nameof(GotoTop));
OnPropertyChanged(nameof(Gravatar)); OnPropertyChanged(nameof(Gravatar));
@@ -592,6 +593,7 @@ namespace HandyControlDemo.Properties.Langs
/// </summary> /// </summary>
public string Frame => Lang.Frame; public string Frame => Lang.Frame;
public string Geometry => Lang.Geometry;
/// <summary> /// <summary>
/// 查找类似 Gif图片 的本地化字符串。 /// 查找类似 Gif图片 的本地化字符串。
/// </summary> /// </summary>
@@ -1666,6 +1668,8 @@ namespace HandyControlDemo.Properties.Langs
/// </summary> /// </summary>
public static string Frame = nameof(Frame); public static string Frame = nameof(Frame);
public static string Geometry = nameof(Geometry);
/// <summary> /// <summary>
/// 查找类似 Gif图片 的本地化字符串。 /// 查找类似 Gif图片 的本地化字符串。
/// </summary> /// </summary>
Binary file not shown.

After

Width:  |  Height:  |  Size: 470 B

@@ -0,0 +1,11 @@
<UserControl x:Class="HandyControlDemo.UserControl.GeometryDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
Background="{DynamicResource RegionBrush}">
<hc:TransitioningContentControl>
<WrapPanel Name="panel"/>
</hc:TransitioningContentControl>
</UserControl>
@@ -0,0 +1,34 @@
using HandyControl.Data;
using System;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Shapes;
namespace HandyControlDemo.UserControl
{
public partial class GeometryDemoCtl
{
public GeometryDemoCtl()
{
InitializeComponent();
GenerateGeometries();
}
public void GenerateGeometries()
{
ResourceDictionary dictionary = new ResourceDictionary();
dictionary.Source = new Uri("pack://application:,,,/HandyControl;component/Themes/Basic/Geometries.xaml", UriKind.Absolute);
foreach (var item in dictionary.Keys)
{
StackPanel stack = new StackPanel { Margin = new Thickness(10) };
TextBlock text = new TextBlock { Text = item.ToString(), HorizontalAlignment = HorizontalAlignment.Stretch };
Path path = new Path { Width = 26, Height = 26, Data = TryFindResource(item.ToString()) as Geometry, Fill = TryFindResource(ResourceToken.PrimaryTextBrush) as Brush };
stack.Children.Add(path);
stack.Children.Add(text);
panel.Children.Add(stack);
}
}
}
}