From a2d947a389e876f9d60c8710dc79a11e4ed6f0c1 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Thu, 7 Mar 2019 18:11:32 +0800 Subject: [PATCH] init pr --- .../CircleProgressBar.cs | 0 .../Controls/ProgressBar/WaveProgressBar.cs | 54 ++++++++++++++++++ HandyControl/HandyControl.csproj | 3 +- HandyControlDemo/Data/MessageToken.cs | 16 +++--- HandyControlDemo/Data/MessageToken.tt | 16 +++--- HandyControlDemo/HandyControlDemo.csproj | 49 ++++++++-------- .../Properties/Langs/Lang.Designer.cs | 9 --- .../Properties/Langs/Lang.en.resx | 3 - HandyControlDemo/Properties/Langs/Lang.resx | 3 - .../Img/LeftMainContent/ShapeArcRing_16x.png | Bin 417 -> 0 bytes ...arDemoCtl.xaml => ProgressBarDemoCtl.xaml} | 2 +- .../ProgressBarDemoCtl.xaml.cs | 0 .../UserControl/Main/LeftMainContent.xaml | 18 +++--- ...emoCtl.xaml => NativeComboBoxDemoCtl.xaml} | 2 +- ....xaml.cs => NativeComboBoxDemoCtl.xaml.cs} | 4 +- ...oCtl.xaml => NativeDatePickerDemoCtl.xaml} | 2 +- ...aml.cs => NativeDatePickerDemoCtl.xaml.cs} | 4 +- ...Ctl.xaml => NativePasswordBoxDemoCtl.xaml} | 2 +- ...ml.cs => NativePasswordBoxDemoCtl.xaml.cs} | 4 +- ...Ctl.xaml => NativeProgressBarDemoCtl.xaml} | 2 +- ...ml.cs => NativeProgressBarDemoCtl.xaml.cs} | 4 +- ...tl.xaml => NativeScrollViewerDemoCtl.xaml} | 2 +- .../NativeScrollViewerDemoCtl.xaml.cs} | 4 +- ...oCtl.xaml => NativeTabControlDemoCtl.xaml} | 2 +- ...aml.cs => NativeTabControlDemoCtl.xaml.cs} | 4 +- ...DemoCtl.xaml => NativeTextBoxDemoCtl.xaml} | 2 +- ...l.xaml.cs => NativeTextBoxDemoCtl.xaml.cs} | 4 +- 27 files changed, 127 insertions(+), 88 deletions(-) rename HandyControl/Controls/{Other => ProgressBar}/CircleProgressBar.cs (100%) create mode 100644 HandyControl/Controls/ProgressBar/WaveProgressBar.cs delete mode 100644 HandyControlDemo/Resources/Img/LeftMainContent/ShapeArcRing_16x.png rename HandyControlDemo/UserControl/Controls/{CircleProgressBarDemoCtl.xaml => ProgressBarDemoCtl.xaml} (94%) rename HandyControlDemo/UserControl/{Styles => Controls}/ProgressBarDemoCtl.xaml.cs (100%) rename HandyControlDemo/UserControl/Styles/{NaiveComboBoxDemoCtl.xaml => NativeComboBoxDemoCtl.xaml} (97%) rename HandyControlDemo/UserControl/Styles/{NaiveComboBoxDemoCtl.xaml.cs => NativeComboBoxDemoCtl.xaml.cs} (56%) rename HandyControlDemo/UserControl/Styles/{NaiveDatePickerDemoCtl.xaml => NativeDatePickerDemoCtl.xaml} (96%) rename HandyControlDemo/UserControl/Styles/{NaiveDatePickerDemoCtl.xaml.cs => NativeDatePickerDemoCtl.xaml.cs} (55%) rename HandyControlDemo/UserControl/Styles/{NaivePasswordBoxDemoCtl.xaml => NativePasswordBoxDemoCtl.xaml} (95%) rename HandyControlDemo/UserControl/Styles/{NaivePasswordBoxDemoCtl.xaml.cs => NativePasswordBoxDemoCtl.xaml.cs} (55%) rename HandyControlDemo/UserControl/Styles/{ProgressBarDemoCtl.xaml => NativeProgressBarDemoCtl.xaml} (97%) rename HandyControlDemo/UserControl/Styles/{NaiveScrollViewerDemoCtl.xaml.cs => NativeProgressBarDemoCtl.xaml.cs} (55%) rename HandyControlDemo/UserControl/Styles/{NaiveScrollViewerDemoCtl.xaml => NativeScrollViewerDemoCtl.xaml} (98%) rename HandyControlDemo/UserControl/{Controls/CircleProgressBarDemoCtl.xaml.cs => Styles/NativeScrollViewerDemoCtl.xaml.cs} (54%) rename HandyControlDemo/UserControl/Styles/{NaiveTabControlDemoCtl.xaml => NativeTabControlDemoCtl.xaml} (99%) rename HandyControlDemo/UserControl/Styles/{NaiveTabControlDemoCtl.xaml.cs => NativeTabControlDemoCtl.xaml.cs} (55%) rename HandyControlDemo/UserControl/Styles/{NaiveTextBoxDemoCtl.xaml => NativeTextBoxDemoCtl.xaml} (95%) rename HandyControlDemo/UserControl/Styles/{NaiveTextBoxDemoCtl.xaml.cs => NativeTextBoxDemoCtl.xaml.cs} (57%) diff --git a/HandyControl/Controls/Other/CircleProgressBar.cs b/HandyControl/Controls/ProgressBar/CircleProgressBar.cs similarity index 100% rename from HandyControl/Controls/Other/CircleProgressBar.cs rename to HandyControl/Controls/ProgressBar/CircleProgressBar.cs diff --git a/HandyControl/Controls/ProgressBar/WaveProgressBar.cs b/HandyControl/Controls/ProgressBar/WaveProgressBar.cs new file mode 100644 index 00000000..5f07b0be --- /dev/null +++ b/HandyControl/Controls/ProgressBar/WaveProgressBar.cs @@ -0,0 +1,54 @@ +using System.Windows; +using System.Windows.Controls.Primitives; +using System.Windows.Media; +using HandyControl.Data; + +namespace HandyControl.Controls +{ + public class WaveProgressBar : RangeBase + { + static WaveProgressBar() + { + FocusableProperty.OverrideMetadata(typeof(CircleProgressBar), + new FrameworkPropertyMetadata(ValueBoxes.FalseBox)); + MaximumProperty.OverrideMetadata(typeof(CircleProgressBar), + new FrameworkPropertyMetadata(ValueBoxes.Double100Box)); + } + + public static readonly DependencyProperty TextProperty = DependencyProperty.Register( + "Text", typeof(string), typeof(WaveProgressBar), new PropertyMetadata(default(string))); + + public string Text + { + get => (string)GetValue(TextProperty); + set => SetValue(TextProperty, value); + } + + public static readonly DependencyProperty ShowTextProperty = DependencyProperty.Register( + "ShowText", typeof(bool), typeof(WaveProgressBar), new PropertyMetadata(ValueBoxes.TrueBox)); + + public bool ShowText + { + get => (bool)GetValue(ShowTextProperty); + set => SetValue(ShowTextProperty, value); + } + + public static readonly DependencyProperty WaveBrushProperty = DependencyProperty.Register( + "WaveBrush", typeof(Brush), typeof(WaveProgressBar), new PropertyMetadata(default(Brush))); + + public Brush WaveBrush + { + get => (Brush)GetValue(WaveBrushProperty); + set => SetValue(WaveBrushProperty, value); + } + + public static readonly DependencyProperty WaveDiameterProperty = DependencyProperty.Register( + "WaveDiameter", typeof(double), typeof(WaveProgressBar), new PropertyMetadata(default(double))); + + public double WaveDiameter + { + get => (double)GetValue(WaveDiameterProperty); + set => SetValue(WaveDiameterProperty, value); + } + } +} \ No newline at end of file diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj index 6e20ed86..a01d6620 100644 --- a/HandyControl/HandyControl.csproj +++ b/HandyControl/HandyControl.csproj @@ -117,11 +117,12 @@ + - + diff --git a/HandyControlDemo/Data/MessageToken.cs b/HandyControlDemo/Data/MessageToken.cs index 529716b5..44fa6c82 100644 --- a/HandyControlDemo/Data/MessageToken.cs +++ b/HandyControlDemo/Data/MessageToken.cs @@ -36,7 +36,7 @@ public static readonly string PreviewSliderDemoCtl = nameof(PreviewSliderDemoCtl); - public static readonly string CircleProgressBarDemoCtl = nameof(CircleProgressBarDemoCtl); + public static readonly string ProgressBarDemoCtl = nameof(ProgressBarDemoCtl); public static readonly string TextBoxDemoCtl = nameof(TextBoxDemoCtl); @@ -94,23 +94,23 @@ public static readonly string ExpanderDemoCtl = nameof(ExpanderDemoCtl); - public static readonly string ProgressBarDemoCtl = nameof(ProgressBarDemoCtl); + 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 NaiveDatePickerDemoCtl = nameof(NaiveDatePickerDemoCtl); + public static readonly string NativeDatePickerDemoCtl = nameof(NativeDatePickerDemoCtl); - public static readonly string NaiveTextBoxDemoCtl = nameof(NaiveTextBoxDemoCtl); + public static readonly string NativeTextBoxDemoCtl = nameof(NativeTextBoxDemoCtl); public static readonly string TextBlockDemoCtl = nameof(TextBlockDemoCtl); - public static readonly string NaiveComboBoxDemoCtl = nameof(NaiveComboBoxDemoCtl); + public static readonly string NativeComboBoxDemoCtl = nameof(NativeComboBoxDemoCtl); - public static readonly string NaivePasswordBoxDemoCtl = nameof(NaivePasswordBoxDemoCtl); + public static readonly string NativePasswordBoxDemoCtl = nameof(NativePasswordBoxDemoCtl); - public static readonly string NaiveTabControlDemoCtl = nameof(NaiveTabControlDemoCtl); + public static readonly string NativeTabControlDemoCtl = nameof(NativeTabControlDemoCtl); public static readonly string DataGridDemoCtl = nameof(DataGridDemoCtl); @@ -126,7 +126,7 @@ public static readonly string RadioButtonDemoCtl = nameof(RadioButtonDemoCtl); - public static readonly string NaiveScrollViewerDemoCtl = nameof(NaiveScrollViewerDemoCtl); + public static readonly string NativeScrollViewerDemoCtl = nameof(NativeScrollViewerDemoCtl); public static readonly string BrushDemoCtl = nameof(BrushDemoCtl); diff --git a/HandyControlDemo/Data/MessageToken.tt b/HandyControlDemo/Data/MessageToken.tt index 3af06d18..549a85ed 100644 --- a/HandyControlDemo/Data/MessageToken.tt +++ b/HandyControlDemo/Data/MessageToken.tt @@ -21,7 +21,7 @@ var controlList = new List "WindowDemoCtl", "ScrollViewerDemoCtl", "PreviewSliderDemoCtl", - "CircleProgressBarDemoCtl", + "ProgressBarDemoCtl", "TextBoxDemoCtl", "ComboBoxDemoCtl", "PasswordBoxDemoCtl", @@ -53,15 +53,15 @@ var styleList = new List "ButtonDemoCtl", "ToggleButtonDemoCtl", "ExpanderDemoCtl", - "ProgressBarDemoCtl", + "NativeProgressBarDemoCtl", "TabControlDemoCtl", "CalendarDemoCtl", - "NaiveDatePickerDemoCtl", - "NaiveTextBoxDemoCtl", + "NativeDatePickerDemoCtl", + "NativeTextBoxDemoCtl", "TextBlockDemoCtl", - "NaiveComboBoxDemoCtl", - "NaivePasswordBoxDemoCtl", - "NaiveTabControlDemoCtl", + "NativeComboBoxDemoCtl", + "NativePasswordBoxDemoCtl", + "NativeTabControlDemoCtl", "DataGridDemoCtl", "CheckBoxDemoCtl", "ListBoxDemoCtl", @@ -69,7 +69,7 @@ var styleList = new List "TreeViewDemoCtl", "BorderDemoCtl", "RadioButtonDemoCtl", - "NaiveScrollViewerDemoCtl", + "NativeScrollViewerDemoCtl", "BrushDemoCtl", "SliderDemoCtl", "GroupBoxDemoCtl", diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj index 464bacdc..58544d2e 100644 --- a/HandyControlDemo/HandyControlDemo.csproj +++ b/HandyControlDemo/HandyControlDemo.csproj @@ -148,8 +148,8 @@ CirclePanelDemoCtl.xaml - - CircleProgressBarDemoCtl.xaml + + ProgressBarDemoCtl.xaml ClockDemoCtl.xaml @@ -280,14 +280,14 @@ ListViewDemoCtl.xaml - - NaiveComboBoxDemoCtl.xaml + + NativeComboBoxDemoCtl.xaml DataGridDemoCtl.xaml - - NaiveDatePickerDemoCtl.xaml + + NativeDatePickerDemoCtl.xaml ExpanderDemoCtl.xaml @@ -310,17 +310,17 @@ MenuDemoCtl.xaml - - NaiveScrollViewerDemoCtl.xaml + + NativeScrollViewerDemoCtl.xaml - - NaiveTabControlDemoCtl.xaml + + NativeTabControlDemoCtl.xaml - - NaivePasswordBoxDemoCtl.xaml + + NativePasswordBoxDemoCtl.xaml - - ProgressBarDemoCtl.xaml + + NativeProgressBarDemoCtl.xaml TabControlDemoCtl.xaml @@ -337,8 +337,8 @@ TextBlockDemoCtl.xaml - - NaiveTextBoxDemoCtl.xaml + + NativeTextBoxDemoCtl.xaml ToggleButtonDemoCtl.xaml @@ -464,7 +464,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -640,7 +640,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -648,7 +648,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -680,19 +680,19 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -716,7 +716,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -843,7 +843,6 @@ - diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs index 3ba49d5c..073911db 100644 --- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs +++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs @@ -222,15 +222,6 @@ namespace HandyControlDemo.Properties.Langs { } } - /// - /// 查找类似 圆形进度条 的本地化字符串。 - /// - public static string CircleProgressBar { - get { - return ResourceManager.GetString("CircleProgressBar", resourceCulture); - } - } - /// /// 查找类似 清空 的本地化字符串。 /// diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx index 9c359170..031b4922 100644 --- a/HandyControlDemo/Properties/Langs/Lang.en.resx +++ b/HandyControlDemo/Properties/Langs/Lang.en.resx @@ -387,9 +387,6 @@ Slider - - CircleProgressBar - It's not a phone number diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx index 858deaca..4bfbd4a1 100644 --- a/HandyControlDemo/Properties/Langs/Lang.resx +++ b/HandyControlDemo/Properties/Langs/Lang.resx @@ -387,9 +387,6 @@ 滑块 - - 圆形进度条 - 不是手机号码 diff --git a/HandyControlDemo/Resources/Img/LeftMainContent/ShapeArcRing_16x.png b/HandyControlDemo/Resources/Img/LeftMainContent/ShapeArcRing_16x.png deleted file mode 100644 index 64f52301f3911f17a8a8e80394ca5276e237d8ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 417 zcmV;S0bc%zP)HE8z$`Dhk_%V{{Uw)N{{Q!mcey`j=up@79RL@A)oE=2 zq`Iy@LqSuF<7O3QSw4kfXbB;pF4owihFVCN0J2adNpi7VE-{2{+wgt=0N}Dovp*(S z#Bto3r_)=!zP#bDe$r>NpNamc8?-a0>RQA<~m-oNdD}wz9x?M)r}ZQMqT0z1B<*z2{PM z<9S{IfYZn%T<9UqjrKrK`wE97OF08Rf4YksPfB()ut|zBCVfgO400000 LNkvXXu0mjfTgAD~ diff --git a/HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/ProgressBarDemoCtl.xaml similarity index 94% rename from HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml rename to HandyControlDemo/UserControl/Controls/ProgressBarDemoCtl.xaml index 1d89bbbc..9bf00205 100644 --- a/HandyControlDemo/UserControl/Controls/CircleProgressBarDemoCtl.xaml +++ b/HandyControlDemo/UserControl/Controls/ProgressBarDemoCtl.xaml @@ -1,4 +1,4 @@ - - + @@ -74,17 +74,17 @@ - + - + - + @@ -94,7 +94,7 @@ - + @@ -104,12 +104,12 @@ - + - + @@ -318,9 +318,9 @@ - + - + diff --git a/HandyControlDemo/UserControl/Styles/NaiveComboBoxDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml similarity index 97% rename from HandyControlDemo/UserControl/Styles/NaiveComboBoxDemoCtl.xaml rename to HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml index 377a8d1f..074f91c2 100644 --- a/HandyControlDemo/UserControl/Styles/NaiveComboBoxDemoCtl.xaml +++ b/HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml @@ -1,4 +1,4 @@ -