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

PDF Office/Styles/ListBoxStyle.xaml

@@ -50,6 +50,57 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
+    <!--  用于BOTA Thunmbnail的Item样式  -->
+    <ControlTemplate x:Key="BOTAListBoxItemTemplate" TargetType="{x:Type ListBoxItem}">
+        <Border
+            x:Name="Bd"
+            Padding="{TemplateBinding Padding}"
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{StaticResource border-radius.4}"
+            FocusVisualStyle="{x:Null}"
+            SnapsToDevicePixels="True">
+            <ContentPresenter
+                Margin="16,8"
+                Content="{TemplateBinding Content}"
+                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                ContentTemplate="{TemplateBinding ContentTemplate}"
+                FocusVisualStyle="{x:Null}"
+                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+        </Border>
+        <ControlTemplate.Triggers>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="True" />
+                </MultiTrigger.Conditions>
+                <Setter TargetName="Bd" Property="Background" Value="{StaticResource color.item-state.hov.bg}" />
+                <!--<Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource color.sys.border.accent.lv2}" />-->
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="Selector.IsSelectionActive" Value="False" />
+                    <Condition Property="IsSelected" Value="True" />
+                </MultiTrigger.Conditions>
+
+                <Setter TargetName="Bd" Property="Background" Value="{StaticResource color.item-state.sel.bg.lv3}" />
+                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource color.item-state.sel.border.lv3}" />
+
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="Selector.IsSelectionActive" Value="True" />
+                    <Condition Property="IsSelected" Value="True" />
+                </MultiTrigger.Conditions>
+                <Setter TargetName="Bd" Property="Background" Value="{StaticResource color.item-state.sel.bg.lv3}" />
+                <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource color.item-state.sel.border.lv3}" />
+            </MultiTrigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="Bd" Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
     <ControlTemplate x:Key="EditToolsItemControlTemplate" TargetType="{x:Type ListBoxItem}">
         <Border
             x:Name="EditToolsBorder"

PDF Office/Styles/ListViewStyle.xaml

@@ -149,16 +149,16 @@
                             <MultiTrigger.Conditions>
                                 <Condition Property="UIElement.IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Bd" Property="Panel.Background" Value="#1A000000" />
-                            <Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A000000" />
+                            <Setter TargetName="Bd" Property="Panel.Background" Value="{StaticResource color.item-state.hov.bg}" />
+                            <!--<Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A000000" />-->
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="Selector.IsSelectionActive" Value="False" />
                                 <Condition Property="Selector.IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Bd" Property="Panel.Background" Value="#1A477EDE" />
-                            <Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A477EDE" />
+                            <Setter TargetName="Bd" Property="Panel.Background" Value="{StaticResource color.item-state.sel.bg.lv3}" />
+                            <!--<Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A477EDE" />-->
                             <!--<Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Visible" />-->
                         </MultiTrigger>
                         <MultiTrigger>
@@ -166,8 +166,8 @@
                                 <Condition Property="Selector.IsSelectionActive" Value="True" />
                                 <Condition Property="Selector.IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Bd" Property="Panel.Background" Value="#1A477EDE" />
-                            <Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A477EDE" />
+                            <Setter TargetName="Bd" Property="Panel.Background" Value="{StaticResource color.item-state.sel.bg.lv3}" />
+                            <!--<Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A477EDE" />-->
                             <!--<Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Visible" />-->
                         </MultiTrigger>
                         <Trigger Property="UIElement.IsEnabled" Value="False">
@@ -224,6 +224,7 @@
                         Background="{TemplateBinding Panel.Background}"
                         BorderBrush="{TemplateBinding Border.BorderBrush}"
                         BorderThickness="{TemplateBinding Border.BorderThickness}"
+                        CornerRadius="{StaticResource border-radius.8}"
                         SnapsToDevicePixels="True">
                         <Grid>
                             <ContentPresenter
@@ -260,8 +261,8 @@
                                 <Condition Property="Selector.IsSelected" Value="False" />
                             </MultiTrigger.Conditions>
                             <!--<Setter Property="Panel.Background" TargetName="Bd" Value="#1A000000" />-->
-                            <Setter TargetName="Bd" Property="Border.BorderBrush" Value="#FF477EDE" />
-                            <Setter TargetName="UnSelectedIcon" Property="Grid.Visibility" Value="Visible" />
+                            <Setter TargetName="Bd" Property="Border.Background" Value="{StaticResource color.item-state.hov.bg}" />
+                            <Setter TargetName="UnSelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
                             <Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
                         </MultiTrigger>
                         <MultiTrigger>
