高保真-大纲，图章，签名高保真

PDF Office/DataConvert/IntToColorBrush.cs

@@ -17,16 +17,16 @@ namespace PDF_Office.DataConvert
             switch ((int)value)
             {
                 case 1:
-                    brush = new SolidColorBrush(Colors.Black);
+                    brush = new SolidColorBrush(Color.FromArgb(0xFF, 0x25, 0x26, 0x29));
                     break;
                 case 2:
-                    brush = new SolidColorBrush(Colors.Red);
+                    brush = new SolidColorBrush(Color.FromArgb(0xFF, 0xF3, 0x46, 0x5B));
                     break;
                 case 3:
-                    brush = new SolidColorBrush(Colors.Green);
+                    brush = new SolidColorBrush(Color.FromArgb(0xFF, 0x27, 0x3C, 0x62));
                     break;
                 case 4:
-                    brush = new SolidColorBrush(Colors.Blue);
+                    brush = new SolidColorBrush(Color.FromArgb(0xFF, 0x94, 0x98, 0x9C));
                     break;
                 default:
                     break;

PDF Office/Themes/Generic.xaml

@@ -67,6 +67,7 @@
                                 Margin="{Binding ElementName=PART_ContentHost, Path=Margin}"
                                 Padding="{TemplateBinding Padding}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 FontSize="{TemplateBinding FontSize}"
                                 Foreground="{TemplateBinding PlaceholderForeground}"
                                 Text="{TemplateBinding PlaceholderText}"

PDF Office/ViewModels/PropertyPanel/AnnotPanel/SignatureCreateDialogViewModel.cs

@@ -34,7 +34,6 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
         public DelegateCommand<object> CheckedCommnad { get; set; }
 
         public DelegateCommand OpenImageCommnad { get; set; }
-        public DelegateCommand ClearImageCommnad { get; set; }
         public DelegateCommand ClearInkCanvasCommnad { get; set; }
         public ObservableCollection<string> FontNameList { get; set; }
         public ObservableCollection<string> ThicknessList { get; set; }
@@ -163,16 +162,16 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
                 switch (imageRadioButtonIndex)
                 {
                     case 1:
-                        DrawingAttributeObject.Color = Colors.Black;
+                        DrawingAttributeObject.Color = System.Windows.Media.Color.FromArgb(0xFF, 0x25, 0x26, 0x29);
                         break;
                     case 2:
-                        DrawingAttributeObject.Color = Colors.Red;
+                        DrawingAttributeObject.Color = System.Windows.Media.Color.FromArgb(0xFF, 0xF3, 0x46, 0x5B);
                         break;
                     case 3:
-                        DrawingAttributeObject.Color = Colors.Green;
+                        DrawingAttributeObject.Color = System.Windows.Media.Color.FromArgb(0xFF, 0x27, 0x3C, 0x62);
                         break;
                     case 4:
-                        DrawingAttributeObject.Color = Colors.Blue;
+                        DrawingAttributeObject.Color = System.Windows.Media.Color.FromArgb(0xFF, 0x94, 0x98, 0x9C);
                         break;
                     default:
                         break;
@@ -224,7 +223,6 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
             CreateCommnad = new DelegateCommand(Create);
             CheckedCommnad = new DelegateCommand<object>(Checked);
             OpenImageCommnad = new DelegateCommand(OpenImage);
-            ClearImageCommnad = new DelegateCommand(ClearImage);
             ClearInkCanvasCommnad = new DelegateCommand(ClearInkCanvas);
             DrawingAttributeObject.Color = Colors.Black;
             DrawingAttributeObject.Width = 1;
@@ -336,11 +334,6 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
             }
         }
 
