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

add FlipClock

Browse Source
This commit is contained in:
NaBian committed 2018-12-22 16:19:26 +08:00
1 parent 2a87323e0f
commit 7e98de25a3
22 files changed
+175 -78
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

HandyControlDemo/Data/MessageToken.cs
+1 -1
View File
@@ -58,7 +58,7 @@
public static readonly string OutlineTextDemoCtl = nameof(OutlineTextDemoCtl);
public static readonly string FlipNumberDemoCtl = nameof(FlipNumberDemoCtl);
public static readonly string FlipClockDemoCtl = nameof(FlipClockDemoCtl);
public static readonly string QQGroupView = nameof(QQGroupView);
HandyControlDemo/Data/MessageToken.tt
+1 -1
View File
@@ -32,7 +32,7 @@ var controlList = new List<string>
"TagDemoCtl",
"GifImageDemoCtl",
"OutlineTextDemoCtl",
"FlipNumberDemoCtl",
"FlipClockDemoCtl",
"QQGroupView"
};
var styleList = new List<string>
HandyControlDemo/HandyControlDemo.csproj
+3 -3
View File
@@ -142,8 +142,8 @@
<Compile Include="UserControl\Controls\DateTimePickerDemoCtl.xaml.cs">
<DependentUpon>DateTimePickerDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Controls\FlipNumberDemoCtl.xaml.cs">
<DependentUpon>FlipNumberDemoCtl.xaml</DependentUpon>
<Compile Include="UserControl\Controls\FlipClockDemoCtl.xaml.cs">
<DependentUpon>FlipClockDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Controls\OutlineTextDemoCtl.xaml.cs">
<DependentUpon>OutlineTextDemoCtl.xaml</DependentUpon>
@@ -408,7 +408,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\Controls\FlipNumberDemoCtl.xaml">
<Page Include="UserControl\Controls\FlipClockDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
HandyControlDemo/MainWindow.xaml
+1 -1
View File
@@ -9,7 +9,7 @@
BorderThickness="1"
BorderBrush="#262e2f"
NonClientAreaBackground="#262e2f"
OtherButtonHoverBrush="#888580"
OtherButtonHoverBackground="#888580"
Style="{StaticResource CustomWindowStyle}"
WindowState="Maximized"
Title="MainWindow"
HandyControlDemo/Properties/Langs/Lang.Designer.cs
Generated
+3 -3
View File
@@ -385,11 +385,11 @@ namespace HandyControlDemo.Properties.Langs {
}
/// <summary>
/// 查找类似 翻页数字 的本地化字符串。
/// 查找类似 翻页时钟 的本地化字符串。
/// </summary>
public static string FlipNumber {
public static string FlipClock {
get {
return ResourceManager.GetString("FlipNumber", resourceCulture);
return ResourceManager.GetString("FlipClock", resourceCulture);
}
}
HandyControlDemo/Properties/Langs/Lang.en.resx
+3 -3
View File
@@ -435,10 +435,10 @@
<data name="OutlineText" xml:space="preserve">
<value>OutlineText</value>
</data>
<data name="FlipNumber" xml:space="preserve">
<value>FlipNumber</value>
</data>
<data name="QQGroup" xml:space="preserve">
<value>QQ Group</value>
</data>
<data name="FlipClock" xml:space="preserve">
<value>FlipClock</value>
</data>
</root>
HandyControlDemo/Properties/Langs/Lang.resx
+3 -3
View File
@@ -415,10 +415,10 @@
<data name="OutlineText" xml:space="preserve">
<value>轮廓文本</value>
</data>
<data name="FlipNumber" xml:space="preserve">
<value>翻页数字</value>
</data>
<data name="QQGroup" xml:space="preserve">
<value>QQ群</value>
</data>
<data name="FlipClock" xml:space="preserve">
<value>翻页时钟</value>
</data>
</root>
HandyControlDemo/UserControl/Controls/FlipClockDemoCtl.xaml
+9
View File
@@ -0,0 +1,9 @@
<UserControl x:Class="HandyControlDemo.UserControl.FlipClockDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Background="{DynamicResource RegionBrush}"
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
<controls:TransitioningContentControl>
<controls:FlipClock Margin="32"/>
</controls:TransitioningContentControl>
</UserControl>
HandyControlDemo/UserControl/Controls/FlipNumberDemoCtl.xaml.cs → HandyControlDemo/UserControl/Controls/FlipClockDemoCtl.xaml.cs
+2 -2
View File
@@ -1,8 +1,8 @@
namespace HandyControlDemo.UserControl
{
public partial class FlipNumberDemoCtl
public partial class FlipClockDemoCtl
{
public FlipNumberDemoCtl()
public FlipClockDemoCtl()
{
InitializeComponent();
}
HandyControlDemo/UserControl/Controls/FlipNumberDemoCtl.xaml
-16
View File
@@ -1,16 +0,0 @@
<UserControl x:Class="HandyControlDemo.UserControl.FlipNumberDemoCtl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Background="{DynamicResource RegionBrush}"
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
<controls:TransitioningContentControl>
<Grid Margin="32">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<controls:NumericUpDown x:Name="UpDown" Minimum="0" Maximum="9"/>
<controls:FlipNumber Number="{Binding Value,ElementName=UpDown}" Grid.Row="1" Margin="0,16,0,0"/>
</Grid>
</controls:TransitioningContentControl>
</UserControl>
HandyControlDemo/UserControl/Main/LeftMainContent.xaml
+1 -1
View File
@@ -189,7 +189,7 @@
<Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
</controls:EdgeElement.LeftContent>
</ListBoxItem>
<ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.FlipNumberDemoCtl}" Content="{x:Static langs:Lang.FlipNumber}">
<ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.FlipClockDemoCtl}" Content="{x:Static langs:Lang.FlipClock}">
<controls:EdgeElement.LeftContent>
<Image Source="../../Resources/Img/LeftMainContent/FlipVertical_16x.png"/>
</controls:EdgeElement.LeftContent>
HandyControlDemo/Window/CustomNonClientAreaWindow.xaml
+1 -1
View File
@@ -8,7 +8,7 @@
mc:Ignorable="d"
OtherButtonForeground="{DynamicResource ReverseTextBrush}"
CloseButtonForeground="{DynamicResource ReverseTextBrush}"
OtherButtonHoverBrush="{DynamicResource ReverseTextBrush}"
OtherButtonHoverBackground="{DynamicResource ReverseTextBrush}"
NonClientAreaBackground="{DynamicResource ToolBarBackground}"
NonClientAreaHeight="69"
Background="{DynamicResource MainContentBackgroundBrush}"