@@ -269,9 +270,9 @@
                                 <Condition Property="Selector.IsSelectionActive" Value="False" />
                                 <Condition Property="Selector.IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Bd" Property="Panel.Background" Value="#1A477EDE" />
-                            <Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A477EDE" />
-                            <Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Visible" />
+                            <Setter TargetName="Bd" Property="Panel.Background" Value="{StaticResource color.item-state.sel.bg.lv3}" />
+                            <Setter TargetName="Bd" Property="Border.BorderBrush" Value="{StaticResource color.item-state.sel.border.lv3}" />
+                            <Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
                             <Setter TargetName="UnSelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
                         </MultiTrigger>
                         <MultiTrigger>
@@ -279,9 +280,9 @@
                                 <Condition Property="Selector.IsSelectionActive" Value="True" />
                                 <Condition Property="Selector.IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Bd" Property="Panel.Background" Value="#1A477EDE" />
-                            <Setter TargetName="Bd" Property="Border.BorderBrush" Value="#1A477EDE" />
-                            <Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Visible" />
+                            <Setter TargetName="Bd" Property="Panel.Background" Value="{StaticResource color.item-state.sel.bg.lv3}" />
+                            <Setter TargetName="Bd" Property="Border.BorderBrush" Value="{StaticResource color.item-state.sel.border.lv3}" />
+                            <Setter TargetName="SelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
                             <Setter TargetName="UnSelectedIcon" Property="Grid.Visibility" Value="Collapsed" />
                         </MultiTrigger>
                         <Trigger Property="UIElement.IsEnabled" Value="False">
@@ -343,10 +344,10 @@
                 <ControlTemplate TargetType="{x:Type ListViewItem}">
                     <Border
                         Name="Bd"
-                        CornerRadius="4"
-                        BorderThickness="1"
                         Background="{TemplateBinding Panel.Background}"
                         BorderBrush="{TemplateBinding Border.BorderBrush}"
+                        BorderThickness="1"
+                        CornerRadius="4"
                         SnapsToDevicePixels="True">
                         <ContentPresenter
                             Margin="0"
@@ -401,8 +402,8 @@
     <ControlTemplate x:Key="AnnotationListItemStyle" TargetType="{x:Type ListBoxItem}">
         <Border
             x:Name="Bd"
-            Padding="8"
             Margin="5"
+            Padding="8"
             Background="{StaticResource color.sys.layout.mg}"
             BorderBrush="{TemplateBinding BorderBrush}"
             BorderThickness="{TemplateBinding BorderThickness}"
@@ -421,7 +422,7 @@
                 <MultiTrigger.Conditions>
                     <Condition Property="IsMouseOver" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter TargetName="Bd" Property="Background" Value="{ StaticResource color.item-state.hov.bg}" />
+                <Setter TargetName="Bd" Property="Background" Value="{StaticResource color.item-state.hov.bg}" />
                 <Setter TargetName="Bd" Property="BorderBrush" Value="Transparent" />
                 <!--<Setter Property="Margin" Value="5,0,5,10" />-->
             </MultiTrigger>

PDF Office/Styles/RadioButtonStyle.xaml

@@ -264,15 +264,16 @@
     <!--  最近列表列表模式单选按钮  -->
     <Style x:Key="ListModeRadioBtnStyle" TargetType="{x:Type RadioButton}">
         <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
-        <Setter Property="Background" Value="{StaticResource RadioButton.Static.Background}" />
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{StaticResource RadioButton.Static.Border}" />
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+        <Setter Property="Foreground" Value="{StaticResource color.icon.base.neutral.norm.lv1}" />
+        <Setter Property="Padding" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RadioButton}">
                     <Border
                         x:Name="root"
-                        Background="#EEF2F3"
+                        Background="Transparent"
                         CornerRadius="4">
 
                         <Grid
@@ -287,7 +288,6 @@
                             </Grid.ColumnDefinitions>
                             <Border
                                 x:Name="radioButtonBorder"
-                                Margin="1,1,2,1"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                 Background="{TemplateBinding Background}"
@@ -295,7 +295,10 @@
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 CornerRadius="100"
                                 Visibility="Collapsed">
-                                <Grid x:Name="markGrid" Margin="2">
+                                <Grid
+                                    x:Name="markGrid"
+                                    Margin="2"
+                                    Visibility="Collapsed">
                                     <Ellipse
                                         x:Name="optionMark"
                                         MinWidth="6"