-        private void ClearImage()
-        {
-            ShowImageButton = Visibility.Visible;
-            ImagePreviewSource = originalimagePreviewSource = null;
-        }
         private void ClearInkCanvas()
         {
             StrokesObject.Clear();

PDF Office/Views/BOTA/OutLineControl.xaml

@@ -35,30 +35,41 @@
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <customcontrol:PathButton
                     x:Name="BtnAdd"
-                    Width="24"
-                    Height="24"
+                    Width="32"
+                    Height="32"
                     Click="BtnAdd_Click"
                     Icon="{StaticResource Ic_AddButtonPath}"
                     IconFill="#616469"
-                    IconHeight="20"
+                    IconHeight="16"
+                    IconWidth="16"
                     IconMouseOver="{StaticResource Ic_AddButtonPath}"
                     IconMouseOverFill="#616469"
                     IconPress="{StaticResource Ic_AddButtonPath}"
                     IconPressFill="#616469"
-                    IconWidth="20" />
+                    CornerRadius="4"
+                    HorizontalContentAlignment="Center"
+                    MouseOverBackground="{StaticResource color.item-state.hov.bg}"
+                    MouseDownBackground="{StaticResource color.item-state.sel.bg.lv3}"                          
+                    MouseDownBorderBrush="{StaticResource color.item-state.sel.border.lv3}"
+                    />
                 <customcontrol:PathButton
                     x:Name="BtnMore"
-                    Width="24"
-                    Height="24"
+                    Width="32"
+                    Height="32"
                     Click="BtnMore_Click"
                     Icon="{StaticResource Ic_MoreButtonPath}"
                     IconFill="#616469"
-                    IconHeight="20"
+                    IconHeight="16"
+                    IconWidth="16"
+                    CornerRadius="4"
                     IconMouseOver="{StaticResource Ic_MoreButtonPath}"
                     IconMouseOverFill="#616469"
                     IconPress="{StaticResource Ic_MoreButtonPath}"
                     IconPressFill="#616469"
-                    IconWidth="20">
+                    HorizontalContentAlignment="Center"
+                    MouseOverBackground="{StaticResource color.item-state.hov.bg}"
+                    MouseDownBackground="{StaticResource color.item-state.sel.bg.lv3}"                          
+                    MouseDownBorderBrush="{StaticResource color.item-state.sel.border.lv3}">
                     <customcontrol:PathButton.ContextMenu>
                         <ContextMenu Name="MenuMore">
                             <ContextMenu.ItemContainerStyle>

PDF Office/Views/BOTA/SearchContent.xaml

@@ -200,7 +200,7 @@
                         <GroupStyle.HeaderTemplate>
                             <DataTemplate >
                                 <Grid Background="#E2E3E6" Height="24" >
-                                    <TextBlock Padding="0,4,12,4" VerticalAlignment="Stretch" TextAlignment="Center" HorizontalAlignment="Left" FontWeight="SemiBold" FontSize="12" Text="{Binding Name}" 
+                                    <TextBlock Padding="0,4,12,4" VerticalAlignment="Stretch" TextAlignment="Center" HorizontalAlignment="Left" FontWeight="SemiBold" FontSize="12" Text="{Binding Items.Count}" 
                                                         FontFamily="Segoe UI" Foreground="#666666 "/>
                                     <customControl:CustomIconToggleBtn x:Name="BtnExptend" Height="24" 
                                                                        HorizontalAlignment="Right" Click="BtnExptend_Click"

PDF Office/Views/PropertyPanel/AnnotPanel/SignatureAnnotProperty.xaml

@@ -4,11 +4,14 @@
              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:customcontrol="clr-namespace:PDF_Office.CustomControl" xmlns:annotpanel="clr-namespace:PDF_Office.ViewModels.PropertyPanel.AnnotPanel" xmlns:dataconvert="clr-namespace:PDF_Office.DataConvert" d:DataContext="{d:DesignInstance Type=annotpanel:SignatureAnnotPropertyViewModel}"
+
              mc:Ignorable="d" >
     <UserControl.Resources>
         <PathGeometry x:Key="Ic_AddButtonPath" Figures="M13.5 8C13.5 11.0376 11.0376 13.5 8 13.5C4.96243 13.5 2.5 11.0376 2.5 8C2.5 4.96243 4.96243 2.5 8 2.5C11.0376 2.5 13.5 4.96243 13.5 8ZM15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8ZM7.25005 4.80003V7.25003H4.80005V8.75003H7.25005V11.2H8.75005V8.75003H11.2V7.25003H8.75005V4.80003H7.25005Z"  FillRule="EvenOdd" />
         <dataconvert:ListCountToVisible x:Key="ListCountToVisible"/>
         <dataconvert:UnVisivleConvert x:Key="UnVisivleConvert"/>
+        <SolidColorBrush x:Key="Item.SelectedInactive.Background" Color="#3DDADADA"/>
+        <SolidColorBrush x:Key="Item.SelectedInactive.Border" Color="#FFDADADA"/>
     </UserControl.Resources>
     <Grid  Background="Transparent">
         <Grid.RowDefinitions>
@@ -16,7 +19,12 @@
             <RowDefinition Height="*"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <Grid x:Name="Header" >
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="16"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="16"/>
+        </Grid.ColumnDefinitions>
+        <Grid x:Name="Header" Grid.Column="1" >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="16"/>
                 <ColumnDefinition Width="*"/>
@@ -25,28 +33,34 @@
             <TextBlock Grid.Column="1" x:Name="TxtTitle" HorizontalAlignment="Left"
                     VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold" Text="Signature" />
             <customcontrol:PathButton Grid.Column="1"
-                HorizontalAlignment="Right"
+            HorizontalAlignment="Right"
+            HorizontalContentAlignment="Center"
             x:Name="BtnAdd"
+            BorderThickness="1"
+            CornerRadius="4"                         
             Command="{Binding ShowDialogCommand}"
-            Height="16" Width="16"  IconHeight="16"  IconWidth="16" 
-            Icon="{StaticResource Ic_AddButtonPath}"  IconFill="#616469"
-            IconPress="{StaticResource Ic_AddButtonPath}" IconPressFill="#C04CF8"
-            IconMouseOver="{StaticResource Ic_AddButtonPath}" IconMouseOverFill="#C04CF8" />
+            Height="32" Width="32"  IconHeight="16"  IconWidth="16" 
+            Icon="{StaticResource Ic_AddButtonPath}"  IconFill="#585A63"
+            IconPress="{StaticResource Ic_AddButtonPath}" IconPressFill="#585A63"
+            IconMouseOver="{StaticResource Ic_AddButtonPath}" IconMouseOverFill="#585A63"
+            MouseOverBackground="{StaticResource color.item-state.hov.bg}"
+            MouseDownBackground="{StaticResource color.item-state.sel.bg.lv3}"                          
+            MouseDownBorderBrush="{StaticResource color.item-state.sel.border.lv3}"/>
         </Grid>
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="1" Grid.Column="1">
             <StackPanel VerticalAlignment="Center" x:Name="NoSignatureStackPanel" Visibility="{Binding SignatureList.Count, Converter={StaticResource ListCountToVisible}}">
                 <Image Source="pack://application:,,,/PDF Office;component/Resources/PropertyPanel/nosign.png" />
                 <TextBlock Text="No signature created" FontSize="14" FontFamily="Segoe UI" Height="22" HorizontalAlignment="Center"/>
                 <TextBlock Width="168" Text="Click the Add button in the upper right corner to create a new signature." FontSize="12" FontFamily="Segoe UI" TextWrapping="Wrap" Foreground="#94989C" HorizontalAlignment="Center"/>
             </StackPanel>
-            <ListBox ItemsSource="{Binding SignatureList}" 
+            <ListBox ItemsSource="{Binding SignatureList}"  
                      SelectedIndex="{Binding CurrentListboxIndex,Mode=TwoWay}"
                      Visibility="{Binding ElementName=NoSignatureStackPanel,Path=Visibility,Converter={StaticResource UnVisivleConvert}}"
-                     SelectionMode="Single" Width="256" Height="auto" VerticalAlignment="Top"  BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                     SelectionMode="Single" Height="auto" VerticalAlignment="Top"  BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                 <ListBox.ItemTemplate>
                     <DataTemplate >
-                        <ListBoxItem >
-                            <ListBoxItem.ContextMenu>
+                        <Grid>
+                            <Grid.ContextMenu>
                                 <ContextMenu>
                                     <MenuItem Header="导出签名">
                                         <MenuItem x:Name="SavePNG" Header="PNG" Tag="PNG" Click="Save_Click"/>
@@ -55,21 +69,57 @@
                                     <MenuItem x:Name="Delete" Header="删除签名" Click="Delete_Click"/>
                                     <MenuItem x:Name="DeleteAll" Header="删除全部签名" Click="DeleteAll_Click"/>
                                 </ContextMenu>
-                            </ListBoxItem.ContextMenu>
+                            </Grid.ContextMenu>
                             <Image Source="{Binding SourcePath}" Stretch="Uniform" Height="48"/>
-                        </ListBoxItem>
+                        </Grid>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
                 <ListBox.ItemContainerStyle>
                     <Style TargetType="ListBoxItem">
-                        <Setter Property="Height" Value="64"/>
-                        <Setter Property="Padding" Value="12 8 12 8"/>
+                        <Setter Property="Height" Value="65"/>
+                        <Setter Property="Padding" Value="8"/>
                         <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                                    <Border x:Name="Bd" CornerRadius="8" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <MultiTrigger>
+                                            <MultiTrigger.Conditions>
+                                                <Condition Property="IsMouseOver" Value="True"/>
+                                            </MultiTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource color.item-state.hov.bg}"/>
+                                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource color.item-state.hov.bg}"/>
+                                        </MultiTrigger>
+                                        <MultiTrigger>
+                                            <MultiTrigger.Conditions>
+                                                <Condition Property="Selector.IsSelectionActive" Value="False"/>
+                                                <Condition Property="IsSelected" Value="True"/>
+                                            </MultiTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
+                                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Border}"/>
+                                        </MultiTrigger>
+                                        <MultiTrigger>
+                                            <MultiTrigger.Conditions>
+                                                <Condition Property="Selector.IsSelectionActive" Value="True"/>
+                                                <Condition Property="IsSelected" Value="True"/>
+                                            </MultiTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource color.item-state.sel.bg.lv3}"/>
+                                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource color.item-state.sel.border.lv3}"/>
+                                        </MultiTrigger>
+                                        <Trigger Property="IsEnabled" Value="False">
+                                            <Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
                         <EventSetter Event="PreviewMouseLeftButtonDown" Handler="ListBoxItem_PreviewMouseLeftButtonDown"/>
                     </Style>
                 </ListBox.ItemContainerStyle>
             </ListBox>
