OYXH\oyxh преди 2 години
родител
ревизия
12f54c1ba9

+ 1 - 0
.gitignore

@@ -6,3 +6,4 @@ PDF Office/PDF Office.csproj.user
 PDFSettings/obj/
 PDFSettings/bin/
 *.htm
+PDF Office/SDKLisence.xml

+ 8 - 1
PDF Office/PDF Office.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props" Condition="Exists('packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -761,6 +761,9 @@
     <Compile Include="Views\Dialog\HomePageToolsDialogs\HomePagePrinter\HomePagePrinterDialog.xaml.cs">
       <DependentUpon>HomePagePrinterDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Dialog\PropertiesDialog.xaml.cs">
+      <DependentUpon>PropertiesDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Dialog\Redaction\MarkSettingDialog.xaml.cs">
       <DependentUpon>MarkSettingDialog.xaml</DependentUpon>
     </Compile>
@@ -1460,6 +1463,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Dialog\PropertiesDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Dialog\Redaction\MarkSettingDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

+ 406 - 388
PDF Office/Views/Dialog/InfoDialog.xaml

@@ -35,6 +35,7 @@
                 <Setter Property="Foreground" Value="{StaticResource color.sys.text.neutral.lv2}" />
                 <Setter Property="VerticalAlignment" Value="Center" />
                 <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontWeight" Value="Bold" />
             </Style>
             <Style x:Key="Label2" TargetType="Label">
                 <Setter Property="Foreground" Value="{StaticResource color.sys.text.neutral.lv1}" />
@@ -66,7 +67,7 @@
                                     Width="14"
                                     Height="14"
                                     HorizontalAlignment="Center"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    VerticalAlignment="Center"
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="{TemplateBinding BorderBrush}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
@@ -137,94 +138,101 @@
                     </StackPanel>
                 </TabItem.Header>
                 <ScrollViewer Margin="0,0,0,80" VerticalScrollBarVisibility="Auto">
-                    <StackPanel Margin="16,10,10,0" Background="{StaticResource color.sys.layout.anti}">
+
+                    <StackPanel Margin="16,10,10,0">
                         <Label Content="文档" Style="{StaticResource Label}" />
-                        <StackPanel Margin="0,10,0,18" Background="{StaticResource color.sys.layout.mg}">
-                            <CheckBox
-                                Margin="8"
-                                Content="APP启动时打开上次未关闭的文档"
-                                Foreground="{StaticResource color.sys.text.neutral.lv1}" />
-                            <CheckBox
-                                Margin="8"
-                                Content="文档打开时恢复上次视图设置"
-                                Foreground="{StaticResource color.sys.text.neutral.lv1}" />
-                            <Label
-                                Margin="8"
-                                Content="最近打开中文档最多显示数量:"
-                                Style="{StaticResource Label2}" />
-                            <StackPanel Margin="8" Orientation="Horizontal">
-                                <cus:NumericUpDown
-                                    Width="120"
-                                    HorizontalAlignment="Left"
-                                    BorderThickness="0"
-                                    FontSize="14"
-                                    Foreground="{StaticResource color.field.text.act}"
-                                    Text="20" />
-                                <TextBlock
-                                    Margin="8,0"
-                                    VerticalAlignment="Center"
-                                    Foreground="{StaticResource color.sys.text.neutral.lv3}"
-                                    Text="10 to 50" />
-                            </StackPanel>
-                            <StackPanel Margin="8" Orientation="Horizontal">
-                                <CheckBox Content="APP自动保存文件,频次为每" Foreground="{StaticResource color.sys.text.neutral.lv1}" />
-                                <cus:NumericUpDown
-                                    Width="120"
-                                    Margin="8,0,0,0"
-                                    HorizontalAlignment="Left"
-                                    BorderThickness="0"
-                                    FontSize="14"
-                                    Foreground="{StaticResource color.field.text.act}"
-                                    Text="10" />
-                                <Label
-                                    Margin="8,0,0,0"
-                                    Content="min"
-                                    Style="{StaticResource Label}" />
-                                <TextBlock
-                                    Margin="8,0"
-                                    VerticalAlignment="Center"
-                                    Foreground="{StaticResource color.sys.text.neutral.lv3}"
-                                    Text="5 to 99" />
-                            </StackPanel>
-                            <Grid Margin="8">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="64" />
-                                    <ColumnDefinition />
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
+                        <Border CornerRadius="6" Margin="0,10,0,18" Background="{StaticResource color.sys.layout.mg}">
+                            <StackPanel>
+                                <CheckBox
+                                    Margin="8"
+                                    Content="APP启动时打开上次未关闭的文档"
+                                    Foreground="{StaticResource color.sys.text.neutral.lv1}" />
+                                <CheckBox
+                                    Margin="8"
+                                    Content="文档打开时恢复上次视图设置"
+                                    Foreground="{StaticResource color.sys.text.neutral.lv1}" />
                                 <Label
-                                    Grid.Row="0"
-                                    Grid.Column="0"
-                                    Content="关闭文档:"
+                                    Margin="8"
+                                    Content="最近打开中文档最多显示数量:"
                                     Style="{StaticResource Label2}" />
+                                <StackPanel Margin="8" Orientation="Horizontal">
+                                    <cus:NumericUpDown
+                                        Width="120"
+                                        HorizontalAlignment="Left"
+                                        BorderThickness="0"
+                                        FontSize="14"
+                                        Foreground="{StaticResource color.field.text.act}"
+                                        Text="20" />
+                                    <TextBlock
+                                        Margin="8,0"
+                                        VerticalAlignment="Center"
+                                        Foreground="{StaticResource color.sys.text.neutral.lv3}"
+                                        Text="10 to 50" />
+                                </StackPanel>
+                                <StackPanel Margin="8" Orientation="Horizontal">
+                                    <CheckBox Content="APP自动保存文件,频次为每" Foreground="{StaticResource color.sys.text.neutral.lv1}" />
+                                    <cus:NumericUpDown
+                                        Width="120"
+                                        Margin="8,0,0,0"
+                                        HorizontalAlignment="Left"
+                                        BorderThickness="0"
+                                        FontSize="14"
+                                        Foreground="{StaticResource color.field.text.act}"
+                                        Text="10" />
+                                    <Label
+                                        Margin="8,0,0,0"
+                                        Content="min"
+                                        Style="{StaticResource Label}" />
+                                    <TextBlock
+                                        Margin="8,0"
+                                        VerticalAlignment="Center"
+                                        Foreground="{StaticResource color.sys.text.neutral.lv3}"
+                                        Text="5 to 99" />
+                                </StackPanel>
+                                <Grid Margin="8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="64" />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
+                                    <Label
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        Content="关闭文档:"
+                                        Style="{StaticResource Label2}" />
+                                    <RadioButton
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Content="弹出“保存/不保存”提示"
+                                        Style="{DynamicResource RadioButtonStyle1}" />
+                                    <RadioButton
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Margin="0,8"
+                                        Content="无提示,直接保存"
+                                        Style="{DynamicResource RadioButtonStyle1}" />
+                                </Grid>
+                            </StackPanel>
+                        </Border>
+
+                        <Label Content="打开图片文档" Style="{StaticResource Label}" />
+                        <Border CornerRadius="6" Margin="0,10,0,18" Background="{StaticResource color.sys.layout.mg}">
+                            <StackPanel>
                                 <RadioButton
-                                    Grid.Row="0"
-                                    Grid.Column="1"
-                                    Content="弹出“保存/不保存”提示"
+                                    Margin="9,12,0,0"
+                                    Content="自动扫描并识别文本"
                                     Style="{DynamicResource RadioButtonStyle1}" />
                                 <RadioButton
                                     Grid.Row="1"
-                                    Grid.Column="1"
-                                    Margin="0,8"
-                                    Content="无提示,直接保存"
+                                    Margin="9,10"
+                                    Content="提示扫描并识别文本"
                                     Style="{DynamicResource RadioButtonStyle1}" />
-                            </Grid>
-                        </StackPanel>
-                        <Label Content="打开图片文档" Style="{StaticResource Label}" />
-                        <StackPanel Margin="0,10,0,18" Background="{StaticResource color.sys.layout.mg}">
-                            <RadioButton
-                                Margin="9,12,0,0"
-                                Content="自动扫描并识别文本"
-                                Style="{DynamicResource RadioButtonStyle1}" />
-                            <RadioButton
-                                Grid.Row="1"
-                                Margin="9,10"
-                                Content="提示扫描并识别文本"
-                                Style="{DynamicResource RadioButtonStyle1}" />
-                        </StackPanel>
+                            </StackPanel>
+                        </Border>
+
                         <WrapPanel>
                             <Label
                                 Margin="1,0"
@@ -277,70 +285,76 @@
                 <ScrollViewer Margin="0,0,0,80" VerticalScrollBarVisibility="Auto">
                     <StackPanel Margin="16,10,10,0" Background="{StaticResource color.sys.layout.anti}">
                         <Label Content="默认视图和缩放" Style="{StaticResource Label}" />
-                        <Grid Margin="0,5,0,10" Background="{StaticResource color.sys.layout.mg}">
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <WrapPanel Margin="0,12,0,0">
-                                <Label Content="页面显示:" Style="{StaticResource Label2}" />
-                                <ComboBox
-                                    Width="348"
-                                    Height="30"
-                                    SelectedIndex="0">
-                                    <ComboBoxItem Content="单页" Foreground="{StaticResource color.field.text.act}" />
-                                    <ComboBoxItem Content="单页连续" Foreground="{StaticResource color.field.text.act}" />
-                                    <ComboBoxItem Content="双页" Foreground="{StaticResource color.field.text.act}" />
-                                    <ComboBoxItem Content="双页连续" Foreground="{StaticResource color.field.text.act}" />
-                                    <ComboBoxItem Content="书本" Foreground="{StaticResource color.field.text.act}" />
-                                    <ComboBoxItem Content="书本连续" Foreground="{StaticResource color.field.text.act}" />
-                                </ComboBox>
-                            </WrapPanel>
-                            <WrapPanel Grid.Row="1" Margin="0,12">
-                                <Label Content="缩放比例:" Style="{StaticResource Label2}" />
-                                <ComboBox
-                                    Width="348"
-                                    Height="30"
-                                    SelectedIndex="0">
-                                    <ComboBoxItem Content="适应宽度" Foreground="{StaticResource color.field.text.act}" />
-                                    <ComboBoxItem Content="适应页面" Foreground="{StaticResource color.field.text.act}" />
-                                    <ComboBoxItem Content="实际大小" Foreground="{StaticResource color.field.text.act}" />
-                                </ComboBox>
-                            </WrapPanel>
-                        </Grid>
+                        <Border CornerRadius="6" Margin="0,5,0,10" Background="{StaticResource color.sys.layout.mg}">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <WrapPanel Margin="0,12,0,0">
+                                    <Label Content="页面显示:" Style="{StaticResource Label2}" Margin="8,0" />
+                                    <ComboBox
+                                        Width="348"
+                                        Height="30"
+                                        SelectedIndex="0">
+                                        <ComboBoxItem Content="单页" Foreground="{StaticResource color.field.text.act}" />
+                                        <ComboBoxItem Content="单页连续" Foreground="{StaticResource color.field.text.act}" />
+                                        <ComboBoxItem Content="双页" Foreground="{StaticResource color.field.text.act}" />
+                                        <ComboBoxItem Content="双页连续" Foreground="{StaticResource color.field.text.act}" />
+                                        <ComboBoxItem Content="书本" Foreground="{StaticResource color.field.text.act}" />
+                                        <ComboBoxItem Content="书本连续" Foreground="{StaticResource color.field.text.act}" />
+                                    </ComboBox>
+                                </WrapPanel>
+                                <WrapPanel Grid.Row="1" Margin="0,12">
+                                    <Label Content="缩放比例:" Style="{StaticResource Label2}" Margin="8,0" />
+                                    <ComboBox
+                                        Width="348"
+                                        Height="30"
+                                        SelectedIndex="0">
+                                        <ComboBoxItem Content="适应宽度" Foreground="{StaticResource color.field.text.act}" />
+                                        <ComboBoxItem Content="适应页面" Foreground="{StaticResource color.field.text.act}" />
+                                        <ComboBoxItem Content="实际大小" Foreground="{StaticResource color.field.text.act}" />
+                                    </ComboBox>
+                                </WrapPanel>
+                            </Grid>
+                        </Border>
 
                         <Label Content="左侧面板" Style="{StaticResource Label}" />
-                        <StackPanel Margin="0,8" Background="{StaticResource color.sys.layout.mg}">
-                            <Label
-                                Margin="0,8,0,0"
-                                Content="默认显示:"
-                                Style="{StaticResource Label2}" />
-                            <RadioButton
-                                Margin="8"
-                                Content="打开文件时收起"
-                                Style="{DynamicResource RadioButtonStyle1}" />
-                            <RadioButton
-                                Margin="8,0,0,8"
-                                Content="打开APP记住上次选择"
-                                Style="{DynamicResource RadioButtonStyle1}" />
-                            <CheckBox
-                                Margin="8,0,0,10"
-                                Content="有大纲时默认显示大纲列表"
-                                Foreground="{StaticResource color.sys.text.neutral.lv1}" />
-                        </StackPanel>
-                        <Label Content="属性面板" Style="{StaticResource Label}" />
+                        <Border CornerRadius="6" Margin="0,8" Background="{StaticResource color.sys.layout.mg}">
+                            <StackPanel>
+                                <Label
+                                    Margin="8,8,0,0"
+                                    Content="默认显示:"
+                                    Style="{StaticResource Label2}" />
+                                <RadioButton
+                                    Margin="12"
+                                    Content="打开文件时收起"
+                                    Style="{DynamicResource RadioButtonStyle1}" />
+                                <RadioButton
+                                    Margin="12,0,0,8"
+                                    Content="打开APP记住上次选择"
+                                    Style="{DynamicResource RadioButtonStyle1}" />
+                                <CheckBox
+                                    Margin="12,0,0,10"
+                                    Content="有大纲时默认显示大纲列表"
+                                    Foreground="{StaticResource color.sys.text.neutral.lv1}" />
+                            </StackPanel>
+                        </Border>
 
-                        <WrapPanel Margin="0,8,0,18" Background="{StaticResource color.sys.layout.mg}">
-                            <Label
-                                Margin="8,5"
-                                Content="显示方式:"
-                                Style="{StaticResource Label2}" />
-                            <RadioButton Content="自动展开" Style="{DynamicResource RadioButtonStyle1}" />
-                            <RadioButton
-                                Margin="8,5"
-                                Content="手动展开"
-                                Style="{DynamicResource RadioButtonStyle1}" />
-                        </WrapPanel>
+                        <Label Content="属性面板" Style="{StaticResource Label}" />
+                        <Border CornerRadius="6" Margin="0,8,0,18" Background="{StaticResource color.sys.layout.mg}">
+                            <WrapPanel>
+                                <Label
+                                    Margin="8,5"
+                                    Content="显示方式:"
+                                    Style="{StaticResource Label2}" />
+                                <RadioButton Content="自动展开" Style="{DynamicResource RadioButtonStyle1}" />
+                                <RadioButton
+                                    Margin="8,5"
+                                    Content="手动展开"
+                                    Style="{DynamicResource RadioButtonStyle1}" />
+                            </WrapPanel>
+                        </Border>
 
                         <Label Content="页码指示符:" Style="{StaticResource Label}" />
                         <WrapPanel Margin="6,10,6,18">
@@ -445,254 +459,257 @@
                 <ScrollViewer Margin="0,0,0,80" VerticalScrollBarVisibility="Auto">
                     <StackPanel Margin="16,10,10,0">
                         <Label Content="注释默认颜色" Style="{StaticResource Label}" />
-                        <Grid Margin="0,8" Background="{StaticResource color.sys.layout.mg}">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition />
-                                <ColumnDefinition />
-                                <ColumnDefinition />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
+                        <Border CornerRadius="6" Margin="0,8" Background="{StaticResource color.sys.layout.mg}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition Width="150" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
 
-                            <Label Content="highlights:" Style="{StaticResource Label2}" />
-                            <Border
-                                Grid.Column="1"
-                                Width="66"
-                                Margin="10"
-                                BorderBrush="{StaticResource color.field.border.norm}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <StackPanel Margin="5" Orientation="Horizontal">
-                                    <Ellipse
-                                        Width="20"
-                                        Height="20"
-                                        Margin="4,0"
-                                        Fill="#F3465B" />
-                                    <cus:ColorDropBox Margin="4,0" />
-                                </StackPanel>
-                            </Border>
+                                <Label Content="highlights:" Style="{StaticResource Label2}" />
+                                <Border
+                                    Grid.Column="1"
+                                    Width="66"
+                                    Margin="10"
+                                    BorderBrush="{StaticResource color.field.border.norm}"
+                                    BorderThickness="1"
+                                    CornerRadius="4">
+                                    <StackPanel Margin="5" Orientation="Horizontal">
+                                        <Ellipse
+                                            Width="20"
+                                            Height="20"
+                                            Margin="4,0"
+                                            Fill="#F3465B" />
+                                        <cus:ColorDropBox Margin="4,0" />
+                                    </StackPanel>
+                                </Border>
+
+                                <Label
+                                    Grid.Column="2"
+                                    Content="Rectangular borders:"
+                                    Style="{StaticResource Label2}" />
+                                <Border
+                                    Grid.Column="3"
+                                    Width="66"
+                                    Margin="10"
+                                    BorderBrush="{StaticResource color.field.border.norm}"
+                                    BorderThickness="1"
+                                    CornerRadius="4">
+                                    <StackPanel Margin="5" Orientation="Horizontal">
+                                        <Ellipse
+                                            Width="20"
+                                            Height="20"
+                                            Margin="4,0"
+                                            Fill="#F3465B" />
+                                        <cus:ColorDropBox Margin="4,0" />
+                                    </StackPanel>
+                                </Border>
+                                <Label
+                                    Grid.Row="1"
+                                    Content="Strikthrough:"
+                                    Style="{StaticResource Label2}" />
+                                <Border
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    Width="66"
+                                    Margin="10"
+                                    BorderBrush="{StaticResource color.field.border.norm}"
+                                    BorderThickness="1"
+                                    CornerRadius="4">
+                                    <StackPanel Margin="5" Orientation="Horizontal">
+                                        <Ellipse
+                                            Width="20"
+                                            Height="20"
+                                            Margin="4,0"
+                                            Fill="#F3465B" />
+                                        <cus:ColorDropBox Margin="4,0" />
+                                    </StackPanel>
+                                </Border>
+                                <Label
+                                    Grid.Row="1"
+                                    Grid.Column="2"
+                                    Content="Round borders:"
+                                    Style="{StaticResource Label2}" />
+                                <Border
+                                    Grid.Row="1"
+                                    Grid.Column="3"
+                                    Width="66"
+                                    Margin="10"
+                                    BorderBrush="{StaticResource color.field.border.norm}"
+                                    BorderThickness="1"
+                                    CornerRadius="4">
+                                    <StackPanel Margin="5" Orientation="Horizontal">
+                                        <Ellipse
+                                            Width="20"
+                                            Height="20"
+                                            Margin="4,0"
+                                            Fill="#F3465B" />
+                                        <cus:ColorDropBox Margin="4,0" />
+                                    </StackPanel>
+                                </Border>
+                                <Label
+                                    Grid.Row="2"
+                                    Content="Underline:"
+                                    Style="{StaticResource Label2}" />
+                                <Border
+                                    Grid.Row="2"
+                                    Grid.Column="1"
+                                    Width="66"
+                                    Margin="10"
+                                    BorderBrush="{StaticResource color.field.border.norm}"
+                                    BorderThickness="1"
+                                    CornerRadius="4">
+                                    <StackPanel Margin="5" Orientation="Horizontal">
+                                        <Ellipse
+                                            Width="20"
+                                            Height="20"
+                                            Margin="4,0"
+                                            Fill="#F3465B" />
+                                        <cus:ColorDropBox Margin="4,0" />
+                                    </StackPanel>
+                                </Border>
+                                <Label
+                                    Grid.Row="2"
+                                    Grid.Column="2"
+                                    Content="Line segment:"
+                                    Style="{StaticResource Label2}" />
+                                <Border
+                                    Grid.Row="2"
+                                    Grid.Column="3"
+                                    Width="66"
+                                    Margin="10"
+                                    BorderBrush="{StaticResource color.field.border.norm}"
+                                    BorderThickness="1"
+                                    CornerRadius="4">
+                                    <StackPanel Margin="5" Orientation="Horizontal">
+                                        <Ellipse
+                                            Width="20"
+                                            Height="20"
+                                            Margin="4,0"
+                                            Fill="#F3465B" />
+                                        <cus:ColorDropBox Margin="4,0" />
+                                    </StackPanel>
+                                </Border>
+                                <Label
+                                    Grid.Row="3"
+                                    Content="Draw:"
+                                    Style="{StaticResource Label2}" />
+                                <Border
+                                    Grid.Row="3"
+                                    Grid.Column="1"
+                                    Width="66"
+                                    Margin="10"
+                                    BorderBrush="{StaticResource color.field.border.norm}"
+                                    BorderThickness="1"
+                                    CornerRadius="4">
+                                    <StackPanel Margin="5" Orientation="Horizontal">
+                                        <Ellipse
+                                            Width="20"
+                                            Height="20"
+                                            Margin="4,0"
+                                            Fill="#F3465B" />
+                                        <cus:ColorDropBox Margin="4,0" />
+                                    </StackPanel>
+                                </Border>
+                                <Label
+                                    Grid.Row="3"
+                                    Grid.Column="2"
+                                    Content="Rectangular Fill:"
+                                    Style="{StaticResource Label2}" />
+                                <Border
+                                    Grid.Row="3"
+                                    Grid.Column="3"
+                                    Width="66"
+                                    Margin="10"
+                                    BorderBrush="{StaticResource color.field.border.norm}"
+                                    BorderThickness="1"
+                                    CornerRadius="4">
+                                    <StackPanel Margin="5" Orientation="Horizontal">
+                                        <Ellipse
+                                            Width="20"
+                                            Height="20"
+                                            Margin="4,0"
+                                            Fill="#F3465B" />
+                                        <cus:ColorDropBox Margin="4,0" />
+                                    </StackPanel>
+                                </Border>
+                                <Label
+                                    Grid.Row="4"
+                                    Content="Text Notes:"
+                                    Style="{StaticResource Label2}" />
+                                <Border
+                                    Grid.Row="4"
+                                    Grid.Column="1"
+                                    Width="66"
+                                    Margin="10"
+                                    BorderBrush="{StaticResource color.field.border.norm}"
+                                    BorderThickness="1"
+                                    CornerRadius="4">
+                                    <StackPanel Margin="5" Orientation="Horizontal">
+                                        <Ellipse
+                                            Width="20"
+                                            Height="20"
+                                            Margin="4,0"
+                                            Fill="#F3465B" />
+                                        <cus:ColorDropBox Margin="4,0" />
+                                    </StackPanel>
+                                </Border>
+                                <Label
+                                    Grid.Row="4"
+                                    Grid.Column="2"
+                                    Content="Round filling:"
+                                    Style="{StaticResource Label2}" />
+                                <Border
+                                    Grid.Row="4"
+                                    Grid.Column="3"
+                                    Width="66"
+                                    Margin="10"
+                                    BorderBrush="{StaticResource color.field.border.norm}"
+                                    BorderThickness="1"
+                                    CornerRadius="4">
+                                    <StackPanel Margin="5" Orientation="Horizontal">
+                                        <Ellipse
+                                            Width="20"
+                                            Height="20"
+                                            Margin="4,0"
+                                            Fill="#F3465B" />
+                                        <cus:ColorDropBox Margin="4,0" />
+                                    </StackPanel>
+                                </Border>
+                                <Label
+                                    Grid.Row="5"
+                                    Content="Notes:"
+                                    Style="{StaticResource Label2}" />
+                                <Border
+                                    Grid.Row="5"
+                                    Grid.Column="1"
+                                    Width="66"
+                                    Margin="10"
+                                    BorderBrush="{StaticResource color.field.border.norm}"
+                                    BorderThickness="1"
+                                    CornerRadius="4">
+                                    <StackPanel Margin="5" Orientation="Horizontal">
+                                        <Ellipse
+                                            Width="20"
+                                            Height="20"
+                                            Margin="4,0"
+                                            Fill="#F3465B" />
+                                        <cus:ColorDropBox Margin="4,0" />
+                                    </StackPanel>
+                                </Border>
+                            </Grid>
+                        </Border>
 
-                            <Label
-                                Grid.Column="2"
-                                Content="Rectangular borders:"
-                                Style="{StaticResource Label2}" />
-                            <Border
-                                Grid.Column="3"
-                                Width="66"
-                                Margin="10"
-                                BorderBrush="{StaticResource color.field.border.norm}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <StackPanel Margin="5" Orientation="Horizontal">
-                                    <Ellipse
-                                        Width="20"
-                                        Height="20"
-                                        Margin="4,0"
-                                        Fill="#F3465B" />
-                                    <cus:ColorDropBox Margin="4,0" />
-                                </StackPanel>
-                            </Border>
-                            <Label
-                                Grid.Row="1"
-                                Content="Strikthrough:"
-                                Style="{StaticResource Label2}" />
-                            <Border
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Width="66"
-                                Margin="10"
-                                BorderBrush="{StaticResource color.field.border.norm}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <StackPanel Margin="5" Orientation="Horizontal">
-                                    <Ellipse
-                                        Width="20"
-                                        Height="20"
-                                        Margin="4,0"
-                                        Fill="#F3465B" />
-                                    <cus:ColorDropBox Margin="4,0" />
-                                </StackPanel>
-                            </Border>
-                            <Label
-                                Grid.Row="1"
-                                Grid.Column="2"
-                                Content="Round borders:"
-                                Style="{StaticResource Label2}" />
-                            <Border
-                                Grid.Row="1"
-                                Grid.Column="3"
-                                Width="66"
-                                Margin="10"
-                                BorderBrush="{StaticResource color.field.border.norm}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <StackPanel Margin="5" Orientation="Horizontal">
-                                    <Ellipse
-                                        Width="20"
-                                        Height="20"
-                                        Margin="4,0"
-                                        Fill="#F3465B" />
-                                    <cus:ColorDropBox Margin="4,0" />
-                                </StackPanel>
-                            </Border>
-                            <Label
-                                Grid.Row="2"
-                                Content="Underline:"
-                                Style="{StaticResource Label2}" />
-                            <Border
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                Width="66"
-                                Margin="10"
-                                BorderBrush="{StaticResource color.field.border.norm}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <StackPanel Margin="5" Orientation="Horizontal">
-                                    <Ellipse
-                                        Width="20"
-                                        Height="20"
-                                        Margin="4,0"
-                                        Fill="#F3465B" />
-                                    <cus:ColorDropBox Margin="4,0" />
-                                </StackPanel>
-                            </Border>
-                            <Label
-                                Grid.Row="2"
-                                Grid.Column="2"
-                                Content="Line segment:"
-                                Style="{StaticResource Label2}" />
-                            <Border
-                                Grid.Row="2"
-                                Grid.Column="3"
-                                Width="66"
-                                Margin="10"
-                                BorderBrush="{StaticResource color.field.border.norm}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <StackPanel Margin="5" Orientation="Horizontal">
-                                    <Ellipse
-                                        Width="20"
-                                        Height="20"
-                                        Margin="4,0"
-                                        Fill="#F3465B" />
-                                    <cus:ColorDropBox Margin="4,0" />
-                                </StackPanel>
-                            </Border>
-                            <Label
-                                Grid.Row="3"
-                                Content="Draw:"
-                                Style="{StaticResource Label2}" />
-                            <Border
-                                Grid.Row="3"
-                                Grid.Column="1"
-                                Width="66"
-                                Margin="10"
-                                BorderBrush="{StaticResource color.field.border.norm}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <StackPanel Margin="5" Orientation="Horizontal">
-                                    <Ellipse
-                                        Width="20"
-                                        Height="20"
-                                        Margin="4,0"
-                                        Fill="#F3465B" />
-                                    <cus:ColorDropBox Margin="4,0" />
-                                </StackPanel>
-                            </Border>
-                            <Label
-                                Grid.Row="3"
-                                Grid.Column="2"
-                                Content="Rectangular Fill:"
-                                Style="{StaticResource Label2}" />
-                            <Border
-                                Grid.Row="3"
-                                Grid.Column="3"
-                                Width="66"
-                                Margin="10"
-                                BorderBrush="{StaticResource color.field.border.norm}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <StackPanel Margin="5" Orientation="Horizontal">
-                                    <Ellipse
-                                        Width="20"
-                                        Height="20"
-                                        Margin="4,0"
-                                        Fill="#F3465B" />
-                                    <cus:ColorDropBox Margin="4,0" />
-                                </StackPanel>
-                            </Border>
-                            <Label
-                                Grid.Row="4"
-                                Content="Text Notes:"
-                                Style="{StaticResource Label2}" />
-                            <Border
-                                Grid.Row="4"
-                                Grid.Column="1"
-                                Width="66"
-                                Margin="10"
-                                BorderBrush="{StaticResource color.field.border.norm}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <StackPanel Margin="5" Orientation="Horizontal">
-                                    <Ellipse
-                                        Width="20"
-                                        Height="20"
-                                        Margin="4,0"
-                                        Fill="#F3465B" />
-                                    <cus:ColorDropBox Margin="4,0" />
-                                </StackPanel>
-                            </Border>
-                            <Label
-                                Grid.Row="4"
-                                Grid.Column="2"
-                                Content="Round filling:"
-                                Style="{StaticResource Label2}" />
-                            <Border
-                                Grid.Row="4"
-                                Grid.Column="3"
-                                Width="66"
-                                Margin="10"
-                                BorderBrush="{StaticResource color.field.border.norm}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <StackPanel Margin="5" Orientation="Horizontal">
-                                    <Ellipse
-                                        Width="20"
-                                        Height="20"
-                                        Margin="4,0"
-                                        Fill="#F3465B" />
-                                    <cus:ColorDropBox Margin="4,0" />
-                                </StackPanel>
-                            </Border>
-                            <Label
-                                Grid.Row="5"
-                                Content="Notes:"
-                                Style="{StaticResource Label2}" />
-                            <Border
-                                Grid.Row="5"
-                                Grid.Column="1"
-                                Width="66"
-                                Margin="10"
-                                BorderBrush="{StaticResource color.field.border.norm}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <StackPanel Margin="5" Orientation="Horizontal">
-                                    <Ellipse
-                                        Width="20"
-                                        Height="20"
-                                        Margin="4,0"
-                                        Fill="#F3465B" />
-                                    <cus:ColorDropBox Margin="4,0" />
-                                </StackPanel>
-                            </Border>
-                        </Grid>
                         <Label Content="注释默认字体" Style="{StaticResource Label}" />
                         <WrapPanel Margin="0,10">
                             <WrapPanel>
@@ -805,6 +822,7 @@
                 VerticalAlignment="Center"
                 FontFamily="Segoe UI"
                 FontSize="16"
+                FontWeight="Bold"
                 Foreground="{StaticResource color.sys.text.neutral.lv1}"
                 Text="Preferences" />
             <StackPanel

+ 266 - 0
PDF Office/Views/Dialog/PropertiesDialog.xaml

@@ -0,0 +1,266 @@
+<Window
+    x:Class="PDF_Office.Views.Dialog.PropertiesDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cus="clr-namespace:PDF_Office.CustomControl"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dataconvert="clr-namespace:PDF_Office.DataConvert"
+    xmlns:dialog="clr-namespace:PDF_Office.ViewModels.Dialog"
+    xmlns:local="clr-namespace:PDF_Office.Views.Dialog"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:prism="http://prismlibrary.com/"
+    Width="457"
+    Height="674"
+    prism:ViewModelLocator.AutoWireViewModel="True"
+    Style="{StaticResource WindowStyle}"
+    ResizeMode="CanMinimize"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <Window.Resources>
+        <ResourceDictionary>
+            <dataconvert:UnVisivleConvert x:Key="UnvisibleConvert" />
+            <Style x:Key="Label" TargetType="Label">
+                <Setter Property="Foreground" Value="{StaticResource color.sys.text.neutral.lv2}" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontWeight" Value="Bold" />
+            </Style>
+            <Style x:Key="Label2" TargetType="Label">
+                <Setter Property="Foreground" Value="{StaticResource color.sys.text.neutral.lv2}" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="FontSize" Value="14" />
+                <Setter Property="Margin" Value="8,8,8,0" />
+            </Style>
+            <Style x:Key="TextBlock" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="{StaticResource color.sys.text.neutral.lv1}" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="FontSize" Value="14" />
+                <Setter Property="Margin" Value="8,8,8,0" />
+            </Style>
+        </ResourceDictionary>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <TextBlock
+            Width="550"
+            Margin="16,6"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            FontFamily="Segoe UI"
+            FontSize="16"
+            FontWeight="Bold"
+            Foreground="{StaticResource color.sys.text.neutral.lv1}"
+            Text="Preferences" />
+        <StackPanel
+            Name="StkPnlRight"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal"
+            WindowChrome.IsHitTestVisibleInChrome="True">
+
+            <Button
+                Name="BtnClose"
+                Width="40"
+                Height="40"
+                Background="Transparent"
+                BorderThickness="0"
+                Click="BtnClose_Click"
+                Style="{StaticResource CloseBtn}">
+                <Polygon Fill="{StaticResource color.btn.sec.text.def}" Points="11.2919922 12 12 11.2919922 6.70800781 6 12 0.708007813 11.2919922 0 6 5.29199219 0.708007812 9.76996262e-15 -2.27456942e-13 0.708007813 5.29199219 6 0 11.2919922 0.708007812 12 6 6.70800781" />
+            </Button>
+        </StackPanel>
+        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
+            <StackPanel Margin="16,6">
+                <Label Content="Abstract" Style="{StaticResource Label}" />
+                <Border
+                    Margin="0,10"
+                    Background="{StaticResource color.sys.layout.mg}"
+                    CornerRadius="6">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="125" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Label Content="Name" Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Column="1"
+                            Style="{StaticResource TextBlock}"
+                            Text="PDF Office Quick Guide.pdf" />
+                        <Label
+                            Grid.Row="1"
+                            Content="Size"
+                            Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Style="{StaticResource TextBlock}"
+                            Text="168.9kb" />
+                        <Label
+                            Grid.Row="2"
+                            Content="Title"
+                            Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Style="{StaticResource TextBlock}"
+                            Text="" />
+                        <Label
+                            Grid.Row="3"
+                            Content="Author"
+                            Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Style="{StaticResource TextBlock}"
+                            Text="" />
+                        <Label
+                            Grid.Row="4"
+                            Margin="8"
+                            Content="Location"
+                            Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Margin="8"
+                            Foreground="{StaticResource color.btn.link.text.norm}"
+                            Style="{StaticResource TextBlock}"
+                            Text="C/User/Desktop/pdfoffice/PDF Office Quick Guide.pdf" />
+                    </Grid>
+                </Border>
+                <Label Content="Create Message" Style="{StaticResource Label}" />
+                <Border
+                    Margin="0,10"
+                    Background="{StaticResource color.sys.layout.mg}"
+                    CornerRadius="6">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="125" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Label Content="Versions" Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Column="1"
+                            Style="{StaticResource TextBlock}"
+                            Text="1.0" />
+                        <Label
+                            Grid.Row="1"
+                            Content="Page"
+                            Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Style="{StaticResource TextBlock}"
+                            Text="1" />
+                        <Label
+                            Grid.Row="2"
+                            Content="Creator"
+                            Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Style="{StaticResource TextBlock}"
+                            Text="PDF Office" />
+                        <Label
+                            Grid.Row="3"
+                            Content="Producer"
+                            Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Style="{StaticResource TextBlock}"
+                            Text="Windows Version 11" />
+                        <Label
+                            Grid.Row="4"
+                            Content="Creation Date"
+                            Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Row="4"
+                            Grid.Column="1"
+                            Style="{StaticResource TextBlock}"
+                            Text="" />
+                        <Label
+                            Grid.Row="5"
+                            Margin="8"
+                            Content="Modify date"
+                            Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            Margin="8"
+                            Style="{StaticResource TextBlock}"
+                            Text="" />
+                    </Grid>
+                </Border>
+                <Label Content="Permissions" Style="{StaticResource Label}" />
+                <Border
+                    Margin="0,10"
+                    Background="{StaticResource color.sys.layout.mg}"
+                    CornerRadius="6">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="125" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Label Content="Encrypted" Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Column="1"
+                            Style="{StaticResource TextBlock}"
+                            Text="No" />
+                        <Label
+                            Grid.Row="1"
+                            Content="Unlocked"
+                            Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Style="{StaticResource TextBlock}"
+                            Text="Yes" />
+                        <Label
+                            Grid.Row="2"
+                            Content="Allow Copying"
+                            Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Style="{StaticResource TextBlock}"
+                            Text="Yes" />
+                        <Label
+                            Grid.Row="3"
+                            Margin="8"
+                            Content="Allow printing"
+                            Style="{StaticResource Label2}" />
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Margin="8"
+                            Style="{StaticResource TextBlock}"
+                            Text="Yes" />
+                    </Grid>
+                </Border>
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
+</Window>

+ 48 - 0
PDF Office/Views/Dialog/PropertiesDialog.xaml.cs

@@ -0,0 +1,48 @@
+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.Shapes;
+
+namespace PDF_Office.Views.Dialog
+{
+/// <summary>
+    /// PropertiesDialog.xaml 的交互逻辑
+/// </summary>
+public partial class PropertiesDialog : Window
+{
+public PropertiesDialog()
+{
+InitializeComponent();
+}
+private void BtnMiniSize_Click(object sender, RoutedEventArgs e)
+{
+System.Windows.SystemCommands.MinimizeWindow(this);
+}
+
+private void BtnClose_Click(object sender, RoutedEventArgs e)
+{
+System.Windows.SystemCommands.CloseWindow(this);
+}
+
+private void BtnReStore_Click(object sender, RoutedEventArgs e)
+{
+if (this.WindowState == WindowState.Maximized)
+{
+System.Windows.SystemCommands.RestoreWindow(this);
+}
+else
+{
+System.Windows.SystemCommands.MaximizeWindow(this);
+}
+}
+}
+}

+ 1 - 1
PDF Office/Views/ViewContent.xaml

@@ -88,7 +88,7 @@
                             <MenuItem Header="Remove Security" />
                             <Separator Margin="8,0" Style="{StaticResource HorizontalSeparatorStyle}" />
                             <MenuItem Header="Show in Folder" />
-                            <MenuItem Header="Properties" />
+                            <MenuItem Header="Properties"  Click="MenuItem_Click" />
                             <Separator Margin="8,0" Style="{StaticResource HorizontalSeparatorStyle}" />
                             <MenuItem Header="Share" />
                             <MenuItem Header="Print" />

+ 6 - 0
PDF Office/Views/ViewContent.xaml.cs

@@ -4,6 +4,7 @@ using PDF_Office.EventAggregators;
 using PDF_Office.Model;
 using PDF_Office.ViewModels;
 using PDF_Office.ViewModels.Tools;
+using PDF_Office.Views.Dialog;
 using PDF_Office.Views.PropertyPanel.ViewModular;
 using PDF_Office.Views.Tools;
 using Prism.Events;
@@ -133,5 +134,10 @@ namespace PDF_Office.Views
             FileMenu.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom;
             FileMenu.IsOpen = true;
         }
+
+        private void MenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            new PropertiesDialog().Show();
+        }
     }
 }