compdfkit(windows) - 中文注释

Demo/Examples/Annotations/MainWindow.xaml

@@ -24,19 +24,16 @@
                 <RowDefinition Height="40"></RowDefinition>
                 <RowDefinition Height="*"></RowDefinition>
             </Grid.RowDefinitions>
-
-            <!--顶部工具栏-->
+ 
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="auto"></ColumnDefinition>
                     <ColumnDefinition Width="*"></ColumnDefinition>
                     <ColumnDefinition Width="auto"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
-
-                <!--左侧工具栏-->
+ 
                 <StackPanel Orientation="Horizontal" Height="40" Margin="20,0,0,0">
-
-                    <!--打开文件-->
+ 
                     <Button BorderThickness="0" VerticalContentAlignment="Center" Width="30" Height="30" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="OpenFile_Click">
                         <Button.Content>
                             <Viewbox Width="20" Height="20">
@@ -65,8 +62,7 @@
                             <ToolTip Content="Open..."></ToolTip>
                         </Button.ToolTip>
                     </Button>
-
-                    <!--保存文件-->
+ 
                     <Button BorderThickness="0" VerticalContentAlignment="Center" Margin="10,0,0,0" Width="30" Height="30" Style="{StaticResource LightButtonStyle}" Background="Transparent"  
                             Click="SaveFileBtn_Click"  IsEnabled="{Binding CanSave,Mode=OneWay}">
                         <Button.Content>
@@ -83,8 +79,7 @@
                             <ToolTip Content="Save"></ToolTip>
                         </Button.ToolTip>
                     </Button>
-
-                    <!--工具栏展开收缩-->
+ 
                     <ToggleButton Name="ToolExpandBtn" Margin="13,0,0,0" BorderThickness="0" Width="30" Height="30" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="ToolExpand_Click">
                         <ToggleButton.Content>
                             <Path Fill="#43474D" Width="30" Height="30">
@@ -99,8 +94,7 @@
                     </ToggleButton>
 
                     <Line Margin="13,0,13,0" Stroke="#E0E0E0" X1="0" Y1="5" X2="0" Y2="35"></Line>
-
-                    <!--抓手工具-->
+ 
                     <ToggleButton BorderThickness="0" Width="30" Height="30" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" IsChecked="True" IsEnabled="False" Visibility="Collapsed">
                         <ToggleButton.Content>
                             <Path Fill="#43474D">
@@ -125,17 +119,14 @@
 
                     <cpdftools:CPDFScalingControl x:Name="CPDFSaclingControl"></cpdftools:CPDFScalingControl>
                 </StackPanel>
-
-                <!--中间工具栏-->
+ 
                 <ComboBox Style="{StaticResource ComboBoxStyle1}" Width="120" Height="26" Grid.Column="1" HorizontalAlignment="Center" FontSize="14" Foreground="#001A4E" SelectionChanged="ComboBox_SelectionChanged">
                     <ComboBoxItem IsSelected="True" Tag="Viewer">Viewer</ComboBoxItem>
                     <ComboBoxItem IsSelected="True" Tag="Annotation">Annotation</ComboBoxItem>
                 </ComboBox>
-
-                <!--右侧工具栏-->
+ 
                 <StackPanel Orientation="Horizontal" Grid.Column="2">
-
-                    <!--搜索按钮-->
+ 
                     <Button BorderThickness="0" Width="40" Height="40" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="ExpandSearchBtn_Click">
                         <Button.Content>
                             <Path Fill="#43474D">
@@ -165,8 +156,7 @@
                             <ToolTip Content="Properties"></ToolTip>
                         </ToggleButton.ToolTip>
                     </ToggleButton>
-
-                    <!--页面显示-->
+ 
                     <ToggleButton Name="ViewSettingBtn" BorderThickness="0" Width="40" Height="40" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="ViewSettingBtn_Click">
                         <ToggleButton.Content>
                             <Path Stroke="#43474D" VerticalAlignment="Center" StrokeThickness="2">
@@ -186,8 +176,7 @@
                             <ToolTip Content="Page Display"></ToolTip>
                         </ToggleButton.ToolTip>
                     </ToggleButton>
-
-                    <!--页面信息-->
+ 
                     <Button BorderThickness="0" Width="40" Height="40" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="PageInfoBtn_Click">
                         <Button.Content>
                             <Path Fill="#43474D" VerticalAlignment="Center">
@@ -213,8 +202,7 @@
                  <Grid.RowDefinitions>
                     <RowDefinition Height="auto"/>
                     <RowDefinition Height="*"/>
-                </Grid.RowDefinitions>
-                                <!--工具栏展开-->
+                </Grid.RowDefinitions> 
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="0"></ColumnDefinition>
                     <ColumnDefinition Width="0"></ColumnDefinition>
@@ -225,8 +213,7 @@
                 <Border x:Name="ToolBarContainer" Height="45" Visibility="Visible"  BorderThickness="1" BorderBrush="#1A000000" Background="#F2F3F5" Grid.ColumnSpan="4">
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                         <cpdftools:CPDFAnnotationBarControl x:Name="AnnotationBarControl" Loaded="AnnotationBarControl_Loaded" Unloaded="AnnotationBarControl_Unloaded" Height="44"/>
-                        <Line Height="40" Stroke="#D5D6D8" StrokeThickness="2" X1="0" Y1="10" X2="0" Y2="30" Margin="8,0,8,0" />
-                        <!--Undo Button-->
+                        <Line Height="40" Stroke="#D5D6D8" StrokeThickness="2" X1="0" Y1="10" X2="0" Y2="30" Margin="8,0,8,0" /> 
                         <Button Name="UndoBtn" Style="{StaticResource LightButtonStyle}" BorderThickness="0"  Width="40" Height="40" IsEnabled="{Binding CanUndo,Mode=OneWay}"  Click="UndoButton_Click"
                                     Background="Transparent">
                             <Path x:Name="UndoPath" IsEnabled="{Binding CanUndo,Mode=OneWay}">
@@ -251,8 +238,7 @@
                             <Button.ToolTip>
                                 <ToolTip Content="Undo"></ToolTip>
                             </Button.ToolTip>
-                        </Button>
-                        <!--Redo Button-->
+                        </Button> 
                         <Button Style="{StaticResource LightButtonStyle}" BorderThickness="0" Width="40" Height="40" Margin="10,0,0,0"  IsEnabled="{Binding CanRedo,Mode=OneWay}" Click="RedoButton_Click"
                                     Background="Transparent">
                             <Path IsEnabled="{Binding CanRedo,Mode=OneWay}">
