Skip to content

Commit

Permalink
Merge pull request #39 from DinoChan/1.4.0
Browse files Browse the repository at this point in the history 
升级到1.4
  • Loading branch information
@DinoChan
DinoChan authored May 9, 2019
2 parents c3a9f82 + 6622c18 commit 74af77e
Show file tree
Hide file tree
Showing 132 changed files with 1,307 additions and 1,085 deletions.
10 changes: 5 additions & 5 deletions Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/App.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Value="/Kino.Toolkit.Wpf.Samples;component/Assets/#Font Awesome 5 Free Regular" />
</Style>

<Style TargetType="kino:KinoFormItem"
<Style TargetType="kino:FormItem"
x:Key="ControlPanelFromItemStyle">
<Setter Property="IsTabStop"
Value="False" />
Expand All @@ -36,7 +36,7 @@
</Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="kino:KinoFormItem">
<ControlTemplate TargetType="kino:FormItem">
<StackPanel x:Name="Root">
<ContentPresenter Content="{TemplateBinding Label}"
ContentTemplate="{TemplateBinding LabelTemplate}" />
Expand All @@ -53,13 +53,13 @@
</Style>


<Style TargetType="kino:KinoForm"
<Style TargetType="kino:Form"
x:Key="ControlPanelFromStyle">
<Setter Property="kino:FocusService.IsAutoFocus" Value="False"/>
<Style.Resources>
<ResourceDictionary>
<Style BasedOn="{StaticResource ControlPanelFromItemStyle}"
TargetType="{x:Type kino:KinoFormItem}" />
TargetType="{x:Type kino:FormItem}" />
</ResourceDictionary>
</Style.Resources>
</Style>
Expand All @@ -75,7 +75,7 @@

<ControlTemplate x:Key="ErrorTemplate">
<AdornedElementPlaceholder>
<kino:KinoValidationContent />
<kino:ValidationContent />
</AdornedElementPlaceholder>
</ControlTemplate>
</ResourceDictionary>
Expand Down
16 changes: 8 additions & 8 deletions Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/ButtonSample.Section1.txt
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<kino:KinoButton Content="bookmark"
<kino:ExtendedButton Content="bookmark"
MinWidth="18"
x:Name="BookmarkButton"
HorizontalAlignment="Left"
State="{Binding SelectedItem,ElementName=StatesListBox}">
<kino:KinoButton.Icon>
<kino:ExtendedButton.Icon>
<TextBlock Style="{StaticResource FontAwesome}"
Text="&#xf02e;" />
</kino:KinoButton.Icon>
</kino:KinoButton>
</kino:ExtendedButton.Icon>
</kino:ExtendedButton>

<local:SampleSection.ControlPanel>
<kino:KinoForm ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
<kino:Form ItemContainerStyle="{StaticResource ControlPanelFromItemStyle}">
<StackPanel Orientation="Horizontal"
kino:KinoForm.Label="Content And Icon">
kino:Form.Label="Content And Icon">
<RadioButton Content="Content Only"
Checked="OnContentOnlyCheck" />
<RadioButton Content="Icon Only"
Expand All @@ -26,6 +26,6 @@
<ListBox x:Name="StatesListBox"
HorizontalAlignment="Left"
Width="250"
kino:KinoForm.Label="State" />
</kino:KinoForm>
kino:Form.Label="State" />
</kino:Form>
</local:SampleSection.ControlPanel>
8 changes: 4 additions & 4 deletions Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/FormSample.Section2.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Style TargetType="kino:KinoFormItem">
<Style TargetType="kino:FormItem">
<Setter Property="Margin"
Value="0,4,0,8" />
<Setter Property="Padding"
Expand All @@ -15,7 +15,7 @@
</Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="kino:KinoFormItem">
<ControlTemplate TargetType="kino:FormItem">
<StackPanel x:Name="Root">
<StackPanel Orientation="Horizontal">
<ContentPresenter Content="{TemplateBinding Header}"
Expand All @@ -39,12 +39,12 @@
</Setter>
</Style>

<Style TargetType="kino:KinoFormTitle">
<Style TargetType="kino:FormTitle">
<Setter Property="Margin"
Value="0,4,4,8" />
</Style>