-
         </Grid>
     </Grid>
 </UserControl>

PDF Office/Views/PropertyPanel/AnnotPanel/SignatureCreateDialog.xaml

@@ -4,6 +4,10 @@
              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:cus="clr-namespace:PDF_Office.CustomControl" xmlns:annotpanel="clr-namespace:PDF_Office.ViewModels.PropertyPanel.AnnotPanel" xmlns:dataconvert="clr-namespace:PDF_Office.DataConvert" xmlns:i="http://schemas.microsoft.com/xaml/behaviors" d:DataContext="{d:DesignInstance Type=annotpanel:SignatureCreateDialogViewModel}"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
+             Width="468"
+             Height="392"
              mc:Ignorable="d" >
     <UserControl.Resources>
 
@@ -37,6 +41,7 @@
     <cus:DialogContent Header="新建签名">
         <cus:DialogContent.Content>
             <TabControl
+                BorderThickness="0"
                 Style="{StaticResource FormTabControl }"
                 SelectedIndex="{Binding TabItemIndex,Mode=TwoWay}">
                 <TabItem Header="Input">
@@ -45,18 +50,29 @@
                             <RowDefinition Height="*"/>
                             <RowDefinition Height="32"/>
                         </Grid.RowDefinitions>
-                        <cus:TextBoxEx PlaceholderText="Input" Text="{Binding InputText,Mode=TwoWay}" Foreground ="{Binding RadioButtonIndex,Converter={StaticResource IntToColorBrush}}"  />
-                        <ComboBox Grid.Row="1"
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="16"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="16"/>
+                        </Grid.ColumnDefinitions>
+                        <cus:TextBoxEx 
+                            FontFamily="{Binding ElementName=TextComBox,Path=SelectedValue, TargetNullValue=Segoe UI}" 
+                            Background="{StaticResource color.sys.layout.mg}" Grid.Column="1" 
+                            PlaceholderText="Input"  Height="182" FontSize="20"
+                            HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  
+                            ShowClose="False" Text="{Binding InputText,Mode=TwoWay}"
+                            Foreground ="{Binding RadioButtonIndex,Converter={StaticResource IntToColorBrush}}"  />
+                        <ComboBox Grid.Row="1" Grid.Column="1" x:Name="TextComBox"
                         Width="200"
                         HorizontalAlignment="Left"
                         VerticalContentAlignment="Center" 
                         ItemsSource="{Binding FontNameList}"
                         SelectedIndex="{Binding FontNameIndex,Mode=TwoWay}"/>