@@ -281,8 +267,7 @@
                     </StackPanel>
                 </Border>
                    
-                <cpdftools:CPDFBOTABarControl Grid.Row="1" Visibility="Collapsed" Name="BotaSideTool"/>
-                <!--拖动调节控件大小-->
+                <cpdftools:CPDFBOTABarControl Grid.Row="1" Visibility="Collapsed" Name="BotaSideTool"/> 
                 <GridSplitter  Grid.Row="1" Name="Splitter" Grid.Column="1" Width="15" ResizeBehavior="PreviousAndNext" Visibility="Collapsed">
                     <GridSplitter.Template>
                         <ControlTemplate TargetType="{x:Type GridSplitter}">
@@ -310,14 +295,11 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition></ColumnDefinition>
                             <ColumnDefinition Width="auto"></ColumnDefinition>
-                        </Grid.ColumnDefinitions>
-                        <!--PDFViewer-->
-                        <Border x:Name="PDFGrid" Background="#CECECE"></Border>
-                        <!--右侧面板-->
+                        </Grid.ColumnDefinitions> 
+                        <Border x:Name="PDFGrid" Background="#CECECE"></Border> 
                         <Border Grid.Column="1" Grid.RowSpan="2" Name="PropertyContainer" Visibility="Collapsed"></Border>
                     </Grid>
-
-                    <!--页码工具-->
+ 
                     <cpdfcommon:PageNumberControl Grid.Row="1" Name="FloatPageTool" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,20"></cpdfcommon:PageNumberControl>
                 </Grid>
             </Grid>
@@ -325,8 +307,7 @@
 
         <Border Name="PopupBorder" Background="#A0000000" Visibility="Collapsed">
             <Grid>
-
-                <!--文件信息-->
+ 
                 <Grid Name="FileInfoUI"  Width="422" Height="680" HorizontalAlignment="Center" VerticalAlignment="Center" Background="White" Visibility="Collapsed">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"></ColumnDefinition>
@@ -349,8 +330,7 @@
                     </Button>
                     <cpdftools:CPDFInfoControl Grid.Row="1" Margin="25,10,25,0" Grid.ColumnSpan="2" Name="FileInfoControl"></cpdftools:CPDFInfoControl>
                 </Grid>
-
-                <!--密码验证-->
+ 
                 <cpdfcommon:PasswordDialog x:Name="PasswordUI" Visibility="Collapsed"></cpdfcommon:PasswordDialog>
             </Grid>
 

Demo/Examples/ContentEditor/MainWindow.xaml

@@ -23,8 +23,7 @@
                 <RowDefinition Height="40"></RowDefinition>
                 <RowDefinition Height="*"></RowDefinition>
             </Grid.RowDefinitions>
-
-            <!--顶部工具栏-->
+ 
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="auto"></ColumnDefinition>
@@ -32,11 +31,9 @@
                     <ColumnDefinition Width="auto"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
 
-                <Border Height="1" Background="LightGray" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
-                <!--左侧工具栏-->
+                <Border Height="1" Background="LightGray" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/> 
                 <StackPanel Orientation="Horizontal" Height="40" Margin="20,0,0,0">
-
-                    <!--打开文件-->
+ 
                     <Button BorderThickness="0" VerticalContentAlignment="Center" Width="30" Height="30" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="OpenFile_Click">
                         <Button.Content>
                             <Viewbox Width="20" Height="20">
@@ -65,8 +62,7 @@
                             <ToolTip Content="Open..."></ToolTip>
                         </Button.ToolTip>
                     </Button>
-
-                    <!--保存文件-->
+ 
                     <Button BorderThickness="0" VerticalContentAlignment="Center" Margin="10,0,0,0" Width="30" Height="30" Style="{StaticResource LightButtonStyle}" Background="Transparent" 
                             Click="SaveFileBtn_Click" IsEnabled="{Binding CanSave,Mode=OneWay}">
                         <Button.Content>
@@ -95,8 +91,7 @@
                             <ToolTip Content="Save"></ToolTip>
                         </Button.ToolTip>
                     </Button>
-
-                    <!--工具栏展开收缩-->
+ 
                     <ToggleButton Name="ToolExpandBtn" Margin="13,0,0,0" BorderThickness="0" Width="30" Height="30" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="ToolExpand_Click">
                         <ToggleButton.Content>
                             <Path Fill="#43474D" Width="30" Height="30">
@@ -111,8 +106,7 @@
                     </ToggleButton>
 
                     <Line Margin="13,0,13,0" Stroke="#E0E0E0" X1="0" Y1="5" X2="0" Y2="35"></Line>
-
-                    <!--抓手工具-->
+ 
                     <ToggleButton BorderThickness="0" Width="30" Height="30" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" IsChecked="True" IsEnabled="False" Visibility="Collapsed">
                         <ToggleButton.Content>
                             <Path Fill="#43474D">
@@ -138,18 +132,15 @@
                     <cpdftools:CPDFScalingControl x:Name="CPDFSaclingControl"></cpdftools:CPDFScalingControl>
 
                 </StackPanel>
-
-                <!--中间工具栏-->
+ 
                 <ComboBox Name="ViewComboBox" Width="120" Height="26" Grid.Column="1" HorizontalAlignment="Center" FontSize="14" Foreground="#001A4E" SelectionChanged="ComboBox_SelectionChanged"
                          Style="{StaticResource ComboBoxStyle1}" >
                     <ComboBoxItem>Viewer</ComboBoxItem>
                     <ComboBoxItem IsSelected="True">PDF Edit</ComboBoxItem>
                 </ComboBox>
-
-                <!--右侧工具栏-->
+ 
                 <StackPanel Orientation="Horizontal" Grid.Column="2">
-
-                    <!--搜索按钮-->
+ 
                     <Button BorderThickness="0" Width="40" Height="40" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="ExpandSearchBtn_Click" Focusable="False">
                         <Button.Content>
                             <Path Fill="#43474D">
@@ -166,8 +157,7 @@
                             <ToolTip Content="Search"></ToolTip>
                         </Button.ToolTip>
                     </Button>
-
-                    <!--右侧工具栏展开收缩-->
+ 
                     <ToggleButton Name="RightPanelBtn" BorderThickness="0" Width="40" Height="40" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="RightPanelBtn_Click">
                         <ToggleButton.Content>
                             <Path Fill="#43474D" Width="30" Height="30">
@@ -180,8 +170,7 @@
                             <ToolTip Content="Properties"></ToolTip>
                         </ToggleButton.ToolTip>
                     </ToggleButton>
