|
|
@@ -1,34 +1,39 @@
|
|
|
-<UserControl x:Class="PDF_Office.Views.PropertyPanel.AnnotPanel.FreetextAnnotProperty"
|
|
|
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
|
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
|
- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
|
- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
|
- xmlns:local="clr-namespace:PDF_Office.Views.PropertyPanel.AnnotPanel"
|
|
|
- xmlns:CompositeControl="clr-namespace:PDF_Office.CustomControl.CompositeControl"
|
|
|
- xmlns:cusColor="clr-namespace:PDF_Office.CustomControl.CompositeControl"
|
|
|
- xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
|
|
|
- xmlns:prism="http://prismlibrary.com/"
|
|
|
- prism:ViewModelLocator.AutoWireViewModel="True"
|
|
|
- xmlns:Convert="clr-namespace:PDF_Office.DataConvert"
|
|
|
- xmlns:cus="clr-namespace:PDF_Office.CustomControl" xmlns:annotpanel="clr-namespace:PDF_Office.ViewModels.PropertyPanel.AnnotPanel" d:DataContext="{d:DesignInstance Type=annotpanel:FreetextAnnotPropertyViewModel}"
|
|
|
- mc:Ignorable="d"
|
|
|
- d:DesignHeight="850" d:DesignWidth="800">
|
|
|
+<UserControl
|
|
|
+ x:Class="PDF_Office.Views.PropertyPanel.AnnotPanel.FreetextAnnotProperty"
|
|
|
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
|
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
|
+ xmlns:CompositeControl="clr-namespace:PDF_Office.CustomControl.CompositeControl"
|
|
|
+ xmlns:Convert="clr-namespace:PDF_Office.DataConvert"
|
|
|
+ xmlns:annotpanel="clr-namespace:PDF_Office.ViewModels.PropertyPanel.AnnotPanel"
|
|
|
+ xmlns:cus="clr-namespace:PDF_Office.CustomControl"
|
|
|
+ xmlns:cusColor="clr-namespace:PDF_Office.CustomControl.CompositeControl"
|
|
|
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
|
+ xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
|
|
|
+ xmlns:local="clr-namespace:PDF_Office.Views.PropertyPanel.AnnotPanel"
|
|
|
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
|
+ xmlns:prism="http://prismlibrary.com/"
|
|
|
+ d:DataContext="{d:DesignInstance Type=annotpanel:FreetextAnnotPropertyViewModel}"
|
|
|
+ d:DesignHeight="850"
|
|
|
+ d:DesignWidth="260"
|
|
|
+ prism:ViewModelLocator.AutoWireViewModel="True"
|
|
|
+ Background="{StaticResource color.sys.layout.mg}"
|
|
|
+ mc:Ignorable="d">
|
|
|
<UserControl.Resources>
|
|
|
<ResourceDictionary>
|
|
|
<ResourceDictionary.MergedDictionaries>
|
|
|
- <ResourceDictionary Source="../../../Styles/SliderStyle.xaml"></ResourceDictionary>
|
|
|
- <ResourceDictionary Source="../../../Styles/CustomBtnStyle.xaml"/>
|
|
|
+ <ResourceDictionary Source="../../../Styles/SliderStyle.xaml" />
|
|
|
+ <ResourceDictionary Source="../../../Styles/CustomBtnStyle.xaml" />
|
|
|
</ResourceDictionary.MergedDictionaries>
|
|
|
- <Convert:InvertBoolToVisibleConvert x:Key="InvertBoolToVisibleConvert"/>
|
|
|
- <Convert:BoolToVisible x:Key="BoolToVisible"/>
|
|
|
- <Convert:CheckToVisibleMutiConvert x:Key="CheckToVisibleMutiConvert"/>
|
|
|
- <Convert:TextAlignToCheckedConverter x:Key="TextAlignToCheckedConverter"/>
|
|
|
+ <Convert:InvertBoolToVisibleConvert x:Key="InvertBoolToVisibleConvert" />
|
|
|
+ <Convert:BoolToVisible x:Key="BoolToVisible" />
|
|
|
+ <Convert:CheckToVisibleMutiConvert x:Key="CheckToVisibleMutiConvert" />
|
|
|
+ <Convert:TextAlignToCheckedConverter x:Key="TextAlignToCheckedConverter" />
|
|
|
<Style x:Key="line1Style" TargetType="{x:Type Line}">
|
|
|
<Setter Property="Visibility">
|
|
|
<Setter.Value>
|
|
|
<MultiBinding Converter="{StaticResource CheckToVisibleMutiConvert}">
|
|
|
- <Binding ElementName="TextAlignLeftBtn" Path="IsChecked"/>
|
|
|
- <Binding ElementName="TextAlignCenterBtn" Path="IsChecked"/>
|
|
|
+ <Binding ElementName="TextAlignLeftBtn" Path="IsChecked" />
|
|
|
+ <Binding ElementName="TextAlignCenterBtn" Path="IsChecked" />
|
|
|
</MultiBinding>
|
|
|
</Setter.Value>
|
|
|
</Setter>
|
|
|
@@ -37,143 +42,178 @@
|
|
|
<Setter Property="Visibility">
|
|
|
<Setter.Value>
|
|
|
<MultiBinding Converter="{StaticResource CheckToVisibleMutiConvert}">
|
|
|
- <Binding ElementName="TextAlignCenterBtn" Path="IsChecked"/>
|
|
|
- <Binding ElementName="TextAlignRightBtn" Path="IsChecked"/>
|
|
|
+ <Binding ElementName="TextAlignCenterBtn" Path="IsChecked" />
|
|
|
+ <Binding ElementName="TextAlignRightBtn" Path="IsChecked" />
|
|
|
</MultiBinding>
|
|
|
</Setter.Value>
|
|
|
</Setter>
|
|
|
</Style>
|
|
|
|
|
|
<DataTemplate x:Key="FontStyleData">
|
|
|
- <Grid >
|
|
|
- <TextBlock Text="{Binding mFontStyleName}" Foreground="Black"/>
|
|
|
+ <Grid>
|
|
|
+ <TextBlock Foreground="Black" Text="{Binding mFontStyleName}" />
|
|
|
</Grid>
|
|
|
</DataTemplate>
|
|
|
</ResourceDictionary>
|
|
|
</UserControl.Resources>
|
|
|
- <Grid Background="#F3F3F3">
|
|
|
+ <Grid>
|
|
|
<StackPanel>
|
|
|
- <TextBlock Name="AnnotTypeTitle" FontFamily="Segoe UI Semibold" FontWeight="SemiBold" FontSize="18" LineHeight="24" HorizontalAlignment="Left" Margin="10,8,0,0" Text="{Binding T_Title}"/>
|
|
|
- <Border Width="228" Height="100" BorderThickness="1" CornerRadius="2" BorderBrush="#DDDDDD" Background="White" Margin="0,8,0,0"
|
|
|
- Visibility="{Binding BasicVm.IsMultiSelected,Converter={StaticResource InvertBoolToVisibleConvert}}"
|
|
|
- >
|
|
|
+ <TextBlock
|
|
|
+ Name="AnnotTypeTitle"
|
|
|
+ Margin="10,8,0,0"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ FontFamily="Segoe UI Semibold"
|
|
|
+ FontSize="18"
|
|
|
+ FontWeight="SemiBold"
|
|
|
+ LineHeight="24"
|
|
|
+ Text="{Binding T_Title}" />
|
|
|
+ <Border
|
|
|
+ Width="228"
|
|
|
+ Height="100"
|
|
|
+ Margin="0,8,0,0"
|
|
|
+ Background="White"
|
|
|
+ BorderBrush="#DDDDDD"
|
|
|
+ BorderThickness="1"
|
|
|
+ CornerRadius="2"
|
|
|
+ Visibility="{Binding BasicVm.IsMultiSelected, Converter={StaticResource InvertBoolToVisibleConvert}}">
|
|
|
<Grid>
|
|
|
- <Border Name="FreeTextBorder" HorizontalAlignment="Center" VerticalAlignment="Center" Padding="5"
|
|
|
+ <Border
|
|
|
+ Name="FreeTextBorder"
|
|
|
+ Padding="5"
|
|
|
+ HorizontalAlignment="Center"
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ Background="{Binding BasicVm.FillColor}"
|
|
|
+ Opacity="{Binding BasicVm.FillOpacity}">
|
|
|
+ <TextBlock
|
|
|
+ Name="SampleText"
|
|
|
+ HorizontalAlignment="Center"
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ FontFamily="{Binding FontVm.CurrentFontFamily.ValueStr}"
|
|
|
+ FontSize="{Binding FontVm.CurrentFontSize.Value}"
|
|
|
+ FontStyle="{Binding FontVm.FontStyleItem}"
|
|
|
+ FontWeight="{Binding FontVm.FontWeightItem}"
|
|
|
+ Foreground="{Binding FontVm.FontColor}"
|
|
|
Opacity="{Binding BasicVm.FillOpacity}"
|
|
|
- Background="{Binding BasicVm.FillColor}">
|
|
|
- <TextBlock Name="SampleText"
|
|
|
- Foreground="{Binding FontVm.FontColor}"
|
|
|
- FontFamily="{Binding FontVm.CurrentFontFamily.ValueStr}"
|
|
|
- FontWeight="{Binding FontVm.FontWeightItem}"
|
|
|
- FontStyle="{Binding FontVm.FontStyleItem}"
|
|
|
- FontSize="{Binding FontVm.CurrentFontSize.Value}" Opacity="{Binding BasicVm.FillOpacity}"
|
|
|
- Text="Sample" HorizontalAlignment="Center" VerticalAlignment="Center">
|
|
|
- </TextBlock>
|
|
|
+ Text="Sample" />
|
|
|
</Border>
|
|
|
|
|
|
- <Path Name="UnderlinePath" HorizontalAlignment="Center" StrokeThickness="2" Margin="0,51,0,0" Visibility="Collapsed">
|
|
|
+ <Path
|
|
|
+ Name="UnderlinePath"
|
|
|
+ Margin="0,51,0,0"
|
|
|
+ HorizontalAlignment="Center"
|
|
|
+ StrokeThickness="2"
|
|
|
+ Visibility="Collapsed">
|
|
|
<Path.Data>
|
|
|
- <LineGeometry StartPoint="0,0" EndPoint="62,0"></LineGeometry>
|
|
|
+ <LineGeometry StartPoint="0,0" EndPoint="62,0" />
|
|
|
</Path.Data>
|
|
|
</Path>
|
|
|
- <Path Name="StrikeoutPath" HorizontalAlignment="Center" StrokeThickness="2" Margin="0,40,0,0" Visibility="Collapsed">
|
|
|
+ <Path
|
|
|
+ Name="StrikeoutPath"
|
|
|
+ Margin="0,40,0,0"
|
|
|
+ HorizontalAlignment="Center"
|
|
|
+ StrokeThickness="2"
|
|
|
+ Visibility="Collapsed">
|
|
|
<Path.Data>
|
|
|
- <LineGeometry StartPoint="0,0" EndPoint="62,0"></LineGeometry>
|
|
|
+ <LineGeometry StartPoint="0,0" EndPoint="62,0" />
|
|
|
</Path.Data>
|
|
|
</Path>
|
|
|
- <Path Name="SquigglyPath" HorizontalAlignment="Center" StrokeThickness="2" Margin="0,51,0,0" Visibility="Collapsed">
|
|
|
-
|
|
|
- </Path>
|
|
|
+ <Path
|
|
|
+ Name="SquigglyPath"
|
|
|
+ Margin="0,51,0,0"
|
|
|
+ HorizontalAlignment="Center"
|
|
|
+ StrokeThickness="2"
|
|
|
+ Visibility="Collapsed" />
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
|
|
|
<Border
|
|
|
- Height="32"
|
|
|
- Margin="15,8,15,18"
|
|
|
- BorderBrush="#E2E3E6"
|
|
|
- BorderThickness="0">
|
|
|
+ Height="32"
|
|
|
+ Margin="15,8,15,18"
|
|
|
+ BorderBrush="#E2E3E6"
|
|
|
+ BorderThickness="0">
|
|
|
<Grid>
|
|
|
<Grid.ColumnDefinitions>
|
|
|
- <ColumnDefinition/>
|
|
|
- <ColumnDefinition Width="auto"/>
|
|
|
+ <ColumnDefinition />
|
|
|
+ <ColumnDefinition Width="auto" />
|
|
|
</Grid.ColumnDefinitions>
|
|
|
<CompositeControl:CustomComboControl
|
|
|
- x:Name="ComBoxPresetFont"
|
|
|
- Width="188"
|
|
|
- Height="32"
|
|
|
- HorizontalAlignment="Left"
|
|
|
- IsValueContent="True"
|
|
|
- ItemSource="{Binding FontVm.PresetFontItems,Mode=OneWay}"
|
|
|
- SelectedItems="{Binding FontVm.CurrentPresetFont, Mode=TwoWay}">
|
|
|
+ x:Name="ComBoxPresetFont"
|
|
|
+ Width="188"
|
|
|
+ Height="32"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ IsValueContent="True"
|
|
|
+ ItemSource="{Binding FontVm.PresetFontItems, Mode=OneWay}"
|
|
|
+ SelectedItems="{Binding FontVm.CurrentPresetFont, Mode=TwoWay}">
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="ValueChanged">
|
|
|
- <i:InvokeCommandAction Command="{Binding SelectedPresetFontCommand}"/>
|
|
|
+ <i:InvokeCommandAction Command="{Binding SelectedPresetFontCommand}" />
|
|
|
</i:EventTrigger>
|
|
|
</i:Interaction.Triggers>
|
|
|
</CompositeControl:CustomComboControl>
|
|
|
|
|
|
-
|
|
|
- <Button Grid.Column="1"
|
|
|
- Width="32"
|
|
|
- Height="32"
|
|
|
- HorizontalAlignment="Left" Command="{Binding CustomFontStyleCommand}"
|
|
|
- Style="{StaticResource btn.sec}">
|
|
|
+ <Button
|
|
|
+ Grid.Column="1"
|
|
|
+ Width="32"
|
|
|
+ Height="32"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ Command="{Binding CustomFontStyleCommand}"
|
|
|
+ Style="{StaticResource btn.sec}">
|
|
|
<Path
|
|
|
- Width="16"
|
|
|
- Height="16"
|
|
|
- Data="M4 8C4 8.82843 3.32843 9.5 2.5 9.5C1.67157 9.5 1 8.82843 1 8C1 7.17157 1.67157 6.5 2.5 6.5C3.32843 6.5 4 7.17157 4 8ZM9.3999 8C9.3999 8.82843 8.72833 9.5 7.8999 9.5C7.07148 9.5 6.3999 8.82843 6.3999 8C6.3999 7.17157 7.07148 6.5 7.8999 6.5C8.72833 6.5 9.3999 7.17157 9.3999 8ZM13.5 9.5C14.3284 9.5 15 8.82843 15 8C15 7.17157 14.3284 6.5 13.5 6.5C12.6716 6.5 12 7.17157 12 8C12 8.82843 12.6716 9.5 13.5 9.5Z"
|
|
|
- Fill="{StaticResource color.icon.base.neutral.norm.lv1}" />
|
|
|
+ Width="16"
|
|
|
+ Height="16"
|
|
|
+ Data="M4 8C4 8.82843 3.32843 9.5 2.5 9.5C1.67157 9.5 1 8.82843 1 8C1 7.17157 1.67157 6.5 2.5 6.5C3.32843 6.5 4 7.17157 4 8ZM9.3999 8C9.3999 8.82843 8.72833 9.5 7.8999 9.5C7.07148 9.5 6.3999 8.82843 6.3999 8C6.3999 7.17157 7.07148 6.5 7.8999 6.5C8.72833 6.5 9.3999 7.17157 9.3999 8ZM13.5 9.5C14.3284 9.5 15 8.82843 15 8C15 7.17157 14.3284 6.5 13.5 6.5C12.6716 6.5 12 7.17157 12 8C12 8.82843 12.6716 9.5 13.5 9.5Z"
|
|
|
+ Fill="{StaticResource color.icon.base.neutral.norm.lv1}" />
|
|
|
</Button>
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
|
|
|
<StackPanel Margin="15,0,15,0">
|
|
|
<TextBlock
|
|
|
- Margin="0,0,0,10" FontWeight="Normal"
|
|
|
- Foreground="{StaticResource color.sys.text.neutral.lv2}"
|
|
|
- Style="{StaticResource PropertyHeaderLv2}"
|
|
|
- Text="{Binding T_Font}" />
|
|
|
+ Margin="0,0,0,10"
|
|
|
+ FontWeight="Normal"
|
|
|
+ Foreground="{StaticResource color.sys.text.neutral.lv2}"
|
|
|
+ Style="{StaticResource PropertyHeaderLv2}"
|
|
|
+ Text="{Binding T_Font}" />
|
|
|
|
|
|
<StackPanel>
|
|
|
<CompositeControl:CustomComboControl
|
|
|
- x:Name="FontFamilyBox"
|
|
|
- Height="32"
|
|
|
- IsValueContent="True"
|
|
|
- ItemSource="{Binding FontVm.FontFamilyItems,Mode=OneWay}"
|
|
|
- SelectedItems="{Binding FontVm.CurrentFontFamily, Mode=TwoWay}" >
|
|
|
+ x:Name="FontFamilyBox"
|
|
|
+ Height="32"
|
|
|
+ IsValueContent="True"
|
|
|
+ ItemSource="{Binding FontVm.FontFamilyItems, Mode=OneWay}"
|
|
|
+ SelectedItems="{Binding FontVm.CurrentFontFamily, Mode=TwoWay}">
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="ValueChanged">
|
|
|
- <i:InvokeCommandAction Command="{Binding FontFamilyChangedCommand}"/>
|
|
|
+ <i:InvokeCommandAction Command="{Binding FontFamilyChangedCommand}" />
|
|
|
</i:EventTrigger>
|
|
|
</i:Interaction.Triggers>
|
|
|
</CompositeControl:CustomComboControl>
|
|
|
|
|
|
<Grid Margin="0,8">
|
|
|
<CompositeControl:CustomComboControl
|
|
|
- x:Name="FontStyleBox"
|
|
|
- Width="110"
|
|
|
- Height="32"
|
|
|
- HorizontalAlignment="Left"
|
|
|
- IsValueContent="True"
|
|
|
- ItemSource="{Binding FontVm.FontStyleItems,Mode=OneWay}"
|
|
|
- SelectedItems="{Binding FontVm.CurrrentFontWeightStyle, Mode=TwoWay}">
|
|
|
+ x:Name="FontStyleBox"
|
|
|
+ Width="110"
|
|
|
+ Height="32"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ IsValueContent="True"
|
|
|
+ ItemSource="{Binding FontVm.FontStyleItems, Mode=OneWay}"
|
|
|
+ SelectedItems="{Binding FontVm.CurrrentFontWeightStyle, Mode=TwoWay}">
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="ValueChanged">
|
|
|
- <i:InvokeCommandAction Command="{Binding FontStyleWeightChangedCommand}"/>
|
|
|
+ <i:InvokeCommandAction Command="{Binding FontStyleWeightChangedCommand}" />
|
|
|
</i:EventTrigger>
|
|
|
</i:Interaction.Triggers>
|
|
|
</CompositeControl:CustomComboControl>
|
|
|
|
|
|
-
|
|
|
<CompositeControl:CustomComboControl
|
|
|
- x:Name="FontSizeBox"
|
|
|
- Width="110"
|
|
|
- Height="32"
|
|
|
- HorizontalAlignment="Right"
|
|
|
- SelectedItems="{Binding FontVm.CurrentFontSize, Mode=TwoWay}" >
|
|
|
+ x:Name="FontSizeBox"
|
|
|
+ Width="110"
|
|
|
+ Height="32"
|
|
|
+ HorizontalAlignment="Right"
|
|
|
+ SelectedItems="{Binding FontVm.CurrentFontSize, Mode=TwoWay}">
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="ValueChanged">
|
|
|
- <i:InvokeCommandAction Command="{Binding FontSizeChangedCommand}"/>
|
|
|
+ <i:InvokeCommandAction Command="{Binding FontSizeChangedCommand}" />
|
|
|
</i:EventTrigger>
|
|
|
</i:Interaction.Triggers>
|
|
|
</CompositeControl:CustomComboControl>
|
|
|
@@ -181,198 +221,201 @@
|
|
|
<Grid>
|
|
|
<StackPanel Orientation="Horizontal">
|
|
|
<RadioButton
|
|
|
- x:Name="TextAlignLeftBtn"
|
|
|
- Width="32"
|
|
|
- Height="32"
|
|
|
- VerticalContentAlignment="Center"
|
|
|
- Background="Transparent"
|
|
|
- Foreground="#616469"
|
|
|
- GroupName="TextAlign"
|
|
|
- IsChecked="{Binding FontVm.StrTextAlign,Mode=OneWay,Converter={StaticResource TextAlignToCheckedConverter},ConverterParameter=AlignLeft}"
|
|
|
- Style="{DynamicResource GreyBgRadioBtnStyle}"
|
|
|
- Command="{Binding TextAlignCheckedCommand}" CommandParameter="{Binding ElementName=TextAlignLeftBtn, Path=Tag}"
|
|
|
- Tag="AlignLeft">
|
|
|
+ x:Name="TextAlignLeftBtn"
|
|
|
+ Width="32"
|
|
|
+ Height="32"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Background="Transparent"
|
|
|
+ Command="{Binding TextAlignCheckedCommand}"
|
|
|
+ CommandParameter="{Binding ElementName=TextAlignLeftBtn, Path=Tag}"
|
|
|
+ Foreground="#616469"
|
|
|
+ GroupName="TextAlign"
|
|
|
+ IsChecked="{Binding FontVm.StrTextAlign, Mode=OneWay, Converter={StaticResource TextAlignToCheckedConverter}, ConverterParameter=AlignLeft}"
|
|
|
+ Style="{DynamicResource GreyBgRadioBtnStyle}"
|
|
|
+ Tag="AlignLeft">
|
|
|
<RadioButton.Content>
|
|
|
<Grid Width="32" Height="32">
|
|
|
<Canvas Margin="5,10,0,0">
|
|
|
<Rectangle
|
|
|
- Canvas.Top="0.25"
|
|
|
- Width="14"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignLeftBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Top="0.25"
|
|
|
+ Width="14"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignLeftBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
<Rectangle
|
|
|
- Canvas.Top="4.25"
|
|
|
- Width="8"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignLeftBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Top="4.25"
|
|
|
+ Width="8"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignLeftBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
<Rectangle
|
|
|
- Canvas.Top="12.25"
|
|
|
- Width="8"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignLeftBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Top="12.25"
|
|
|
+ Width="8"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignLeftBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
<Rectangle
|
|
|
- Canvas.Top="8.25"
|
|
|
- Width="14"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignLeftBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Top="8.25"
|
|
|
+ Width="14"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignLeftBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
</Canvas>
|
|
|
</Grid>
|
|
|
</RadioButton.Content>
|
|
|
</RadioButton>
|
|
|
<RadioButton
|
|
|
- x:Name="TextAlignCenterBtn"
|
|
|
- Width="32"
|
|
|
- Height="32"
|
|
|
- Margin="8,0"
|
|
|
- VerticalContentAlignment="Center"
|
|
|
- Background="Transparent"
|
|
|
- Foreground="#616469"
|
|
|
- GroupName="TextAlign"
|
|
|
- Style="{DynamicResource GreyBgRadioBtnStyle}"
|
|
|
- IsChecked="{Binding FontVm.StrTextAlign,Mode=OneWay,Converter={StaticResource TextAlignToCheckedConverter},ConverterParameter=AlignCenter}"
|
|
|
- Command="{Binding TextAlignCheckedCommand}" CommandParameter="{Binding ElementName=TextAlignCenterBtn, Path=Tag}"
|
|
|
- Tag="AlignCenter">
|
|
|
+ x:Name="TextAlignCenterBtn"
|
|
|
+ Width="32"
|
|
|
+ Height="32"
|
|
|
+ Margin="8,0"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Background="Transparent"
|
|
|
+ Command="{Binding TextAlignCheckedCommand}"
|
|
|
+ CommandParameter="{Binding ElementName=TextAlignCenterBtn, Path=Tag}"
|
|
|
+ Foreground="#616469"
|
|
|
+ GroupName="TextAlign"
|
|
|
+ IsChecked="{Binding FontVm.StrTextAlign, Mode=OneWay, Converter={StaticResource TextAlignToCheckedConverter}, ConverterParameter=AlignCenter}"
|
|
|
+ Style="{DynamicResource GreyBgRadioBtnStyle}"
|
|
|
+ Tag="AlignCenter">
|
|
|
<RadioButton.Content>
|
|
|
<Grid Width="32" Height="32">
|
|
|
<Canvas Margin="5,10,0,0">
|
|
|
<Rectangle
|
|
|
- Canvas.Top="0.25"
|
|
|
- Width="14"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignCenterBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Top="0.25"
|
|
|
+ Width="14"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignCenterBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
<Rectangle
|
|
|
- Canvas.Left="3"
|
|
|
- Canvas.Top="4.25"
|
|
|
- Width="8"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignCenterBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Left="3"
|
|
|
+ Canvas.Top="4.25"
|
|
|
+ Width="8"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignCenterBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
<Rectangle
|
|
|
- Canvas.Left="3"
|
|
|
- Canvas.Top="12.25"
|
|
|
- Width="8"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignCenterBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Left="3"
|
|
|
+ Canvas.Top="12.25"
|
|
|
+ Width="8"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignCenterBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
<Rectangle
|
|
|
- Canvas.Top="8.25"
|
|
|
- Width="14"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignCenterBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Top="8.25"
|
|
|
+ Width="14"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignCenterBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
</Canvas>
|
|
|
</Grid>
|
|
|
</RadioButton.Content>
|
|
|
</RadioButton>
|
|
|
|
|
|
<RadioButton
|
|
|
- x:Name="TextAlignRightBtn"
|
|
|
- Grid.Column="2"
|
|
|
- Width="32"
|
|
|
- Height="32"
|
|
|
- VerticalContentAlignment="Center"
|
|
|
- Background="Transparent"
|
|
|
- Foreground="#616469"
|
|
|
- GroupName="TextAlign"
|
|
|
- Style="{DynamicResource GreyBgRadioBtnStyle}"
|
|
|
- IsChecked="{Binding FontVm.StrTextAlign,Mode=OneWay,Converter={StaticResource TextAlignToCheckedConverter},ConverterParameter=AlignRight}"
|
|
|
- Command="{Binding TextAlignCheckedCommand}" CommandParameter="{Binding ElementName=TextAlignRightBtn, Path=Tag}"
|
|
|
- Tag="AlignRight">
|
|
|
+ x:Name="TextAlignRightBtn"
|
|
|
+ Grid.Column="2"
|
|
|
+ Width="32"
|
|
|
+ Height="32"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Background="Transparent"
|
|
|
+ Command="{Binding TextAlignCheckedCommand}"
|
|
|
+ CommandParameter="{Binding ElementName=TextAlignRightBtn, Path=Tag}"
|
|
|
+ Foreground="#616469"
|
|
|
+ GroupName="TextAlign"
|
|
|
+ IsChecked="{Binding FontVm.StrTextAlign, Mode=OneWay, Converter={StaticResource TextAlignToCheckedConverter}, ConverterParameter=AlignRight}"
|
|
|
+ Style="{DynamicResource GreyBgRadioBtnStyle}"
|
|
|
+ Tag="AlignRight">
|
|
|
<RadioButton.Content>
|
|
|
<Grid Width="32" Height="32">
|
|
|
<Canvas Margin="5,10,0,0">
|
|
|
<Rectangle
|
|
|
- Canvas.Top="0.25"
|
|
|
- Width="14"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignRightBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Top="0.25"
|
|
|
+ Width="14"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignRightBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
<Rectangle
|
|
|
- Canvas.Left="6"
|
|
|
- Canvas.Top="4.25"
|
|
|
- Width="8"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignRightBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Left="6"
|
|
|
+ Canvas.Top="4.25"
|
|
|
+ Width="8"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignRightBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
<Rectangle
|
|
|
- Canvas.Left="6"
|
|
|
- Canvas.Top="12.25"
|
|
|
- Width="8"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignRightBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Left="6"
|
|
|
+ Canvas.Top="12.25"
|
|
|
+ Width="8"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignRightBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
<Rectangle
|
|
|
- Canvas.Top="8.25"
|
|
|
- Width="14"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignRightBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Top="8.25"
|
|
|
+ Width="14"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignRightBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
</Canvas>
|
|
|
</Grid>
|
|
|
</RadioButton.Content>
|
|
|
</RadioButton>
|
|
|
|
|
|
<RadioButton
|
|
|
- x:Name="TextAlignBtn"
|
|
|
- Grid.Column="3"
|
|
|
- Width="32"
|
|
|
- Height="32"
|
|
|
- Margin="8,0"
|
|
|
- VerticalContentAlignment="Center"
|
|
|
- Background="Transparent"
|
|
|
- Foreground="#616469"
|
|
|
- GroupName="TextAlign"
|
|
|
- Style="{DynamicResource GreyBgRadioBtnStyle}"
|
|
|
- IsChecked="{Binding FontVm.StrTextAlign,Mode=OneWay,Converter={StaticResource TextAlignToCheckedConverter},ConverterParameter=Justify}"
|
|
|
- Command="{Binding TextAlignCheckedCommand}" CommandParameter="{Binding ElementName=TextAlignBtn, Path=Tag}"
|
|
|
- Tag="Justify">
|
|
|
+ x:Name="TextAlignBtn"
|
|
|
+ Grid.Column="3"
|
|
|
+ Width="32"
|
|
|
+ Height="32"
|
|
|
+ Margin="8,0"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Background="Transparent"
|
|
|
+ Command="{Binding TextAlignCheckedCommand}"
|
|
|
+ CommandParameter="{Binding ElementName=TextAlignBtn, Path=Tag}"
|
|
|
+ Foreground="#616469"
|
|
|
+ GroupName="TextAlign"
|
|
|
+ IsChecked="{Binding FontVm.StrTextAlign, Mode=OneWay, Converter={StaticResource TextAlignToCheckedConverter}, ConverterParameter=Justify}"
|
|
|
+ Style="{DynamicResource GreyBgRadioBtnStyle}"
|
|
|
+ Tag="Justify">
|
|
|
<RadioButton.Content>
|
|
|
<Grid Width="32" Height="32">
|
|
|
<Canvas Margin="5,10,0,0">
|
|
|
<Rectangle
|
|
|
- Canvas.Top="0.25"
|
|
|
- Width="14"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Top="0.25"
|
|
|
+ Width="14"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
<Rectangle
|
|
|
- Canvas.Top="8.25"
|
|
|
- Width="14"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Top="8.25"
|
|
|
+ Width="14"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
<Rectangle
|
|
|
- Canvas.Top="4.25"
|
|
|
- Width="14"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Top="4.25"
|
|
|
+ Width="14"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
<Rectangle
|
|
|
- Canvas.Top="12.25"
|
|
|
- Width="14"
|
|
|
- Height="1.5"
|
|
|
- Stroke="{Binding ElementName=TextAlignBtn, Path=Foreground}"
|
|
|
- StrokeThickness="1.5" />
|
|
|
+ Canvas.Top="12.25"
|
|
|
+ Width="14"
|
|
|
+ Height="1.5"
|
|
|
+ Stroke="{Binding ElementName=TextAlignBtn, Path=Foreground}"
|
|
|
+ StrokeThickness="1.5" />
|
|
|
</Canvas>
|
|
|
</Grid>
|
|
|
</RadioButton.Content>
|
|
|
</RadioButton>
|
|
|
</StackPanel>
|
|
|
<cusColor:ColorContent
|
|
|
- x:Name="FontColorBox"
|
|
|
- Width="56"
|
|
|
- HorizontalAlignment="Right"
|
|
|
- ShowColorList="Collapsed"
|
|
|
- UIColor="{Binding FontVm.CurrentFontColor,Mode=OneWay}"
|
|
|
- >
|
|
|
+ x:Name="FontColorBox"
|
|
|
+ Width="56"
|
|
|
+ HorizontalAlignment="Right"
|
|
|
+ ShowColorList="Collapsed"
|
|
|
+ UIColor="{Binding FontVm.CurrentFontColor, Mode=OneWay}">
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="SelectedColorInvoke">
|
|
|
- <i:InvokeCommandAction Command="{Binding SelectedColorCommand}" CommandParameter="{Binding ElementName=FontColorBox,Path=SelectedColor}"/>
|
|
|
+ <i:InvokeCommandAction Command="{Binding SelectedColorCommand}" CommandParameter="{Binding ElementName=FontColorBox, Path=SelectedColor}" />
|
|
|
</i:EventTrigger>
|
|
|
</i:Interaction.Triggers>
|
|
|
</cusColor:ColorContent>
|
|
|
@@ -381,111 +424,210 @@
|
|
|
</StackPanel>
|
|
|
<Grid Margin="15,18,15,0">
|
|
|
<Grid.RowDefinitions>
|
|
|
- <RowDefinition Height="auto"/>
|
|
|
- <RowDefinition/>
|
|
|
+ <RowDefinition Height="auto" />
|
|
|
+ <RowDefinition />
|
|
|
</Grid.RowDefinitions>
|
|
|
- <TextBlock Text="{Binding T_Fill}" FontWeight="Normal" Foreground="{StaticResource color.sys.text.neutral.lv2}" VerticalAlignment="Center"/>
|
|
|
- <CompositeControl:SlidContent x:Name="layerThick" HorizontalAlignment="Right"
|
|
|
- InitValue="{Binding BasicVm.FillOpacity,Mode=OneWay}"
|
|
|
- Visibility="{Binding BasicVm.IsMultiSelected,Converter={StaticResource InvertBoolToVisibleConvert}}"
|
|
|
- >
|
|
|
+ <TextBlock
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ FontWeight="Normal"
|
|
|
+ Foreground="{StaticResource color.sys.text.neutral.lv2}"
|
|
|
+ Text="{Binding T_Fill}" />
|
|
|
+ <CompositeControl:SlidContent
|
|
|
+ x:Name="layerThick"
|
|
|
+ HorizontalAlignment="Right"
|
|
|
+ InitValue="{Binding BasicVm.FillOpacity, Mode=OneWay}"
|
|
|
+ Visibility="{Binding BasicVm.IsMultiSelected, Converter={StaticResource InvertBoolToVisibleConvert}}">
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="SelectedValueChanged">
|
|
|
- <i:InvokeCommandAction Command="{Binding SelectedOpacityValueCommand}" CommandParameter="{Binding ElementName=layerThick,Path=Value}"/>
|
|
|
+ <i:InvokeCommandAction Command="{Binding SelectedOpacityValueCommand}" CommandParameter="{Binding ElementName=layerThick, Path=Value}" />
|
|
|
</i:EventTrigger>
|
|
|
</i:Interaction.Triggers>
|
|
|
</CompositeControl:SlidContent>
|
|
|
- <CompositeControl:ColorContent Grid.Row="1" x:Name="cusColor" Margin="0,8,0,0"
|
|
|
- ItemSource="{Binding BasicVm.FillColorItems}"
|
|
|
- ColorType="Fill"
|
|
|
- UIColor="{Binding BasicVm.CurrentFillColor,Mode=OneWay}">
|
|
|
+ <CompositeControl:ColorContent
|
|
|
+ x:Name="cusColor"
|
|
|
+ Grid.Row="1"
|
|
|
+ Margin="0,8,0,0"
|
|
|
+ ColorType="Fill"
|
|
|
+ ItemSource="{Binding BasicVm.FillColorItems}"
|
|
|
+ UIColor="{Binding BasicVm.CurrentFillColor, Mode=OneWay}">
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="SelectedColorInvoke">
|
|
|
- <i:InvokeCommandAction Command="{Binding SelectedFillColorCommand}" CommandParameter="{Binding ElementName=cusColor,Path=SelectedColor}"/>
|
|
|
+ <i:InvokeCommandAction Command="{Binding SelectedFillColorCommand}" CommandParameter="{Binding ElementName=cusColor, Path=SelectedColor}" />
|
|
|
</i:EventTrigger>
|
|
|
</i:Interaction.Triggers>
|
|
|
</CompositeControl:ColorContent>
|
|
|
</Grid>
|
|
|
|
|
|
-
|
|
|
- <StackPanel Visibility="{Binding IsFillFreeTextAnnot,Converter={StaticResource BoolToVisible}}">
|
|
|
- <TextBlock Margin="0,8,0,8" Text="Date Type" Foreground="{StaticResource color.sys.text.neutral.lv2}" />
|
|
|
+ <StackPanel Visibility="{Binding IsFillFreeTextAnnot, Converter={StaticResource BoolToVisible}}">
|
|
|
+ <TextBlock
|
|
|
+ Margin="0,8,0,8"
|
|
|
+ Foreground="{StaticResource color.sys.text.neutral.lv2}"
|
|
|
+ Text="Date Type" />
|
|
|
<CompositeControl:CustomComboControl
|
|
|
- x:Name="DateTimeBox"
|
|
|
- Width="228"
|
|
|
- Height="32"
|
|
|
- HorizontalAlignment="Left"
|
|
|
- IsValueContent="True"
|
|
|
- ItemSource="{Binding DateFormatItems,Mode=OneWay}"
|
|
|
- SelectedItems="{Binding CurrrentDateFormat, Mode=TwoWay}">
|
|
|
+ x:Name="DateTimeBox"
|
|
|
+ Width="228"
|
|
|
+ Height="32"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ IsValueContent="True"
|
|
|
+ ItemSource="{Binding DateFormatItems, Mode=OneWay}"
|
|
|
+ SelectedItems="{Binding CurrrentDateFormat, Mode=TwoWay}">
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="ValueChanged">
|
|
|
- <i:InvokeCommandAction Command="{Binding DateFormatChangedCommand}"/>
|
|
|
+ <i:InvokeCommandAction Command="{Binding DateFormatChangedCommand}" />
|
|
|
</i:EventTrigger>
|
|
|
</i:Interaction.Triggers>
|
|
|
</CompositeControl:CustomComboControl>
|
|
|
|
|
|
- <CheckBox x:Name="isShowTime" Margin="0,16,0,0" Content="Show Time" IsChecked="{Binding IsCheckedTime,Mode=TwoWay}"
|
|
|
- Command="{Binding ShowTimeCheckedChnagedCommand}"
|
|
|
- >
|
|
|
-
|
|
|
- </CheckBox>
|
|
|
-
|
|
|
+ <CheckBox
|
|
|
+ x:Name="isShowTime"
|
|
|
+ Margin="0,16,0,0"
|
|
|
+ Command="{Binding ShowTimeCheckedChnagedCommand}"
|
|
|
+ Content="Show Time"
|
|
|
+ IsChecked="{Binding IsCheckedTime, Mode=TwoWay}" />
|
|
|
</StackPanel>
|
|
|
-
|
|
|
- <!--MVP不上-->
|
|
|
|
|
|
- <TextBlock x:Name="thicknessText" Visibility="Collapsed" FontFamily="Segoe UI Semibold" FontWeight="SemiBold" FontSize="14" LineHeight="20" Margin="12,14,0,0" >Thickness</TextBlock>
|
|
|
+ <!-- MVP不上 -->
|
|
|
+
|
|
|
+ <TextBlock
|
|
|
+ x:Name="thicknessText"
|
|
|
+ Margin="12,14,0,0"
|
|
|
+ FontFamily="Segoe UI Semibold"
|
|
|
+ FontSize="14"
|
|
|
+ FontWeight="SemiBold"
|
|
|
+ LineHeight="20"
|
|
|
+ Visibility="Collapsed">
|
|
|
+ Thickness
|
|
|
+ </TextBlock>
|
|
|
|
|
|
<Grid Visibility="Collapsed">
|
|
|
<Grid.ColumnDefinitions>
|
|
|
- <ColumnDefinition Width="*"></ColumnDefinition>
|
|
|
- <ColumnDefinition Width="auto"></ColumnDefinition>
|
|
|
+ <ColumnDefinition Width="*" />
|
|
|
+ <ColumnDefinition Width="auto" />
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
|
|
- <Slider Name="ThicknessSlider" VerticalAlignment="Center" Margin="12,0,0,0" Width="148" Minimum="0" Maximum="24" IsSelectionRangeEnabled="True" IsMoveToPointEnabled="True"
|
|
|
- Style="{StaticResource RoundThumbSlider}" TickFrequency="1" IsSnapToTickEnabled="True" >
|
|
|
+ <Slider
|
|
|
+ Name="ThicknessSlider"
|
|
|
+ Width="148"
|
|
|
+ Margin="12,0,0,0"
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ IsMoveToPointEnabled="True"
|
|
|
+ IsSelectionRangeEnabled="True"
|
|
|
+ IsSnapToTickEnabled="True"
|
|
|
+ Maximum="24"
|
|
|
+ Minimum="0"
|
|
|
+ Style="{StaticResource RoundThumbSlider}"
|
|
|
+ TickFrequency="1">
|
|
|
<Slider.Resources>
|
|
|
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="#477EDE" />
|
|
|
<SolidColorBrush x:Key="{x:Static SystemColors.ControlDarkDarkBrushKey}" Color="#E2E3E6" />
|
|
|
</Slider.Resources>
|
|
|
</Slider>
|
|
|
|
|
|
-
|
|
|
- <Border Grid.Column="1" BorderBrush="#E2E3E6" Width="80" Height="32" Margin="0,0,11,0" BorderThickness="0">
|
|
|
+ <Border
|
|
|
+ Grid.Column="1"
|
|
|
+ Width="80"
|
|
|
+ Height="32"
|
|
|
+ Margin="0,0,11,0"
|
|
|
+ BorderBrush="#E2E3E6"
|
|
|
+ BorderThickness="0">
|
|
|
<Grid>
|
|
|
- <ComboBox Name="ThicknessBox" BorderThickness="1" Padding="10" Background="Transparent" BorderBrush="#FFE2E3E6"
|
|
|
- MaxDropDownHeight="200">
|
|
|
+ <ComboBox
|
|
|
+ Name="ThicknessBox"
|
|
|
+ Padding="10"
|
|
|
+ Background="Transparent"
|
|
|
+ BorderBrush="#FFE2E3E6"
|
|
|
+ BorderThickness="1"
|
|
|
+ MaxDropDownHeight="200">
|
|
|
<ComboBox.ItemContainerStyle>
|
|
|
<Style TargetType="{x:Type ComboBoxItem}">
|
|
|
- <Setter Property="Padding" Value="10 0 0 0"/>
|
|
|
+ <Setter Property="Padding" Value="10,0,0,0" />
|
|
|
</Style>
|
|
|
</ComboBox.ItemContainerStyle>
|
|
|
- <ComboBoxItem Content="1" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
|
|
|
- <ComboBoxItem Content="3" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
|
|
|
- <ComboBoxItem Content="6" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
|
|
|
- <ComboBoxItem Content="9" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
|
|
|
- <ComboBoxItem Content="12" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
|
|
|
- <ComboBoxItem Content="15" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
|
|
|
- <ComboBoxItem Content="18" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
|
|
|
- <ComboBoxItem Content="21" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
|
|
|
- <ComboBoxItem Content="24" Height="32" VerticalContentAlignment="Center" Template="{StaticResource comboxitem}"/>
|
|
|
+ <ComboBoxItem
|
|
|
+ Height="32"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Content="1"
|
|
|
+ Template="{StaticResource comboxitem}" />
|
|
|
+ <ComboBoxItem
|
|
|
+ Height="32"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Content="3"
|
|
|
+ Template="{StaticResource comboxitem}" />
|
|
|
+ <ComboBoxItem
|
|
|
+ Height="32"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Content="6"
|
|
|
+ Template="{StaticResource comboxitem}" />
|
|
|
+ <ComboBoxItem
|
|
|
+ Height="32"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Content="9"
|
|
|
+ Template="{StaticResource comboxitem}" />
|
|
|
+ <ComboBoxItem
|
|
|
+ Height="32"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Content="12"
|
|
|
+ Template="{StaticResource comboxitem}" />
|
|
|
+ <ComboBoxItem
|
|
|
+ Height="32"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Content="15"
|
|
|
+ Template="{StaticResource comboxitem}" />
|
|
|
+ <ComboBoxItem
|
|
|
+ Height="32"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Content="18"
|
|
|
+ Template="{StaticResource comboxitem}" />
|
|
|
+ <ComboBoxItem
|
|
|
+ Height="32"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Content="21"
|
|
|
+ Template="{StaticResource comboxitem}" />
|
|
|
+ <ComboBoxItem
|
|
|
+ Height="32"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Content="24"
|
|
|
+ Template="{StaticResource comboxitem}" />
|
|
|
</ComboBox>
|
|
|
- <TextBox Name="ThicknessText" Background="White" FontFamily="Segoe UI" FontSize="14" Height="20" Margin="10,0,35,0" IsReadOnly="True"
|
|
|
- BorderThickness="0" VerticalAlignment="Center" TextAlignment="Left" >
|
|
|
- </TextBox>
|
|
|
+ <TextBox
|
|
|
+ Name="ThicknessText"
|
|
|
+ Height="20"
|
|
|
+ Margin="10,0,35,0"
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ Background="White"
|
|
|
+ BorderThickness="0"
|
|
|
+ FontFamily="Segoe UI"
|
|
|
+ FontSize="14"
|
|
|
+ IsReadOnly="True"
|
|
|
+ TextAlignment="Left" />
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
</Grid>
|
|
|
|
|
|
- <StackPanel Visibility="Collapsed" Orientation="Horizontal" Margin="0,20,0,0">
|
|
|
+ <StackPanel
|
|
|
+ Margin="0,20,0,0"
|
|
|
+ Orientation="Horizontal"
|
|
|
+ Visibility="Collapsed">
|
|
|
|
|
|
- <RadioButton x:Name="BtnSolid" Tag="Solid" GroupName="LineMode"
|
|
|
- Width="105" Height="32" Margin="0,0,10,0" Foreground="#616469"
|
|
|
- VerticalContentAlignment="Center" Background="Transparent"
|
|
|
- Style="{DynamicResource GreyBgRadioBtnStyle}">
|
|
|
+ <RadioButton
|
|
|
+ x:Name="BtnSolid"
|
|
|
+ Width="105"
|
|
|
+ Height="32"
|
|
|
+ Margin="0,0,10,0"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Background="Transparent"
|
|
|
+ Foreground="#616469"
|
|
|
+ GroupName="LineMode"
|
|
|
+ Style="{DynamicResource GreyBgRadioBtnStyle}"
|
|
|
+ Tag="Solid">
|
|
|
<RadioButton.Content>
|
|
|
- <Line X1="10" Y1="5" X2="90" Y2="5" Stroke="Black" StrokeThickness="2" />
|
|
|
+ <Line
|
|
|
+ Stroke="Black"
|
|
|
+ StrokeThickness="2"
|
|
|
+ X1="10"
|
|
|
+ X2="90"
|
|
|
+ Y1="5"
|
|
|
+ Y2="5" />
|
|
|
</RadioButton.Content>
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="Checked">
|
|
|
@@ -494,12 +636,26 @@
|
|
|
</i:Interaction.Triggers>
|
|
|
</RadioButton>
|
|
|
|
|
|
- <RadioButton x:Name="BtnDashed" Tag="Dashed" GroupName="LineMode"
|
|
|
- Width="105" Height="32" Margin="0,0" Foreground="#616469"
|
|
|
- VerticalContentAlignment="Center" Background="Transparent"
|
|
|
- Style="{DynamicResource GreyBgRadioBtnStyle}">
|
|
|
+ <RadioButton
|
|
|
+ x:Name="BtnDashed"
|
|
|
+ Width="105"
|
|
|
+ Height="32"
|
|
|
+ Margin="0,0"
|
|
|
+ VerticalContentAlignment="Center"
|
|
|
+ Background="Transparent"
|
|
|
+ Foreground="#616469"
|
|
|
+ GroupName="LineMode"
|
|
|
+ Style="{DynamicResource GreyBgRadioBtnStyle}"
|
|
|
+ Tag="Dashed">
|
|
|
<RadioButton.Content>
|
|
|
- <Line X1="10" Y1="5" X2="90" Y2="5" Stroke="Black" StrokeThickness="2" StrokeDashArray="2"/>
|
|
|
+ <Line
|
|
|
+ Stroke="Black"
|
|
|
+ StrokeDashArray="2"
|
|
|
+ StrokeThickness="2"
|
|
|
+ X1="10"
|
|
|
+ X2="90"
|
|
|
+ Y1="5"
|
|
|
+ Y2="5" />
|
|
|
</RadioButton.Content>
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="Checked">
|
|
|
@@ -507,8 +663,7 @@
|
|
|
</i:EventTrigger>
|
|
|
</i:Interaction.Triggers>
|
|
|
</RadioButton>
|
|
|
-
|
|
|
</StackPanel>
|
|
|
</StackPanel>
|
|
|
</Grid>
|
|
|
-</UserControl>
|
|
|
+</UserControl>
|