-                        <StackPanel Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
-                            <cus:PathRadioButton Tag="1" Checked="TextRadioButton_Checked" MouseOverBackground="#EDEEF0" MouseDownBackground="#CED0D4" MouseDownBackgroundOpacity="0.6">
+                        <StackPanel Grid.Row="1" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal">
+                            <cus:PathRadioButton CornerRadius="4" Tag="1" Checked="TextRadioButton_Checked" MouseOverBackground="#EDEEF0" MouseDownBackground="#CED0D4" MouseDownBackgroundOpacity="0.6">
                                 <cus:PathRadioButton.Content>
                                     <Grid Width="32" Height="32">
-                                        <Ellipse Width="11" Height="11" Fill="Black"/>
+                                        <Ellipse Width="20" Height="20" Fill="#252629"/>
                                     </Grid>
                                 </cus:PathRadioButton.Content>
                                 <i:Interaction.Triggers>
@@ -73,10 +89,10 @@
                                     </MultiBinding>
                                 </RadioButton.IsChecked>
                             </cus:PathRadioButton>
-                            <cus:PathRadioButton Tag="2" Checked="TextRadioButton_Checked" MouseOverBackground="#EDEEF0" MouseDownBackground="#CED0D4" MouseDownBackgroundOpacity="0.6">
+                            <cus:PathRadioButton Tag="2" CornerRadius="4" Checked="TextRadioButton_Checked" MouseOverBackground="#EDEEF0" MouseDownBackground="#CED0D4" MouseDownBackgroundOpacity="0.6">
                                 <cus:PathRadioButton.Content>
                                     <Grid Width="32" Height="32">