-                    
-                    <!--页面显示-->
+                     
                     <ToggleButton  Name="ViewSettingBtn" BorderThickness="0" Width="40" Height="40" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="ViewSettingBtn_Click">
                         <ToggleButton.Content>
                             <Path Stroke="#43474D" VerticalAlignment="Center" StrokeThickness="2">
@@ -201,8 +190,7 @@
                             <ToolTip Content="Page Display"></ToolTip>
                         </ToggleButton.ToolTip>
                     </ToggleButton>
-
-                    <!--页面信息-->
+ 
                     <Button BorderThickness="0" Width="40" Height="40" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="PageInfoBtn_Click">
                         <Button.Content>
                             <Path Fill="#43474D" VerticalAlignment="Center">
@@ -238,8 +226,7 @@
 
                 <Border Grid.ColumnSpan="5" Name="PDFEditTool" Background="#F2F3F5">
                     <StackPanel  Orientation="Horizontal" HorizontalAlignment="Center">
-
-                        <!--文字编辑按钮-->
+ 
                         <ToggleButton Style="{StaticResource ToggleButtonStyle}" Name="PDFTextEditButton" BorderThickness="0" Padding="10,5,10,5" Click="PDFTextEditButton_Click" Width="99" Height="40">
                             <StackPanel Orientation="Horizontal">
                                 <Path Fill="#273C62" VerticalAlignment="Center">
@@ -254,8 +241,7 @@
                                 <ToolTip Content="Text"></ToolTip>
                             </ToggleButton.ToolTip>
                         </ToggleButton>
-
-                        <!--图片编辑按钮-->
+ 
                         <ToggleButton Style="{StaticResource ToggleButtonStyle}" Name="PDFImageEditButton" BorderThickness="0" Padding="10,5,10,5" Margin="10,0,0,0" Click="PDFImageEditButton_Click">
                             <StackPanel Orientation="Horizontal">
                                 <Path Fill="#273C62" VerticalAlignment="Center">
@@ -273,8 +259,7 @@
                         </ToggleButton>
 
                         <Line Height="40" Stroke="#D5D6D8" StrokeThickness="2" X1="0" Y1="10" X2="0" Y2="30" Margin="8,0,8,0" />
-
-                        <!--撤销-->
+ 
                         <Button Name="UndoBtn" Style="{StaticResource LightButtonStyle}" BorderThickness="0"  Width="40" Height="40" IsEnabled="{Binding CanUndo,Mode=OneWay}" Click="UndoBtn_Click"
                                     Background="Transparent">
                             <Path x:Name="UndoPath" IsEnabled="{Binding CanUndo,Mode=OneWay}">
@@ -299,8 +284,7 @@
                             <Button.ToolTip>
                                 <ToolTip Content="Undo"></ToolTip>
                             </Button.ToolTip>
-                        </Button>
-                        <!--重做-->
+                        </Button> 
                         <Button Style="{StaticResource LightButtonStyle}" BorderThickness="0" Width="40" Height="40" Margin="10,0,0,0"  IsEnabled="{Binding CanRedo,Mode=OneWay}" Click="RedoBtn_Click"
                                     Background="Transparent">
                             <Path IsEnabled="{Binding CanRedo,Mode=OneWay}">
@@ -327,12 +311,10 @@
                             </Button.ToolTip>
                         </Button>
                     </StackPanel>
-                </Border>
-                <!--工具栏展开-->
+                </Border> 
 
                 <cpdftools:CPDFBOTABarControl Grid.Row="1" Visibility="Collapsed" Name="BotaSideTool"></cpdftools:CPDFBOTABarControl>
-
-                <!--拖动调节控件大小-->
+ 
                 <GridSplitter Grid.Row="1" Name="Splitter" Grid.Column="1" Width="15" ResizeBehavior="PreviousAndNext" Visibility="Collapsed">
                     <GridSplitter.Template>
                         <ControlTemplate TargetType="{x:Type GridSplitter}">
@@ -354,24 +336,19 @@
                         <RowDefinition Height="auto"></RowDefinition>
                         <RowDefinition Height="*"></RowDefinition>
                     </Grid.RowDefinitions>
-
-
-                    <!--PDFViewer-->
+ 
                     <Border Grid.Row="1" x:Name="PDFGrid" Background="#CECECE"></Border>
-
-                    <!--页码工具-->
+ 
                     <cpdfcommon:PageNumberControl Grid.Row="1" Name="FloatPageTool" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,20"></cpdfcommon:PageNumberControl>
                 </Grid>
-
-                <!--右侧面板-->
+ 
                 <Border Grid.Row="1" Name="PropertyContainer" Grid.Column="3" Visibility="Hidden"></Border>
             </Grid>
         </Grid>
 
         <Border Name="PopupBorder" Background="#A0000000" Visibility="Collapsed">
             <Grid>
-
-                <!--文件信息-->
+ 
                 <Grid Name="FileInfoUI"  Width="422" Height="680" HorizontalAlignment="Center" VerticalAlignment="Center" Background="White" Visibility="Collapsed">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"></ColumnDefinition>
@@ -394,8 +371,7 @@
                     </Button>
                     <cpdftools:CPDFInfoControl Grid.Row="1" Margin="25,10,25,0" Grid.ColumnSpan="2" Name="FileInfoControl"></cpdftools:CPDFInfoControl>
                 </Grid>
-
-                <!--密码验证-->
+ 
                 <cpdfcommon:PasswordDialog x:Name="PasswordUI" Visibility="Collapsed"></cpdfcommon:PasswordDialog>
             </Grid>
 

Demo/Examples/DocsEditor/MainWindow.xaml

@@ -32,8 +32,7 @@
                 <Border Height="1" Background="LightGray" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
                 <Grid>
                     <StackPanel Orientation="Horizontal" Margin="20,0,0,0">
-
-                        <!--打开文件-->
+ 
                         <Button BorderThickness="0" VerticalContentAlignment="Center" Width="30" Height="30" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="OpenFile_Click">
                             <Button.Content>
                                 <Viewbox Width="20" Height="20">
@@ -62,8 +61,7 @@
                                 <ToolTip Content="Open..."></ToolTip>
                             </Button.ToolTip>
                         </Button>
-
-                        <!--保存文件-->
+ 
                         <Button BorderThickness="0" VerticalContentAlignment="Center" Margin="10,0,0,0" Width="30" Height="30" Style="{StaticResource LightButtonStyle}" Background="Transparent" 
                             Click="SaveFileBtn_Click" IsEnabled="{Binding CanSave,Mode=OneWay}">
                             <Button.Content>