@@ -348,7 +351,8 @@
                         </Trigger>
                         <Trigger Property="IsChecked" Value="true">
                             <Setter TargetName="optionMark" Property="Opacity" Value="1" />
-                            <Setter TargetName="root" Property="Border.Background" Value="White" />
+                            <Setter TargetName="root" Property="Border.Background" Value="{StaticResource color.sys.layout.anti}" />
+                            <Setter Property="Foreground" Value="{StaticResource color.icon.base.neutral.sel}" />
                         </Trigger>
                         <Trigger Property="IsChecked" Value="{x:Null}">
                             <Setter TargetName="optionMark" Property="Opacity" Value="0.56" />

PDF Office/ViewModels/FillAndSign/FillAndSignContentViewModel.cs

@@ -55,7 +55,8 @@ namespace PDF_Office.ViewModels.FillAndSign
         private PopMenu MultiAnnotPopMenu;
         private IRegionManager regions { get; set; }
         private Dictionary<string, AnnotArgsType> ToolExpandDict = new Dictionary<string, AnnotArgsType>();
-        public static bool IsEdit = false;
+        public static bool IsEdit = false;
+        public static bool IsSignPoint=false;
         public Brush SelectColor = new SolidColorBrush(Colors.GreenYellow);
         public double FillOpacity = 1;
         public double LineWidth = 1;