-                                        <Ellipse Width="11" Height="11"   Fill="#F66B7C"/>
+                                        <Ellipse Width="20" Height="20"   Fill="#F3465B"/>
                                     </Grid>
                                 </cus:PathRadioButton.Content>
                                 <i:Interaction.Triggers>
@@ -93,10 +109,10 @@
                                     </MultiBinding>
                                 </RadioButton.IsChecked>
                             </cus:PathRadioButton>
-                            <cus:PathRadioButton Tag="3" Checked="TextRadioButton_Checked" MouseOverBackground="#EDEEF0" MouseDownBackground="#CED0D4" MouseDownBackgroundOpacity="0.6">
+                            <cus:PathRadioButton Tag="3" CornerRadius="4" Checked="TextRadioButton_Checked" MouseOverBackground="#EDEEF0" MouseDownBackground="#CED0D4" MouseDownBackgroundOpacity="0.6">
                                 <cus:PathRadioButton.Content>
                                     <Grid Width="32" Height="32">
-                                        <Ellipse Width="11" Height="11"   Fill="#48DDAD"/>
+                                        <Ellipse Width="20" Height="20"   Fill="#273C62"/>
                                     </Grid>
                                 </cus:PathRadioButton.Content>
                                 <i:Interaction.Triggers>
@@ -113,10 +129,10 @@
                                     </MultiBinding>
                                 </RadioButton.IsChecked>
                             </cus:PathRadioButton>
-                            <cus:PathRadioButton Tag="4" Checked="TextRadioButton_Checked" MouseOverBackground="#EDEEF0" MouseDownBackground="#CED0D4" MouseDownBackgroundOpacity="0.6">
+                            <cus:PathRadioButton Tag="4" CornerRadius="4" Checked="TextRadioButton_Checked" MouseOverBackground="#EDEEF0" MouseDownBackground="#CED0D4" MouseDownBackgroundOpacity="0.6">
                                 <cus:PathRadioButton.Content>
                                     <Grid Width="32" Height="32">
-                                        <Ellipse Width="11" Height="11"   Fill="#458DF6"/>
+                                        <Ellipse Width="20" Height="20"   Fill="#94989C"/>
                                     </Grid>
                                 </cus:PathRadioButton.Content>
                                 <i:Interaction.Triggers>
@@ -142,23 +158,33 @@
                             <RowDefinition Height="*"/>
                             <RowDefinition Height="32"/>
                         </Grid.RowDefinitions>
-                        <InkCanvas x:Name="inkCanvas" Width="240" Height="240" DefaultDrawingAttributes="{Binding DrawingAttributeObject}" Strokes="{Binding StrokesObject}"/>
 