@@ -92,8 +90,7 @@
                                 <ToolTip Content="Save"></ToolTip>
                             </Button.ToolTip>
                         </Button>
-
-                        <!--工具栏展开收缩-->
+ 
                         <ToggleButton Name="LeftToolPanelButton" Margin="13,0,0,0" BorderThickness="0" Width="30" Height="30" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="LeftToolPanelButton_Click">
                             <ToggleButton.Content>
                                 <Path Fill="#43474D" Width="30" Height="30">
@@ -113,17 +110,14 @@
 
                     </StackPanel>
                 </Grid>
-
-                <!--中间工具栏-->
+ 
                 <ComboBox Name="ViewComboBox" Width="120" Height="26" Grid.Column="1" HorizontalAlignment="Center" FontSize="14" Foreground="#001A4E"
                          Style="{StaticResource ComboBoxStyle1}" SelectionChanged="ViewComboBox_SelectionChanged">
                     <ComboBoxItem>Viewer</ComboBoxItem>
                     <ComboBoxItem  IsSelected="True">Page Edit</ComboBoxItem>
-                </ComboBox>
-                <!--右侧工具栏-->
+                </ComboBox> 
                 <StackPanel Orientation="Horizontal" Grid.Column="2">
-
-                    <!--搜索按钮-->
+ 
                     <Button x:Name="SearchButton" BorderThickness="0" Width="40" Height="40" Style="{StaticResource LightButtonStyle}" Background="Transparent" Focusable="False" Click="ExpandSearchBtn_Click">
                         <Button.Content>
                             <Path Fill="#43474D">
@@ -140,8 +134,7 @@
                             <ToolTip Content="Search"></ToolTip>
                         </Button.ToolTip>
                     </Button>
-
-                    <!--右侧工具栏展开收缩-->
+ 
                     <ToggleButton BorderThickness="0" Width="40" Height="40" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Visibility="Collapsed">
                         <ToggleButton.Content>
                             <Path Fill="#43474D" Width="30" Height="30">
@@ -164,8 +157,7 @@
                             <ToolTip Content="Properties"></ToolTip>
                         </ToggleButton.ToolTip>
                     </ToggleButton>
-
-                    <!--页面显示-->
+ 
                     <ToggleButton  Name="ViewSettingBtn" BorderThickness="0" Width="40" Height="40" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="ViewSettingBtn_Click">
                         <ToggleButton.Content>
                             <Path Stroke="#43474D" VerticalAlignment="Center" StrokeThickness="2">
@@ -185,8 +177,7 @@
                             <ToolTip Content="Page Display"></ToolTip>
                         </ToggleButton.ToolTip>
                     </ToggleButton>
-
-                    <!--页面信息-->
+ 
                     <Button BorderThickness="0" Width="40" Height="40" Style="{StaticResource LightButtonStyle}" Background="Transparent"  Click="PageInfoBtn_Click">
                         <Button.Content>
                             <Path Fill="#43474D" VerticalAlignment="Center">
@@ -217,12 +208,9 @@
                     <RowDefinition Height="auto"/>
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
-
-
-                <!--工具栏展开-->
+ 
                 <cpdftools:CPDFBOTABarControl Grid.Row="1" Visibility="Collapsed" Name="BotaSideTool"/>
-
-                <!--拖动调节控件大小-->
+ 
                 <GridSplitter Name="Splitter" Grid.Row="1" Grid.Column="1" Width="15" ResizeBehavior="PreviousAndNext" Visibility="Collapsed">
                     <GridSplitter.Template>
                         <ControlTemplate TargetType="{x:Type GridSplitter}">
@@ -243,18 +231,15 @@
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"></RowDefinition>
                         <RowDefinition Height="*"></RowDefinition>
-                    </Grid.RowDefinitions>
-                    <!--PDFViewer-->
+                    </Grid.RowDefinitions> 
                     <Border Grid.Row="1" x:Name="PDFGrid" Background="#CECECE" Grid.ColumnSpan="2"></Border>
                     <Border x:Name="ToolBarContainer" Height="45" Visibility="Collapsed"  BorderThickness="1" BorderBrush="#1A000000" Background="#F2F3F5" Grid.ColumnSpan="2">
                         <cpdftools:CPDFPageEditBarControl x:Name="CPDFPageEditBarControl" Grid.ColumnSpan="4" Height="44"/>
                     </Border>
-
-                    <!--页码工具-->
+ 
                     <cpdfcommon:PageNumberControl Grid.Row="1" Name="FloatPageTool" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,20" Grid.Column="1"></cpdfcommon:PageNumberControl>
                     <Border Name="PopupBorder" Background="#A0000000" Visibility="Collapsed"  Grid.Row="1">
-                        <Grid>
-                            <!--文件信息-->
+                        <Grid> 
                             <Grid Name="FileInfoUI"  Width="422" Height="680" HorizontalAlignment="Center" VerticalAlignment="Center" Background="White" Visibility="Collapsed">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*"></ColumnDefinition>
@@ -276,16 +261,13 @@
                                     </Button.Content>
                                 </Button>
                                 <cpdftools:CPDFInfoControl Grid.Row="1" Margin="25,10,25,0" Grid.ColumnSpan="2" Name="FileInfoControl"></cpdftools:CPDFInfoControl>
-                            </Grid>
-
-                            <!--密码验证-->
+                            </Grid> 
                             <cpdfcommon:PasswordDialog x:Name="PasswordUI" Visibility="Collapsed"/>
                         </Grid>
 
                     </Border>
                 </Grid>
-
-                <!--右侧面板-->
+ 
                 <Border Grid.Row="1" Name="PropertyContainer" Grid.Column="3" Visibility="Hidden"></Border>
             </Grid>
             

Demo/Examples/Forms/MainWindow.xaml

@@ -22,19 +22,16 @@
                 <RowDefinition Height="40"></RowDefinition>
                 <RowDefinition Height="*"></RowDefinition>
             </Grid.RowDefinitions>
-
-            <!--顶部工具栏-->
+ 
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="auto"></ColumnDefinition>
                     <ColumnDefinition Width="*"></ColumnDefinition>
                     <ColumnDefinition Width="auto"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
-                <Border Height="1" Background="LightGray" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
-                <!--左侧工具栏-->
+                <Border Height="1" Background="LightGray" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/> 
                 <StackPanel Orientation="Horizontal" Height="40" Margin="20,0,0,0">
-
-                    <!--打开文件-->
+ 
                     <Button BorderThickness="0" VerticalContentAlignment="Center" Width="30" Height="30" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="OpenFile_Click">
                         <Button.Content>
                             <Viewbox Width="20" Height="20">
