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

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -131,6 +131,12 @@ namespace PDF_Office.ViewModels.Tools
             bool isSnapshotEdit = false;
             AnnotHandlerEventArgs annotArgs = null;
 
+            if(annotBtn.Name== "BtnShowAnnot")
+            {
+                PDFViewer.SetDrawAnnot((bool)annotBtn.IsChecked);
+                return;
+            }
+
             if (annotBtn.IsChecked == true)
             {
                 var tag = annotBtn.Tag.ToString();

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -1316,7 +1316,7 @@ namespace PDF_Office.ViewModels
                         return saveAsFile();
                     else
                         return false;
-                }
+                } 
 
                 //文件路径无法存在时
                 if (!File.Exists(PDFViewer.Document.FilePath))

PDF Office/Views/ViewContent.xaml

@@ -77,7 +77,7 @@
                                 Command="{Binding SaveAsFile}"
                                 Header="Save As"
                                 InputGestureText="Ctrl+Shift+S" />
-                            <MenuItem Command="{Binding SaveAsFlattenCommand}" Header="Save as Flattened PDF" />
+                            <MenuItem Command="{Binding SaveAsFlattenCommand}" Header="Save as Flattened PDF" Visibility="Collapsed" />
                             <MenuItem Command="{Binding CompressCommand}" Header="Compress" />
                             <MenuItem Header="Convert To">
                                 <MenuItem
@@ -244,21 +244,24 @@
                 <cus:IconAndTextTabItem
                     x:Name="TabItemScan"
                     Header="扫描和OCR"
-                    Style="{StaticResource ToolbarTabs}">
+                    Style="{StaticResource ToolbarTabs}"
+                    Visibility="Collapsed">
                     <Grid Grid.Row="1" Height="40" />
                 </cus:IconAndTextTabItem>
                 <cus:IconAndTextTabItem
                     x:Name="TabItemEdit"
                     Height="40"
                     Header="编辑"
-                    Style="{StaticResource ToolbarTabs}">
+                    Style="{StaticResource ToolbarTabs}"
+                    Visibility="Collapsed">
                     <Grid Grid.Row="1" Height="40" />
                 </cus:IconAndTextTabItem>
                 <cus:IconAndTextTabItem
                     x:Name="TabItemForm"
                     Height="40"
                     Header="表单"
-                    Style="{StaticResource ToolbarTabs}">
+                    Style="{StaticResource ToolbarTabs}"
+                    Visibility="Collapsed">
                     <Grid Grid.Row="1" Height="40" />
                 </cus:IconAndTextTabItem>
                 <cus:IconAndTextTabItem