-                        <Grid Opacity="0.7" x:Name="PlanGrid" IsHitTestVisible="False" Background="#F3F3F3" Visibility="{Binding StrokesObject.Count,Converter={StaticResource ListCountToVisible}}">
-                            <TextBlock Text="此处绘制签名" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                        </Grid>
-                        <Button   Style="{StaticResource btn.sec}" Width="50" Height="50" HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="Clear" Command="{Binding ClearInkCanvasCommnad}" Visibility="{Binding ElementName=PlanGrid,Path=Visibility}"/>
-                        <ComboBox Grid.Row="1"
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="16"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="16"/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.Column="1"  Height="182" BorderThickness="1" CornerRadius="4" BorderBrush="{StaticResource color.field.border.norm}">
+                            <Grid>
+                                <InkCanvas x:Name="inkCanvas"   DefaultDrawingAttributes="{Binding DrawingAttributeObject}" Strokes="{Binding StrokesObject}"/>
+
+                                <Grid Opacity="0.7" x:Name="PlanGrid"   IsHitTestVisible="False" Background="#F3F3F3" Visibility="{Binding StrokesObject.Count,Converter={StaticResource ListCountToVisible}}">
+                                    <TextBlock Text="此处绘制签名" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                </Grid>
+                                <Button Style="{StaticResource btn.sec}" Margin="0,0,8,8" Width="43" Height="24" HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="Clear" Command="{Binding ClearInkCanvasCommnad}" Visibility="{Binding ElementName=PlanGrid,Path=Visibility,Converter={StaticResource UnVisivleConvert}}"/>
+                            </Grid>
+                        </Border>
+                        <ComboBox Grid.Row="1" Grid.Column="1" 
                         Width="80"
                         HorizontalAlignment="Left"
                         VerticalContentAlignment="Center" 
                         ItemsSource="{Binding ThicknessList}"
                         SelectedIndex="{Binding ThicknessListIndex,Mode=TwoWay}"/>
-                        <StackPanel Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal" >
+                        <StackPanel Grid.Row="1" Grid.Column="1"  HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal" >
                             <cus:PathRadioButton Tag="1" Checked="ImageRadioButton_Checked" MouseOverBackground="#EDEEF0" MouseDownBackground="#CED0D4" MouseDownBackgroundOpacity="0.6">
                                 <cus:PathRadioButton.Content>
                                     <Grid Width="32" Height="32">
-                                        <Ellipse Width="11" Height="11" Fill="Black"/>
+                                        <Ellipse Width="20" Height="20" Fill="#252629"/>
                                     </Grid>
                                 </cus:PathRadioButton.Content>
                                 <i:Interaction.Triggers>
@@ -178,7 +204,7 @@
                             <cus:PathRadioButton Tag="2" Checked="ImageRadioButton_Checked" MouseOverBackground="#EDEEF0" MouseDownBackground="#CED0D4" MouseDownBackgroundOpacity="0.6">
                                 <cus:PathRadioButton.Content>
                                     <Grid Width="32" Height="32">
-                                        <Ellipse Width="11" Height="11"   Fill="#F66B7C"/>
+                                        <Ellipse Width="20" Height="20"   Fill="#FC1F1F"/>
                                     </Grid>
                                 </cus:PathRadioButton.Content>
                                 <i:Interaction.Triggers>
@@ -198,7 +224,7 @@
                             <cus:PathRadioButton Tag="3" Checked="ImageRadioButton_Checked" MouseOverBackground="#EDEEF0" MouseDownBackground="#CED0D4" MouseDownBackgroundOpacity="0.6">
                                 <cus:PathRadioButton.Content>
                                     <Grid Width="32" Height="32">
-                                        <Ellipse Width="11" Height="11" Fill="#48DDAD"/>
+                                        <Ellipse Width="20" Height="20" Fill="#273C62"/>
                                     </Grid>
                                 </cus:PathRadioButton.Content>
                                 <i:Interaction.Triggers>
@@ -218,7 +244,7 @@
                             <cus:PathRadioButton Tag="4" Checked="ImageRadioButton_Checked" MouseOverBackground="#EDEEF0" MouseDownBackground="#CED0D4" MouseDownBackgroundOpacity="0.6">
                                 <cus:PathRadioButton.Content>
                                     <Grid Width="32" Height="32">
-                                        <Ellipse Width="11" Height="11" Fill="#458DF6"/>
+                                        <Ellipse Width="20" Height="20" Fill="#94989C"/>
                                     </Grid>
                                 </cus:PathRadioButton.Content>
                                 <i:Interaction.Triggers>
@@ -242,35 +268,53 @@
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="*"/>
-                            <RowDefinition Height="20"/>
+                            <RowDefinition Height="32"/>
                         </Grid.RowDefinitions>