@@ -63,8 +60,7 @@
                             <ToolTip Content="Open..."></ToolTip>
                         </Button.ToolTip>
                     </Button>
-
-                    <!--保存文件-->
+ 
                     <Button BorderThickness="0" VerticalContentAlignment="Center" Margin="10,0,0,0" Width="30" Height="30" Style="{StaticResource LightButtonStyle}" Background="Transparent" 
                             Click="SaveFileBtn_Click" IsEnabled="{Binding CanSave,Mode=OneWay}">
                         <Button.Content>
@@ -93,8 +89,7 @@
                             <ToolTip Content="Save"></ToolTip>
                         </Button.ToolTip>
                     </Button>
-
-                    <!--工具栏展开收缩-->
+ 
                     <ToggleButton Name="ToolExpandBtn" Margin="13,0,0,0" BorderThickness="0" Width="30" Height="30" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="ToolExpand_Click">
                         <ToggleButton.Content>
                             <Path Fill="#43474D" Width="30" Height="30">
@@ -109,8 +104,7 @@
                     </ToggleButton>
 
                     <Line Margin="13,0,13,0" Stroke="#E0E0E0" X1="0" Y1="5" X2="0" Y2="35"></Line>
-
-                    <!--抓手工具-->
+ 
                     <ToggleButton BorderThickness="0" Width="30" Height="30" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" IsChecked="True" IsEnabled="False" Visibility="Collapsed">
                         <ToggleButton.Content>
                             <Path Fill="#43474D">
@@ -136,18 +130,15 @@
                     <cpdftools:CPDFScalingControl x:Name="CPDFSaclingControl"></cpdftools:CPDFScalingControl>
  
                 </StackPanel>
-
-                <!--中间工具栏-->
+ 
                 <ComboBox Name="ViewComboBox" Width="120" Height="26" Grid.Column="1" HorizontalAlignment="Center" FontSize="14" Foreground="#001A4E" SelectionChanged="ComboBox_SelectionChanged"
                          Style="{StaticResource ComboBoxStyle1}" >
                     <ComboBoxItem>Viewer</ComboBoxItem>
                     <ComboBoxItem IsSelected="True">Form</ComboBoxItem>
                 </ComboBox>
-
-                <!--右侧工具栏-->
+ 
                 <StackPanel Orientation="Horizontal" Grid.Column="2">
-
-                    <!--搜索按钮-->
+ 
                     <Button BorderThickness="0" Width="40" Height="40" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="ExpandSearchBtn_Click" Focusable="False">
                         <Button.Content>
                             <Path Fill="#43474D">
@@ -164,8 +155,7 @@
                             <ToolTip Content="Search"></ToolTip>
                         </Button.ToolTip>
                     </Button>
-
-                    <!--右侧工具栏展开收缩-->
+ 
                     <ToggleButton BorderThickness="0" Width="40" Height="40" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Visibility="Collapsed">
                         <ToggleButton.Content>
                             <Path Fill="#43474D" Width="30" Height="30">
@@ -188,8 +178,7 @@
                             <ToolTip Content="Properties"></ToolTip>
                         </ToggleButton.ToolTip>
                     </ToggleButton>
-
-                    <!--页面显示-->
+ 
                     <ToggleButton  Name="ViewSettingBtn" BorderThickness="0" Width="40" Height="40" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="ViewSettingBtn_Click">
                         <ToggleButton.Content>
                             <Path Stroke="#43474D" VerticalAlignment="Center" StrokeThickness="2">
@@ -209,8 +198,7 @@
                             <ToolTip Content="Page Display"></ToolTip>
                         </ToggleButton.ToolTip>
                     </ToggleButton>
-
-                    <!--页面信息-->
+ 
                     <Button BorderThickness="0" Width="40" Height="40" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="PageInfoBtn_Click">
                         <Button.Content>
                             <Path Fill="#43474D" VerticalAlignment="Center">
@@ -247,8 +235,7 @@
                 <Border x:Name="ToolBarContainer" Height="45" Visibility="Visible"  BorderThickness="1" BorderBrush="#1A000000" Background="#F2F3F5" Grid.ColumnSpan="4">
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                         <cpdftools:CPDFFormBarControl x:Name="PDFFormTool" Loaded="PDFFormTool_Loaded" Unloaded="PDFFormTool_Unloaded" Grid.ColumnSpan="4" Height="44"/>
-                        <Line Height="40" Stroke="#D5D6D8" StrokeThickness="2" X1="0" Y1="10" X2="0" Y2="30" Margin="8,0,8,0" />
-                        <!--Undo Button-->
+                        <Line Height="40" Stroke="#D5D6D8" StrokeThickness="2" X1="0" Y1="10" X2="0" Y2="30" Margin="8,0,8,0" /> 
                         <Button Name="UndoBtn" Style="{StaticResource LightButtonStyle}" BorderThickness="0"  Width="40" Height="40" IsEnabled="{Binding CanUndo,Mode=OneWay}"  Click="UndoButton_Click"
                                     Background="Transparent">
                             <Path x:Name="UndoPath" IsEnabled="{Binding CanUndo,Mode=OneWay}">
@@ -273,8 +260,7 @@
                             <Button.ToolTip>
                                 <ToolTip Content="Undo"></ToolTip>
                             </Button.ToolTip>
-                        </Button>
-                        <!--Redo Button-->
+                        </Button> 
                         <Button Style="{StaticResource LightButtonStyle}" BorderThickness="0" Width="40" Height="40" Margin="10,0,0,0"  IsEnabled="{Binding CanRedo,Mode=OneWay}" Click="RedoButton_Click"
                                     Background="Transparent">
                             <Path IsEnabled="{Binding CanRedo,Mode=OneWay}">
@@ -302,11 +288,9 @@
                         </Button>
                     </StackPanel>
                 </Border>
-                
-                <!--工具栏展开-->
+                 
                 <cpdftools:CPDFBOTABarControl Grid.Row="1" Visibility="Collapsed" Name="BotaSideTool"/>
-
-                <!--拖动调节控件大小-->
+ 
                 <GridSplitter Name="Splitter" Grid.Row="1" Grid.Column="1" Width="15" ResizeBehavior="PreviousAndNext" Visibility="Collapsed">
                     <GridSplitter.Template>
                         <ControlTemplate TargetType="{x:Type GridSplitter}">
@@ -327,23 +311,19 @@
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"></RowDefinition>
                         <RowDefinition Height="*"></RowDefinition>
