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

Synchronize the Net40

Browse Source
This commit is contained in:
NaBian committed 2019-02-24 12:46:34 +08:00
1 parent b8c264d135
commit 11ebf96334
21 files changed
+282 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Net40/HandyControlDemo_Net40/Data/MessageToken.cs
+2
View File
@@ -82,6 +82,8 @@
public static readonly string ChatBubbleDemoCtl = nameof(ChatBubbleDemoCtl);
public static readonly string GotoTopDemoCtl = nameof(GotoTopDemoCtl);
public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl);
public static readonly string ToggleButtonDemoCtl = nameof(ToggleButtonDemoCtl);
Net40/HandyControlDemo_Net40/Data/MessageToken.tt
+2 -1
View File
@@ -43,7 +43,8 @@ var controlList = new List<string>
"CoverFlowDemoCtl",
"ProgressButtonDemoCtl",
"TransferDemoCtl",
"ChatBubbleDemoCtl"
"ChatBubbleDemoCtl",
"GotoTopDemoCtl"
};
var styleList = new List<string>
{
Net40/HandyControlDemo_Net40/HandyControlDemo_Net40.csproj
+8
View File
@@ -154,6 +154,9 @@
<Compile Include="UserControl\Controls\FlipClockDemoCtl.xaml.cs">
<DependentUpon>FlipClockDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Controls\GotoTopDemoCtl.xaml.cs">
<DependentUpon>GotoTopDemoCtl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControl\Controls\OutlineTextDemoCtl.xaml.cs">
<DependentUpon>OutlineTextDemoCtl.xaml</DependentUpon>
</Compile>
@@ -467,6 +470,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\Controls\GotoTopDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControl\Controls\OutlineTextDemoCtl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -725,6 +732,7 @@
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>MessageToken.cs</LastGenOutput>
</Content>
<Resource Include="Resources\Img\LeftMainContent\GoToTop_16x.png" />
<Resource Include="Resources\Img\LeftMainContent\Label_16x.png" />
<Resource Include="Resources\Img\Chat\chat_back1.jpg" />
<Resource Include="Resources\Img\Chat\chat_back2.jpg" />
Net40/HandyControlDemo_Net40/Properties/Langs/Lang.Designer.cs
Generated
+10 -1
View File
@@ -47,7 +47,7 @@ namespace HandyControlDemo.Properties.Langs {
}
/// <summary>
/// 重写当前线程的 CurrentUICulture 属性
/// 使用此强类型资源类，为所有资源查找
/// 重写当前线程的 CurrentUICulture 属性。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
@@ -438,6 +438,15 @@ namespace HandyControlDemo.Properties.Langs {
}
}
/// <summary>
/// 查找类似 回到顶部 的本地化字符串。
/// </summary>
public static string GotoTop {
get {
return ResourceManager.GetString("GotoTop", resourceCulture);
}
}
/// <summary>
/// 查找类似 分组框 的本地化字符串。
/// </summary>
Net40/HandyControlDemo_Net40/Properties/Langs/Lang.en.resx
+3
View File
@@ -498,4 +498,7 @@
<data name="Label" xml:space="preserve">
<value>Label</value>
</data>
<data name="GotoTop" xml:space="preserve">
<value>GotoTop</value>
</data>
</root>
Net40/HandyControlDemo_Net40/Properties/Langs/Lang.resx
+3
View File
@@ -498,4 +498,7 @@
<data name="Label" xml:space="preserve">
<value>标签</value>
</data>
<data name="GotoTop" xml:space="preserve">
<value>回到顶部</value>
</data>
</root>
Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/GoToTop_16x.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 194 B

Net40/HandyControlDemo_Net40/UserControl/Controls/GotoTopDemoCtl.xaml
+21
View File
@@ -0,0 +1,21 @@
<UserControl x:Class="HandyControlDemo.UserControl.GotoTopDemoCtl"
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="{DynamicResource RegionBrush}">
<controls:TransitioningContentControl>
<Grid Width="500" Height="400">
<controls:ScrollViewer Name="ScrollViewerDemo" IsEnableInertia="True" Margin="0,10,0,0">
<Border Height="2000" Margin="8,0">
<Border.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="White" Offset="0"/>
<GradientStop Color="Black" Offset="1"/>
</LinearGradientBrush>
</Border.Background>
</Border>
</controls:ScrollViewer>
<controls:GotoTop Animated="True" AutoHiding="True" AnimationTime="500" Target="{Binding ElementName=ScrollViewerDemo}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,20,20"/>
</Grid>
</controls:TransitioningContentControl>
</UserControl>
Net40/HandyControlDemo_Net40/UserControl/Controls/GotoTopDemoCtl.xaml.cs
+10
View File
@@ -0,0 +1,10 @@
namespace HandyControlDemo.UserControl
{
public partial class GotoTopDemoCtl
{
public GotoTopDemoCtl()
{
InitializeComponent();
}
}
}
Net40/HandyControlDemo_Net40/UserControl/Main/LeftMainContent.xaml
+6 -1
View File
@@ -187,6 +187,11 @@
</controls:StatusSwitchElement.CheckedElement>
</ToggleButton>
<ListBox Name="ListBoxControl" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single" Style="{StaticResource ListBoxTransparent}">
<ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.GotoTopDemoCtl}" Content="{x:Static langs:Lang.GotoTop}">
<controls:EdgeElement.LeftContent>
<Image Source="../../Resources/Img/LeftMainContent/GoToTop_16x.png"/>
</controls:EdgeElement.LeftContent>
</ListBoxItem>
<ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.ProgressButtonDemoCtl}" Content="{x:Static langs:Lang.ProgressButton}">
<controls:EdgeElement.LeftContent>
<Image Source="../../Resources/Img/LeftMainContent/ProgressButton_16x.png"/>
@@ -292,7 +297,7 @@
<Image Source="../../Resources/Img/LeftMainContent/Panel_16x.png"/>
</controls:EdgeElement.LeftContent>
</ListBoxItem>
<ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.CoverViewDemoCtl}" Content="{x:Static langs:Lang.CoverView}">
<ListBoxItem Tag="{x:Static data:MessageToken.CoverViewDemoCtl}" Content="{x:Static langs:Lang.CoverView}">
<controls:EdgeElement.LeftContent>
<Image Source="../../Resources/Img/LeftMainContent/DetailDataView_16x.png"/>
</controls:EdgeElement.LeftContent>