|
@@ -84,10 +84,10 @@
|
|
|
Margin="0,18,0,10"
|
|
|
Style="{StaticResource PropertyHeaderLv2}"
|
|
|
Text="Name" />
|
|
|
- <cus:TextBoxEx x:Name="TbName" Height="32" CornerRadius="4" Text="{Binding NameStr,Mode=TwoWay}" >
|
|
|
+ <cus:TextBoxEx x:Name="TbName" Height="32" CornerRadius="4" Text="{Binding FieldName,Mode=TwoWay}" >
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="TextChanged">
|
|
|
- <i:InvokeCommandAction Command="{Binding NameTextChangedCommand}" CommandParameter="{Binding ElementName=TbName,Path=Text}"/>
|
|
|
+ <i:InvokeCommandAction Command="{Binding FieldNameTextChangedCommand}" CommandParameter="{Binding ElementName=TbName,Path=Text}"/>
|
|
|
</i:EventTrigger>
|
|
|
</i:Interaction.Triggers>
|
|
|
</cus:TextBoxEx>
|
|
@@ -106,9 +106,9 @@
|
|
|
Margin="0,18,0,10"
|
|
|
Style="{StaticResource PropertyHeaderLv2}"
|
|
|
Text="Form Field" />
|
|
|
- <form:FormFieldCombox x:Name="formCombox" Type="{Binding FormPos,Mode=OneWay}" Height="32" Margin="0,8,0,16" />
|
|
|
- <CheckBox x:Name="ReadOnlyCheckBox" Content="Read Only" Command="{Binding IsReadOnlyCheckedCommand}" CommandParameter="{Binding ElementName=ReadOnlyCheckBox,Path=IsChecked}"/>
|
|
|
- <CheckBox x:Name="RequiredFieldCheckBox" Margin="0,8" Content="Required field" Command="{Binding RequiredFieldCheckedCommand}" CommandParameter="{Binding ElementName=RequiredFieldCheckBox,Path=IsChecked}"/>
|
|
|
+ <form:FormFieldCombox x:Name="formCombox" Type="{Binding FormField,Mode=OneWay}" Height="32" Margin="0,8,0,16" />
|
|
|
+ <CheckBox x:Name="ReadOnlyCheckBox" Content="Read Only" IsChecked="{Binding IsReadOnly,Mode=TwoWay}"/>
|
|
|
+ <CheckBox x:Name="RequiredFieldCheckBox" Margin="0,8" Content="Required field" IsChecked="{Binding IsRequiredField,Mode=TwoWay}" />
|
|
|
</StackPanel>
|
|
|
</TabItem>
|
|
|
<TabItem>
|
|
@@ -206,14 +206,7 @@
|
|
|
Style="{StaticResource PropertyHeaderLv2}"
|
|
|
Text="Line" />
|
|
|
|
|
|
-
|
|
|
- <CompositeControl:SlidComboControl x:Name="thickness">
|
|
|
- <i:Interaction.Triggers>
|
|
|
- <i:EventTrigger EventName="ValueChanged">
|
|
|
- <i:InvokeCommandAction Command="{Binding ThicknessChangedCommand}" CommandParameter="{Binding ElementName=thickness,Path=Value}"/>
|
|
|
- </i:EventTrigger>
|
|
|
- </i:Interaction.Triggers>
|
|
|
- </CompositeControl:SlidComboControl>
|
|
|
+ <CompositeControl:SlidComboControl x:Name="thickness" Value="{Binding BorderThiness,Mode=TwoWay}"/>
|
|
|
|
|
|
<StackPanel
|
|
|
x:Name="PnlLineStyle"
|
|
@@ -226,7 +219,7 @@
|
|
|
Click="BtnLineStyle_Click"
|
|
|
Command="{Binding LineStyleCommand}"
|
|
|
CommandParameter="{Binding ElementName=BtnSolidLine, Path=Tag}"
|
|
|
- Style="{StaticResource ToggleBtnViewModeStyle}"
|
|
|
+ Style="{StaticResource ToggleBtnViewModeStyle}" IsChecked="{Binding IsSolid}"
|
|
|
Tag="Solid">
|
|
|
<Border
|
|
|
Width="108"
|
|
@@ -250,7 +243,7 @@
|
|
|
Click="BtnLineStyle_Click"
|
|
|
Command="{Binding LineStyleCommand}"
|
|
|
CommandParameter="{Binding ElementName=BtnDottedLine, Path=Tag}"
|
|
|
- Style="{StaticResource ToggleBtnViewModeStyle}"
|
|
|
+ Style="{StaticResource ToggleBtnViewModeStyle}" IsChecked="{Binding IsSolid,Converter={StaticResource InvertBoolConvert}}"
|
|
|
Tag="Dotted">
|
|
|
<Border
|
|
|
Width="108"
|
|
@@ -271,122 +264,6 @@
|
|
|
</StackPanel>
|
|
|
</StackPanel>
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- <StackPanel>
|
|
|
- <TextBlock
|
|
|
- Margin="0,18,0,10"
|
|
|
- Style="{StaticResource PropertyHeaderLv2}"
|
|
|
- Text="文本" />
|
|
|
-
|
|
|
- <Grid Margin="0,6,0,0">
|
|
|
- <Grid.ColumnDefinitions>
|
|
|
- <ColumnDefinition Width="auto"></ColumnDefinition>
|
|
|
- <ColumnDefinition Width="auto"></ColumnDefinition>
|
|
|
- </Grid.ColumnDefinitions>
|
|
|
- <Grid.RowDefinitions>
|
|
|
- <RowDefinition Height="auto"></RowDefinition>
|
|
|
- <RowDefinition Height="auto"></RowDefinition>
|
|
|
- <RowDefinition Height="auto"></RowDefinition>
|
|
|
- </Grid.RowDefinitions>
|
|
|
-
|
|
|
- <Border BorderBrush="#E2E3E6" Grid.ColumnSpan="2" Width="228" Height="32" Margin="12,0,4,0" BorderThickness="0">
|
|
|
- <Grid>
|
|
|
- <ComboBox IsReadOnly="True" Name="FontFamilyBox" Background="Transparent" Padding="10 10 0 0" BorderThickness="1" BorderBrush="#FFE2E3E6">
|
|
|
- <ComboBox.ItemContainerStyle>
|
|
|
- <Style TargetType="{x:Type ComboBoxItem}">
|
|
|
- <Setter Property="Padding" Value="10 0 0 0"/>
|
|
|
- </Style>
|
|
|
- </ComboBox.ItemContainerStyle>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">
|
|
|
- <TextBlock Text="Courier New" FontFamily="Courier New" Tag="Courier" FontSize="14"/>
|
|
|
- </ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">
|
|
|
- <TextBlock Text="Arial" FontFamily="Arial" Tag="Helvetica" FontSize="14"/>
|
|
|
- </ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">
|
|
|
- <TextBlock Text="Times New Roman" FontFamily="Times New Roman" Tag="Times Roman" FontSize="14"/>
|
|
|
- </ComboBoxItem>
|
|
|
- <i:Interaction.Triggers>
|
|
|
- <i:EventTrigger EventName="SelectionChanged">
|
|
|
- <i:InvokeCommandAction Command="{Binding FontFamilyChangedCommand}" CommandParameter="{Binding ElementName=FontFamilyBox,Path=SelectedIndex}"/>
|
|
|
- </i:EventTrigger>
|
|
|
- </i:Interaction.Triggers>
|
|
|
- </ComboBox>
|
|
|
-
|
|
|
- <TextBox Name="FontFamilyText" FontFamily="Segoe UI" FontSize="14" Background="White" Padding="10 0 0 0" Margin="2,0,25,0" IsReadOnly="True"
|
|
|
- BorderThickness="0" VerticalAlignment="Center" TextAlignment="Left">
|
|
|
- </TextBox>
|
|
|
- </Grid>
|
|
|
- </Border>
|
|
|
-
|
|
|
-
|
|
|
- <Border Grid.Row="1" BorderBrush="#E2E3E6" Width="148" Height="32" Margin="12,8,4,0" BorderThickness="0">
|
|
|
- <Grid>
|
|
|
- <ComboBox Name="FontStyleBox" IsReadOnly="True" BorderThickness="1" BorderBrush="#FFE2E3E6" Padding="10 10 0 0" Background="Transparent">
|
|
|
- <ComboBox.ItemContainerStyle>
|
|
|
- <Style TargetType="{x:Type ComboBoxItem}">
|
|
|
- <Setter Property="Padding" Value="10 0 0 0"/>
|
|
|
- </Style>
|
|
|
- </ComboBox.ItemContainerStyle>
|
|
|
- <ComboBoxItem x:Name="RegularItem" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">Regular</ComboBoxItem>
|
|
|
- <ComboBoxItem x:Name="BoldItem" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">Bold</ComboBoxItem>
|
|
|
- <ComboBoxItem x:Name="ItalicItem" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">Italic</ComboBoxItem>
|
|
|
- <ComboBoxItem x:Name="BoldItalicItem" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">Bold Italic</ComboBoxItem>
|
|
|
-
|
|
|
- <i:Interaction.Triggers>
|
|
|
- <i:EventTrigger EventName="SelectionChanged">
|
|
|
- <i:InvokeCommandAction Command="{Binding FontStyleChangedCommand}" CommandParameter="{Binding ElementName=FontStyleBox,Path=SelectedItem}"/>
|
|
|
- </i:EventTrigger>
|
|
|
- </i:Interaction.Triggers>
|
|
|
- </ComboBox>
|
|
|
- <TextBox Name="FontStyleText" IsReadOnly="True" FontFamily="Segoe UI" FontSize="14" Background="White" Padding="10 0 0 0" Height="20" Margin="2,0,35,0"
|
|
|
- BorderThickness="0" VerticalAlignment="Center" TextAlignment="Left">
|
|
|
- </TextBox>
|
|
|
- </Grid>
|
|
|
- </Border>
|
|
|
-
|
|
|
- <Border Grid.Row="1" Grid.Column="1" BorderBrush="#E2E3E6" Width="80" Height="32" Margin="-1,8,0,0" BorderThickness="0">
|
|
|
- <Grid>
|
|
|
- <ComboBox Name="FontSizeBox" BorderThickness="1" Background="Transparent" BorderBrush="#FFE2E3E6"
|
|
|
- MaxDropDownHeight="200">
|
|
|
- <ComboBox.ItemContainerStyle>
|
|
|
- <Style TargetType="{x:Type ComboBoxItem}">
|
|
|
- <Setter Property="Padding" Value="10 0 0 0"/>
|
|
|
- </Style>
|
|
|
- </ComboBox.ItemContainerStyle>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">6</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">8</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">9</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">10</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">12</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">14</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">18</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">20</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">22</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">24</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">26</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">28</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">32</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">36</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">48</ComboBoxItem>
|
|
|
- <ComboBoxItem Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}">72</ComboBoxItem>
|
|
|
- <i:Interaction.Triggers>
|
|
|
- <i:EventTrigger EventName="SelectionChanged">
|
|
|
- <i:InvokeCommandAction Command="{Binding FontSizeChangedCommand}" CommandParameter="{Binding ElementName=FontSizeBox,Path=SelectedItem}"/>
|
|
|
- </i:EventTrigger>
|
|
|
- </i:Interaction.Triggers>
|
|
|
- </ComboBox>
|
|
|
- <TextBox Name="FontSizeText" FontFamily="Segoe UI" FontSize="14" Background="White" Height="20" Padding="10 0 0 0" Margin="2,0,35,0"
|
|
|
- BorderThickness="0" VerticalAlignment="Center" TextAlignment="Left" IsReadOnly="True">
|
|
|
- </TextBox>
|
|
|
- </Grid>
|
|
|
- </Border>
|
|
|
-
|
|
|
- </Grid>
|
|
|
-
|
|
|
- </StackPanel>
|
|
|
-
|
|
|
<StackPanel>
|
|
|
|
|
|
<TextBlock
|
|
@@ -395,10 +272,10 @@
|
|
|
Text="大小" />
|
|
|
<StackPanel Orientation="Horizontal">
|
|
|
<Path Data="M12.9999 8.75012V10.8285L15.8284 8.00006L12.9999 5.17163V7.25012H2.82843V5.17175L0 8.00017L2.82843 10.8286V8.75012H12.9999Z" Fill="#616469"/>
|
|
|
- <cus:NumericUpDown Height="32" Width="90"/>
|
|
|
+ <cus:NumericUpDown Height="32" Width="90" Value="{Binding WidthSize,Mode=TwoWay}"/>
|
|
|
|
|
|
<Path Data="M10.8284 2.82843H8.74999L8.74999 12.9999H10.8285L8.00005 15.8284L5.17163 12.9999H7.24999L7.24999 2.82843H5.17151L7.99994 0L10.8284 2.82843Z" Fill="#616469"/>
|
|
|
- <cus:NumericUpDown Height="32" Width="90"/>
|
|
|
+ <cus:NumericUpDown Height="32" Width="90" Value="{Binding HeightSize,Mode=TwoWay}"/>
|
|
|
</StackPanel>
|
|
|
</StackPanel>
|
|
|
|
|
@@ -418,7 +295,7 @@
|
|
|
<Grid>
|
|
|
<StackPanel IsEnabled="{Binding ElementName=ChkLock, Path=IsChecked, Converter={StaticResource InvertBoolConvert}}">
|
|
|
<TextBlock Text="Default Value"/>
|
|
|
- <cus:TextBoxEx x:Name="DefaultValueBox" Height="32" CornerRadius="4" Text="{Binding FormContent,Mode=TwoWay}" >
|
|
|
+ <cus:TextBoxEx x:Name="DefaultValueBox" Height="32" CornerRadius="4" Text="{Binding ExportedValues,Mode=TwoWay}" >
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="TextChanged">
|
|
|
<i:InvokeCommandAction Command="{Binding FormContentTextChangedCommand}" CommandParameter="{Binding ElementName=DefaultValueBox,Path=Text}"/>
|
|
@@ -426,7 +303,7 @@
|
|
|
</i:Interaction.Triggers>
|
|
|
</cus:TextBoxEx>
|
|
|
|
|
|
- <CheckBox x:Name="DefaultCheckBox" Content="The checkbox is checked by default" Command="{Binding DefaultCheckBoxCheckedCommand}" CommandParameter="{Binding ElementName=DefaultCheckBox,Path=IsChecked}"/>
|
|
|
+ <CheckBox x:Name="DefaultCheckBox" Content="The checkbox is checked by default" IsChecked="{Binding IsDefaultCheckBox}"/>
|
|
|
|
|
|
</StackPanel>
|
|
|
</Grid>
|
|
@@ -446,7 +323,7 @@
|
|
|
<CheckBox
|
|
|
Name="ChkLock"
|
|
|
Margin="16"
|
|
|
- Content="Locked" />
|
|
|
+ Content="Locked" IsChecked="{Binding IsLocked,Mode=TwoWay}"/>
|
|
|
</Border>
|
|
|
</Grid>
|
|
|
</UserControl>
|