-                    </Grid.RowDefinitions>
-                    <!--PDFViewer-->
+                    </Grid.RowDefinitions> 
                     <Border Grid.Row="1" x:Name="PDFGrid" Background="#CECECE"></Border>
-
-                    <!--页码工具-->
+ 
                     <cpdfcommon:PageNumberControl Grid.Row="1" Name="FloatPageTool" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,20"></cpdfcommon:PageNumberControl>
                 </Grid>
-
-                <!--右侧面板-->
+ 
                 <Border Grid.Row="1" Name="PropertyContainer" Grid.Column="3" Visibility="Hidden"></Border>
             </Grid>
         </Grid>
 
         <Border Name="PopupBorder" Background="#A0000000" Visibility="Collapsed">
             <Grid>
-
-                <!--文件信息-->
+ 
                 <Grid Name="FileInfoUI"  Width="422" Height="680" HorizontalAlignment="Center" VerticalAlignment="Center" Background="White" Visibility="Collapsed">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"></ColumnDefinition>
@@ -366,8 +346,7 @@
                     </Button>
                     <cpdftools:CPDFInfoControl Grid.Row="1" Margin="25,10,25,0" Grid.ColumnSpan="2" Name="FileInfoControl"></cpdftools:CPDFInfoControl>
                 </Grid>
-
-                <!--密码验证-->
+ 
                 <cpdfcommon:PasswordDialog x:Name="PasswordUI" Visibility="Collapsed"></cpdfcommon:PasswordDialog>
             </Grid>
 

Demo/Examples/PDFViewer/MainPage.xaml

@@ -23,8 +23,7 @@
             <RowDefinition Height="40"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
-
-        <!--顶部工具栏-->
+ 
         <cpdftools:CPDFTitleBarControl x:Name="CPDFTitleBarControl" Visibility="Visible" Loaded="CPDFTitleBarControl_Loaded" CanSave="{Binding CanSave,Mode=OneWay}" Margin="2 0 0 0"></cpdftools:CPDFTitleBarControl>
 
         <Grid Grid.Row="1">
@@ -34,10 +33,8 @@
                 <ColumnDefinition Width="auto"></ColumnDefinition>
             </Grid.ColumnDefinitions>
             <Border Height="1" Background="LightGray" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
-            
-            <!--左侧工具栏-->
-            <StackPanel Orientation="Horizontal" Height="40" Margin="20,0,0,0">
-                <!--打开文件-->
+             
+            <StackPanel Orientation="Horizontal" Height="40" Margin="20,0,0,0"> 
                 <Button BorderThickness="0" VerticalContentAlignment="Center" Width="30" Height="30" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="OpenFile_Click">
                     <Button.Content>
                         <Viewbox Width="20" Height="20">
@@ -66,8 +63,7 @@
                         <ToolTip Content="Open..."></ToolTip>
                     </Button.ToolTip>
                 </Button>
-
-                <!--保存文件-->
+ 
                 <Button BorderThickness="0" VerticalContentAlignment="Center" Margin="10,0,0,0" Width="30" Height="30" Style="{StaticResource LightButtonStyle}" Background="Transparent" 
                             Click="SaveFileBtn_Click" IsEnabled="{Binding CanSave,Mode=OneWay}">
                     <Button.Content>
@@ -96,8 +92,7 @@
                         <ToolTip Content="Save"></ToolTip>
                     </Button.ToolTip>
                 </Button>
-
-                <!--工具栏展开收缩-->
+ 
                 <ToggleButton  x:Name="LeftToolPanelButton" Margin="13,0,0,0" BorderThickness="0" Width="30" Height="30" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="LeftToolPanelButton_Click">
                     <ToggleButton.Content>
                         <Path Fill="#43474D" Width="30" Height="30">
@@ -115,8 +110,7 @@
 
                 <cpdftools:CPDFScalingControl x:Name="CPDFSaclingControl"></cpdftools:CPDFScalingControl>
             </StackPanel>
-
-            <!--中间工具栏-->
+ 
             <ComboBox Name="ModeComboBox"  Style="{StaticResource ComboBoxStyle1}" Width="140" Height="26" Grid.Column="1" HorizontalAlignment="Center" FontSize="14" Foreground="#001A4E" SelectedIndex="0" SelectionChanged="ComboBox_SelectionChanged">
                 <ComboBoxItem>Viewer</ComboBoxItem>
                 <ComboBoxItem>Annotations</ComboBoxItem>
@@ -124,11 +118,9 @@
                 <ComboBoxItem>Forms</ComboBoxItem>
                 <ComboBoxItem>Docs Editor</ComboBoxItem>
             </ComboBox>
-
-            <!--右侧工具栏-->
+ 
             <StackPanel Orientation="Horizontal" Grid.Column="2">
-
-                <!--搜索按钮-->
+ 
                 <Button x:Name="SearchButton" BorderThickness="0" Width="40" Height="40" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="ExpandSearchBtn_Click">
                     <Button.Content>
                         <Path Fill="#43474D">
@@ -145,8 +137,7 @@
                         <ToolTip Content="Search"></ToolTip>
                     </Button.ToolTip>
                 </Button>
-
-                <!--页面显示-->
+ 
                 <ToggleButton Name="ViewSettingBtn" BorderThickness="0" Width="40" Height="40" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="ViewSettingBtn_Click">
                     <ToggleButton.Content>
                         <Path Stroke="#43474D" VerticalAlignment="Center" StrokeThickness="2">
@@ -166,8 +157,7 @@
                         <ToolTip Content="Page Display"></ToolTip>
                     </ToggleButton.ToolTip>
                 </ToggleButton>
-
-                <!--右侧属性面板开关-->
+ 
                 <ToggleButton  x:Name="RightPanelButton" BorderThickness="0" Width="40" Height="40" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="RightPanelButton_Click">
                     <ToggleButton.Content>
                         <Path Fill="#43474D" Width="30" Height="30">
@@ -180,8 +170,7 @@
                         <ToolTip Content="Properties"></ToolTip>
                     </ToggleButton.ToolTip>
                 </ToggleButton>
-
-                <!--页面信息-->
+ 
                 <Button BorderThickness="0" Width="40" Height="40" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="PageInfoBtn_Click">
                     <Button.Content>
                         <Path Fill="#43474D" VerticalAlignment="Center">
@@ -220,8 +209,7 @@
                             <cpdftools:CPDFAnnotationBarControl x:Name="AnnotationBarControl" Height="44" Loaded="AnnotationBarControl_Loaded" Unloaded="AnnotationBarControl_Unloaded"  Visibility="Collapsed"/>
                             <cpdftools:CPDFFormBarControl x:Name="FormBarControl" Height="44"  Visibility="Collapsed"></cpdftools:CPDFFormBarControl>
                             <Border Name="PDFEditTool" Background="#F2F3F5" Visibility="Collapsed">