-                        <Button x:Name="BtnAdd" Width="50" Height="50" Content="添加图片" Command="{Binding OpenImageCommnad}" Visibility="{Binding ShowImageButton}"/>
-                        <Grid Visibility="{Binding ElementName=BtnAdd,Path=Visibility,Converter={StaticResource UnVisivleConvert}}">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="24"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <Image Grid.RowSpan="2" Width="200" Height="200" Source="{Binding ImagePreviewSource}" />
-                            <Button Grid.Row="1" Width="50" Height="50" HorizontalAlignment="Left" VerticalAlignment="Bottom" Content="清除" Command="{Binding ClearImageCommnad}"/>
-                            <Button Grid.Row="1" Width="50" Height="50" HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="重新选择" Command="{Binding OpenImageCommnad}"/>
-                        </Grid>
-                        <StackPanel  Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
-                        <CheckBox Width="20" Height="20" IsChecked="{Binding IsRemoveBackground}"/>
-                        <cus:ImageButton Margin="8,0,0,0"
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="16"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="16"/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.Column="1"  Height="182" BorderThickness="1" CornerRadius="4" BorderBrush="{StaticResource color.field.border.norm}">
+                            <Grid>
+                                <StackPanel  x:Name="AddStackPanel"  HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding ShowImageButton}">
+                                    <cus:ImageButton
+                                Height="128" Width="128" IconHeight="128" IconWidth="128"  
+                                Icon="pack://application:,,,/PDF Office;component/Resources/Dialog/AddImage.png"  
+                                IconPress="pack://application:,,,/PDF Office;component/Resources/Dialog/AddImageSuspend.png"  
+                                IconMouseOver="pack://application:,,,/PDF Office;component/Resources/Dialog/AddImageSuspend.png"   
+                                Command="{Binding OpenImageCommnad}"/>
+                                    <TextBlock Text="Select image file" FontSize="14" FontFamily="Segoe UI" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                </StackPanel>
+                                <Grid Visibility="{Binding ElementName=AddStackPanel,Path=Visibility,Converter={StaticResource UnVisivleConvert}}">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="24"/>
+                                        <RowDefinition Height="*"/>
+                                    </Grid.RowDefinitions>
+                                    <Image Grid.RowSpan="2" Width="200" Height="200" Source="{Binding ImagePreviewSource}" />
+                                    <Button Style="{StaticResource btn.sec}" Grid.Row="1" Width="60" Height="24" Margin="0,0,8,8" HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="重新选择" Command="{Binding OpenImageCommnad}"/>
+                                </Grid>
+                            </Grid>
+                        </Border>
+                        <StackPanel Grid.Column="1"   Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
+                            <CheckBox Width="20" Height="20" IsChecked="{Binding IsRemoveBackground}"/>
+                            <TextBlock Text="Clear background" FontSize="14" FontFamily="Segoe UI" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            <cus:ImageButton Margin="8,0,0,0"
                                 Height="16" Width="16" IconHeight="16" IconWidth="16"  
                                 Icon="pack://application:,,,/PDF Office;component/Resources/Dialog/help.png"  
                                 IconPress="pack://application:,,,/PDF Office;component/Resources/Dialog/help.png"  
                                 IconMouseOver="pack://application:,,,/PDF Office;component/Resources/Dialog/help.png">
-                            <cus:ImageButton.ToolTip >
+                                <cus:ImageButton.ToolTip >
                                     <ToolTip Style ="{StaticResource TriangleToolTipStyle}" Placement="Bottom" Content="Remove white background from images" >
-                                    <ToolTip.HorizontalOffset>
-                                        <MultiBinding Converter="{StaticResource CenterToolTipConverter}">
-                                            <Binding RelativeSource="{RelativeSource Self}" Path="PlacementTarget.ActualWidth"/>
-                                            <Binding RelativeSource="{RelativeSource Self}" Path="ActualWidth"/>
-                                        </MultiBinding>
-                                    </ToolTip.HorizontalOffset>
-                                </ToolTip>
-                            </cus:ImageButton.ToolTip>
+                                        <ToolTip.HorizontalOffset>
+                                            <MultiBinding Converter="{StaticResource CenterToolTipConverter}">
+                                                <Binding RelativeSource="{RelativeSource Self}" Path="PlacementTarget.ActualWidth"/>
+                                                <Binding RelativeSource="{RelativeSource Self}" Path="ActualWidth"/>
+                                            </MultiBinding>
+                                        </ToolTip.HorizontalOffset>
+                                    </ToolTip>
+                                </cus:ImageButton.ToolTip>
                             </cus:ImageButton>
                         </StackPanel>
                     </Grid>
@@ -279,30 +323,25 @@
         </cus:DialogContent.Content>
 
         <cus:DialogContent.BottmBar>
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="50*" />
-                    <ColumnDefinition Width="50*" />
-                </Grid.ColumnDefinitions>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                 <Button
                     Style="{StaticResource Btn.cta}"
                     Grid.Column="0"
-                    Width="150"
+                    Width="80"
                     Height="32"
