From d8eca3ad2cd429aba9aba6b18953f550d81695d3 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Fri, 10 Jan 2020 00:32:43 +0800 Subject: [PATCH] init branch --- .../HandyControlDemo_Core30.csproj | 5 +- .../HandyControl_Core_30.csproj | 2 +- .../HandyControlDemo_Net_40.csproj | 3 + .../HandyControlDemo_Net_GE45.csproj | 3 + .../Data/DemoInfo.json | 3 +- .../Data/MessageToken.cs | 206 +----------------- .../Data/MessageToken.tt | 138 +----------- .../HandyControlDemo_Shared.projitems | 7 + .../Properties/AssemblyInfo.cs | 2 +- .../Properties/Langs/Lang.Designer.cs | 9 + .../Properties/Langs/Lang.en.resx | 3 + .../Properties/Langs/Lang.fa.resx | 3 + .../Properties/Langs/Lang.fr.resx | 3 + .../Properties/Langs/Lang.ko-KR.resx | 5 +- .../Properties/Langs/Lang.resx | 3 + .../Img/LeftMainContent/Ellipsis_16x.png | Bin 0 -> 196 bytes .../Controls/PasswordBoxDemoCtl.xaml | 2 +- .../UserControl/Controls/PinBoxDemoCtl.xaml | 7 + .../Controls/PinBoxDemoCtl.xaml.cs | 10 + .../Controls/Input/PinBox.cs | 9 + .../HandyControl_Shared.projitems | 9 + .../Properties/AssemblyInfo.cs | 2 +- .../Themes/Styles/Base/PinBoxBaseStyle.xaml | 9 + .../Themes/Styles/PinBox.xaml | 10 + .../Themes/Styles/Style.xaml | 1 + 25 files changed, 119 insertions(+), 335 deletions(-) create mode 100644 src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Ellipsis_16x.png create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs create mode 100644 src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Base/PinBoxBaseStyle.xaml create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/PinBox.xaml diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj index adc0c830..b3c41945 100644 --- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj +++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj @@ -8,7 +8,7 @@ 2.4.0 ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico Debug;Release - Copyright © HandyOrg 2018-2019 + Copyright © HandyOrg 2018-2020 2.4.0.0 2.4.0.0 8.0 @@ -454,6 +454,9 @@ Resources\Img\LeftMainContent\Effects_16x.png + + Resources\Img\LeftMainContent\Ellipsis_16x.png + diff --git a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj index ed8fecd0..600b0889 100644 --- a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj +++ b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj @@ -8,7 +8,7 @@ 2.4.0.0 false false - Copyright © HandyOrg 2018-2019 + Copyright © HandyOrg 2018-2020 Contains some commonly used simple WPF controls Debug;Release 8.0 diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index 79850bd2..d2ee3658 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -520,6 +520,9 @@ Resources\Img\LeftMainContent\RepeatButton_16x.png + + Resources\Img\LeftMainContent\Ellipsis_16x.png + diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj index 14b45a8c..9b86a79e 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -583,6 +583,9 @@ Resources\Img\LeftMainContent\MainMenuControl_16x.png + + Resources\Img\LeftMainContent\Ellipsis_16x.png + diff --git a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json index 18f69028..e10713f7 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json +++ b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json @@ -50,6 +50,7 @@ [ "TextBox", "TextBoxDemoCtl", "TextBox_16x", "" ], [ "ComboBox", "ComboBoxDemoCtl", "ComboBox_16x", "" ], [ "PasswordBox", "PasswordBoxDemoCtl", "PasswordBox_16x", "" ], + [ "PinBox", "PinBoxDemoCtl", "Ellipsis_16x", "1" ], [ "DatePicker", "DatePickerDemoCtl", "DatePicker_16x", "" ], [ "Clock", "ClockDemoCtl", "Time_color_16x", "" ], [ "TimePicker", "TimePickerDemoCtl", "TimePicker_16x", "" ], @@ -65,7 +66,7 @@ [ "OutlineText", "OutlineTextDemoCtl", "TextBlock_16x", "" ], [ "RunningBlock", "RunningBlockDemoCtl", "Dynamic_16x", "" ], [ "Card", "CardDemoCtl", "VSO_Card_16x", "" ], - [ "Divider", "DividerDemoCtl", "DottedSplitter_16x", "1" ], + [ "Divider", "DividerDemoCtl", "DottedSplitter_16x", "" ], [ "CirclePanel", "CirclePanelDemoCtl", "ColorWheel_16x", "" ], [ "Grid", "GridDemoCtl", "GridPane_16x", "" ], [ "RelativePanel", "RelativePanelDemoCtl", "TransformRelative_16x", "1" ], diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs index 5c4cab57..5d039b04 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs @@ -2,202 +2,6 @@ { public class MessageToken { - /*-------------------- Controls --------------------*/ - - public static readonly string GrowlDemoCtl = nameof(GrowlDemoCtl); - - public static readonly string LoadingDemoCtl = nameof(LoadingDemoCtl); - - public static readonly string ImageBrowserDemoCtl = nameof(ImageBrowserDemoCtl); - - public static readonly string ColorPickerDemoCtl = nameof(ColorPickerDemoCtl); - - public static readonly string CarouselDemoCtl = nameof(CarouselDemoCtl); - - public static readonly string CompareSliderDemoCtl = nameof(CompareSliderDemoCtl); - - public static readonly string TimeBarDemoCtl = nameof(TimeBarDemoCtl); - - public static readonly string PaginationDemoCtl = nameof(PaginationDemoCtl); - - public static readonly string AnimationPathDemoCtl = nameof(AnimationPathDemoCtl); - - public static readonly string StepBarDemoCtl = nameof(StepBarDemoCtl); - - public static readonly string ClockDemoCtl = nameof(ClockDemoCtl); - - public static readonly string TimePickerDemoCtl = nameof(TimePickerDemoCtl); - - public static readonly string CirclePanelDemoCtl = nameof(CirclePanelDemoCtl); - - public static readonly string NumericUpDownDemoCtl = nameof(NumericUpDownDemoCtl); - - public static readonly string WindowDemoCtl = nameof(WindowDemoCtl); - - public static readonly string ScrollViewerDemoCtl = nameof(ScrollViewerDemoCtl); - - public static readonly string PreviewSliderDemoCtl = nameof(PreviewSliderDemoCtl); - - public static readonly string ProgressBarDemoCtl = nameof(ProgressBarDemoCtl); - - public static readonly string TextBoxDemoCtl = nameof(TextBoxDemoCtl); - - public static readonly string ComboBoxDemoCtl = nameof(ComboBoxDemoCtl); - - public static readonly string PasswordBoxDemoCtl = nameof(PasswordBoxDemoCtl); - - public static readonly string DatePickerDemoCtl = nameof(DatePickerDemoCtl); - - public static readonly string DateTimePickerDemoCtl = nameof(DateTimePickerDemoCtl); - - public static readonly string CalendarWithClockDemoCtl = nameof(CalendarWithClockDemoCtl); - - public static readonly string SearchBarDemoCtl = nameof(SearchBarDemoCtl); - - public static readonly string TagDemoCtl = nameof(TagDemoCtl); - - public static readonly string GifImageDemoCtl = nameof(GifImageDemoCtl); - - public static readonly string OutlineTextDemoCtl = nameof(OutlineTextDemoCtl); - - public static readonly string FlipClockDemoCtl = nameof(FlipClockDemoCtl); - - public static readonly string QQGroupView = nameof(QQGroupView); - - public static readonly string BlurWindow = nameof(BlurWindow); - - public static readonly string NoNonClientAreaDragableWindow = nameof(NoNonClientAreaDragableWindow); - - public static readonly string RateDemoCtl = nameof(RateDemoCtl); - - public static readonly string ShieldDemoCtl = nameof(ShieldDemoCtl); - - public static readonly string WaterfallPanelDemoCtl = nameof(WaterfallPanelDemoCtl); - - public static readonly string CoverViewDemoCtl = nameof(CoverViewDemoCtl); - - public static readonly string CoverFlowDemoCtl = nameof(CoverFlowDemoCtl); - - public static readonly string ProgressButtonDemoCtl = nameof(ProgressButtonDemoCtl); - - public static readonly string TransferDemoCtl = nameof(TransferDemoCtl); - - public static readonly string ChatBubbleDemoCtl = nameof(ChatBubbleDemoCtl); - - public static readonly string GotoTopDemoCtl = nameof(GotoTopDemoCtl); - - public static readonly string NotifyIconDemoCtl = nameof(NotifyIconDemoCtl); - - public static readonly string BadgeDemoCtl = nameof(BadgeDemoCtl); - - public static readonly string GravatarDemoCtl = nameof(GravatarDemoCtl); - - public static readonly string DialogDemoCtl = nameof(DialogDemoCtl); - - public static readonly string SideMenuDemoCtl = nameof(SideMenuDemoCtl); - - public static readonly string GridDemoCtl = nameof(GridDemoCtl); - - public static readonly string PoptipDemoCtl = nameof(PoptipDemoCtl); - - public static readonly string RangeSliderDemoCtl = nameof(RangeSliderDemoCtl); - - public static readonly string ButtonGroupDemoCtl = nameof(ButtonGroupDemoCtl); - - public static readonly string CardDemoCtl = nameof(CardDemoCtl); - - public static readonly string MagnifierDemoCtl = nameof(MagnifierDemoCtl); - - public static readonly string ImageBlockDemoCtl = nameof(ImageBlockDemoCtl); - - public static readonly string RunningBlockDemoCtl = nameof(RunningBlockDemoCtl); - - public static readonly string HoneycombPanelDemoCtl = nameof(HoneycombPanelDemoCtl); - - public static readonly string SpriteDemoCtl = nameof(SpriteDemoCtl); - - public static readonly string NotificationDemoCtl = nameof(NotificationDemoCtl); - - public static readonly string FloatingBlockDemoCtl = nameof(FloatingBlockDemoCtl); - - public static readonly string SplitButtonDemoCtl = nameof(SplitButtonDemoCtl); - - public static readonly string DividerDemoCtl = nameof(DividerDemoCtl); - - public static readonly string TransitioningContentControlDemoCtl = nameof(TransitioningContentControlDemoCtl); - - /*-------------------- Tools --------------------*/ - - public static readonly string HatchBrushGeneratorDemoCtl = nameof(HatchBrushGeneratorDemoCtl); - - public static readonly string GeometryAnimationDemoCtl = nameof(GeometryAnimationDemoCtl); - - /*-------------------- Styles --------------------*/ - - public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl); - - public static readonly string RepeatButtonDemoCtl = nameof(RepeatButtonDemoCtl); - - public static readonly string ToggleButtonDemoCtl = nameof(ToggleButtonDemoCtl); - - public static readonly string ExpanderDemoCtl = nameof(ExpanderDemoCtl); - - public static readonly string NativeProgressBarDemoCtl = nameof(NativeProgressBarDemoCtl); - - public static readonly string TabControlDemoCtl = nameof(TabControlDemoCtl); - - public static readonly string CalendarDemoCtl = nameof(CalendarDemoCtl); - - public static readonly string NativeDatePickerDemoCtl = nameof(NativeDatePickerDemoCtl); - - public static readonly string NativeTextBoxDemoCtl = nameof(NativeTextBoxDemoCtl); - - public static readonly string TextBlockDemoCtl = nameof(TextBlockDemoCtl); - - public static readonly string NativeComboBoxDemoCtl = nameof(NativeComboBoxDemoCtl); - - public static readonly string NativePasswordBoxDemoCtl = nameof(NativePasswordBoxDemoCtl); - - public static readonly string NativeTabControlDemoCtl = nameof(NativeTabControlDemoCtl); - - public static readonly string DataGridDemoCtl = nameof(DataGridDemoCtl); - - public static readonly string CheckBoxDemoCtl = nameof(CheckBoxDemoCtl); - - public static readonly string ListBoxDemoCtl = nameof(ListBoxDemoCtl); - - public static readonly string MenuDemoCtl = nameof(MenuDemoCtl); - - public static readonly string TreeViewDemoCtl = nameof(TreeViewDemoCtl); - - public static readonly string BorderDemoCtl = nameof(BorderDemoCtl); - - public static readonly string RadioButtonDemoCtl = nameof(RadioButtonDemoCtl); - - public static readonly string NativeScrollViewerDemoCtl = nameof(NativeScrollViewerDemoCtl); - - public static readonly string BrushDemoCtl = nameof(BrushDemoCtl); - - public static readonly string SliderDemoCtl = nameof(SliderDemoCtl); - - public static readonly string GroupBoxDemoCtl = nameof(GroupBoxDemoCtl); - - public static readonly string ListViewDemoCtl = nameof(ListViewDemoCtl); - - public static readonly string RichTextBoxDemoCtl = nameof(RichTextBoxDemoCtl); - - public static readonly string ToolBarDemoCtl = nameof(ToolBarDemoCtl); - - public static readonly string LabelDemoCtl = nameof(LabelDemoCtl); - - /*-------------------- Windows --------------------*/ - - public static readonly string CommonWindow = nameof(CommonWindow); - - public static readonly string CustomNonClientAreaWindow = nameof(CustomNonClientAreaWindow); - - /*-------------------- Messages --------------------*/ - public static readonly string LoadShowContent = nameof(LoadShowContent); public static readonly string FullSwitch = nameof(FullSwitch); @@ -226,5 +30,15 @@ public static readonly string NotifyIconContextDemo = nameof(NotifyIconContextDemo); + public static readonly string CommonWindow = nameof(CommonWindow); + + public static readonly string BlurWindow = nameof(BlurWindow); + + public static readonly string CustomNonClientAreaWindow = nameof(CustomNonClientAreaWindow); + + public static readonly string NoNonClientAreaDragableWindow = nameof(NoNonClientAreaDragableWindow); + + public static readonly string QQGroupView = nameof(QQGroupView); + } } \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt index 75d66f65..885626a9 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt @@ -2,111 +2,6 @@ <#@ import namespace="System.Collections.Generic"#> <#@ output extension=".cs" #> <# -var controlList = new List -{ - "GrowlDemoCtl", - "LoadingDemoCtl", - "ImageBrowserDemoCtl", - "ColorPickerDemoCtl", - "CarouselDemoCtl", - "CompareSliderDemoCtl", - "TimeBarDemoCtl", - "PaginationDemoCtl", - "AnimationPathDemoCtl", - "StepBarDemoCtl", - "ClockDemoCtl", - "TimePickerDemoCtl", - "CirclePanelDemoCtl", - "NumericUpDownDemoCtl", - "WindowDemoCtl", - "ScrollViewerDemoCtl", - "PreviewSliderDemoCtl", - "ProgressBarDemoCtl", - "TextBoxDemoCtl", - "ComboBoxDemoCtl", - "PasswordBoxDemoCtl", - "DatePickerDemoCtl", - "DateTimePickerDemoCtl", - "CalendarWithClockDemoCtl", - "SearchBarDemoCtl", - "TagDemoCtl", - "GifImageDemoCtl", - "OutlineTextDemoCtl", - "FlipClockDemoCtl", - "QQGroupView", - "BlurWindow", - "NoNonClientAreaDragableWindow", - "RateDemoCtl", - "ShieldDemoCtl", - "WaterfallPanelDemoCtl", - "CoverViewDemoCtl", - "CoverFlowDemoCtl", - "ProgressButtonDemoCtl", - "TransferDemoCtl", - "ChatBubbleDemoCtl", - "GotoTopDemoCtl", - "NotifyIconDemoCtl", - "BadgeDemoCtl", - "GravatarDemoCtl", - "DialogDemoCtl", - "SideMenuDemoCtl", - "GridDemoCtl", - "PoptipDemoCtl", - "RangeSliderDemoCtl", - "ButtonGroupDemoCtl", - "CardDemoCtl", - "MagnifierDemoCtl", - "ImageBlockDemoCtl", - "RunningBlockDemoCtl", - "HoneycombPanelDemoCtl", - "SpriteDemoCtl", - "NotificationDemoCtl", - "FloatingBlockDemoCtl", - "SplitButtonDemoCtl", - "DividerDemoCtl", - "TransitioningContentControlDemoCtl" -}; -var styleList = new List -{ - "ButtonDemoCtl", - "RepeatButtonDemoCtl", - "ToggleButtonDemoCtl", - "ExpanderDemoCtl", - "NativeProgressBarDemoCtl", - "TabControlDemoCtl", - "CalendarDemoCtl", - "NativeDatePickerDemoCtl", - "NativeTextBoxDemoCtl", - "TextBlockDemoCtl", - "NativeComboBoxDemoCtl", - "NativePasswordBoxDemoCtl", - "NativeTabControlDemoCtl", - "DataGridDemoCtl", - "CheckBoxDemoCtl", - "ListBoxDemoCtl", - "MenuDemoCtl", - "TreeViewDemoCtl", - "BorderDemoCtl", - "RadioButtonDemoCtl", - "NativeScrollViewerDemoCtl", - "BrushDemoCtl", - "SliderDemoCtl", - "GroupBoxDemoCtl", - "ListViewDemoCtl", - "RichTextBoxDemoCtl", - "ToolBarDemoCtl", - "LabelDemoCtl" -}; -var toolList = new List -{ - "HatchBrushGeneratorDemoCtl", - "GeometryAnimationDemoCtl" -}; -var windowList = new List -{ - "CommonWindow", - "CustomNonClientAreaWindow" -}; var messageList = new List { "LoadShowContent", @@ -122,39 +17,18 @@ var messageList = new List "BlogsView", "WebsitesView", "NotifyIconDemo", - "NotifyIconContextDemo" + "NotifyIconContextDemo", + "CommonWindow", + "BlurWindow", + "CustomNonClientAreaWindow", + "NoNonClientAreaDragableWindow", + "QQGroupView" }; #> namespace HandyControlDemo.Data { public class MessageToken { - /*-------------------- Controls --------------------*/ - - <#foreach(var item in controlList){#> - public static readonly string <#=item#> = nameof(<#=item#>); - - <#}#> - /*-------------------- Tools --------------------*/ - - <#foreach(var item in toolList){#> - public static readonly string <#=item#> = nameof(<#=item#>); - - <#}#> - /*-------------------- Styles --------------------*/ - - <#foreach(var item in styleList){#> - public static readonly string <#=item#> = nameof(<#=item#>); - - <#}#> - /*-------------------- Windows --------------------*/ - - <#foreach(var item in windowList){#> - public static readonly string <#=item#> = nameof(<#=item#>); - - <#}#> - /*-------------------- Messages --------------------*/ - <#foreach(var item in messageList){#> public static readonly string <#=item#> = nameof(<#=item#>); diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index 57b7c22a..e9b3c59e 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -80,6 +80,9 @@ NotificationDemoCtl.xaml + + PinBoxDemoCtl.xaml + RangeSliderDemoCtl.xaml @@ -513,6 +516,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs b/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs index fca449dd..7c03ec55 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Windows; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("HandyControlDemo")] -[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2019")] +[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs index 14c08812..7c2eff9a 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -1131,6 +1131,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 PIN码框 的本地化字符串。 + /// + public static string PinBox { + get { + return ResourceManager.GetString("PinBox", resourceCulture); + } + } + /// /// 查找类似 请输入... 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index 682dbe38..82034ede 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -711,4 +711,7 @@ Demo + + PinBox + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx index 4ea3c493..d6102272 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx @@ -711,4 +711,7 @@ Demo + + PinBox + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx index dcc76a17..95a79a20 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx @@ -711,4 +711,7 @@ Demo + + PinBox + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx index 697c1a98..6c0bf75a 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx @@ -1,4 +1,4 @@ - + diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml new file mode 100644 index 00000000..77c4a6f4 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml @@ -0,0 +1,7 @@ + + + diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs new file mode 100644 index 00000000..dc8f65fd --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs @@ -0,0 +1,10 @@ +namespace HandyControlDemo.UserControl +{ + public partial class PinBoxDemoCtl + { + public PinBoxDemoCtl() + { + InitializeComponent(); + } + } +} diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs new file mode 100644 index 00000000..86634976 --- /dev/null +++ b/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs @@ -0,0 +1,9 @@ +using System.Windows.Controls; + +namespace HandyControl.Controls +{ + public class PinBox : Control + { + + } +} diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems index 4af77f44..32cab771 100644 --- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems @@ -25,6 +25,7 @@ + @@ -393,6 +394,14 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs b/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs index 8b80dbb4..46ac97c7 100644 --- a/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs +++ b/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("HandyControl")] -[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2019")] +[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PinBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PinBoxBaseStyle.xaml new file mode 100644 index 00000000..98d80b3f --- /dev/null +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PinBoxBaseStyle.xaml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/PinBox.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/PinBox.xaml new file mode 100644 index 00000000..1ad0f94d --- /dev/null +++ b/src/Shared/HandyControl_Shared/Themes/Styles/PinBox.xaml @@ -0,0 +1,10 @@ + + + + + + +