-                                <StackPanel  Orientation="Horizontal" HorizontalAlignment="Center">
-                                    <!--文字编辑按钮-->
+                                <StackPanel  Orientation="Horizontal" HorizontalAlignment="Center"> 
                                     <ToggleButton Style="{StaticResource ToggleButtonStyle}" Name="PDFTextEditButton" BorderThickness="0" Padding="10,5,10,5" Click="PDFTextEditButton_Click" Width="99" Height="40">
                                         <StackPanel Orientation="Horizontal">
                                             <Path Fill="#273C62" VerticalAlignment="Center">
@@ -236,8 +224,7 @@
                                             <ToolTip Content="Text"></ToolTip>
                                         </ToggleButton.ToolTip>
                                     </ToggleButton>
-
-                                    <!--图片编辑按钮-->
+ 
                                     <ToggleButton Style="{StaticResource ToggleButtonStyle}" Name="PDFImageEditButton" BorderThickness="0" Padding="10,5,10,5" Margin="10,0,0,0" Click="PDFImageEditButton_Click">
                                         <StackPanel Orientation="Horizontal">
                                             <Path Fill="#273C62" VerticalAlignment="Center">
@@ -258,8 +245,7 @@
                         </Grid>
                         
                         <StackPanel x:Name="UndoRedoStackPanel" Orientation="Horizontal" Visibility="Visible">
-                            <Line Height="40" Stroke="#D5D6D8" StrokeThickness="2" X1="0" Y1="10" X2="0" Y2="30" Margin="8,0,8,0" />
-                            <!--Undo Button-->
+                            <Line Height="40" Stroke="#D5D6D8" StrokeThickness="2" X1="0" Y1="10" X2="0" Y2="30" Margin="8,0,8,0" /> 
                             <Button Name="UndoBtn" Style="{StaticResource LightButtonStyle}" BorderThickness="0"  Width="40" Height="40" IsEnabled="{Binding CanUndo,Mode=OneWay}" Click="UndoBtn_Click"
                                     Background="Transparent">
                                 <Path x:Name="UndoPath" IsEnabled="{Binding CanUndo,Mode=OneWay}">
@@ -284,8 +270,7 @@
                                 <Button.ToolTip>
                                     <ToolTip Content="Undo"></ToolTip>
                                 </Button.ToolTip>
-                            </Button>
-                            <!--Redo Button-->
+                            </Button> 
                             <Button Style="{StaticResource LightButtonStyle}" BorderThickness="0" Width="40" Height="40" Margin="10,0,0,0"  IsEnabled="{Binding CanRedo,Mode=OneWay}" Click="RedoBtn_Click"
                                     Background="Transparent">
                                 <Path IsEnabled="{Binding CanRedo,Mode=OneWay}">
@@ -315,12 +300,10 @@
                     </StackPanel>
                 </Grid>
             </Border>
-
-            <!--工具栏展开-->
+ 
 
             <cpdftools:CPDFBOTABarControl Grid.Row="1" Visibility="Collapsed" Name="BotaSideTool"/>
-
-            <!--拖动调节控件大小-->
+ 
             <GridSplitter Name="Splitter"  Grid.Row="1"  Grid.Column="1" Width="15" ResizeBehavior="PreviousAndNext" Visibility="Collapsed">
                 <GridSplitter.Template>
                     <ControlTemplate TargetType="{x:Type GridSplitter}">
@@ -347,20 +330,16 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition></ColumnDefinition>
                         <ColumnDefinition Width="auto"></ColumnDefinition>
-                    </Grid.ColumnDefinitions>
-                    <!--PDFViewer-->
-                    <Border x:Name="PDFGrid" Background="#CECECE"></Border>
-                    <!--页码工具-->
+                    </Grid.ColumnDefinitions> 
+                    <Border x:Name="PDFGrid" Background="#CECECE"></Border> 
                     <cpdfcommon:PageNumberControl Grid.Row="1" Name="FloatPageTool" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,20"></cpdfcommon:PageNumberControl>
-
-                    <!--右侧面板-->
+ 
                     <Border Grid.Column="1" Name="PropertyContainer" Visibility="Collapsed"></Border>
                 </Grid>
             </Grid>
         </Grid>
         <Border Name="PopupBorder" Background="#A0000000" Visibility="Collapsed" Grid.RowSpan="3" Grid.ColumnSpan="2">
-            <Grid>
-                <!--文件信息-->
+            <Grid> 
                 <Grid Name="FileInfoUI"  Width="422" Height="680" HorizontalAlignment="Center" VerticalAlignment="Center" Background="White" Visibility="Collapsed">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"></ColumnDefinition>
@@ -382,8 +361,7 @@
                         </Button.Content>
                     </Button>
                     <cpdftools:CPDFInfoControl Grid.Row="1" Margin="25,10,25,0" Grid.ColumnSpan="2" Name="FileInfoControl"></cpdftools:CPDFInfoControl>
-                </Grid>
-                <!--密码验证-->
+                </Grid> 
                 <cpdfcommon:PasswordDialog x:Name="PasswordUI" Visibility="Collapsed"></cpdfcommon:PasswordDialog>
             </Grid>
         </Border>

Demo/Examples/PDFViewer/MainWindow.xaml

@@ -256,8 +256,7 @@
             </dragablz:TabablzControl>
         </Grid>
 
-        <Border Name="PopupBorder" Background="#A0000000" Visibility="Collapsed">
-            <!--密码验证-->
+        <Border Name="PopupBorder" Background="#A0000000" Visibility="Collapsed"> 
             <cpdfcommon:PasswordDialog x:Name="PasswordUI" Visibility="Collapsed"></cpdfcommon:PasswordDialog>
         </Border>
     </Grid>

Demo/Examples/Samples/HeaderFooterTest/HeaderFooterTest.cs