<Style TargetType="kino:KinoFormSeparator">
<Style TargetType="kino:FormSeparator">
<Setter Property="Margin"
Value="0,4,0,8" />
</Style>
41 changes: 21 additions & 20 deletions Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
d:DesignHeight="450"
d:DesignWidth="800">
<FrameworkElement.Resources>
<Style TargetType="kino:KinoHyperlinkButton">
<Style TargetType="kino:HyperlinkButton">
<Setter Property="Margin"
Value="0,10,20,10" />
<Setter Property="MinWidth"
Expand Down Expand Up @@ -157,37 +157,37 @@
FontSize="20"
Foreground="#FF333333" />
<WrapPanel x:Name="ControlsPanel">
<kino:KinoHyperlinkButton Content="Button"
<kino:HyperlinkButton Content="Button"
Tag="{x:Type local:ButtonSample}" />
<kino:KinoHyperlinkButton Content="TransitioningContentControl"
<kino:HyperlinkButton Content="TransitioningContentControl"
Tag="{x:Type local:TransitioningContentControlSample}" />
<kino:KinoHyperlinkButton Content="ProgressRing"
<kino:HyperlinkButton Content="ProgressRing"
Tag="{x:Type local:ProgressRingSample}" />
<kino:KinoHyperlinkButton Content="StateIndicator"
<kino:HyperlinkButton Content="StateIndicator"
Tag="{x:Type local:StateIndicatorSample}" />
<kino:KinoHyperlinkButton Content="Window"
<kino:HyperlinkButton Content="Window"
Tag="{x:Type local:WindowSample}" />
<kino:KinoHyperlinkButton Content="Resizer"
<kino:HyperlinkButton Content="Resizer"
Tag="{x:Type local:ResizerSample}" />
<kino:KinoHyperlinkButton Content="Expander"
<kino:HyperlinkButton Content="Expander"
Tag="{x:Type local:ExpanderSample}" />
<kino:KinoHyperlinkButton Content="SquareBox"
<kino:HyperlinkButton Content="SquareBox"
Tag="{x:Type local:SquareBoxSample}" />
<kino:KinoHyperlinkButton Content="FormItem"
<kino:HyperlinkButton Content="FormItem"
Tag="{x:Type local:FormItemSample}" />
<kino:KinoHyperlinkButton Content="Form"
<kino:HyperlinkButton Content="Form"
Tag="{x:Type local:FormSample}" />
<kino:KinoHyperlinkButton Content="RadioButtonMenuItem"
<kino:HyperlinkButton Content="RadioButtonMenuItem"
Tag="{x:Type local:RadioButtonMenuItemSample}" />
<kino:KinoHyperlinkButton Content="DataPager"
<kino:HyperlinkButton Content="DataPager"
Tag="{x:Type local:DataPagerSample}" />
<kino:KinoHyperlinkButton Content="ListBox"
<kino:HyperlinkButton Content="ListBox"
Tag="{x:Type local:ListBoxSample}" />
<kino:KinoHyperlinkButton Content="DataGrid"
<kino:HyperlinkButton Content="DataGrid"
Tag="{x:Type local:DataGridSample}" />
<kino:KinoHyperlinkButton Content="Paging"
<kino:HyperlinkButton Content="Paging"
Tag="{x:Type local:PagingSample}" />
<kino:KinoHyperlinkButton Content="Highlight"
<kino:HyperlinkButton Content="Highlight"
Tag="{x:Type local:HighlightSample}" />
</WrapPanel>
<Rectangle Height="1"
Expand All @@ -197,9 +197,10 @@
<TextBlock Text="About"
FontSize="20"
Foreground="#FF333333" />
<TextBlock Text="Version 1.3.0"
Margin="0,10" />
<kino:KinoHyperlinkButton Content="Github"
<TextBlock Text="Version 1.3.1"
Margin="0,10"
x:Name="VersionElement"/>
<kino:HyperlinkButton Content="Github"
NavigateUri="https://github.com/DinoChan/Kino.Toolkit.Wpf" />
</StackPanel>
</ScrollViewer>
Expand Down
5 changes: 4 additions & 1 deletion Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/HomePage.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
Expand All @@ -23,7 +24,9 @@ public partial class HomePage : UserControl
public HomePage()
{
InitializeComponent();
foreach (var button in ControlsPanel.Children.OfType<KinoHyperlinkButton>())
var version = Assembly.GetAssembly(typeof(ExtendedButton)).GetName().Version;
VersionElement.Text = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
foreach (var button in ControlsPanel.Children.OfType<HyperlinkButton>())
{
button.Click += (s, e) =>
{
Expand Down
6 changes: 3 additions & 3 deletions Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/Curd/CurdSample.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</Button>
</StackPanel>
</Grid>
<kino:KinoDataGrid Grid.Row="1"
<kino:ExtendedDataGrid Grid.Row="1"
Margin="0,8,0,0"
IsReadOnly="True"
AutoGenerateColumns="False"
Expand All @@ -70,8 +70,8 @@
Binding="{Binding Age}"
SortMemberPath="Age" />
</DataGrid.Columns>
</kino:KinoDataGrid>
<kino:KinoDataPager Source="{Binding}"
</kino:ExtendedDataGrid>
<kino:DataPager Source="{Binding}"
Grid.Row="2"
DisplayMode="FirstLastPreviousNextNumeric" />
</Grid>
Expand Down
22 changes: 11 additions & 11 deletions Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/Curd/TestModelWindow.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<kino:KinoWindow x:Class="Kino.Toolkit.Wpf.Samples.TestModelWindow"
<kino:ExtendedWindow x:Class="Kino.Toolkit.Wpf.Samples.TestModelWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
Expand All @@ -15,23 +15,23 @@
Width="800">
<Grid Width="400">
<xctk:BusyIndicator x:Name="BusyIndicator">
<kino:KinoForm>
<kino:KinoFormTitle Content="TestModel" />
<TextBox kino:KinoForm.Label="Name"
<kino:Form>
<kino:FormTitle Content="TestModel" />
<TextBox kino:Form.Label="Name"
Text="{Binding Name}" />
<xctk:IntegerUpDown kino:KinoForm.Label="Age"
<xctk:IntegerUpDown kino:Form.Label="Age"
Value="{Binding Age,Mode=TwoWay}" />
<kino:KinoForm.FunctionBar>
<kino:KinoFormFunctionBar>
<kino:Form.FunctionBar>
<kino:FormFunctionBar>
<Button Content="Save"
IsDefault="True"
Click="OnSave" />
<Button Content="Cancel"
IsCancel="True"
Click="OnCancel" />
</kino:KinoFormFunctionBar>
</kino:KinoForm.FunctionBar>
</kino:KinoForm>
</kino:FormFunctionBar>
</kino:Form.FunctionBar>
</kino:Form>
</xctk:BusyIndicator>
</Grid>
</kino:KinoWindow>
</kino:ExtendedWindow>
24 changes: 12 additions & 12 deletions Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SignInView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<UserControl.Resources>
<kino:EmptyObjectToVisibilityConverter x:Key="EmptyObjectToVisibilityConverter" />
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<Style TargetType="kino:KinoFormItem">
<Style TargetType="kino:FormItem">
<Setter Property="Padding"
Value="0,4,0,0" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="kino:KinoFormItem">
<ControlTemplate TargetType="kino:FormItem">
<StackPanel x:Name="Root">
<StackPanel Orientation="Horizontal">
<ContentPresenter Content="{TemplateBinding Label}"
Expand Down Expand Up @@ -53,31 +53,31 @@
<RowDefinition />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<kino:KinoForm Header="登录">
<TextBox kino:KinoForm.Label="用户名"
<kino:Form Header="登录">
<TextBox kino:Form.Label="用户名"
x:Name="UsernameElement"
Text="{Binding Username,Mode=TwoWay}"
Validation.ErrorTemplate="{StaticResource ErrorTemplate}"/>
<PasswordBox kino:KinoForm.Label="密码"
<PasswordBox kino:Form.Label="密码"
local:PasswordBoxHelper.Password="{Binding Password,Mode=TwoWay}"
Validation.ErrorTemplate="{StaticResource ErrorTemplate}" />
<kino:KinoForm.FunctionBar>
<kino:KinoFormFunctionBar>
<kino:KinoButton Content="Sign In"
<kino:Form.FunctionBar>
<kino:FormFunctionBar>
<kino:ExtendedButton Content="Sign In"
IsDefault="True"
Click="OnSignIn"
x:Name="SignInButton" />
</kino:KinoFormFunctionBar>
</kino:KinoForm.FunctionBar>
</kino:KinoForm>
</kino:FormFunctionBar>
</kino:Form.FunctionBar>
</kino:Form>
<Grid Grid.Row="1"
Background="#FFDFDFDF">
<StackPanel Orientation="Horizontal"
HorizontalAlignment="Center"
Margin="8">
<TextBlock Text="没有账号？"
VerticalAlignment="Center" />
<kino:KinoHyperlinkButton Content="注册"
<kino:HyperlinkButton Content="注册"
Click="OnSignUp" />
</StackPanel>
</Grid>
Expand Down
40 changes: 20 additions & 20 deletions Kino.Toolkit.Wpf/Kino.Toolkit.Wpf.Samples/Patterns/SignIn/SignUpView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<UserControl.Resources>
<kino:EmptyObjectToVisibilityConverter x:Key="EmptyObjectToVisibilityConverter" />
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<Style TargetType="kino:KinoFormItem">
<Style TargetType="kino:FormItem">
<Setter Property="Padding"
Value="0,4,0,0" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="kino:KinoFormItem">
<ControlTemplate TargetType="kino:FormItem">
<StackPanel x:Name="Root">
<StackPanel Orientation="Horizontal">
<ContentPresenter Content="{TemplateBinding Label}"
Expand Down Expand Up @@ -46,42 +46,42 @@
</Setter>
</Style>
</UserControl.Resources>
<kino:KinoResizer HorizontalContentAlignment="Stretch">
<kino:Resizer HorizontalContentAlignment="Stretch">
<Grid>
<Grid>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<kino:KinoForm Header="注册">
<TextBox kino:KinoForm.Label="用户名"
<kino:Form Header="注册">
<TextBox kino:Form.Label="用户名"
Text="{Binding Username,Mode=TwoWay}"
Validation.ErrorTemplate="{StaticResource ErrorTemplate}" />
<TextBox kino:KinoForm.Label="昵称"
<TextBox kino:Form.Label="昵称"
Validation.ErrorTemplate="{StaticResource ErrorTemplate}" />
<PasswordBox kino:KinoForm.Label="密码"
<PasswordBox kino:Form.Label="密码"
Validation.ErrorTemplate="{StaticResource ErrorTemplate}"
local:PasswordBoxHelper.Password="{Binding Password,Mode=TwoWay}" />
<TextBox kino:KinoForm.Label="邮箱"/>
<TextBox kino:KinoForm.Label="家庭住址"/>
<TextBox kino:KinoForm.Label="邮编"/>
<kino:KinoForm.FunctionBar>
<kino:KinoFormFunctionBar>
<kino:KinoFormFunctionBar.Header>
<kino:KinoHyperlinkButton Content="返回"
<TextBox kino:Form.Label="邮箱"/>
<TextBox kino:Form.Label="家庭住址"/>
<TextBox kino:Form.Label="邮编"/>
<kino:Form.FunctionBar>
<kino:FormFunctionBar>
<kino:FormFunctionBar.Header>
<kino:HyperlinkButton Content="返回"
Click="OnBack"
VerticalAlignment="Bottom"
HorizontalAlignment="Left" />
</kino:KinoFormFunctionBar.Header>
<kino:KinoButton Content="Sign Up"
</kino:FormFunctionBar.Header>
<kino:ExtendedButton Content="Sign Up"
x:Name="SignUpButton"
IsDefault="True"
Click="OnSignUp" />
</kino:KinoFormFunctionBar>
</kino:KinoForm.FunctionBar>
</kino:KinoForm>
</kino:FormFunctionBar>
</kino:Form.FunctionBar>
</kino:Form>

</Grid>
</Grid>
</kino:KinoResizer>
</kino:Resizer>
</UserControl>
Loading

0 comments on commit 74af77e

Please sign in to comment.