diff --git a/HandyControlDemo/Data/MessageToken.cs b/HandyControlDemo/Data/MessageToken.cs index 1669743c..c65216bd 100644 --- a/HandyControlDemo/Data/MessageToken.cs +++ b/HandyControlDemo/Data/MessageToken.cs @@ -134,6 +134,8 @@ public static readonly string ToolBarDemoCtl = nameof(ToolBarDemoCtl); + public static readonly string LabelDemoCtl = nameof(LabelDemoCtl); + public static readonly string CommonWindow = nameof(CommonWindow); public static readonly string CustomNonClientAreaWindow = nameof(CustomNonClientAreaWindow); diff --git a/HandyControlDemo/Data/MessageToken.tt b/HandyControlDemo/Data/MessageToken.tt index f25d34ce..8c10a656 100644 --- a/HandyControlDemo/Data/MessageToken.tt +++ b/HandyControlDemo/Data/MessageToken.tt @@ -72,7 +72,8 @@ var styleList = new List "GroupBoxDemoCtl", "ListViewDemoCtl", "RichTextBoxDemoCtl", - "ToolBarDemoCtl" + "ToolBarDemoCtl", + "LabelDemoCtl" }; var windowList = new List { diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj index af034a28..9b9ae6f4 100644 --- a/HandyControlDemo/HandyControlDemo.csproj +++ b/HandyControlDemo/HandyControlDemo.csproj @@ -262,6 +262,9 @@ GroupBoxDemoCtl.xaml + + LabelDemoCtl.xaml + ListViewDemoCtl.xaml @@ -601,6 +604,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -739,6 +746,7 @@ TextTemplatingFileGenerator MessageToken.cs + diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs index 5c2fd6c9..a4e7d112 100644 --- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs +++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs @@ -564,6 +564,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 标签 的本地化字符串。 + /// + public static string Label { + get { + return ResourceManager.GetString("Label", resourceCulture); + } + } + /// /// 查找类似 列表框 的本地化字符串。 /// diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx index 966dc242..3ea49fc7 100644 --- a/HandyControlDemo/Properties/Langs/Lang.en.resx +++ b/HandyControlDemo/Properties/Langs/Lang.en.resx @@ -495,4 +495,7 @@ Sec + + Label + \ No newline at end of file diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx index 88e899a7..0b8bdbc9 100644 --- a/HandyControlDemo/Properties/Langs/Lang.resx +++ b/HandyControlDemo/Properties/Langs/Lang.resx @@ -495,4 +495,7 @@ 秒 + + 标签 + \ No newline at end of file diff --git a/HandyControlDemo/Resources/Img/LeftMainContent/Label_16x.png b/HandyControlDemo/Resources/Img/LeftMainContent/Label_16x.png new file mode 100644 index 00000000..0b8cfa77 Binary files /dev/null and b/HandyControlDemo/Resources/Img/LeftMainContent/Label_16x.png differ diff --git a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml index 3b7dceee..766a7179 100644 --- a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml +++ b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml @@ -159,6 +159,12 @@ + + + + + + diff --git a/HandyControlDemo/UserControl/Styles/LabelDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/LabelDemoCtl.xaml new file mode 100644 index 00000000..c4b9dff7 --- /dev/null +++ b/HandyControlDemo/UserControl/Styles/LabelDemoCtl.xaml @@ -0,0 +1,17 @@ + + + + + + diff --git a/HandyControlDemo/UserControl/Styles/LabelDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/LabelDemoCtl.xaml.cs new file mode 100644 index 00000000..aaa52331 --- /dev/null +++ b/HandyControlDemo/UserControl/Styles/LabelDemoCtl.xaml.cs @@ -0,0 +1,10 @@ +namespace HandyControlDemo.UserControl +{ + public partial class LabelDemoCtl + { + public LabelDemoCtl() + { + InitializeComponent(); + } + } +}