@@ -140,6 +141,7 @@ namespace PDF_Office.ViewModels.FillAndSign
         private void FindAnnotTypeKey(string tag, ref AnnotHandlerEventArgs annotArgs, bool isRightMenuAdd = false)
         {
             LineWidthMultiple = 1;
+            IsSignPoint=false;
             switch (tag)
             {
 
@@ -176,6 +178,7 @@ namespace PDF_Office.ViewModels.FillAndSign
                     annotArgs = GetStamp();
                     break;
                 case "RbtnPoint":
+                    IsSignPoint = true;
                     Shape = "DotShape";
                     ShapePoints = new List<List<Point>> { new List<Point> { new Point(3.19995, 3.19995), new Point(3.19995, 3.19995) } };
                     LineWidthMultiple = 5;
@@ -213,7 +216,7 @@ namespace PDF_Office.ViewModels.FillAndSign
             //stampAnnotArgs.Type = StampType.STANDARD_STAMP;
             // stampAnnotArgs.Type = StampType.STANDARD_STAMP;
             stampAnnotArgs.IsContinueMode = true;
-           
+            stampAnnotArgs.IsSignPoint = IsSignPoint;
             Dictionary<AnnotAttrib, object> annotAttribsList = new Dictionary<AnnotAttrib, object>();
             annotAttribsList[AnnotAttrib.Transparency] = stampAnnotArgs.Opacity;
             DefaultAnnotProperty annotProperty = SettingHelper.GetAnnotDefaultProperty(AnnotArgsType.AnnotStamp);
@@ -249,6 +252,7 @@ namespace PDF_Office.ViewModels.FillAndSign
             //stampAnnotArgs.StampText = "APPROVED";
             //stampAnnotArgs.Type = StampType.STANDARD_STAMP;
             stampAnnotArgs.IsContinueMode = true;
+            stampAnnotArgs.IsSignPoint = IsSignPoint;
             stampAnnotArgs.Opacity = FillOpacity;
             Dictionary<AnnotAttrib, object> annotAttribsList = new Dictionary<AnnotAttrib, object>();
             annotAttribsList[AnnotAttrib.Transparency] = stampAnnotArgs.Opacity;

PDF Office/Views/BOTA/OutLineControl.xaml

@@ -20,83 +20,85 @@
     </UserControl.Resources>
     <Grid Background="Transparent">
         <Grid.RowDefinitions>
-            <RowDefinition Height="40" />
+            <RowDefinition Height="48" />
             <RowDefinition />
         </Grid.RowDefinitions>
-        <Grid x:Name="Header">
-            <TextBlock
-                x:Name="TxtTitle"
-                Margin="12,0,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                FontSize="18"
-                FontWeight="SemiBold"
-                Text="Outline" />
-            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                <customcontrol:PathButton
-                    x:Name="BtnAdd"
-                    Width="32"
-                    Height="32"
-                    Click="BtnAdd_Click"
-                    Icon="{StaticResource Ic_AddButtonPath}"
-                    IconFill="#616469"
-                    IconHeight="16"
-                    IconWidth="16"
-                    IconMouseOver="{StaticResource Ic_AddButtonPath}"
-                    IconMouseOverFill="#616469"
-                    IconPress="{StaticResource Ic_AddButtonPath}"
-                    IconPressFill="#616469"
-                    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="32"
-                    Height="32"
-                    Click="BtnMore_Click"
-                    Icon="{StaticResource Ic_MoreButtonPath}"
-                    IconFill="#616469"
-                    IconHeight="16"
-                    IconWidth="16"
-                    CornerRadius="4"
-                    IconMouseOver="{StaticResource Ic_MoreButtonPath}"
-                    IconMouseOverFill="#616469"
-                    IconPress="{StaticResource Ic_MoreButtonPath}"
-                    IconPressFill="#616469"
-                    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>
-                                <Style TargetType="MenuItem" BasedOn="{StaticResource GlobalMenuItem}">
-                                    <Setter Property="Padding" Value="-25,7,-40,7" />
-                                    <Setter Property="VerticalContentAlignment" Value="Center" />
-                                </Style>
-                            </ContextMenu.ItemContainerStyle>
-                            <MenuItem
-                                Name="MenuDeleteAll"
-                                Command="{Binding DeleteAllCommand}"
-                                Header="Delete All Outline" />
-                            <MenuItem
-                                Name="MenuExpandAll"
-                                Command="{Binding ExpandAllCommand}"
-                                CommandParameter="{Binding Outlinelist}"
-                                Header="一键展开" />
-                            <MenuItem
-                                Name="MenuCollapseAll"
-                                Command="{Binding CollapseAllCommand}"
-                                CommandParameter="{Binding Outlinelist}"
-                                Header="一键折叠" />
-                        </ContextMenu>
-                    </customcontrol:PathButton.ContextMenu>
-                </customcontrol:PathButton>
-            </StackPanel>
-        </Grid>
+        <Border BorderBrush="{StaticResource color.field.border.norm}" BorderThickness="0,0,0,1">
+            <Grid x:Name="Header">
+                <TextBlock
+                    x:Name="TxtTitle"
+                    Margin="16,0,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontFamily="Segoe UI"
+                    FontSize="14"
+                    FontWeight="SemiBold"
+                    Text="Outline" />
+                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                    <customcontrol:PathButton
+                        x:Name="BtnAdd"
+                        Width="32"
+                        Height="32"
+                        HorizontalContentAlignment="Center"
+                        Click="BtnAdd_Click"
+                        CornerRadius="4"
+                        Icon="{StaticResource Ic_AddButtonPath}"
+                        IconFill="#616469"
+                        IconHeight="16"
+                        IconMouseOver="{StaticResource Ic_AddButtonPath}"
+                        IconMouseOverFill="#616469"
+                        IconPress="{StaticResource Ic_AddButtonPath}"
+                        IconPressFill="#616469"
+                        IconWidth="16"
+                        MouseDownBackground="{StaticResource color.item-state.sel.bg.lv3}"
+                        MouseDownBorderBrush="{StaticResource color.item-state.sel.border.lv3}"
+                        MouseOverBackground="{StaticResource color.item-state.hov.bg}" />
+                    <customcontrol:PathButton
+                        x:Name="BtnMore"
+                        Width="32"
+                        Height="32"
+                        HorizontalContentAlignment="Center"
+                        Click="BtnMore_Click"
+                        CornerRadius="4"
+                        Icon="{StaticResource Ic_MoreButtonPath}"
+                        IconFill="#616469"
+                        IconHeight="16"
+                        IconMouseOver="{StaticResource Ic_MoreButtonPath}"
+                        IconMouseOverFill="#616469"
+                        IconPress="{StaticResource Ic_MoreButtonPath}"
+                        IconPressFill="#616469"
+                        IconWidth="16"
+                        MouseDownBackground="{StaticResource color.item-state.sel.bg.lv3}"
+                        MouseDownBorderBrush="{StaticResource color.item-state.sel.border.lv3}"
+                        MouseOverBackground="{StaticResource color.item-state.hov.bg}">
+                        <customcontrol:PathButton.ContextMenu>
+                            <ContextMenu Name="MenuMore">
+                                <ContextMenu.ItemContainerStyle>
+                                    <Style BasedOn="{StaticResource GlobalMenuItem}" TargetType="MenuItem">
+                                        <Setter Property="Padding" Value="-25,7,-40,7" />
+                                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                                    </Style>
+                                </ContextMenu.ItemContainerStyle>
+                                <MenuItem
+                                    Name="MenuDeleteAll"
+                                    Command="{Binding DeleteAllCommand}"
+                                    Header="Delete All Outline" />
+                                <MenuItem
+                                    Name="MenuExpandAll"
+                                    Command="{Binding ExpandAllCommand}"
+                                    CommandParameter="{Binding Outlinelist}"
+                                    Header="一键展开" />
+                                <MenuItem
+                                    Name="MenuCollapseAll"
+                                    Command="{Binding CollapseAllCommand}"
+                                    CommandParameter="{Binding Outlinelist}"
+                                    Header="一键折叠" />
+                            </ContextMenu>
+                        </customcontrol:PathButton.ContextMenu>
+                    </customcontrol:PathButton>
+                </StackPanel>
+            </Grid>
+        </Border>
 
         <StackPanel
             x:Name="FirstOulineLine"
@@ -129,7 +131,10 @@
                 x:Name="NoOutlineStackPanel"
                 VerticalAlignment="Center"
                 Visibility="{Binding Outlinelist.Count, Converter={StaticResource ListCountToVisible}}">
-                <Image Width="128" Height="128" Source="pack://application:,,,/PDF Office;component/Resources/BOTA/no_outline.png" />
+                <Image
+                    Width="128"
+                    Height="128"
+                    Source="pack://application:,,,/PDF Office;component/Resources/BOTA/no_outline.png" />
                 <TextBlock
                     Height="22"
                     HorizontalAlignment="Center"
@@ -149,6 +154,7 @@
                 x:Name="OutlineView"
                 Grid.Row="1"
                 AllowDrop="True"
+                Background="Transparent"
                 BorderThickness="0"
                 Drop="OutlineView_Drop"
                 ItemsSource="{Binding Outlinelist}"
@@ -227,7 +233,7 @@
                                     x:Name="Content"
                                     VerticalAlignment="Center"
                                     Text="{Binding Outline.Title}"
-                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="WrapWithOverflow"
                                     Visibility="{Binding IsReName, Mode=TwoWay}" />
                                 <TextBlock
                                     x:Name="PageIndex"

PDF Office/Views/HomePanel/PDFTools/PDFToolExpendItem.xaml

@@ -28,25 +28,26 @@
 
                 <TextBlock
                     Name="TxbTitle"
-                    Margin="8 0 0 0"
+                    Margin="8,0,0,0"
                     VerticalAlignment="Center"
+                    FontFamily="Segoe UI"
                     FontSize="14"
                     FontWeight="SemiBold"
                     Foreground="Black"
                     Text="{Binding FnName}" />
 
-            </StackPanel> 
+            </StackPanel>
 
             <TextBlock
-                            Name="ToolInfoBlock"
+                Name="ToolInfoBlock"
                 Grid.Row="1"
-                Margin="0 8 0 0"
-                            VerticalAlignment="Center"
-                            FontSize="12"
-                            Foreground="#666666"
-                            LineHeight="16"
-                            Text="{Binding FnInfo}"
-                            TextWrapping="Wrap" />
+                Margin="0,8,0,0"
+                VerticalAlignment="Center"
+                FontSize="12"
+                Foreground="#666666"
+                LineHeight="16"
+                Text="{Binding FnInfo}"
+                TextWrapping="Wrap" />
         </Grid>
     </Border>
 </UserControl>

PDF Office/Views/HomePanel/PDFTools/PDFToolItem.xaml

@@ -31,6 +31,7 @@
                     Name="TxbTitleConcise"
                     Margin="8,0,0,0"
                     VerticalAlignment="Center"
+                    FontFamily="Segoe UI"
                     FontSize="14"
                     FontWeight="SemiBold"
                     Text="{Binding FnName}" />

PDF Office/Views/HomePanel/PDFTools/QuickToolsContent.xaml

@@ -8,7 +8,9 @@
     xmlns:local="clr-namespace:PDF_Office.Views.HomePanel"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pDFTools="clr-namespace:PDF_Office.Views.HomePanel.PDFTools"
-    xmlns:prism="http://prismlibrary.com/" xmlns:pdftools="clr-namespace:PDF_Office.ViewModels.HomePanel.PDFTools" d:DataContext="{d:DesignInstance Type=pdftools:QuickToolsContentViewModel}"
+    xmlns:pdftools="clr-namespace:PDF_Office.ViewModels.HomePanel.PDFTools"
+    xmlns:prism="http://prismlibrary.com/"
+    d:DataContext="{d:DesignInstance Type=pdftools:QuickToolsContentViewModel}"
     d:DesignHeight="450"
     d:DesignWidth="800"
     prism:ViewModelLocator.AutoWireViewModel="True"
@@ -57,9 +59,11 @@
         </Grid.RowDefinitions>
         <TextBlock
             x:Name="TxbQuickToolsTitle"
-            Margin="0,0,0,16"
-            FontSize="24"
+            Margin="0,2,0,2"
+            FontFamily="Segoe UI"
+            FontSize="20"
             FontWeight="SemiBold"
+            LineHeight="28"
             Text="Quick Tools" />
 
 
@@ -69,7 +73,7 @@
             Grid.ColumnSpan="2"
             Margin="0,0,12,0"
             HorizontalAlignment="Right"
-            VerticalAlignment="Top"
+            VerticalAlignment="Center"
             Orientation="Horizontal"
             Visibility="Visible">
 

PDF Office/Views/HomePanel/RecentFiles/DocItemControl.xaml

@@ -1,21 +1,56 @@
-<UserControl x:Class="PDF_Office.Views.HomePanel.RecentFiles.DocItemControl"
-             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.HomePanel"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid Height="272" Width="230" Loaded="Grid_Loaded" DataContext="{Binding}" ToolTip="{Binding FilePath}">
+<UserControl
+    x:Class="PDF_Office.Views.HomePanel.RecentFiles.DocItemControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:PDF_Office.Views.HomePanel"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid
+        Width="226"
+        Height="248"
+        DataContext="{Binding}"
+        Loaded="Grid_Loaded"
+        ToolTip="{Binding FilePath}">
         <Grid.RowDefinitions>
-            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto" />
             <RowDefinition />
         </Grid.RowDefinitions>
-        <Image Name="CoverImage" Width="136" Height="176" Margin="4" RenderOptions.BitmapScalingMode="HighQuality" UseLayoutRounding="True"/>
-        <TextBlock Grid.Row="1"
-                   FontSize="14"  MaxWidth="136" TextTrimming="CharacterEllipsis"
-                   ToolTip="{Binding FileName}" Text="{Binding FileName}" 
-                   VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        <Border
+            Margin="51,16"
+            BorderBrush="{StaticResource color.sys.layout.divider}"
+            BorderThickness="1"
+            CornerRadius="{StaticResource border-radius.8}">
+            <Grid>
+                <Border
+                    Name="BorderImage"
+                    Height="164"
+                    Background="White"
+                    CornerRadius="{StaticResource border-radius.8}" />
+                <Image
+                    Name="CoverImage"
+                    RenderOptions.BitmapScalingMode="HighQuality"
+                    UseLayoutRounding="True">
+                    <Image.OpacityMask>
+                        <VisualBrush Visual="{Binding ElementName=BorderImage}" />
+                    </Image.OpacityMask>
+                </Image>
+            </Grid>
+        </Border>
+        <TextBlock
+            Grid.Row="1"
+            MaxWidth="226"
+            MaxHeight="44"
+            Margin="0,0,0,8"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Top"
+            FontSize="14"
+            Text="{Binding FileName}"
+            TextTrimming="CharacterEllipsis"
+            TextWrapping="Wrap"
+            ToolTip="{Binding FileName}" />
     </Grid>
-    
+
 </UserControl>

PDF Office/Views/PageEdit/PageEditContent.xaml

@@ -310,9 +310,11 @@
                     <TextBlock
                         Margin="16,0"
                         VerticalAlignment="Center"
+                        FontFamily="Segoe UI"
                         FontSize="14"
+                        FontWeight="SemiBold"
                         LineHeight="20"
-                        Text="缩略图" />
+                        Text="Thumbnails" />
                     <ToggleButton
                         Name="TbnTwoLine"
                         Width="32"
@@ -361,6 +363,11 @@
                         <EventSetter Event="DragLeave" Handler="ListBoxItem_DragLeave" />
                         <EventSetter Event="PreviewMouseLeftButtonDown" Handler="ListBoxItem_PreviewMouseLeftButtonDown" />
                         <EventSetter Event="PreviewMouseDoubleClick" Handler="ListBoxItem_PreviewMouseDoubleClick" />
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl,Mode=FindAncestor}, Path=DataContext.IsBOTAThumb}" Value="Visible">
+                                <Setter Property="Template" Value="{StaticResource BOTAListBoxItemTemplate}" />
+                            </DataTrigger>
+                        </Style.Triggers>
                     </Style>
                 </ListBox.ItemContainerStyle>
                 <ListBox.ItemsPanel>