chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to v1.3.0

Browse Source
This commit is contained in:
NaBian committed 2018-10-03 21:27:15 +08:00
1 parent a68b0213a6
commit 9daa1a6ee1
60 files changed
+2391 -76
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

HandyControlDemo/Data/MessageToken.cs
+8
View File
@@ -22,6 +22,10 @@
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 ButtonDemoCtl = nameof(ButtonDemoCtl);
public static readonly string ToggleButtonDemoCtl = nameof(ToggleButtonDemoCtl);
@@ -32,6 +36,10 @@
public static readonly string TabControlDemoCtl = nameof(TabControlDemoCtl);
public static readonly string CalendarDemoCtl = nameof(CalendarDemoCtl);
public static readonly string DatePickerDemoCtl = nameof(DatePickerDemoCtl);
public static readonly string LoadShowContent = nameof(LoadShowContent);
}
}
HandyControlDemo/Data/MessageToken.tt
+6 -2
View File
@@ -13,7 +13,9 @@ var controlList = new List<string>
"TimeBarDemoCtl",
"PaginationDemoCtl",
"AnimationPathDemoCtl",
"StepBarDemoCtl"
"StepBarDemoCtl",
"ClockDemoCtl",
"TimePickerDemoCtl"
};
var styleList = new List<string>
{
@@ -21,7 +23,9 @@ var styleList = new List<string>
"ToggleButtonDemoCtl",
"ExpanderDemoCtl",
"ProgressBarDemoCtl",
"TabControlDemoCtl"
"TabControlDemoCtl",
"CalendarDemoCtl",
"DatePickerDemoCtl"
};
#>
namespace HandyControlDemo.Data
HandyControlDemo/HandyControlDemo.csproj
+28
View File
@@ -84,6 +84,9 @@
<Compile Include="UserControl\Controls\CarouselDemoCtl.xaml.cs">
<DependentUpon>CarouselDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Controls\ClockDemoCtl.xaml.cs">
<DependentUpon>ClockDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Controls\ColorPickerDemoCtl.xaml.cs">
<DependentUpon>ColorPickerDemoCtl.xaml</DependentUpon>
</Compile>
@@ -102,12 +105,21 @@
<Compile Include="UserControl\Controls\StepBarDemoCtl.xaml.cs">
<DependentUpon>StepBarDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Controls\TimePickerDemoCtl.xaml.cs">
<DependentUpon>TimePickerDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Main\NoUserContent.xaml.cs">
<DependentUpon>NoUserContent.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Styles\ButtonDemoCtl.xaml.cs">
<DependentUpon>ButtonDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Styles\CalendarDemoCtl.xaml.cs">
<DependentUpon>CalendarDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Styles\DatePickerDemoCtl.xaml.cs">
<DependentUpon>DatePickerDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Styles\ExpanderDemoCtl.xaml.cs">
<DependentUpon>ExpanderDemoCtl.xaml</DependentUpon>
</Compile>
@@ -180,6 +192,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\Controls\ClockDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\Controls\ColorPickerDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -204,6 +220,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\Controls\TimePickerDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\Main\NoUserContent.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -212,6 +232,14 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\Styles\CalendarDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\Styles\DatePickerDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\Styles\ExpanderDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
HandyControlDemo/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -7,10 +7,10 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("HandyControlDemo")]
[assembly: AssemblyCopyright("Copyright © 纳边 2018")]
[assembly: AssemblyCopyright("Copyright © NaBian 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
[assembly: AssemblyVersion("1.2.2.1")]
[assembly: AssemblyFileVersion("1.2.2.1")]
[assembly: AssemblyVersion("1.3.0.0")]
[assembly: AssemblyFileVersion("1.3.0.0")]
HandyControlDemo/Properties/Langs/Lang.Designer.cs
Generated
+19 -1
View File
@@ -177,6 +177,15 @@ namespace HandyControlDemo.Properties.Langs {
}
}
/// <summary>
/// 查找类似 日期选择器 的本地化字符串。
/// </summary>
public static string DatePicker {
get {
return ResourceManager.GetString("DatePicker", resourceCulture);
}
}
/// <summary>
/// 查找类似 默认 的本地化字符串。
/// </summary>
@@ -205,7 +214,7 @@ namespace HandyControlDemo.Properties.Langs {
}
/// <summary>
/// 查找类似 检测到有新版本！ 的本地化字符串。
/// 查找类似 检测到有新版本！是否更新？ 的本地化字符串。
/// </summary>
public static string GrowlAsk {
get {
@@ -402,6 +411,15 @@ namespace HandyControlDemo.Properties.Langs {
}
}
/// <summary>
/// 查找类似 时间选择器 的本地化字符串。
/// </summary>
public static string TimePicker {
get {
return ResourceManager.GetString("TimePicker", resourceCulture);
}
}
/// <summary>
/// 查找类似 标题 的本地化字符串。
/// </summary>
HandyControlDemo/Properties/Langs/Lang.en.resx
+7 -1
View File
@@ -142,7 +142,7 @@
<value>The program has crashed~~~</value>
</data>
<data name="GrowlAsk" xml:space="preserve">
<value>A new version has been detected!</value>
<value>A new version has been detected!Do you want to update?</value>
</data>
<data name="Loading" xml:space="preserve">
<value>Loading</value>
@@ -243,4 +243,10 @@
<data name="Calendar" xml:space="preserve">
<value>Calendar</value>
</data>
<data name="DatePicker" xml:space="preserve">
<value>DatePicker</value>
</data>
<data name="TimePicker" xml:space="preserve">
<value>TimePicker</value>
</data>
</root>
HandyControlDemo/Properties/Langs/Lang.resx
+7 -1
View File
@@ -122,7 +122,7 @@
<value>程序已崩溃~~~</value>
</data>
<data name="GrowlAsk" xml:space="preserve">
<value>检测到有新版本！</value>
<value>检测到有新版本！是否更新？</value>
</data>
<data name="Loading" xml:space="preserve">
<value>加载条</value>
@@ -223,4 +223,10 @@
<data name="Calendar" xml:space="preserve">
<value>日历</value>
</data>
<data name="DatePicker" xml:space="preserve">
<value>日期选择器</value>
</data>
<data name="TimePicker" xml:space="preserve">
<value>时间选择器</value>
</data>
</root>
HandyControlDemo/Resources/Themes/Styles/Label.xaml
+3 -3
View File
@@ -2,9 +2,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="LabelInfo" TargetType="{x:Type Label}">
<Setter Property="Margin" Value="0,32,16,0"></Setter>
<Setter Property="HorizontalAlignment" Value="Left"></Setter>
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}"></Setter>
<Setter Property="Margin" Value="0,32,16,0"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Label}">
HandyControlDemo/UserControl/Controls/ClockDemoCtl.xaml
+9
View File
@@ -0,0 +1,9 @@
<UserControl x:Class="HandyControlDemo.UserControl.ClockDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
Background="White">
<controls:TransitioningContentControl>
<controls:Clock Margin="32"/>
</controls:TransitioningContentControl>
</UserControl>
HandyControlDemo/UserControl/Controls/ClockDemoCtl.xaml.cs
+14
View File
@@ -0,0 +1,14 @@
// ReSharper disable once CheckNamespace
namespace HandyControlDemo.UserControl
{
/// <summary>
/// ClockDemoCtl.xaml 的交互逻辑
/// </summary>
public partial class ClockDemoCtl
{
public ClockDemoCtl()
{
InitializeComponent();
}
}
}
HandyControlDemo/UserControl/Controls/ColorPickerDemoCtl.xaml
+2 -5
View File
@@ -1,12 +1,9 @@
<UserControl x:Class="HandyControlDemo.UserControl.ColorPickerDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Background="White"
Background="{Binding SelectedBrush,ElementName=ColorPicker}"
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
<controls:TransitioningContentControl>
<StackPanel Orientation="Horizontal" Margin="32" VerticalAlignment="Center">
<controls:ColorPicker Name="ColorPicker"/>
<Border Margin="32,0,0,0" Height="100" Width="100" BorderThickness="1" BorderBrush="{StaticResource BorderBrush}" CornerRadius="50" Background="{Binding SelectedBrush,ElementName=ColorPicker}"></Border>
</StackPanel>
<controls:ColorPicker Name="ColorPicker" Margin="32"/>
</controls:TransitioningContentControl>
</UserControl>
HandyControlDemo/UserControl/Controls/DatePickerDemoCtl.xaml
+9
View File
@@ -0,0 +1,9 @@
<UserControl x:Class="HandyControlDemo.UserControl.DatePickerDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
Background="White">
<controls:TransitioningContentControl>
<DatePicker Margin="32" SelectedDate="2018-10-01"/>
</controls:TransitioningContentControl>
</UserControl>
HandyControlDemo/UserControl/Controls/DatePickerDemoCtl.xaml.cs
+14
View File
@@ -0,0 +1,14 @@
// ReSharper disable once CheckNamespace
namespace HandyControlDemo.UserControl
{
/// <summary>
/// DatePickerDemoCtl.xaml 的交互逻辑
/// </summary>
public partial class DatePickerDemoCtl
{
public DatePickerDemoCtl()
{
InitializeComponent();
}
}
}
HandyControlDemo/UserControl/Controls/TimePickerDemoCtl.xaml
+9
View File
@@ -0,0 +1,9 @@
<UserControl x:Class="HandyControlDemo.UserControl.TimePickerDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
Background="White">
<controls:TransitioningContentControl>
<controls:TimePicker Margin="32"/>
</controls:TransitioningContentControl>
</UserControl>
HandyControlDemo/UserControl/Controls/TimePickerDemoCtl.xaml.cs
+14
View File
@@ -0,0 +1,14 @@
// ReSharper disable once CheckNamespace
namespace HandyControlDemo.UserControl
{
/// <summary>
/// TimePickerDemoCtl.xaml 的交互逻辑
/// </summary>
public partial class TimePickerDemoCtl
{
public TimePickerDemoCtl()
{
InitializeComponent();
}
}
}
HandyControlDemo/UserControl/Main/LeftMainContent.xaml
+5 -1
View File
@@ -18,9 +18,13 @@
<TreeViewItem Tag="{x:Static data:MessageToken.ToggleButtonDemoCtl}" Header="{x:Static langs:Lang.ToggleButton}"/>
<TreeViewItem Tag="{x:Static data:MessageToken.ExpanderDemoCtl}" Header="{x:Static langs:Lang.Expander}"/>
<TreeViewItem Tag="{x:Static data:MessageToken.ProgressBarDemoCtl}" Header="{x:Static langs:Lang.ProgressBar}"/>
<TreeViewItem Style="{StaticResource TreeViewItemNew}" Tag="{x:Static data:MessageToken.CalendarDemoCtl}" Header="{x:Static langs:Lang.Calendar}"/>
<TreeViewItem Style="{StaticResource TreeViewItemNew}" Tag="{x:Static data:MessageToken.DatePickerDemoCtl}" Header="{x:Static langs:Lang.DatePicker}"/>
</TreeViewItem>
<TreeViewItem IsExpanded="True" Header="{x:Static langs:Lang.Controls}">
<TreeViewItem Style="{StaticResource TreeViewItemNew}" Tag="{x:Static data:MessageToken.StepBarDemoCtl}" Header="{x:Static langs:Lang.StepBar}"/>
<TreeViewItem Style="{StaticResource TreeViewItemNew}" Tag="{x:Static data:MessageToken.ClockDemoCtl}" Header="{x:Static langs:Lang.Clock}"/>
<TreeViewItem Style="{StaticResource TreeViewItemNew}" Tag="{x:Static data:MessageToken.TimePickerDemoCtl}" Header="{x:Static langs:Lang.TimePicker}"/>
<TreeViewItem Tag="{x:Static data:MessageToken.StepBarDemoCtl}" Header="{x:Static langs:Lang.StepBar}"/>
<TreeViewItem Tag="{x:Static data:MessageToken.GrowlDemoCtl}" Header="{x:Static langs:Lang.Growl}"/>
<TreeViewItem Tag="{x:Static data:MessageToken.LoadingDemoCtl}" Header="{x:Static langs:Lang.Loading}"/>
<TreeViewItem Tag="{x:Static data:MessageToken.ImageBrowserDemoCtl}" Header="{x:Static langs:Lang.ImageBrowser}"/>
HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml
+9
View File
@@ -0,0 +1,9 @@
<UserControl x:Class="HandyControlDemo.UserControl.CalendarDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
Background="White">
<controls:TransitioningContentControl>
<Calendar Margin="32" SelectionMode="MultipleRange"/>
</controls:TransitioningContentControl>
</UserControl>
HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml.cs
+14
View File
@@ -0,0 +1,14 @@
// ReSharper disable once CheckNamespace
namespace HandyControlDemo.UserControl
{
/// <summary>
/// CalendarDemoCtl.xaml 的交互逻辑
/// </summary>
public partial class CalendarDemoCtl
{
public CalendarDemoCtl()
{
InitializeComponent();
}
}
}
HandyControlDemo/UserControl/Styles/DatePickerDemoCtl.xaml
+10
View File
@@ -0,0 +1,10 @@
<UserControl x:Class="HandyControlDemo.UserControl.DatePickerDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
xmlns:system="clr-namespace:System;assembly=mscorlib"
Background="White">
<controls:TransitioningContentControl>
<DatePicker Margin="32" SelectedDate="{x:Static system:DateTime.Now}"/>
</controls:TransitioningContentControl>
</UserControl>
HandyControlDemo/UserControl/Styles/DatePickerDemoCtl.xaml.cs
+14
View File
@@ -0,0 +1,14 @@
// ReSharper disable once CheckNamespace
namespace HandyControlDemo.UserControl
{
/// <summary>
/// DatePickerDemoCtl.xaml 的交互逻辑
/// </summary>
public partial class DatePickerDemoCtl
{
public DatePickerDemoCtl()
{
InitializeComponent();
}
}
}