Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

PDF Office/App.xaml.cs

@@ -212,6 +212,7 @@ namespace PDF_Office
             containerRegistry.RegisterForNavigation<ShapFillProperty>();
             containerRegistry.RegisterForNavigation<TextFillProperty>();
             //Form表单
+            containerRegistry.RegisterForNavigation<EmptyFormProperty>();
             containerRegistry.RegisterForNavigation<FormsToolContent>();
             containerRegistry.RegisterForNavigation<TextFieldProperty>();
             containerRegistry.RegisterForNavigation<ButtonProperty>();

PDF Office/CustomControl/CompositeControl/ColorContent.xaml.cs

@@ -55,6 +55,10 @@ namespace PDF_Office.CustomControl.CompositeControl
             Color = defaultColor;
         }
     }
+
+    //类说明：
+    //复合控件：调色板
+    //组合而成的控件：颜色圆形UI的列表容器、调色板选择的颜色圆形按钮UI，弹出调色版的按钮
     /// <summary>
     /// ColorContent.xaml 的交互逻辑
     /// </summary>

PDF Office/CustomControl/CompositeControl/ColorSubContent.xaml.cs

@@ -15,6 +15,9 @@ using System.Windows.Shapes;
 
 namespace PDF_Office.CustomControl.CompositeControl
 {
+    //类的说明：
+    //复合控件：调色版
+    //组合而成的控件：调色板选择的颜色圆形按钮UI，弹出调色版的按钮
     /// <summary>
     /// ColorSubContent.xaml 的交互逻辑
     /// </summary>

PDF Office/CustomControl/CompositeControl/SlidComboControl.xaml

@@ -16,6 +16,11 @@
                 <ResourceDictionary Source="../../Styles/CustomBtnStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
+            <DataTemplate x:Key="numberData">
+                <Grid>
+                    <TextBlock Text="{Binding Content}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                </Grid>
+            </DataTemplate>
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid>
@@ -42,21 +47,14 @@
             <Border Grid.Column="1" BorderBrush="#E2E3E6"  Width="80" Height="32" Margin="0,0,11,0"  BorderThickness="0">
                 <Grid>
                     <ComboBox Name="ThicknessBox" BorderThickness="1" Padding="10" Background="Transparent" BorderBrush="#FFE2E3E6" 
-                                  MaxDropDownHeight="200">
+                                  MaxDropDownHeight="200"
+                            ItemTemplate="{StaticResource numberData}"
+                              >
                         <ComboBox.ItemContainerStyle>
                             <Style TargetType="{x:Type ComboBoxItem}">
                                 <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}"/>
                     </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" >

PDF Office/CustomControl/CompositeControl/SlidComboControl.xaml.cs