-                    Margin="25,0,0,0"
                     HorizontalAlignment="Right"
                     Command="{Binding CreateCommnad}"
                     Content="确定" />
                 <Button
                     Style="{StaticResource btn.sec}"
-                    Grid.Column="1"
-                    Width="150"
+                    Grid.Column="2"
+                    Width="80"
                     Height="32"
-                    Margin="0,0,25,0"
-                    HorizontalAlignment="Right"
+                    Margin="16,0,16,0"
+                    HorizontalAlignment="Left"
                     Command="{Binding CancelCommand}"
                     Content="取消" />
-            </Grid>
+            </StackPanel>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>
 </UserControl>

PDF Office/Views/PropertyPanel/AnnotPanel/StampAnnotProperty.xaml

@@ -56,7 +56,71 @@
             IconPress="{StaticResource Ic_SettingButtonPath}" IconPressFill="#C04CF8"
             IconMouseOver="{StaticResource Ic_SettingButtonPath}" IconMouseOverFill="#C04CF8" />
         </Grid>
-        <TabControl Padding="0" Grid.Column="1" BorderThickness="0" Grid.Row="1" Name="StampTabControl" SelectedIndex="{Binding TabControlSelectedIndex,Mode=TwoWay}"  HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"  Style="{StaticResource FormTabControl}">
+        <Grid Grid.Column="1"  Grid.Row="1">
+            <ListBox  ItemsSource="{Binding StandardStampList}" SelectionMode="Single"  Height="auto" VerticalAlignment="Top"  BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Disabled" >
+                <ListBox.ItemTemplate>
+                    <DataTemplate >
+                        <Grid >
+                            <Grid.ContextMenu>
+                                <ContextMenu>
+                                    <MenuItem Header="导出图章">
+                                        <MenuItem x:Name="SavePNG" Header="PNG" Tag="PNG" Click="Save_Click"/>
+                                        <MenuItem x:Name="SavePDF" Header="PDF" Tag="PDF" Click="Save_Click"/>
+                                    </MenuItem>
+                                </ContextMenu>
+                            </Grid.ContextMenu>
+                            <Image Source="{Binding SourcePath}" Stretch="Uniform" Height="40"/>
+                        </Grid>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+                <ListBox.ItemContainerStyle>
+                    <Style TargetType="ListBoxItem">
+                        <Setter Property="Height" Value="65"/>
+                        <Setter Property="Padding" Value="8"/>
+                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                                    <Border x:Name="Bd" CornerRadius="8" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <MultiTrigger>
+                                            <MultiTrigger.Conditions>
+                                                <Condition Property="IsMouseOver" Value="True"/>
+                                            </MultiTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource color.item-state.hov.bg}"/>
+                                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource color.item-state.hov.bg}"/>
+                                        </MultiTrigger>
+                                        <MultiTrigger>
+                                            <MultiTrigger.Conditions>
+                                                <Condition Property="Selector.IsSelectionActive" Value="False"/>
+                                                <Condition Property="IsSelected" Value="True"/>
+                                            </MultiTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
+                                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Border}"/>
+                                        </MultiTrigger>
+                                        <MultiTrigger>
+                                            <MultiTrigger.Conditions>
+                                                <Condition Property="Selector.IsSelectionActive" Value="True"/>
+                                                <Condition Property="IsSelected" Value="True"/>
+                                            </MultiTrigger.Conditions>
+                                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource color.item-state.sel.bg.lv3}"/>
+                                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource color.item-state.sel.border.lv3}"/>
+                                        </MultiTrigger>
+                                        <Trigger Property="IsEnabled" Value="False">
+                                            <Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                        <EventSetter Event="PreviewMouseLeftButtonDown" Handler="ListBoxItem_PreviewMouseLeftButtonDown"/>
+                    </Style>
+                </ListBox.ItemContainerStyle>
+            </ListBox>
+        </Grid>
+        <!--<TabControl Padding="0" Grid.Column="1" BorderThickness="0" Grid.Row="1" Name="StampTabControl" SelectedIndex="{Binding TabControlSelectedIndex,Mode=TwoWay}"  HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"  Style="{StaticResource FormTabControl}">
             <TabItem x:Name="TabStandard"
                         Header="Standard"
                         FontFamily="Segoe UI"
@@ -290,6 +354,6 @@
                     </ListBox>
                 </Grid>
             </TabItem>
-        </TabControl>
+        </TabControl>-->
     </Grid>
 </UserControl>