@@ -26,6 +26,7 @@ namespace HeaderFooterTest
 
         static void Main(string[] args)
         {
+            Console.WriteLine("");
             SDKLicenseHelper.LicenseVerify();
 
             CPDFDocument document = CPDFDocument.InitWithFilePath("Blank Page.pdf");

Demo/Examples/Viewer/MainWindow.xaml

@@ -22,18 +22,15 @@
                 <RowDefinition Height="40"></RowDefinition>
                 <RowDefinition Height="*"></RowDefinition>
             </Grid.RowDefinitions>
-            <Border Height="1" Background="LightGray" VerticalAlignment="Bottom"/>
-            <!--顶部工具栏-->
+            <Border Height="1" Background="LightGray" VerticalAlignment="Bottom"/> 
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="auto"></ColumnDefinition>
                     <ColumnDefinition Width="*"></ColumnDefinition>
                     <ColumnDefinition Width="auto"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
-
-                <!--左侧工具栏-->
-                <StackPanel Orientation="Horizontal" Height="40" Margin="20,0,0,0">
-                    <!--打开文件-->
+ 
+                <StackPanel Orientation="Horizontal" Height="40" Margin="20,0,0,0"> 
                     <Button BorderThickness="0" VerticalContentAlignment="Center" Width="30" Height="30" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="OpenFile_Click">
                         <Button.Content>
                             <Viewbox Width="20" Height="20">
@@ -62,8 +59,7 @@
                             <ToolTip Content="Open..."></ToolTip>
                         </Button.ToolTip>
                     </Button>
-
-                    <!--保存文件-->
+ 
                     <Button BorderThickness="0" VerticalContentAlignment="Center" Margin="10,0,0,0" Width="30" Height="30" Style="{StaticResource LightButtonStyle}" Background="Transparent" 
                             Click="SaveFileBtn_Click"  IsEnabled="{Binding CanSave,Mode=OneWay}">
                         <Button.Content>
@@ -79,9 +75,7 @@
                         <Button.ToolTip>
                             <ToolTip Content="Save"></ToolTip>
                         </Button.ToolTip>
-                    </Button>
-
-                    <!--工具栏展开收缩-->
+                    </Button> 
                     <ToggleButton Name="ToolExpandBtn" Margin="13,0,0,0" BorderThickness="0" Width="30" Height="30" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="ToolExpand_Click">
                         <ToggleButton.Content>
                             <Path Fill="#43474D" Width="30" Height="30">
@@ -96,8 +90,7 @@
                     </ToggleButton>
 
                     <Line Margin="13,0,13,0" Stroke="#E0E0E0" X1="0" Y1="5" X2="0" Y2="35"></Line>
-
-                    <!--抓手工具-->
+ 
                     <ToggleButton BorderThickness="0" Width="30" Height="30" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" IsChecked="True" IsEnabled="False" Visibility="Collapsed">
                         <ToggleButton.Content>
                             <Path Fill="#43474D">
@@ -121,16 +114,13 @@
                     <Line Margin="13,0,13,0" Stroke="#E0E0E0" X1="0" Y1="5" X2="0" Y2="35"></Line>
                     <cpdftools:CPDFScalingControl x:Name="CPDFSaclingControl"></cpdftools:CPDFScalingControl>
                 </StackPanel>
-
-                <!--中间工具栏-->
+ 
                 <ComboBox Width="120" Height="26" Grid.Column="1" HorizontalAlignment="Center" FontSize="14" Foreground="#001A4E">
                     <ComboBoxItem IsSelected="True">Viewer</ComboBoxItem>
                 </ComboBox>
-
-                <!--右侧工具栏-->
+ 
                 <StackPanel Orientation="Horizontal" Grid.Column="2">
-
-                    <!--搜索按钮-->
+ 
                     <Button BorderThickness="0" Width="40" Height="40" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="ExpandSearchBtn_Click">
                         <Button.Content>
                             <Path Fill="#43474D">
@@ -147,8 +137,7 @@
                             <ToolTip Content="Search"></ToolTip>
                         </Button.ToolTip>
                     </Button>
-
-                    <!--页面显示-->
+ 
                     <ToggleButton Name="ViewSettingBtn" BorderThickness="0" Width="40" Height="40" Style="{StaticResource ToggleButtonStyle}" Background="Transparent" Click="ViewSettingBtn_Click">
                         <ToggleButton.Content>
                             <Path Stroke="#43474D" VerticalAlignment="Center" StrokeThickness="2">
@@ -168,8 +157,7 @@
                             <ToolTip Content="Page Display"></ToolTip>
                         </ToggleButton.ToolTip>
                     </ToggleButton>
-
-                    <!--页面信息-->
+ 
                     <Button BorderThickness="0" Width="40" Height="40" Style="{StaticResource LightButtonStyle}" Background="Transparent" Click="PageInfoBtn_Click">
                         <Button.Content>
                             <Path Fill="#43474D" VerticalAlignment="Center">
@@ -196,12 +184,9 @@
                     <ColumnDefinition Width="*"></ColumnDefinition>
                     <ColumnDefinition Width="auto"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
-
-                <!--工具栏展开-->
-
+  
                 <cpdftools:CPDFBOTABarControl Visibility="Collapsed" Name="BotaSideTool"/>
-
-                <!--拖动调节控件大小-->
+ 
                 <GridSplitter Name="Splitter" Grid.Column="1" Width="15" ResizeBehavior="PreviousAndNext" Visibility="Collapsed">
                     <GridSplitter.Template>
                         <ControlTemplate TargetType="{x:Type GridSplitter}">
@@ -218,23 +203,19 @@
                     </GridSplitter.Template>
                 </GridSplitter>
 
-                <Grid Grid.Column="2" >
-                    <!--PDFViewer-->
+                <Grid Grid.Column="2" > 
                     <Border x:Name="PDFGrid" Background="#CECECE"></Border>
-
-                    <!--页码工具-->
+ 
                     <cpdfcommon:PageNumberControl Name="FloatPageTool" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,20"></cpdfcommon:PageNumberControl>
                 </Grid>
-
-                <!--右侧面板-->
+ 
                 <Border Name="PropertyContainer" Grid.Column="3" Visibility="Hidden"></Border>
             </Grid>
         </Grid>
 
         <Border Name="PopupBorder" Background="#A0000000" Visibility="Collapsed">
             <Grid>
-
-                <!--文件信息-->
+ 
                 <Grid Name="FileInfoUI"  Width="422" Height="680" HorizontalAlignment="Center" VerticalAlignment="Center" Background="White" Visibility="Collapsed">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"></ColumnDefinition>
@@ -257,8 +238,7 @@
                     </Button>
                     <cpdftools:CPDFInfoControl Grid.Row="1" Margin="25,10,25,0" Grid.ColumnSpan="2" Name="FileInfoControl"></cpdftools:CPDFInfoControl>
                 </Grid>
-
-                <!--密码验证-->
+ 
                 <cpdfcommon:PasswordDialog x:Name="PasswordUI" Visibility="Collapsed"></cpdfcommon:PasswordDialog>
             </Grid>