@@ -15,15 +15,56 @@ using System.Windows.Shapes;
 
 namespace PDF_Office.CustomControl.CompositeControl
 {
+    public class ComboNumberItem
+    {
+        public double Value { get; set; }
+        public string Content { get; set; }
+        public string Unit { get; set; }
+        public ComboNumberItem(double value,string unitStr = "")
+        {
+            Content = value + unitStr;
+        }
+    }
     /// <summary>
     /// SlidComboControl.xaml 的交互逻辑
     /// </summary>
     public partial class SlidComboControl : UserControl
     {
+        public List<ComboNumberItem> Items { get;private set; }    
         public event EventHandler<double> ValueChanged;
         public SlidComboControl()
         {
             InitializeComponent();
+            Items = new List<ComboNumberItem>();
+            DefaultItems();
+        }
+
+        public void SetItemSource(List<ComboNumberItem> items)
+        {
+            Items = items;
+            ThicknessBox.ItemsSource = Items;
+        }
+
+        private void DefaultItems()
+        {
+            var item = new ComboNumberItem(3);
+            Items.Add(item);
+            item = new ComboNumberItem(6);
+            Items.Add(item);
+            item = new ComboNumberItem(9);
+            Items.Add(item);
+            item = new ComboNumberItem(12);
+            Items.Add(item);
+            item = new ComboNumberItem(15);
+            Items.Add(item);
+            item = new ComboNumberItem(18);
+            Items.Add(item);
+            item = new ComboNumberItem(21);
+            Items.Add(item);
+            item = new ComboNumberItem(24);
+            Items.Add(item);
+
+            ThicknessBox.ItemsSource = Items;
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
@@ -38,11 +79,11 @@ namespace PDF_Office.CustomControl.CompositeControl
         {
             foreach(var item in ThicknessBox.Items)
             {
-                var itemData = item as ComboBoxItem;
+
+                var itemData = item as ComboNumberItem;
                 if(itemData != null)
                 {
-                   var doubleItem = double.Parse(itemData.Content.ToString());
-                    if(doubleItem == Value)
+                    if(itemData.Value == Value)
                     {
                         ThicknessBox.SelectedItem = itemData;
                         break;
@@ -54,20 +95,13 @@ namespace PDF_Office.CustomControl.CompositeControl
 
         private void ThicknessBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            var listItem = ThicknessBox.ItemContainerGenerator.ContainerFromItem(ThicknessBox.SelectedItem) as ComboBoxItem;
-            if (listItem != null)
+            var item = ThicknessBox.SelectedItem as ComboNumberItem;
+            if(item != null)
             {
-                Value = double.Parse(listItem.Content.ToString());
-                ThicknessText.Text = listItem.Content.ToString();
+                Value = item.Value;
+                ThicknessText.Text = item.Content;
             }
-            else
-            {
-                ThicknessText.Text = "1";
-                Value = 1.0;
-            }
-                
-
-            
+           
 
         }
 

PDF Office/Model/DialogNames.cs

@@ -143,5 +143,7 @@ namespace PDF_Office.Model
         ///转档进度条弹窗
         /// </summary>
         public static string ConverterProgressBarDialog = "ConverterProgressBarDialog";
+
+        public static string EditPresetColorsDialog = "EditPresetColorsDialog";
     }
 }

PDF Office/PDF Office.csproj

@@ -677,6 +677,9 @@
     <Compile Include="Views\Form\ComboxProperty.xaml.cs">
       <DependentUpon>ComboxProperty.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Form\EditPresetColorsDialog.xaml.cs">
+      <DependentUpon>EditPresetColorsDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Form\EmptyFormProperty.xaml.cs">
       <DependentUpon>EmptyFormProperty.xaml</DependentUpon>
     </Compile>
@@ -1231,6 +1234,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Form\EditPresetColorsDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\Form\EmptyFormProperty.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

PDF Office/Styles/CustomBtnStyle.xaml

@@ -550,6 +550,71 @@
         </Style.Triggers>
     </Style>
 
+    <!--带有蓝色边框的单选按钮-->
+    <Style x:Key="BlueBorderRadionButtonWithCorner" TargetType="{x:Type RadioButton}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Width" Value="72" />
+        <Setter Property="Height" Value="80" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <Grid
+                        x:Name="templateRoot"
+                        Background="Transparent"
+                        SnapsToDevicePixels="True">
+                        <Border
+                            x:Name="radioButtonBorder"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="4">
+                            <Rectangle
+                                x:Name="optionMark"
+                                Width="{TemplateBinding Width}"
+                                Height="{TemplateBinding Height}"
+                                Opacity="0" />
+                        </Border>
+                        <ContentPresenter
+                            x:Name="contentPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Focusable="False"
+                            RecognizesAccessKey="True"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="optionMark" Property="Fill" Value="{StaticResource RadioButton.MouseOver.Glyph}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter TargetName="radioButtonBorder" Property="Background" Value="{StaticResource RadioButton.Disabled.Background}" />
+                            <Setter TargetName="radioButtonBorder" Property="BorderBrush" Value="{StaticResource RadioButton.Disabled.Border}" />
+                            <Setter TargetName="optionMark" Property="Fill" Value="{StaticResource RadioButton.Disabled.Glyph}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+
+                            <Setter TargetName="optionMark" Property="Fill" Value="{StaticResource RadioButton.Pressed.Glyph}" />
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter TargetName="radioButtonBorder" Property="BorderBrush" Value="blue" />
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="{x:Null}">
+                            <Setter TargetName="optionMark" Property="Opacity" Value="0.56" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!--  Design Token SubToolbar lv2 radionbutton  -->
     <Style
         x:Key="SubToolbarRdb"

PDF Office/ViewModels/Form/FormBaseVM.cs

@@ -35,14 +35,15 @@ namespace PDF_Office.ViewModels.Form
         public string ToolTipStr
         {
             get { return _toolTipStr; }
-            set { SetProperty(ref _toolTipStr, value); ChangeValueHandler?.Invoke(null, FormAttributeType.ToolTip); }
+            set { SetProperty(ref _toolTipStr, value); ChangeValueHandler?.Invoke(value, FormAttributeType.ToolTip); }
         }
+
         //名称
         private string _nameStr;
         public string NameStr
         {
             get { return _nameStr; }
-            set { SetProperty(ref _nameStr, value); ChangeValueHandler?.Invoke(null, FormAttributeType.Name); }
+            set { SetProperty(ref _nameStr, value); ChangeValueHandler?.Invoke(value, FormAttributeType.Name); }
         }
 
         //只读
@@ -50,7 +51,7 @@ namespace PDF_Office.ViewModels.Form
         public bool IsReadOnly
         {
             get { return _isReadOnly; }
-            set { SetProperty(ref _isReadOnly, value); ChangeValueHandler?.Invoke(null, FormAttributeType.IsReadOnly); }
+            set { SetProperty(ref _isReadOnly, value); ChangeValueHandler?.Invoke(value, FormAttributeType.IsReadOnly); }
         }
 
         //必填
@@ -58,14 +59,15 @@ namespace PDF_Office.ViewModels.Form
         public bool IsRequiredField
         {
             get { return _isRequiredField; }
-            set { SetProperty(ref _isRequiredField, value); ChangeValueHandler?.Invoke(null, FormAttributeType.IsRequiredField); }
+            set { SetProperty(ref _isRequiredField, value); ChangeValueHandler?.Invoke(value, FormAttributeType.IsRequiredField); }
         }
+
         //锁定
         public bool _isLocked = false;
         public bool IsLocked
         {
             get { return _isLocked; }
-            set { SetProperty(ref _isLocked, value); ChangeValueHandler?.Invoke(null, FormAttributeType.IsLocked); }
+            set { SetProperty(ref _isLocked, value); ChangeValueHandler?.Invoke(value, FormAttributeType.IsLocked); }
         }
 
         #endregion
@@ -76,45 +78,50 @@ namespace PDF_Office.ViewModels.Form
         public double BorderThiness
         {
             get { return _borderThiness; }
-            set { SetProperty(ref _borderThiness, value); ChangeValueHandler?.Invoke(null, FormAttributeType.BorderThiness); }
+            set { SetProperty(ref _borderThiness, value); ChangeValueHandler?.Invoke(value, FormAttributeType.BorderThiness); }
         }
+
         //是否为实线条
         private ComPDFKit.PDFAnnotation.C_BORDER_STYLE _isSolid = ComPDFKit.PDFAnnotation.C_BORDER_STYLE.BS_SOLID;
         public ComPDFKit.PDFAnnotation.C_BORDER_STYLE IsSolid
         {
             get { return _isSolid; }
-            set { SetProperty(ref _isSolid, value); ChangeValueHandler?.Invoke(null, FormAttributeType.IsSolid); }
+            set { SetProperty(ref _isSolid, value); ChangeValueHandler?.Invoke(value, FormAttributeType.IsSolid); }
         }
+
         //宽大小
         private double _widthSize = 150;
         public double WidthSize
         {
             get { return _widthSize; }
-            set { SetProperty(ref _widthSize, value); ChangeValueHandler?.Invoke(null, FormAttributeType.WidthSize); }
+            set { SetProperty(ref _widthSize, value); ChangeValueHandler?.Invoke(value, FormAttributeType.WidthSize); }
         }
+
         //高大小
         private double _heightSize = 22;
         public double HeightSize
         {
             get { return _heightSize; }
-            set { SetProperty(ref _heightSize, value); ChangeValueHandler?.Invoke(null, FormAttributeType.HeightSize); }
+            set { SetProperty(ref _heightSize, value); ChangeValueHandler?.Invoke(value, FormAttributeType.HeightSize); }
         }
+
         //边框颜色
         private Color _borderColor = Colors.Transparent;
         public Color BorderColor
         {
             get { return _borderColor; }
-            set { SetProperty(ref _borderColor, value); ChangeValueHandler?.Invoke(null, FormAttributeType.BorderColor); }
+            set { SetProperty(ref _borderColor, value); ChangeValueHandler?.Invoke(value, FormAttributeType.BorderColor); }
         }
+
+
         //内容颜色
         private Color _contentColor = Colors.Transparent;
         public Color ContentColor
         {
             get { return _contentColor; }
-            set { SetProperty(ref _contentColor, value); ChangeValueHandler?.Invoke(null, FormAttributeType.ContentColor); }
+            set { SetProperty(ref _contentColor, value); ChangeValueHandler?.Invoke(value, FormAttributeType.ContentColor); }
         }
 
-
         #endregion
     }
 }

PDF Office/ViewModels/Form/FormsToolContentViewModel.cs

@@ -73,6 +73,7 @@ namespace PDF_Office.ViewModels.Form
 
         private void InitBtnToProperty()
         {
+            btnToProperty.Add("EmptyForm", "EmptyFormProperty");
             btnToProperty.Add("Text", "TextFieldProperty");
             btnToProperty.Add("CheckBox", "CheckBoxProperty");
             btnToProperty.Add("RadioButton", "RadioButtonProperty");
@@ -187,6 +188,7 @@ namespace PDF_Office.ViewModels.Form
         #region 表单内部触发的事件（比如选中表单行为等）
         private void PDFViewer_WidgetClickHander(object sender, WidgetArgs e)
         {
+            //点击表单，签名表单，触发事件
             if (e != null)
             {
 
@@ -196,12 +198,24 @@ namespace PDF_Office.ViewModels.Form
         {
             if (e != null)
             {
-
+               // 选中时
                 var annotHandlerEventArgs = e.AnnotItemsList[0];
                 if (annotHandlerEventArgs as WidgetArgs != null)
                 {
                     var widgetArgs = annotHandlerEventArgs as WidgetArgs;
-                    GetSelectWidget(widgetArgs,e);
+
+                    //新建的表单之后；
+                    if (CurrentWidgetArgs != null &&
+                        CurrentWidgetArgs.AnnotIndex == widgetArgs.AnnotIndex  &&
+                        CurrentWidgetArgs.PageIndex == widgetArgs.PageIndex)
+                    {
+                        GetSelectWidget(widgetArgs, e);
+                        return;
+                    }
+
+                    CurrentWidgetArgs = widgetArgs;
+
+                    GetSelectWidget(widgetArgs, e);
                     UncheckedToolsBtnEvent?.Invoke(null, CurrentToolBtnType);
                     CurrentToolBtnType = "";
                 }
@@ -210,16 +224,25 @@ namespace PDF_Office.ViewModels.Form
 
         }
 
+        public WidgetArgs CurrentWidgetArgs;
         private void PDFViewer_AnnotEditHandler(object sender, List<AnnotEditEvent> e)
         {
            if(e != null && e.Count > 0)
             {
-                var widgeArgs = e[0].EditAnnotArgs as WidgetArgs;
-                if(widgeArgs != null)
+            
+                var widgeArgs = e[e.Count - 1].EditAnnotArgs as WidgetArgs;
+                if (widgeArgs != null)
                 {
-                    
-                 //   GetSelectWidget(widgeArgs,e[0]);
+                    CurrentWidgetArgs = widgeArgs;
                 }
+                AnnotEditEvent editEvent = e[e.Count - 1];
+                //新增表单后，选中
+                if (editEvent.EditAction == ActionType.Add)
+                {
+                    PDFViewer.SelectAnnotation(editEvent.PageIndex, editEvent.AnnotIndex);
+                }
+               
+
             }
         }
 

PDF Office/ViewModels/Form/TextFieldPropertyViewModel.cs

@@ -1,4 +1,5 @@
-using ComPDFKitViewer;
+using ComPDFKit.PDFAnnotation;
+using ComPDFKitViewer;
 using ComPDFKitViewer.AnnotEvent;
 using ComPDFKitViewer.PdfViewer;
 using PDF_Office.Helper;
@@ -7,6 +8,7 @@ using PDF_Office.Model.From;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
+using Prism.Services.Dialogs;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -65,18 +67,25 @@ namespace PDF_Office.ViewModels.Form
 
         public DelegateCommand<object> IsReadOnlyCheckedCommand { get; set; }
         public DelegateCommand<object> RequiredFieldCheckedCommand { get; set; }
+
+        //外观
+        public DelegateCommand<object> ThicknessChangedCommand { get; set; }
         
+
         #endregion
 
         #region 变量
+        public UpdateAttributeHelper AttribEvent;
         private CPDFViewer PDFViewer;
         private WidgetTextBoxArgs textBoxArgs;
-        public UpdateAttributeHelper AttribEvent;
+        private bool IsCurrentWidget = false;
+        private IDialogService dialogs;
         #endregion
 
         #region 初始化
-        public TextFieldPropertyViewModel()
+        public TextFieldPropertyViewModel(IDialogService dialogService)
         {
+            dialogs = dialogService;
             InitVariable();
             InitCommand();
         }
@@ -92,11 +101,21 @@ namespace PDF_Office.ViewModels.Form
             ToolTipTextChangedCommand = new DelegateCommand<string>(ToolTipTextChanged);
             IsReadOnlyCheckedCommand = new DelegateCommand<object>(IsReadOnlyChecked);
             RequiredFieldCheckedCommand = new DelegateCommand<object>(RequiredFieldChecked);
+            //外观
+            ThicknessChangedCommand = new DelegateCommand<object>(ThicknessChanged);
 
             ChangeValueHandler -= ChangeValue;
             ChangeValueHandler += ChangeValue;
         }
 
+        private void ThicknessChanged(object obj)
+        {
+            if(obj != null)
+            {
+                var str = (double)obj;
+            }
+        }
+
 
         #endregion
 
@@ -104,9 +123,10 @@ namespace PDF_Office.ViewModels.Form
         #region 一般处理
         private void NameTextChanged(string obj)
         {
-            if(string.IsNullOrEmpty(obj) == false)
+            if(string.IsNullOrEmpty(obj) == false && IsCurrentWidget == true)
             {
                 NameStr = obj;
+
             }
         }
 
@@ -152,6 +172,8 @@ namespace PDF_Office.ViewModels.Form
 
         public void OnNavigatedFrom(NavigationContext navigationContext)
         {
+            isCreateWidget = false;
+            IsCurrentWidget = false;
             textBoxArgs = null;
         }
 
@@ -163,13 +185,14 @@ namespace PDF_Office.ViewModels.Form
            
             GetWidgeText();
         }
-
+        bool isCreateWidget = false;
         private void GetWidgeText()
         {
-            PDFViewer.SetMouseMode(MouseModes.FormEditTool);
 
+            //新建的form表单
             if (textBoxArgs == null)
             {
+                PDFViewer.SetMouseMode(MouseModes.FormEditTool);
                 WidgetTextBoxArgs textArgs = new WidgetTextBoxArgs();
                 textArgs.BgColor = Colors.Transparent;
                 textArgs.FontSize = 12;
@@ -178,13 +201,16 @@ namespace PDF_Office.ViewModels.Form
                 textArgs.FieldName = "TextBox";
                 textBoxArgs = textArgs;
                 PDFViewer.SetToolParam(textBoxArgs);
+                isCreateWidget = true;
             }
             else
             {
                 PDFViewer.SetToolParam(new AnnotHandlerEventArgs());
+                isCreateWidget = false;
             }
 
             GetProperty();
+            IsCurrentWidget = true;
         }
         private void GetProperty()
         {
@@ -193,13 +219,17 @@ namespace PDF_Office.ViewModels.Form
                 NameStr = textBoxArgs.FieldName;
                 IsRequiredField = textBoxArgs.IsRequired;
                 IsMultiLine = textBoxArgs.IsMultiLine;
-                
+                IsLocked = textBoxArgs.Locked;
+                ToolTipStr = textBoxArgs.Tooltip;
+
+
             }
         }
 
         //更改基类公共属性后，触发的事件
         private void ChangeValue(object sender, FormAttributeType e)
         {
+
            switch(e)
             {
                 case FormAttributeType.Name:
@@ -223,7 +253,7 @@ namespace PDF_Office.ViewModels.Form
                     break;
 
                 case FormAttributeType.HeightSize:
-                    textBoxArgs.DefaultWidth = HeightSize;
+                   // textBoxArgs.DefaultWidth = HeightSize;
                     //AttribEvent?.UpdateAttrib(, BorderThiness);
                     break;
 
@@ -233,7 +263,7 @@ namespace PDF_Office.ViewModels.Form
                     break;
 
                 case FormAttributeType.BorderColor:
-                    textBoxArgs.LineColor = BorderColor;
+                    textBoxArgs.BgColor = BorderColor;
                     AttribEvent?.UpdateAttrib(AnnotAttrib.Color, BorderColor);
                     break;
 
@@ -248,6 +278,8 @@ namespace PDF_Office.ViewModels.Form
                     break;
 
                 case FormAttributeType.WidthSize:
+                    textBoxArgs.DefaultWidth = WidthSize;
+                    
                     break;
 
                 case FormAttributeType.IsRequiredField:
@@ -265,6 +297,7 @@ namespace PDF_Office.ViewModels.Form
             switch(tag)
             {
                 case "FormPos":
+                    textBoxArgs.FormField = FormField.Visible;
                     AttribEvent?.UpdateAttrib(AnnotAttrib.FormField,FormPos);
                     break;
             }

PDF Office/Views/Form/EditPresetColorsDialog.xaml

@@ -0,0 +1,100 @@
+<UserControl x:Class="PDF_Office.Views.Form.EditPresetColorsDialog"
+             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.Form"
+             xmlns:cus="clr-namespace:PDF_Office.CustomControl"
+             xmlns:cusColor="clr-namespace:PDF_Office.CustomControl.CompositeControl"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <cus:DialogContent Header="Edit Preset Colors" Width="468" Height="258">
+        <cus:DialogContent.Content>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+
+                <Border Width="162" Height="144" BorderThickness="1" CornerRadius="8" Background="#F7F8FA">
+                    <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <TextBlock Text="Text"/>
+                    </Grid>
+                </Border>
+
+                <Grid Grid.Column="1" Height="144">
+                    <Grid.RowDefinitions>
+                        <RowDefinition  Height="*"/>
+                        <RowDefinition  Height="*"/>
+                        <RowDefinition  Height="*"/>
+                        <RowDefinition  Height="*"/>
+                    </Grid.RowDefinitions>
+
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock Text="Settings" Grid.ColumnSpan="2" VerticalAlignment="Center"/>
+                    <TextBlock Text="Border Color:" Grid.Row="1" VerticalAlignment="Center"/>
+                    <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1">
+                        <cusColor:ColorSubContent x:Name="BorderColorBox" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left"
+                                   ></cusColor:ColorSubContent>
+                    </StackPanel>
+
+                    <TextBlock Text="Background Color:" Grid.Row="2" VerticalAlignment="Center"/>
+                    <StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="1">
+                        <cusColor:ColorSubContent x:Name="BgColorBox" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left"
+                                   ></cusColor:ColorSubContent>
+                    </StackPanel>
+                    
+                    <TextBlock Text="Text Color:" Grid.Row="3" VerticalAlignment="Center"/>
+                    <StackPanel Orientation="Horizontal" Grid.Row="3" Grid.Column="1">
+                        <RadioButton Style="{StaticResource RectangleRadionButtonWithCorner}">
+                            <cusColor:ColorSubContent x:Name="TextColorBox" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left"
+                                   ></cusColor:ColorSubContent>
+                        </RadioButton>
+                       
+                    </StackPanel>
+                </Grid>
+            </Grid>
+        </cus:DialogContent.Content>
+
+        <cus:DialogContent.BottmBar>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="50*" />
+                    <ColumnDefinition Width="50*" />
+                    <ColumnDefinition Width="50*" />
+                </Grid.ColumnDefinitions>
+                <Button
+                    Style="{StaticResource btn.sec}"
+                    Grid.Column="0"
+                    Width="150"
+                    Height="32"
+                    Margin="25,0,0,0"
+                    HorizontalAlignment="Right"
+                    Command="{Binding CreateCommnad}"
+                    Content="Reset Settings" />
+                <Button
+                    Style="{StaticResource Btn.cta}"
+                    Grid.Column="1"
+                    Width="150"
+                    Height="32"
+                    Margin="25,0,0,0"
+                    HorizontalAlignment="Right"
+                    Command="{Binding CreateCommnad}"
+                    Content="确定" />
+                <Button
+                    Style="{StaticResource btn.sec}"
+                    Grid.Column="2"
+                    Width="150"
+                    Height="32"
+                    Margin="0,0,25,0"
+                    HorizontalAlignment="Right"
+                    Command="{Binding CancelCommand}"
+                    Content="取消" />
+            </Grid>
+        </cus:DialogContent.BottmBar>
+    </cus:DialogContent>
+</UserControl>

PDF Office/Views/Form/EditPresetColorsDialog.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace PDF_Office.Views.Form
+{
+    /// <summary>
+    /// EditPresetColorsDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class EditPresetColorsDialog : UserControl
+    {
+        public EditPresetColorsDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}

PDF Office/Views/Form/TextFieldProperty.xaml

@@ -10,6 +10,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     prism:ViewModelLocator.AutoWireViewModel="True"
+    xmlns:CompositeControl="clr-namespace:PDF_Office.CustomControl.CompositeControl"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     d:DesignHeight="750"
     d:DesignWidth="260"
@@ -17,6 +18,11 @@
     mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="../../Styles/ListViewStyle.xaml" />
+                <ResourceDictionary Source="../../Styles/SliderStyle.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+           
             <convert:InvertBoolConvert x:Key="InvertBoolConvert" />
             <Style TargetType="{x:Type TabItem}">
                 <Setter Property="Width" Value="74.67 " />
@@ -29,6 +35,13 @@
                 <Setter Property="Height" Value="16" />
                 <Setter Property="Fill" Value="{StaticResource color.icon.base.neutral.norm.lv1}" />
             </Style>
+
+            <DataTemplate x:Key="ContentColorTemplate">
+                <Grid Width="84" Height="24">
+                    <Rectangle Stroke="Red" StrokeThickness="1"/>
+                    <TextBlock Text="Text"/>
+                </Grid>
+            </DataTemplate>
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid ScrollViewer.VerticalScrollBarVisibility="Auto">
@@ -82,7 +95,7 @@
                         Margin="0,18,0,10"
                         Style="{StaticResource PropertyHeaderLv2}"
                         Text="Form Field" />
-                    <form:FormFieldCombox x:Name="formCombox" Type="{Binding FormPos,Mode=TwoWay}" Height="32" Margin="0,8,0,16" />
+                    <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}"/>
                 </StackPanel>
@@ -93,23 +106,212 @@
                 </TabItem.Header>
                 <Grid IsEnabled="{Binding ElementName=ChkLock, Path=IsChecked, Converter={StaticResource InvertBoolConvert}}" >
                     <StackPanel>
-                        <TextBlock
+                        <StackPanel>
+                            <TextBlock
                         Margin="0,18,0,10"
                         Style="{StaticResource PropertyHeaderLv2}"
                         Text="Set Color" />
-                        <TextBlock
+
+                            <Grid Height="50" >
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="auto"/>
+                                    <RowDefinition  Height="auto"/>
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <RadioButton  BorderThickness="1" Width="84" Height="24" Grid.Row="0" Grid.Column="0"
+                                          Style="{StaticResource BlueBorderRadionButtonWithCorner}">
+                                    <Grid Width="84" Height="24" Margin="3">
+                                        <Rectangle Fill="BlueViolet" Stroke="Black" StrokeThickness="1" VerticalAlignment="Stretch"/>
+                                        <TextBlock Text="Text" FontSize="14" LineHeight="22" FontFamily="Segoe UI" Foreground="Red" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    </Grid>
+                                </RadioButton>
+
+                                <RadioButton BorderThickness="1" Width="84" Height="24" Grid.Row="0" Grid.Column="1"
+                                          Style="{StaticResource BlueBorderRadionButtonWithCorner}">
+                                    <Grid Width="84" Height="24" Margin="3">
+                                        <Rectangle Fill="BlueViolet" Stroke="Black" StrokeThickness="1" VerticalAlignment="Stretch"/>
+                                        <TextBlock Text="Text" FontSize="14" LineHeight="22" FontFamily="Segoe UI" Foreground="Red" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    </Grid>
+                                </RadioButton>
+
+                                <RadioButton  BorderThickness="1" Width="84" Height="24" Grid.Row="1" Grid.Column="0"
+                                          Style="{StaticResource BlueBorderRadionButtonWithCorner}">
+                                    <Grid Width="84" Height="24" Margin="3">
+                                        <Rectangle Fill="BlueViolet" Stroke="Black" StrokeThickness="1" VerticalAlignment="Stretch"/>
+                                        <TextBlock Text="Text" FontSize="14" LineHeight="22" FontFamily="Segoe UI" Foreground="Red" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    </Grid>
+                                </RadioButton>
+
+                                <RadioButton  BorderThickness="1" Width="84" Height="24" Grid.Row="1" Grid.Column="1"
+                                          Style="{StaticResource BlueBorderRadionButtonWithCorner}">
+                                    <Grid Width="84" Height="24" Margin="3">
+                                        <Rectangle Fill="BlueViolet" Stroke="Black" StrokeThickness="1" VerticalAlignment="Stretch"/>
+                                        <TextBlock Text="Text" FontSize="14" LineHeight="22" FontFamily="Segoe UI" Foreground="Red" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    </Grid>
+                                </RadioButton>
+                                
+                            </Grid>
+                           
+
+                        </StackPanel>
+
+                        <StackPanel>
+                            <TextBlock
                         Margin="0,18,0,10"
                         Style="{StaticResource PropertyHeaderLv2}"
                         Text="Line" />
-                        <TextBlock
+
+
+                            <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>
+                        </StackPanel>
+                        
+                        
+                        
+                        <StackPanel>
+                            <TextBlock
                         Margin="0,18,0,10"
                         Style="{StaticResource PropertyHeaderLv2}"
                         Text="文本" />
 
-                        <TextBlock
+                            <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
                         Margin="0,18,0,10"
                         Style="{StaticResource PropertyHeaderLv2}"
                         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"/>
+
+                                <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"/>
+                            </StackPanel>
+                        </StackPanel>
+                     
+                        
+                        
+                     
+                       
+
                     </StackPanel>
                 </Grid>
             </TabItem>

PDF Office/Views/Form/TextFieldProperty.xaml.cs

@@ -20,9 +20,12 @@ namespace PDF_Office.Views.Form
     /// </summary>
     public partial class TextFieldProperty : UserControl
     {
+       
         public TextFieldProperty()
         {
             InitializeComponent();
+
+           
         }
     }
 }

PDF Office/Views/PropertyPanel/PDFEdit/TextEditProperty.xaml

@@ -18,9 +18,9 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Styles/SliderStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="../Styles/CustomBtnStyle.xaml"/>
-                <ResourceDictionary Source="/../Styles/RadioButtonStyle.xaml"/>
+                <ResourceDictionary Source="../../../Styles/SliderStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="../../../Styles/CustomBtnStyle.xaml"/>
+                <ResourceDictionary Source="../../../Styles/RadioButtonStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <Convert:BoolToVisible x:Key="BoolToVisible"/>

PDF Office/Views/PropertyPanel/PropertyPanelContent.xaml

@@ -16,16 +16,7 @@
         <Convert:PropertyPanelVisible x:Key="PropertyPanelVisible"/>
     </UserControl.Resources>
     <Grid  VerticalAlignment="Stretch">
-        <Grid x:Name="GridAnnot">
-            <!--<AnnotPanel:TextAnnotProperty x:Name="textAnnotProperty"  Visibility="{Binding AnnotPanelType,ConverterParameter=HighLight, Converter={StaticResource PropertyPanelVisible}}"/>-->
-            <!--<AnnotPanel:FreetextAnnotProperty  x:Name="freetextAnnotProperty" Visibility="{Binding AnnotPanelType,ConverterParameter=Freetext,Converter={StaticResource PropertyPanelVisible}}"/>
-            <AnnotPanel:SharpsAnnotProperty  x:Name="sharpsAnnotProperty" Visibility="{Binding AnnotPanelType,ConverterParameter=HighLight,Converter={StaticResource PropertyPanelVisible}}"/>
-            <AnnotPanel:StampAnnotProperty  x:Name="stampAnnotProperty" Visibility="{Binding AnnotPanelType,ConverterParameter=HighLight,Converter={StaticResource PropertyPanelVisible}}"/>
-            <AnnotPanel:FreehandAnnotProperty  x:Name="freehandAnnotProperty" Visibility="{Binding AnnotPanelType,ConverterParameter=HighLight,Converter={StaticResource PropertyPanelVisible}}"/>
-            <AnnotPanel:ImageAnnotProperty  x:Name="imageAnnotProperty" Visibility="{Binding AnnotPanelType,ConverterParameter=HighLight,Converter={StaticResource PropertyPanelVisible}}"/>
-            <AnnotPanel:LinkAnnotProperty  x:Name="linkAnnotProperty" Visibility="{Binding AnnotPanelType,ConverterParameter=HighLight,Converter={StaticResource PropertyPanelVisible}}"/>-->
-
-        </Grid>
+ 
         <Grid>
             
         </Grid>