Browse Source

Merge remote-tracking branch 'origin/dev' into dev

chenrongqian@kdanmobile.com 2 years ago
parent
commit
9d35f99279
33 changed files with 1942 additions and 298 deletions
  1. 1 1
      PDF Office/Model/Dialog/ConverterDialogs/ConverterDialogsModel.cs
  2. 220 1
      PDF Office/MultilingualResources/PDF Office.en.xlf
  3. 220 1
      PDF Office/MultilingualResources/PDF Office.zh-Hans.xlf
  4. 220 1
      PDF Office/MultilingualResources/PDF Office.zh-Hant.xlf
  5. 0 27
      PDF Office/PDF Office.csproj
  6. 81 0
      PDF Office/Strings/HomePage/HomePage.Designer.cs
  7. 27 0
      PDF Office/Strings/HomePage/HomePage.resx
  8. 501 69
      PDF Office/Strings/MainPage/MainPage.Designer.cs
  9. 179 26
      PDF Office/Strings/MainPage/MainPage.resx
  10. 39 36
      PDF Office/Styles/ContextMenuStyle.xaml
  11. 44 0
      PDF Office/ViewModels/BottomToolContentViewModel.cs
  12. 98 8
      PDF Office/ViewModels/FillAndSign/FillAndSignContentViewModel.cs
  13. 3 3
      PDF Office/ViewModels/HomeContentViewModel.cs
  14. 21 1
      PDF Office/ViewModels/HomePanel/PDFTools/QuickToolsContentViewModel.cs
  15. 5 5
      PDF Office/ViewModels/HomePanel/RecentFiles/RecentFilesContentViewModel.cs
  16. 3 4
      PDF Office/ViewModels/PropertyPanel/AnnotPanel/LinkAnnotPropertyViewModel.cs
  17. 21 0
      PDF Office/ViewModels/PropertyPanel/ViewModular/ReadViewContentViewModel.cs
  18. 133 1
      PDF Office/ViewModels/PropertyPanel/ViewModular/ViewModularContentViewModel.cs
  19. 11 1
      PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs
  20. 77 1
      PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Function.cs
  21. 11 11
      PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Layout.cs
  22. 1 0
      PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Properties.cs
  23. 0 76
      PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs
  24. 1 1
      PDF Office/Views/Dialog/ConverterDialogs/ConverterExcelDialog.xaml
  25. 2 2
      PDF Office/Views/Dialog/ConverterDialogs/ConverterHTMLDialog.xaml
  26. 2 2
      PDF Office/Views/Dialog/ConverterDialogs/ConverterPPTDialog.xaml
  27. 2 2
      PDF Office/Views/Dialog/ConverterDialogs/ConverterRTFDialog.xaml
  28. 2 2
      PDF Office/Views/Dialog/ConverterDialogs/ConverterTextDialog.xaml
  29. 3 3
      PDF Office/Views/Dialog/ConverterDialogs/ConverterWordDialog.xaml
  30. 1 1
      PDF Office/Views/HomePanel/PDFTools/QuickToolsContent.xaml
  31. 1 1
      PDF Office/Views/PropertyPanel/ViewModular/ReadViewContent.xaml
  32. 10 10
      PDF Office/Views/PropertyPanel/ViewModular/ViewModularContent.xaml
  33. 2 1
      PDF Office/Views/TipContent/ReadModelTip.xaml

+ 1 - 1
PDF Office/Model/Dialog/ConverterDialogs/ConverterDialogsModel.cs

@@ -14,7 +14,7 @@ namespace PDF_Office.Model.Dialog.ConverterDialogs
     public class ConvertOptions
     {
         public COCRLanguage OCRLanguage = COCRLanguage.English;
-        public bool IsAllowOCR = true;
+        public bool IsAllowOCR = false;
         public bool IsContainOCRBgImage =false;
         public bool IsContainAnnotations = true;
         public bool IsContainImages = true;

+ 220 - 1
PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -51,7 +51,44 @@
       <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.1.12.0" tool-company="Microsoft" />
     </header>
     <body>
-      <group id="PDF OFFICE/STRINGS/HOMEPAGE/HOMEPAGE.RESX" datatype="resx" />
+      <group id="PDF OFFICE/STRINGS/HOMEPAGE/HOMEPAGE.RESX" datatype="resx">
+        <trans-unit id="HomeList_MenuRemove" translate="yes" xml:space="preserve">
+          <source>Remove from Recents</source>
+          <target state="new">Remove from Recents</target>
+        </trans-unit>
+        <trans-unit id="HomeList_MenuShow" translate="yes" xml:space="preserve">
+          <source>Show in Folder</source>
+          <target state="new">Show in Folder</target>
+        </trans-unit>
+        <trans-unit id="HomeList_NoFilesContent" translate="yes" xml:space="preserve">
+          <source>Click “Open Files” or drag file here to open</source>
+          <target state="new">Click “Open Files” or drag file here to open</target>
+        </trans-unit>
+        <trans-unit id="HomeList_NoFilesTitle" translate="yes" xml:space="preserve">
+          <source>No recently opened files</source>
+          <target state="new">No recently opened files</target>
+        </trans-unit>
+        <trans-unit id="HomeList_Title" translate="yes" xml:space="preserve">
+          <source>Recents</source>
+          <target state="new">Recents</target>
+        </trans-unit>
+        <trans-unit id="HomeTool_Title" translate="yes" xml:space="preserve">
+          <source>Quick Tools</source>
+          <target state="new">Quick Tools</target>
+        </trans-unit>
+        <trans-unit id="Home_CreatePDF" translate="yes" xml:space="preserve">
+          <source>Create PDF</source>
+          <target state="new">Create PDF</target>
+        </trans-unit>
+        <trans-unit id="Home_CreateToNew" translate="yes" xml:space="preserve">
+          <source>New Blank Page</source>
+          <target state="new">New Blank Page</target>
+        </trans-unit>
+        <trans-unit id="Home_OpenFiles" translate="yes" xml:space="preserve">
+          <source>Open Files</source>
+          <target state="new">Open Files</target>
+        </trans-unit>
+      </group>
     </body>
   </file>
   <file datatype="xml" source-language="en-US" target-language="en" original="PDF OFFICE/STRINGS/MAINPAGE/MAINPAGE.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
@@ -355,6 +392,188 @@ Drag files to reorder as you need.</target>
           <source>Undo</source>
           <target state="new">Undo</target>
         </trans-unit>
+        <trans-unit id="Zoom_Actual" translate="yes" xml:space="preserve">
+          <source>Actual Size</source>
+          <target state="new">Actual Size</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">阅读页底部工具栏-缩放菜单实际大小选项</note>
+        </trans-unit>
+        <trans-unit id="Zoom_FitPage" translate="yes" xml:space="preserve">
+          <source>Fit Page</source>
+          <target state="new">Fit Page</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">阅读页底部工具栏-缩放菜单适应宽度选项</note>
+        </trans-unit>
+        <trans-unit id="Zoom_FitWidth" translate="yes" xml:space="preserve">
+          <source>Fit Width</source>
+          <target state="new">Fit Width</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">阅读页底部工具栏-缩放菜单适应页面选项</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Title" translate="yes" xml:space="preserve">
+          <source>View</source>
+          <target state="new">View</target>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Book" translate="yes" xml:space="preserve">
+          <source>Book Mode</source>
+          <target state="new">Book Mode</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">书本模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Full" translate="yes" xml:space="preserve">
+          <source>Full Screen</source>
+          <target state="new">Full Screen</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">全屏模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Mode" translate="yes" xml:space="preserve">
+          <source>Display Mode</source>
+          <target state="new">Display Mode</target>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Read" translate="yes" xml:space="preserve">
+          <source>Read Mode</source>
+          <target state="new">Read Mode</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">阅读模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Single" translate="yes" xml:space="preserve">
+          <source>Single Page</source>
+          <target state="new">Single Page</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">单页模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Two" translate="yes" xml:space="preserve">
+          <source>Two Pages</source>
+          <target state="new">Two Pages</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">双页模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_ContinuousScroll" translate="yes" xml:space="preserve">
+          <source>Continuous Scroll</source>
+          <target state="new">Continuous Scroll</target>
+        </trans-unit>
+        <trans-unit id="ViewProperties_PageBreak" translate="yes" xml:space="preserve">
+          <source>Page Break</source>
+          <target state="new">Page Break</target>
+        </trans-unit>
+        <trans-unit id="ViewProperties_RotateTitle" translate="yes" xml:space="preserve">
+          <source>Rotate</source>
+          <target state="new">Rotate</target>
+        </trans-unit>
+        <trans-unit id="GlobalTip_ESCReadMode" translate="yes" xml:space="preserve">
+          <source>Enter Read Mode, tap ESC to exit</source>
+          <target state="new">Enter Read Mode, tap ESC to exit</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">进入阅读模式,提示可以按ESC退出</note>
+        </trans-unit>
+        <trans-unit id="GlobalTip_ExitReadMode" translate="yes" xml:space="preserve">
+          <source>Exit Read Mode</source>
+          <target state="new">Exit Read Mode</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AddBookmarks" translate="yes" xml:space="preserve">
+          <source>Add Bookmarks</source>
+          <target state="new">Add Bookmarks</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AddComment" translate="yes" xml:space="preserve">
+          <source>Add Comment</source>
+          <target state="new">Add Comment</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AddLink" translate="yes" xml:space="preserve">
+          <source>Add Link</source>
+          <target state="new">Add Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AddOutline" translate="yes" xml:space="preserve">
+          <source>Add Outline</source>
+          <target state="new">Add Outline</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AreaZoom" translate="yes" xml:space="preserve">
+          <source>Zoom to Selected Area</source>
+          <target state="new">Zoom to Selected Area</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">缩放至选定区域</note>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Arrow" translate="yes" xml:space="preserve">
+          <source>Arrow</source>
+          <target state="new">Arrow</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_ContentSelection" translate="yes" xml:space="preserve">
+          <source>Content Selection</source>
+          <target state="new">Content Selection</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Copy" translate="yes" xml:space="preserve">
+          <source>Copy</source>
+          <target state="new">Copy</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_ExtractImage" translate="yes" xml:space="preserve">
+          <source>Extract Image</source>
+          <target state="new">Extract Image</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Freehand" translate="yes" xml:space="preserve">
+          <source>Freehand</source>
+          <target state="new">Freehand</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_HideAnnotations" translate="yes" xml:space="preserve">
+          <source>Hide Annotations</source>
+          <target state="new">Hide Annotations</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Highlight" translate="yes" xml:space="preserve">
+          <source>Highlight</source>
+          <target state="new">Highlight</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Link" translate="yes" xml:space="preserve">
+          <source>Link</source>
+          <target state="new">Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Note" translate="yes" xml:space="preserve">
+          <source>Note</source>
+          <target state="new">Note</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_OnReadMode" translate="yes" xml:space="preserve">
+          <source>Read Mode On</source>
+          <target state="new">Read Mode On</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_OutReadMode" translate="yes" xml:space="preserve">
+          <source>Read Mode Off</source>
+          <target state="new">Read Mode Off</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Oval" translate="yes" xml:space="preserve">
+          <source>Oval</source>
+          <target state="new">Oval</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Paste" translate="yes" xml:space="preserve">
+          <source>Paste</source>
+          <target state="new">Paste</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Rectangle" translate="yes" xml:space="preserve">
+          <source>Rectangle</source>
+          <target state="new">Rectangle</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_RemoveBookmarks" translate="yes" xml:space="preserve">
+          <source>Remove Bookmarks</source>
+          <target state="new">Remove Bookmarks</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_ScrollTool" translate="yes" xml:space="preserve">
+          <source>Scroll Tool</source>
+          <target state="new">Scroll Tool</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_ShowAnnotations" translate="yes" xml:space="preserve">
+          <source>Show Annotations</source>
+          <target state="new">Show Annotations</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Signature" translate="yes" xml:space="preserve">
+          <source>Signature</source>
+          <target state="new">Signature</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Stamp" translate="yes" xml:space="preserve">
+          <source>Stamp</source>
+          <target state="new">Stamp</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_StraightLine" translate="yes" xml:space="preserve">
+          <source>Straight Line</source>
+          <target state="new">Straight Line</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Strikethrough" translate="yes" xml:space="preserve">
+          <source>Strikethrough</source>
+          <target state="new">Strikethrough</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Text" translate="yes" xml:space="preserve">
+          <source>Text</source>
+          <target state="new">Text</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Underline" translate="yes" xml:space="preserve">
+          <source>Underline</source>
+          <target state="new">Underline</target>
+        </trans-unit>
       </group>
     </body>
   </file>

+ 220 - 1
PDF Office/MultilingualResources/PDF Office.zh-Hans.xlf

@@ -51,7 +51,44 @@
       <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.1.12.0" tool-company="Microsoft" />
     </header>
     <body>
-      <group id="PDF OFFICE/STRINGS/HOMEPAGE/HOMEPAGE.RESX" datatype="resx" />
+      <group id="PDF OFFICE/STRINGS/HOMEPAGE/HOMEPAGE.RESX" datatype="resx">
+        <trans-unit id="HomeList_MenuRemove" translate="yes" xml:space="preserve">
+          <source>Remove from Recents</source>
+          <target state="new">Remove from Recents</target>
+        </trans-unit>
+        <trans-unit id="HomeList_MenuShow" translate="yes" xml:space="preserve">
+          <source>Show in Folder</source>
+          <target state="new">Show in Folder</target>
+        </trans-unit>
+        <trans-unit id="HomeList_NoFilesContent" translate="yes" xml:space="preserve">
+          <source>Click “Open Files” or drag file here to open</source>
+          <target state="new">Click “Open Files” or drag file here to open</target>
+        </trans-unit>
+        <trans-unit id="HomeList_NoFilesTitle" translate="yes" xml:space="preserve">
+          <source>No recently opened files</source>
+          <target state="new">No recently opened files</target>
+        </trans-unit>
+        <trans-unit id="HomeList_Title" translate="yes" xml:space="preserve">
+          <source>Recents</source>
+          <target state="new">Recents</target>
+        </trans-unit>
+        <trans-unit id="HomeTool_Title" translate="yes" xml:space="preserve">
+          <source>Quick Tools</source>
+          <target state="new">Quick Tools</target>
+        </trans-unit>
+        <trans-unit id="Home_CreatePDF" translate="yes" xml:space="preserve">
+          <source>Create PDF</source>
+          <target state="new">Create PDF</target>
+        </trans-unit>
+        <trans-unit id="Home_CreateToNew" translate="yes" xml:space="preserve">
+          <source>New Blank Page</source>
+          <target state="new">New Blank Page</target>
+        </trans-unit>
+        <trans-unit id="Home_OpenFiles" translate="yes" xml:space="preserve">
+          <source>Open Files</source>
+          <target state="new">Open Files</target>
+        </trans-unit>
+      </group>
     </body>
   </file>
   <file datatype="xml" source-language="en-US" target-language="zh-Hans" original="PDF OFFICE/STRINGS/MAINPAGE/MAINPAGE.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
@@ -355,6 +392,188 @@ Drag files to reorder as you need.</target>
           <source>Undo</source>
           <target state="new">Undo</target>
         </trans-unit>
+        <trans-unit id="Zoom_Actual" translate="yes" xml:space="preserve">
+          <source>Actual Size</source>
+          <target state="new">Actual Size</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">阅读页底部工具栏-缩放菜单实际大小选项</note>
+        </trans-unit>
+        <trans-unit id="Zoom_FitPage" translate="yes" xml:space="preserve">
+          <source>Fit Page</source>
+          <target state="new">Fit Page</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">阅读页底部工具栏-缩放菜单适应宽度选项</note>
+        </trans-unit>
+        <trans-unit id="Zoom_FitWidth" translate="yes" xml:space="preserve">
+          <source>Fit Width</source>
+          <target state="new">Fit Width</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">阅读页底部工具栏-缩放菜单适应页面选项</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Title" translate="yes" xml:space="preserve">
+          <source>View</source>
+          <target state="new">View</target>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Book" translate="yes" xml:space="preserve">
+          <source>Book Mode</source>
+          <target state="new">Book Mode</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">书本模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Full" translate="yes" xml:space="preserve">
+          <source>Full Screen</source>
+          <target state="new">Full Screen</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">全屏模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Mode" translate="yes" xml:space="preserve">
+          <source>Display Mode</source>
+          <target state="new">Display Mode</target>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Read" translate="yes" xml:space="preserve">
+          <source>Read Mode</source>
+          <target state="new">Read Mode</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">阅读模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Single" translate="yes" xml:space="preserve">
+          <source>Single Page</source>
+          <target state="new">Single Page</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">单页模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Two" translate="yes" xml:space="preserve">
+          <source>Two Pages</source>
+          <target state="new">Two Pages</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">双页模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_ContinuousScroll" translate="yes" xml:space="preserve">
+          <source>Continuous Scroll</source>
+          <target state="new">Continuous Scroll</target>
+        </trans-unit>
+        <trans-unit id="ViewProperties_PageBreak" translate="yes" xml:space="preserve">
+          <source>Page Break</source>
+          <target state="new">Page Break</target>
+        </trans-unit>
+        <trans-unit id="ViewProperties_RotateTitle" translate="yes" xml:space="preserve">
+          <source>Rotate</source>
+          <target state="new">Rotate</target>
+        </trans-unit>
+        <trans-unit id="GlobalTip_ESCReadMode" translate="yes" xml:space="preserve">
+          <source>Enter Read Mode, tap ESC to exit</source>
+          <target state="new">Enter Read Mode, tap ESC to exit</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">进入阅读模式,提示可以按ESC退出</note>
+        </trans-unit>
+        <trans-unit id="GlobalTip_ExitReadMode" translate="yes" xml:space="preserve">
+          <source>Exit Read Mode</source>
+          <target state="new">Exit Read Mode</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AddBookmarks" translate="yes" xml:space="preserve">
+          <source>Add Bookmarks</source>
+          <target state="new">Add Bookmarks</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AddComment" translate="yes" xml:space="preserve">
+          <source>Add Comment</source>
+          <target state="new">Add Comment</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AddLink" translate="yes" xml:space="preserve">
+          <source>Add Link</source>
+          <target state="new">Add Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AddOutline" translate="yes" xml:space="preserve">
+          <source>Add Outline</source>
+          <target state="new">Add Outline</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AreaZoom" translate="yes" xml:space="preserve">
+          <source>Zoom to Selected Area</source>
+          <target state="new">Zoom to Selected Area</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">缩放至选定区域</note>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Arrow" translate="yes" xml:space="preserve">
+          <source>Arrow</source>
+          <target state="new">Arrow</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_ContentSelection" translate="yes" xml:space="preserve">
+          <source>Content Selection</source>
+          <target state="new">Content Selection</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Copy" translate="yes" xml:space="preserve">
+          <source>Copy</source>
+          <target state="new">Copy</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_ExtractImage" translate="yes" xml:space="preserve">
+          <source>Extract Image</source>
+          <target state="new">Extract Image</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Freehand" translate="yes" xml:space="preserve">
+          <source>Freehand</source>
+          <target state="new">Freehand</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_HideAnnotations" translate="yes" xml:space="preserve">
+          <source>Hide Annotations</source>
+          <target state="new">Hide Annotations</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Highlight" translate="yes" xml:space="preserve">
+          <source>Highlight</source>
+          <target state="new">Highlight</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Link" translate="yes" xml:space="preserve">
+          <source>Link</source>
+          <target state="new">Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Note" translate="yes" xml:space="preserve">
+          <source>Note</source>
+          <target state="new">Note</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_OnReadMode" translate="yes" xml:space="preserve">
+          <source>Read Mode On</source>
+          <target state="new">Read Mode On</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_OutReadMode" translate="yes" xml:space="preserve">
+          <source>Read Mode Off</source>
+          <target state="new">Read Mode Off</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Oval" translate="yes" xml:space="preserve">
+          <source>Oval</source>
+          <target state="new">Oval</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Paste" translate="yes" xml:space="preserve">
+          <source>Paste</source>
+          <target state="new">Paste</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Rectangle" translate="yes" xml:space="preserve">
+          <source>Rectangle</source>
+          <target state="new">Rectangle</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_RemoveBookmarks" translate="yes" xml:space="preserve">
+          <source>Remove Bookmarks</source>
+          <target state="new">Remove Bookmarks</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_ScrollTool" translate="yes" xml:space="preserve">
+          <source>Scroll Tool</source>
+          <target state="new">Scroll Tool</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_ShowAnnotations" translate="yes" xml:space="preserve">
+          <source>Show Annotations</source>
+          <target state="new">Show Annotations</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Signature" translate="yes" xml:space="preserve">
+          <source>Signature</source>
+          <target state="new">Signature</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Stamp" translate="yes" xml:space="preserve">
+          <source>Stamp</source>
+          <target state="new">Stamp</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_StraightLine" translate="yes" xml:space="preserve">
+          <source>Straight Line</source>
+          <target state="new">Straight Line</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Strikethrough" translate="yes" xml:space="preserve">
+          <source>Strikethrough</source>
+          <target state="new">Strikethrough</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Text" translate="yes" xml:space="preserve">
+          <source>Text</source>
+          <target state="new">Text</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Underline" translate="yes" xml:space="preserve">
+          <source>Underline</source>
+          <target state="new">Underline</target>
+        </trans-unit>
       </group>
     </body>
   </file>

+ 220 - 1
PDF Office/MultilingualResources/PDF Office.zh-Hant.xlf

@@ -51,7 +51,44 @@
       <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.1.12.0" tool-company="Microsoft" />
     </header>
     <body>
-      <group id="PDF OFFICE/STRINGS/HOMEPAGE/HOMEPAGE.RESX" datatype="resx" />
+      <group id="PDF OFFICE/STRINGS/HOMEPAGE/HOMEPAGE.RESX" datatype="resx">
+        <trans-unit id="HomeList_MenuRemove" translate="yes" xml:space="preserve">
+          <source>Remove from Recents</source>
+          <target state="new">Remove from Recents</target>
+        </trans-unit>
+        <trans-unit id="HomeList_MenuShow" translate="yes" xml:space="preserve">
+          <source>Show in Folder</source>
+          <target state="new">Show in Folder</target>
+        </trans-unit>
+        <trans-unit id="HomeList_NoFilesContent" translate="yes" xml:space="preserve">
+          <source>Click “Open Files” or drag file here to open</source>
+          <target state="new">Click “Open Files” or drag file here to open</target>
+        </trans-unit>
+        <trans-unit id="HomeList_NoFilesTitle" translate="yes" xml:space="preserve">
+          <source>No recently opened files</source>
+          <target state="new">No recently opened files</target>
+        </trans-unit>
+        <trans-unit id="HomeList_Title" translate="yes" xml:space="preserve">
+          <source>Recents</source>
+          <target state="new">Recents</target>
+        </trans-unit>
+        <trans-unit id="HomeTool_Title" translate="yes" xml:space="preserve">
+          <source>Quick Tools</source>
+          <target state="new">Quick Tools</target>
+        </trans-unit>
+        <trans-unit id="Home_CreatePDF" translate="yes" xml:space="preserve">
+          <source>Create PDF</source>
+          <target state="new">Create PDF</target>
+        </trans-unit>
+        <trans-unit id="Home_CreateToNew" translate="yes" xml:space="preserve">
+          <source>New Blank Page</source>
+          <target state="new">New Blank Page</target>
+        </trans-unit>
+        <trans-unit id="Home_OpenFiles" translate="yes" xml:space="preserve">
+          <source>Open Files</source>
+          <target state="new">Open Files</target>
+        </trans-unit>
+      </group>
     </body>
   </file>
   <file datatype="xml" source-language="en-US" target-language="zh-Hant" original="PDF OFFICE/STRINGS/MAINPAGE/MAINPAGE.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
@@ -355,6 +392,188 @@ Drag files to reorder as you need.</target>
           <source>Undo</source>
           <target state="new">Undo</target>
         </trans-unit>
+        <trans-unit id="Zoom_Actual" translate="yes" xml:space="preserve">
+          <source>Actual Size</source>
+          <target state="new">Actual Size</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">阅读页底部工具栏-缩放菜单实际大小选项</note>
+        </trans-unit>
+        <trans-unit id="Zoom_FitPage" translate="yes" xml:space="preserve">
+          <source>Fit Page</source>
+          <target state="new">Fit Page</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">阅读页底部工具栏-缩放菜单适应宽度选项</note>
+        </trans-unit>
+        <trans-unit id="Zoom_FitWidth" translate="yes" xml:space="preserve">
+          <source>Fit Width</source>
+          <target state="new">Fit Width</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">阅读页底部工具栏-缩放菜单适应页面选项</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Title" translate="yes" xml:space="preserve">
+          <source>View</source>
+          <target state="new">View</target>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Book" translate="yes" xml:space="preserve">
+          <source>Book Mode</source>
+          <target state="new">Book Mode</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">书本模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Full" translate="yes" xml:space="preserve">
+          <source>Full Screen</source>
+          <target state="new">Full Screen</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">全屏模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Mode" translate="yes" xml:space="preserve">
+          <source>Display Mode</source>
+          <target state="new">Display Mode</target>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Read" translate="yes" xml:space="preserve">
+          <source>Read Mode</source>
+          <target state="new">Read Mode</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">阅读模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Single" translate="yes" xml:space="preserve">
+          <source>Single Page</source>
+          <target state="new">Single Page</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">单页模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_Two" translate="yes" xml:space="preserve">
+          <source>Two Pages</source>
+          <target state="new">Two Pages</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">双页模式</note>
+        </trans-unit>
+        <trans-unit id="ViewProperties_ContinuousScroll" translate="yes" xml:space="preserve">
+          <source>Continuous Scroll</source>
+          <target state="new">Continuous Scroll</target>
+        </trans-unit>
+        <trans-unit id="ViewProperties_PageBreak" translate="yes" xml:space="preserve">
+          <source>Page Break</source>
+          <target state="new">Page Break</target>
+        </trans-unit>
+        <trans-unit id="ViewProperties_RotateTitle" translate="yes" xml:space="preserve">
+          <source>Rotate</source>
+          <target state="new">Rotate</target>
+        </trans-unit>
+        <trans-unit id="GlobalTip_ESCReadMode" translate="yes" xml:space="preserve">
+          <source>Enter Read Mode, tap ESC to exit</source>
+          <target state="new">Enter Read Mode, tap ESC to exit</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">进入阅读模式,提示可以按ESC退出</note>
+        </trans-unit>
+        <trans-unit id="GlobalTip_ExitReadMode" translate="yes" xml:space="preserve">
+          <source>Exit Read Mode</source>
+          <target state="new">Exit Read Mode</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AddBookmarks" translate="yes" xml:space="preserve">
+          <source>Add Bookmarks</source>
+          <target state="new">Add Bookmarks</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AddComment" translate="yes" xml:space="preserve">
+          <source>Add Comment</source>
+          <target state="new">Add Comment</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AddLink" translate="yes" xml:space="preserve">
+          <source>Add Link</source>
+          <target state="new">Add Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AddOutline" translate="yes" xml:space="preserve">
+          <source>Add Outline</source>
+          <target state="new">Add Outline</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_AreaZoom" translate="yes" xml:space="preserve">
+          <source>Zoom to Selected Area</source>
+          <target state="new">Zoom to Selected Area</target>
+          <note from="MultilingualBuild" annotates="source" priority="2">缩放至选定区域</note>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Arrow" translate="yes" xml:space="preserve">
+          <source>Arrow</source>
+          <target state="new">Arrow</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_ContentSelection" translate="yes" xml:space="preserve">
+          <source>Content Selection</source>
+          <target state="new">Content Selection</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Copy" translate="yes" xml:space="preserve">
+          <source>Copy</source>
+          <target state="new">Copy</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_ExtractImage" translate="yes" xml:space="preserve">
+          <source>Extract Image</source>
+          <target state="new">Extract Image</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Freehand" translate="yes" xml:space="preserve">
+          <source>Freehand</source>
+          <target state="new">Freehand</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_HideAnnotations" translate="yes" xml:space="preserve">
+          <source>Hide Annotations</source>
+          <target state="new">Hide Annotations</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Highlight" translate="yes" xml:space="preserve">
+          <source>Highlight</source>
+          <target state="new">Highlight</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Link" translate="yes" xml:space="preserve">
+          <source>Link</source>
+          <target state="new">Link</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Note" translate="yes" xml:space="preserve">
+          <source>Note</source>
+          <target state="new">Note</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_OnReadMode" translate="yes" xml:space="preserve">
+          <source>Read Mode On</source>
+          <target state="new">Read Mode On</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_OutReadMode" translate="yes" xml:space="preserve">
+          <source>Read Mode Off</source>
+          <target state="new">Read Mode Off</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Oval" translate="yes" xml:space="preserve">
+          <source>Oval</source>
+          <target state="new">Oval</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Paste" translate="yes" xml:space="preserve">
+          <source>Paste</source>
+          <target state="new">Paste</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Rectangle" translate="yes" xml:space="preserve">
+          <source>Rectangle</source>
+          <target state="new">Rectangle</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_RemoveBookmarks" translate="yes" xml:space="preserve">
+          <source>Remove Bookmarks</source>
+          <target state="new">Remove Bookmarks</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_ScrollTool" translate="yes" xml:space="preserve">
+          <source>Scroll Tool</source>
+          <target state="new">Scroll Tool</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_ShowAnnotations" translate="yes" xml:space="preserve">
+          <source>Show Annotations</source>
+          <target state="new">Show Annotations</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Signature" translate="yes" xml:space="preserve">
+          <source>Signature</source>
+          <target state="new">Signature</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Stamp" translate="yes" xml:space="preserve">
+          <source>Stamp</source>
+          <target state="new">Stamp</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_StraightLine" translate="yes" xml:space="preserve">
+          <source>Straight Line</source>
+          <target state="new">Straight Line</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Strikethrough" translate="yes" xml:space="preserve">
+          <source>Strikethrough</source>
+          <target state="new">Strikethrough</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Text" translate="yes" xml:space="preserve">
+          <source>Text</source>
+          <target state="new">Text</target>
+        </trans-unit>
+        <trans-unit id="ViewRightMenu_Underline" translate="yes" xml:space="preserve">
+          <source>Underline</source>
+          <target state="new">Underline</target>
+        </trans-unit>
       </group>
     </body>
   </file>

+ 0 - 27
PDF Office/PDF Office.csproj

@@ -2429,36 +2429,9 @@
     <Content Include="x64\CPDFConverterNative.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="x64\ComDocumentAINative.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\DocumentAI.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\libiomp5md.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\mkldnn.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\mklml.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\onnxruntime.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="x64\opencv_world420.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="x64\opencv_world420d.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\paddle2onnx.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\paddle_inference.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="x64\libhpdf.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

+ 81 - 0
PDF Office/Strings/HomePage/HomePage.Designer.cs

@@ -59,5 +59,86 @@ namespace PDF_Office.Strings.HomePage {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   查找类似 Create PDF 的本地化字符串。
+        /// </summary>
+        public static string Home_CreatePDF {
+            get {
+                return ResourceManager.GetString("Home_CreatePDF", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 New Blank Page 的本地化字符串。
+        /// </summary>
+        public static string Home_CreateToNew {
+            get {
+                return ResourceManager.GetString("Home_CreateToNew", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Open Files 的本地化字符串。
+        /// </summary>
+        public static string Home_OpenFiles {
+            get {
+                return ResourceManager.GetString("Home_OpenFiles", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Remove from Recents 的本地化字符串。
+        /// </summary>
+        public static string HomeList_MenuRemove {
+            get {
+                return ResourceManager.GetString("HomeList_MenuRemove", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Show in Folder 的本地化字符串。
+        /// </summary>
+        public static string HomeList_MenuShow {
+            get {
+                return ResourceManager.GetString("HomeList_MenuShow", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Click “Open Files” or drag file here to open 的本地化字符串。
+        /// </summary>
+        public static string HomeList_NoFilesContent {
+            get {
+                return ResourceManager.GetString("HomeList_NoFilesContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 No recently opened files 的本地化字符串。
+        /// </summary>
+        public static string HomeList_NoFilesTitle {
+            get {
+                return ResourceManager.GetString("HomeList_NoFilesTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Recents 的本地化字符串。
+        /// </summary>
+        public static string HomeList_Title {
+            get {
+                return ResourceManager.GetString("HomeList_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Quick Tools 的本地化字符串。
+        /// </summary>
+        public static string HomeTool_Title {
+            get {
+                return ResourceManager.GetString("HomeTool_Title", resourceCulture);
+            }
+        }
     }
 }

+ 27 - 0
PDF Office/Strings/HomePage/HomePage.resx

@@ -117,4 +117,31 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="HomeList_MenuRemove" xml:space="preserve">
+    <value>Remove from Recents</value>
+  </data>
+  <data name="HomeList_MenuShow" xml:space="preserve">
+    <value>Show in Folder</value>
+  </data>
+  <data name="HomeList_NoFilesContent" xml:space="preserve">
+    <value>Click “Open Files” or drag file here to open</value>
+  </data>
+  <data name="HomeList_NoFilesTitle" xml:space="preserve">
+    <value>No recently opened files</value>
+  </data>
+  <data name="HomeList_Title" xml:space="preserve">
+    <value>Recents</value>
+  </data>
+  <data name="HomeTool_Title" xml:space="preserve">
+    <value>Quick Tools</value>
+  </data>
+  <data name="Home_CreatePDF" xml:space="preserve">
+    <value>Create PDF</value>
+  </data>
+  <data name="Home_CreateToNew" xml:space="preserve">
+    <value>New Blank Page</value>
+  </data>
+  <data name="Home_OpenFiles" xml:space="preserve">
+    <value>Open Files</value>
+  </data>
 </root>

+ 501 - 69
PDF Office/Strings/MainPage/MainPage.Designer.cs

@@ -61,83 +61,20 @@ namespace PDF_Office.Strings.MainPage {
         }
         
         /// <summary>
-        ///   查找类似 Create PDF 的本地化字符串。
+        ///   查找类似 Enter Read Mode, tap ESC to exit 的本地化字符串。
         /// </summary>
-        public static string Home_CreatePDF {
+        public static string GlobalTip_ESCReadMode {
             get {
-                return ResourceManager.GetString("Home_CreatePDF", resourceCulture);
+                return ResourceManager.GetString("GlobalTip_ESCReadMode", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   查找类似 New Blank Page 的本地化字符串。
+        ///   查找类似 Exit Read Mode 的本地化字符串。
         /// </summary>
-        public static string Home_CreateToNew {
+        public static string GlobalTip_ExitReadMode {
             get {
-                return ResourceManager.GetString("Home_CreateToNew", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Open Files 的本地化字符串。
-        /// </summary>
-        public static string Home_OpenFiles {
-            get {
-                return ResourceManager.GetString("Home_OpenFiles", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Remove from Recents 的本地化字符串。
-        /// </summary>
-        public static string HomeList_MenuRemove {
-            get {
-                return ResourceManager.GetString("HomeList_MenuRemove", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Show in Folder 的本地化字符串。
-        /// </summary>
-        public static string HomeList_MenuShow {
-            get {
-                return ResourceManager.GetString("HomeList_MenuShow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Click “Open Files” or drag file here to open 的本地化字符串。
-        /// </summary>
-        public static string HomeList_NoFilesContent {
-            get {
-                return ResourceManager.GetString("HomeList_NoFilesContent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 No recently opened files 的本地化字符串。
-        /// </summary>
-        public static string HomeList_NoFilesTitle {
-            get {
-                return ResourceManager.GetString("HomeList_NoFilesTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Recents 的本地化字符串。
-        /// </summary>
-        public static string HomeList_Title {
-            get {
-                return ResourceManager.GetString("HomeList_Title", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Quick Tools 的本地化字符串。
-        /// </summary>
-        public static string HomeTool_Title {
-            get {
-                return ResourceManager.GetString("HomeTool_Title", resourceCulture);
+                return ResourceManager.GetString("GlobalTip_ExitReadMode", resourceCulture);
             }
         }
         
@@ -548,6 +485,474 @@ namespace PDF_Office.Strings.MainPage {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Book Mode 的本地化字符串。
+        /// </summary>
+        public static string ViewProperties_Book {
+            get {
+                return ResourceManager.GetString("ViewProperties_Book", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Continuous Scroll 的本地化字符串。
+        /// </summary>
+        public static string ViewProperties_ContinuousScroll {
+            get {
+                return ResourceManager.GetString("ViewProperties_ContinuousScroll", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Full Screen 的本地化字符串。
+        /// </summary>
+        public static string ViewProperties_Full {
+            get {
+                return ResourceManager.GetString("ViewProperties_Full", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Display Mode 的本地化字符串。
+        /// </summary>
+        public static string ViewProperties_Mode {
+            get {
+                return ResourceManager.GetString("ViewProperties_Mode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Page Break 的本地化字符串。
+        /// </summary>
+        public static string ViewProperties_PageBreak {
+            get {
+                return ResourceManager.GetString("ViewProperties_PageBreak", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Read Mode 的本地化字符串。
+        /// </summary>
+        public static string ViewProperties_Read {
+            get {
+                return ResourceManager.GetString("ViewProperties_Read", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Rotate 的本地化字符串。
+        /// </summary>
+        public static string ViewProperties_RotateTitle {
+            get {
+                return ResourceManager.GetString("ViewProperties_RotateTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Single Page 的本地化字符串。
+        /// </summary>
+        public static string ViewProperties_Single {
+            get {
+                return ResourceManager.GetString("ViewProperties_Single", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 View 的本地化字符串。
+        /// </summary>
+        public static string ViewProperties_Title {
+            get {
+                return ResourceManager.GetString("ViewProperties_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Two Pages 的本地化字符串。
+        /// </summary>
+        public static string ViewProperties_Two {
+            get {
+                return ResourceManager.GetString("ViewProperties_Two", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Actual Size 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_ActualSize {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_ActualSize", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Bookmarks 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_AddBookmarks {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_AddBookmarks", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Comment 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_AddComment {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_AddComment", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Link 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_AddLink {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_AddLink", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Add Outline 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_AddOutline {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_AddOutline", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Zoom to Selected Area 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_AreaZoom {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_AreaZoom", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Arrow 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Arrow {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Arrow", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Book Mode 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_BookMode {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_BookMode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Content Selection 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_ContentSelection {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_ContentSelection", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Copy 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Copy {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Copy", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Extract Image 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_ExtractImage {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_ExtractImage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Fit Page 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_FitPage {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_FitPage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Fit Width 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_FitWidth {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_FitWidth", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Freehand 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Freehand {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Freehand", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Hide Annotations 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_HideAnnotations {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_HideAnnotations", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Highlight 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Highlight {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Highlight", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Link 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Link {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Link", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Note 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Note {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Note", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Read Mode On 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_OnReadMode {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_OnReadMode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Read Mode Off 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_OutReadMode {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_OutReadMode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Oval 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Oval {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Oval", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Page Display 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_PageDisplay {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_PageDisplay", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Paste 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Paste {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Paste", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Print 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Print {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Print", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Rectangle 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Rectangle {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Rectangle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Remove Bookmarks 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_RemoveBookmarks {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_RemoveBookmarks", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Scroll Tool 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_ScrollTool {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_ScrollTool", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Search 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Search {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Search", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Show Annotations 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_ShowAnnotations {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_ShowAnnotations", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Signature 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Signature {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Signature", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Single Page 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_SinglePage {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_SinglePage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Single Page Continuous 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_SinglePageContinuous {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_SinglePageContinuous", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Stamp 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Stamp {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Stamp", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Straight Line 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_StraightLine {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_StraightLine", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Strikethrough 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Strikethrough {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Strikethrough", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Text 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Text {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Text", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Two Pages 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_TwoPages {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_TwoPages", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Two Pages Continuous 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_TwoPagesContinuous {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_TwoPagesContinuous", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Underline 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Underline {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Underline", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Zoom 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_Zoom {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_Zoom", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Zoom In 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_ZoomIn {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_ZoomIn", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Zoom Out 的本地化字符串。
+        /// </summary>
+        public static string ViewRightMenu_ZoomOut {
+            get {
+                return ResourceManager.GetString("ViewRightMenu_ZoomOut", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Annotation 的本地化字符串。
         /// </summary>
@@ -691,5 +1096,32 @@ namespace PDF_Office.Strings.MainPage {
                 return ResourceManager.GetString("WritableComboBox_OddPage", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   查找类似 Actual Size 的本地化字符串。
+        /// </summary>
+        public static string Zoom_Actual {
+            get {
+                return ResourceManager.GetString("Zoom_Actual", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Fit Page 的本地化字符串。
+        /// </summary>
+        public static string Zoom_FitPage {
+            get {
+                return ResourceManager.GetString("Zoom_FitPage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Fit Width 的本地化字符串。
+        /// </summary>
+        public static string Zoom_FitWidth {
+            get {
+                return ResourceManager.GetString("Zoom_FitWidth", resourceCulture);
+            }
+        }
     }
 }

+ 179 - 26
PDF Office/Strings/MainPage/MainPage.resx

@@ -117,33 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="HomeList_MenuRemove" xml:space="preserve">
-    <value>Remove from Recents</value>
+  <data name="GlobalTip_ESCReadMode" xml:space="preserve">
+    <value>Enter Read Mode, tap ESC to exit</value>
+    <comment>进入阅读模式,提示可以按ESC退出</comment>
   </data>
-  <data name="HomeList_MenuShow" xml:space="preserve">
-    <value>Show in Folder</value>
-  </data>
-  <data name="HomeList_NoFilesContent" xml:space="preserve">
-    <value>Click “Open Files” or drag file here to open</value>
-  </data>
-  <data name="HomeList_NoFilesTitle" xml:space="preserve">
-    <value>No recently opened files</value>
-  </data>
-  <data name="HomeList_Title" xml:space="preserve">
-    <value>Recents</value>
-  </data>
-  <data name="HomeTool_Title" xml:space="preserve">
-    <value>Quick Tools</value>
-  </data>
-  <data name="Home_CreatePDF" xml:space="preserve">
-    <value>Create PDF</value>
-  </data>
-  <data name="Home_CreateToNew" xml:space="preserve">
-    <value>New Blank Page</value>
-    <comment>下拉菜单-新建空白文档</comment>
-  </data>
-  <data name="Home_OpenFiles" xml:space="preserve">
-    <value>Open Files</value>
+  <data name="GlobalTip_ExitReadMode" xml:space="preserve">
+    <value>Exit Read Mode</value>
   </data>
   <data name="Merge_AddFiles" xml:space="preserve">
     <value>Add Files</value>
@@ -291,6 +270,168 @@ Drag files to reorder as you need.</value>
   <data name="Stamp_Title" xml:space="preserve">
     <value>Stamp</value>
   </data>
+  <data name="ViewProperties_Book" xml:space="preserve">
+    <value>Book Mode</value>
+    <comment>书本模式</comment>
+  </data>
+  <data name="ViewProperties_ContinuousScroll" xml:space="preserve">
+    <value>Continuous Scroll</value>
+  </data>
+  <data name="ViewProperties_Full" xml:space="preserve">
+    <value>Full Screen</value>
+    <comment>全屏模式</comment>
+  </data>
+  <data name="ViewProperties_Mode" xml:space="preserve">
+    <value>Display Mode</value>
+  </data>
+  <data name="ViewProperties_PageBreak" xml:space="preserve">
+    <value>Page Break</value>
+  </data>
+  <data name="ViewProperties_Read" xml:space="preserve">
+    <value>Read Mode</value>
+    <comment>阅读模式</comment>
+  </data>
+  <data name="ViewProperties_RotateTitle" xml:space="preserve">
+    <value>Rotate</value>
+  </data>
+  <data name="ViewProperties_Single" xml:space="preserve">
+    <value>Single Page</value>
+    <comment>单页模式</comment>
+  </data>
+  <data name="ViewProperties_Title" xml:space="preserve">
+    <value>View</value>
+  </data>
+  <data name="ViewProperties_Two" xml:space="preserve">
+    <value>Two Pages</value>
+    <comment>双页模式</comment>
+  </data>
+  <data name="ViewRightMenu_ActualSize" xml:space="preserve">
+    <value>Actual Size</value>
+  </data>
+  <data name="ViewRightMenu_AddBookmarks" xml:space="preserve">
+    <value>Add Bookmarks</value>
+  </data>
+  <data name="ViewRightMenu_AddComment" xml:space="preserve">
+    <value>Add Comment</value>
+  </data>
+  <data name="ViewRightMenu_AddLink" xml:space="preserve">
+    <value>Add Link</value>
+  </data>
+  <data name="ViewRightMenu_AddOutline" xml:space="preserve">
+    <value>Add Outline</value>
+  </data>
+  <data name="ViewRightMenu_AreaZoom" xml:space="preserve">
+    <value>Zoom to Selected Area</value>
+    <comment>缩放至选定区域</comment>
+  </data>
+  <data name="ViewRightMenu_Arrow" xml:space="preserve">
+    <value>Arrow</value>
+  </data>
+  <data name="ViewRightMenu_BookMode" xml:space="preserve">
+    <value>Book Mode</value>
+  </data>
+  <data name="ViewRightMenu_ContentSelection" xml:space="preserve">
+    <value>Content Selection</value>
+  </data>
+  <data name="ViewRightMenu_Copy" xml:space="preserve">
+    <value>Copy</value>
+  </data>
+  <data name="ViewRightMenu_ExtractImage" xml:space="preserve">
+    <value>Extract Image</value>
+  </data>
+  <data name="ViewRightMenu_FitPage" xml:space="preserve">
+    <value>Fit Page</value>
+  </data>
+  <data name="ViewRightMenu_FitWidth" xml:space="preserve">
+    <value>Fit Width</value>
+  </data>
+  <data name="ViewRightMenu_Freehand" xml:space="preserve">
+    <value>Freehand</value>
+  </data>
+  <data name="ViewRightMenu_HideAnnotations" xml:space="preserve">
+    <value>Hide Annotations</value>
+  </data>
+  <data name="ViewRightMenu_Highlight" xml:space="preserve">
+    <value>Highlight</value>
+  </data>
+  <data name="ViewRightMenu_Link" xml:space="preserve">
+    <value>Link</value>
+  </data>
+  <data name="ViewRightMenu_Note" xml:space="preserve">
+    <value>Note</value>
+  </data>
+  <data name="ViewRightMenu_OnReadMode" xml:space="preserve">
+    <value>Read Mode On</value>
+  </data>
+  <data name="ViewRightMenu_OutReadMode" xml:space="preserve">
+    <value>Read Mode Off</value>
+  </data>
+  <data name="ViewRightMenu_Oval" xml:space="preserve">
+    <value>Oval</value>
+  </data>
+  <data name="ViewRightMenu_PageDisplay" xml:space="preserve">
+    <value>Page Display</value>
+  </data>
+  <data name="ViewRightMenu_Paste" xml:space="preserve">
+    <value>Paste</value>
+  </data>
+  <data name="ViewRightMenu_Print" xml:space="preserve">
+    <value>Print</value>
+  </data>
+  <data name="ViewRightMenu_Rectangle" xml:space="preserve">
+    <value>Rectangle</value>
+  </data>
+  <data name="ViewRightMenu_RemoveBookmarks" xml:space="preserve">
+    <value>Remove Bookmarks</value>
+  </data>
+  <data name="ViewRightMenu_ScrollTool" xml:space="preserve">
+    <value>Scroll Tool</value>
+  </data>
+  <data name="ViewRightMenu_Search" xml:space="preserve">
+    <value>Search</value>
+  </data>
+  <data name="ViewRightMenu_ShowAnnotations" xml:space="preserve">
+    <value>Show Annotations</value>
+  </data>
+  <data name="ViewRightMenu_Signature" xml:space="preserve">
+    <value>Signature</value>
+  </data>
+  <data name="ViewRightMenu_SinglePage" xml:space="preserve">
+    <value>Single Page</value>
+  </data>
+  <data name="ViewRightMenu_SinglePageContinuous" xml:space="preserve">
+    <value>Single Page Continuous</value>
+  </data>
+  <data name="ViewRightMenu_Stamp" xml:space="preserve">
+    <value>Stamp</value>
+  </data>
+  <data name="ViewRightMenu_StraightLine" xml:space="preserve">
+    <value>Straight Line</value>
+  </data>
+  <data name="ViewRightMenu_Strikethrough" xml:space="preserve">
+    <value>Strikethrough</value>
+  </data>
+  <data name="ViewRightMenu_Text" xml:space="preserve">
+    <value>Text</value>
+  </data>
+  <data name="ViewRightMenu_TwoPages" xml:space="preserve">
+    <value>Two Pages</value>
+  </data>
+  <data name="ViewRightMenu_TwoPagesContinuous" xml:space="preserve">
+    <value>Two Pages Continuous</value>
+  </data>
+  <data name="ViewRightMenu_Underline" xml:space="preserve">
+    <value>Underline</value>
+  </data>
+  <data name="ViewRightMenu_Zoom" xml:space="preserve">
+    <value>Zoom</value>
+  </data>
+  <data name="ViewRightMenu_ZoomIn" xml:space="preserve">
+    <value>Zoom In</value>
+  </data>
+  <data name="ViewRightMenu_ZoomOut" xml:space="preserve">
+    <value>Zoom Out</value>
+  </data>
   <data name="ViewTopToolbar_Annotation" xml:space="preserve">
     <value>Annotation</value>
   </data>
@@ -340,4 +481,16 @@ Drag files to reorder as you need.</value>
   <data name="WritableComboBox_OddPage" xml:space="preserve">
     <value>Odd Pages</value>
   </data>
+  <data name="Zoom_Actual" xml:space="preserve">
+    <value>Actual Size</value>
+    <comment>阅读页底部工具栏-缩放菜单实际大小选项</comment>
+  </data>
+  <data name="Zoom_FitPage" xml:space="preserve">
+    <value>Fit Page</value>
+    <comment>阅读页底部工具栏-缩放菜单适应宽度选项</comment>
+  </data>
+  <data name="Zoom_FitWidth" xml:space="preserve">
+    <value>Fit Width</value>
+    <comment>阅读页底部工具栏-缩放菜单适应页面选项</comment>
+  </data>
 </root>

+ 39 - 36
PDF Office/Styles/ContextMenuStyle.xaml

@@ -1,4 +1,7 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:mainpage="clr-namespace:PDF_Office.Strings.MainPage"
+                    >
     <!--  快捷工具展开收缩  -->
     <ContextMenu x:Key="ExpendToolsContextMenu" FontSize="14">
         <MenuItem
@@ -149,7 +152,7 @@
     <!--  阅读页点击空白处菜单  -->
     <ContextMenu x:Key="ViewerContextMenu" FontSize="14">
         <MenuItem
-            Header="粘贴"
+            Header="{x:Static mainpage:MainPage.ViewRightMenu_Copy}"
             InputGestureText="Ctrl+V"
             Tag="Paste" />
         <Separator
@@ -157,32 +160,32 @@
             BorderBrush="#33000000"
             BorderThickness="1"
             Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-        <MenuItem Header="添加注释" Tag="AddAnnotation">
-            <MenuItem Header="绘制" Tag="AnnotFreehand"  />
-            <MenuItem Header="文本" Tag="AnnotFreeText" />
-            <MenuItem Header="便签" Tag="AnnotSticky"/>
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_AddComment}" Tag="AddAnnotation">
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Freehand}" Tag="AnnotFreehand"  />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Text}" Tag="AnnotFreeText" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Note}" Tag="AnnotSticky"/>
             <Separator
                 Height="1"
                 BorderBrush="#33000000"
                 BorderThickness="1"
                 Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-            <MenuItem Header="矩形" Tag="AnnotSquare"  />
-            <MenuItem Header="椭圆形" Tag="AnnotCircle"  />
-            <MenuItem Header="箭头" Tag="AnnotArrow"  />
-            <MenuItem Header="直线" Tag="AnnotLine"  />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Rectangle}" Tag="AnnotSquare"  />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Oval}" Tag="AnnotCircle"  />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Arrow}" Tag="AnnotArrow"  />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_StraightLine}" Tag="AnnotLine"  />
             <Separator
                 Height="1"
                 BorderBrush="#33000000"
                 BorderThickness="1"
                 Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-            <MenuItem Header="链接" Tag="AnnotLink"  />
-            <MenuItem Header="图章" Tag="AnnotStamp"  />
-            <MenuItem Header="签名" Tag="AnnotAutograph"  />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Link}" Tag="AnnotLink"  />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Stamp}" Tag="AnnotStamp"  />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Signature}" Tag="AnnotAutograph"  />
         </MenuItem>
-        <MenuItem Header="隐藏注释" Tag="HiddenAnnot" />
-        <MenuItem Header="显示注释" Tag="DisplayAnnot" />
-        <MenuItem Header="添加书签" Tag="AddBookMark" />
-        <MenuItem Header="删除书签" Tag="DelBookMark" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_HideAnnotations}" Tag="HiddenAnnot" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_ShowAnnotations}" Tag="DisplayAnnot" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_AddBookmarks}" Tag="AddBookMark" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_RemoveBookmarks}" Tag="DelBookMark" />
         <Separator
             Height="1"
             BorderBrush="#33000000"
@@ -190,37 +193,37 @@
             Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
         <MenuItem Header="工具模式" Tag="ToolMode">
             <MenuItem Header="默认工具" Tag="default" IsCheckable="True" />
-            <MenuItem Header="滚动工具" Tag="roll" IsCheckable="True" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_ScrollTool}" Tag="roll" IsCheckable="True" />
             <MenuItem
                 Header="放大镜"
                 Tag="magnifier"
                 Visibility="Collapsed" IsCheckable="True" />
-            <MenuItem Header="内容选择" Tag="content" IsCheckable="True" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_ContentSelection}" Tag="content" IsCheckable="True" />
             <MenuItem
-                Header="缩放至选定区域"
+                Header="{x:Static mainpage:MainPage.ViewRightMenu_AreaZoom}"
                 Tag="zoom"
                 Visibility="Collapsed" IsCheckable="True" />
         </MenuItem>
-        <MenuItem Header="进入阅读模式" Tag="ReadModel" />
-        <MenuItem Header="退出阅读模式" Tag="UnReadModel" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_OnReadMode}" Tag="ReadModel" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_OutReadMode}" Tag="UnReadModel" />
         <Separator
             Height="1"
             BorderBrush="#33000000"
             BorderThickness="1"
             Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-        <MenuItem Header="视图缩放" Tag="ViewZoom">
-            <MenuItem Header="适应宽度" Tag="FitWidth" IsCheckable="True" />
-            <MenuItem Header="适应页面" Tag="FitHeight" IsCheckable="True" />
-            <MenuItem Header="实际大小" Tag="FitSize" IsCheckable="True" />
-            <MenuItem Header="放大" Tag="enlarge" IsCheckable="True" />
-            <MenuItem Header="缩小" Tag="narrow" IsCheckable="True" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Zoom}" Tag="ViewZoom">
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_FitWidth}" Tag="FitWidth" IsCheckable="True" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_FitPage}" Tag="FitHeight" IsCheckable="True" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_ActualSize}" Tag="FitSize" IsCheckable="True" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_ZoomIn}" Tag="enlarge" IsCheckable="True" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_ZoomOut}" Tag="narrow" IsCheckable="True" />
         </MenuItem>
-        <MenuItem Header="页面显示" Tag="PageDisplay">
-            <MenuItem Header="单页" Tag="SingleView" IsCheckable="True" />
-            <MenuItem Header="单页连续" Tag="SingleContinueView" IsCheckable="True" />
-            <MenuItem Header="双页" Tag="DoubleView" IsCheckable="True" />
-            <MenuItem Header="双页连续" Tag="DoubleContinueView" IsCheckable="True" />
-            <MenuItem Header="书本模式" Tag="BookMode" IsCheckable="True" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_PageDisplay}" Tag="PageDisplay">
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_SinglePage}" Tag="SingleView" IsCheckable="True" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_SinglePageContinuous}" Tag="SingleContinueView" IsCheckable="True" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_TwoPages}" Tag="DoubleView" IsCheckable="True" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_TwoPagesContinuous}" Tag="DoubleContinueView" IsCheckable="True" />
+            <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_BookMode}" Tag="BookMode" IsCheckable="True" />
         </MenuItem>
         <MenuItem  Tag="HighlightLinks" Header="高亮显示超链接" IsCheckable="True">
         </MenuItem>
@@ -229,7 +232,7 @@
             BorderBrush="#33000000"
             BorderThickness="1"
             Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-        <MenuItem Header="查找" Tag="Select" />
-        <MenuItem Header="打印" Tag="Print" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Search}" Tag="Select" />
+        <MenuItem Header="{x:Static mainpage:MainPage.ViewRightMenu_Print}" Tag="Print" />
     </ContextMenu>
 </ResourceDictionary>

+ 44 - 0
PDF Office/ViewModels/BottomToolContentViewModel.cs

@@ -27,6 +27,49 @@ namespace PDF_Office.ViewModels
 {
     public class BottomToolContentViewModel : BindableBase, INavigationAware
     {
+        #region 文案
+
+        private string T_actual;
+
+        public string T_Actual
+        {
+            get { return T_actual; }
+            set
+            {
+                SetProperty(ref T_actual, value);
+            }
+        }
+
+        private string T_fitWidth;
+
+        public string T_FitWidth
+        {
+            get { return T_fitWidth; }
+            set
+            {
+                SetProperty(ref T_fitWidth, value);
+            }
+        }
+
+        private string T_fitPage;
+
+        public string T_FitPage
+        {
+            get { return T_fitPage; }
+            set
+            {
+                SetProperty(ref T_fitPage, value);
+            }
+        }
+
+        private void InitString()
+        {
+            T_Actual = App.MainPageLoader.GetString("Zoom_Actual");
+            T_FitWidth = App.MainPageLoader.GetString("Zoom_FitWidth");
+            T_FitPage = App.MainPageLoader.GetString("Zoom_FitPage");
+        }
+
+        #endregion
         public DelegateCommand Load { get; set; }
 
         public DelegateCommand FirstPageCommand { get; set; }
@@ -264,6 +307,7 @@ namespace PDF_Office.ViewModels
             PreViewCommand = new DelegateCommand(undo);
 
             NextViewCommnad = new DelegateCommand(redo);
+            InitString();
         }
 
         private void undo()

+ 98 - 8
PDF Office/ViewModels/FillAndSign/FillAndSignContentViewModel.cs

@@ -38,6 +38,10 @@ using System.Drawing;
 using Color = System.Windows.Media.Color;
 using Brush = System.Windows.Media.Brush;
 using FontFamily = System.Windows.Media.FontFamily;
+using ToolTip = System.Windows.Controls.ToolTip;
+using ContentControl = System.Windows.Controls.ContentControl;
+using MouseEventArgs = System.Windows.Input.MouseEventArgs;
+using Pen = System.Windows.Media.Pen;
 
 namespace PDF_Office.ViewModels.FillAndSign
 {
@@ -69,7 +73,7 @@ namespace PDF_Office.ViewModels.FillAndSign
         
         }
         #endregion
-
+        public DelegateCommand<object> AnnotDefaultValue_MenuCommand { get; set; }
         #region Command
         public DelegateCommand<RoutedEventArgs> CheckCommand { get; set; }
 
@@ -86,9 +90,10 @@ namespace PDF_Office.ViewModels.FillAndSign
             CheckCommand = new DelegateCommand<RoutedEventArgs>(CheckedEvent);
             ToolExpandDict.Add("Freetext", AnnotArgsType.AnnotFreeText);
             InitDictionary();
+            AnnotDefaultValue_MenuCommand = new DelegateCommand<object>(AnnotDefaultValues_Menu);
             InitSelectFreeHandAnnotMenu();
         }
-
+        private void AnnotDefaultValues_Menu(object e){}
         private void CheckedEvent(RoutedEventArgs e)
         {
             IsEdit = false;
@@ -642,6 +647,11 @@ namespace PDF_Office.ViewModels.FillAndSign
             menuItem.Header = "删除";
             pop.BindingEvent(pop.AddItem(menuItem), ApplicationCommands.Delete);
             pop.AddItem(GetSeparator());
+
+            menuItem = new MenuItem();
+            menuItem.Name = "FreeHandDefault";
+            menuItem.Header = "设置当前属性为默认值";
+            pop.BindingEvent(pop.AddItem(menuItem), AnnotDefaultValue_MenuCommand);
             FreeHandAnnotPopMenu = pop;
         }
         private Separator GetSeparator()
@@ -666,6 +676,8 @@ namespace PDF_Office.ViewModels.FillAndSign
                 PDFViewer.AnnotCommandHandler += PDFViewer_AnnotCommandHandler;
                 PDFViewer.AnnotEditHandler -= PDFViewer_AnnotEditHandler;
                 PDFViewer.AnnotEditHandler += PDFViewer_AnnotEditHandler;
+                PDFViewer.AnnotHoverHandler -= PDFViewer_AnnotHoverHandler;
+                PDFViewer.AnnotHoverHandler += PDFViewer_AnnotHoverHandler;
             }
         }
         private void UnBindingPDFViewerHandler()
@@ -675,6 +687,7 @@ namespace PDF_Office.ViewModels.FillAndSign
                 PDFViewer.AnnotActiveHandler -= PDFViewer_AnnotActiveHandler;
                 PDFViewer.AnnotEditHandler -= PDFViewer_AnnotEditHandler;
                 PDFViewer.AnnotCommandHandler -= PDFViewer_AnnotCommandHandler;
+                PDFViewer.AnnotHoverHandler -= PDFViewer_AnnotHoverHandler;
             }
         }
         //在注释工具的状态下,右键菜单
@@ -742,7 +755,7 @@ namespace PDF_Office.ViewModels.FillAndSign
                         }
                         else
                         {
-                           e.PopupMenu = ViewerContextMenu();
+                           e.PopupMenu = ViewerContextMenu(sender);
                             if (e.PopupMenu != null)
                             {
                                 e.Handle = true;
@@ -753,15 +766,92 @@ namespace PDF_Office.ViewModels.FillAndSign
                     break;
             }
         }
-        private ContextMenu ViewerContextMenu()
+
+        private void PDFViewer_AnnotHoverHandler(object sender, AnnotHoverData e)
+        {
+            if (e != null && e.DrawContext != null)
+            {
+                Rect hoverRect = new Rect(
+                    e.PaintRect.Left - 2,
+                    e.PaintRect.Top - 2,
+                    e.PaintRect.Width + 4,
+                    e.PaintRect.Height + 4);
+                Pen hoverPen = new Pen(new SolidColorBrush(Color.FromArgb(0xff, 0x11, 0x8A, 0xff)), 1);
+                hoverPen.DashStyle = DashStyles.Dash;
+                e.DrawContext?.DrawRectangle(null, hoverPen, hoverRect);
+
+                //Todo:目前ComPDFKit.Viewer没有e.Annot参数
+                //便签,显示ToolTip内容
+                //if (e.Annot != null && e.Annot.Type == C_ANNOTATION_TYPE.C_ANNOTATION_TEXT)
+                //{
+                //    if (PDFViewer.ToolTip == null)
+                //    {
+                //        var content = e.Annot.GetContent();
+                //        if (string.IsNullOrEmpty(content) == false)
+                //        {
+                //            ToolTip TipChild = new ToolTip();
+                //            TipChild.Style = App.Current.Resources["FlowToolTip"] as Style;
+                //            TipChild.MaxWidth = 246;
+                //            TipChild.Content = content;
+                //            TipChild.Visibility = Visibility.Visible;
+                //            TipChild.IsOpen = true;
+                //            TipChild.Placement = PlacementMode.Right;
+                //            var rec = e.Annot.GetRect();
+                //            TipChild.PlacementRectangle = new Rect(rec.left, rec.top, rec.right, rec.bottom);
+                //            TipChild.PlacementTarget = PDFViewer.Parent as ContentControl;
+                //            TipChild.Placement = PlacementMode.MousePoint;
+                //            PDFViewer.ToolTip = TipChild;
+                //            oldRect = hoverRect;
+                //            PDFViewer.MouseMove -= PDFViewer_MouseMove;
+                //            PDFViewer.MouseMove += PDFViewer_MouseMove;
+                //            return;
+                //        }
+
+                //    }
+
+                //}
+            }
+
+            CloseAnnotToolTip();
+        }
+
+        private Rect oldRect = new Rect(0, 0, 0, 0);
+
+        private void CloseAnnotToolTip()
+        {
+            if (PDFViewer.ToolTip != null && PDFViewer.ToolTip is ToolTip)
+            {
+                ToolTip oldTips = (ToolTip)PDFViewer.ToolTip;
+                oldTips.IsOpen = false;
+                oldTips.Visibility = Visibility.Collapsed;
+                PDFViewer.ToolTip = null;
+                PDFViewer.MouseMove -= PDFViewer_MouseMove;
+                oldRect = new Rect(0, 0, 0, 0);
+            }
+        }
+
+        private void PDFViewer_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (sender != null && PDFViewer.ToolTip != null && PDFViewer.Parent != null)
+            {
+                var newPoint = e.GetPosition(PDFViewer.Parent as ContentControl);
+                var isOutw = newPoint.X > (oldRect.X + oldRect.Width + 4);
+                var isOuth = newPoint.Y > (oldRect.Y + oldRect.Height + 4);
+                if (newPoint.X < oldRect.X || newPoint.Y < oldRect.Y || isOutw || isOuth)
+                {
+                    CloseAnnotToolTip();
+                }
+            }
+        }
+        private ContextMenu ViewerContextMenu(object sender)
         {
             ContextMenu contextMenu = App.Current.FindResource("ViewerContextMenu") as ContextMenu;
            
-            ViewerContextMenu_Loaded(contextMenu, null);
+            ViewerContextMenu_Loaded(contextMenu,sender);
             return contextMenu;
         }
 
-        private void ViewerContextMenu_Loaded(object sender, RoutedEventArgs e,Visibility visibility =Visibility.Collapsed)
+        private void ViewerContextMenu_Loaded(object sender,object e,Visibility visibility =Visibility.Collapsed)
         {
             ContextMenu contextMenu = sender as ContextMenu;
             if (contextMenu.Items.Count > 0)
@@ -784,7 +874,7 @@ namespace PDF_Office.ViewModels.FillAndSign
                         
                         switch (menuItem1.Tag.ToString())
                         {
-                            case "Copy":
+                            case "Paste":
                                 //粘贴
                                 //if (!ApplicationCommands.Paste.CanExecute(null, (UIElement)sender))
                                 //{
@@ -796,7 +886,7 @@ namespace PDF_Office.ViewModels.FillAndSign
                                 //    menuItem1.IsEnabled = true;
                                 //    menuItem1.Opacity = 1;
                                 //}
-                                menuItem1.CommandTarget = (UIElement)PDFViewer;
+                                menuItem1.CommandTarget = (UIElement)e;
                                 menuItem1.Command = ApplicationCommands.Paste;
                                 break;
 

+ 3 - 3
PDF Office/ViewModels/HomeContentViewModel.cs

@@ -56,9 +56,9 @@ namespace PDF_Office.ViewModels
         }
         private void InitString()
         {
-            T_OpenFiles= App.MainPageLoader.GetString("Home_OpenFiles");
-            T_CreatePDF = App.MainPageLoader.GetString("Home_CreatePDF");
-            T_CreatePDFToNew = App.MainPageLoader.GetString("Home_CreateToNew");
+            T_OpenFiles= App.HomePageLoader.GetString("Home_OpenFiles");
+            T_CreatePDF = App.HomePageLoader.GetString("Home_CreatePDF");
+            T_CreatePDFToNew = App.HomePageLoader.GetString("Home_CreateToNew");
         }
 
         #endregion

+ 21 - 1
PDF Office/ViewModels/HomePanel/PDFTools/QuickToolsContentViewModel.cs

@@ -25,6 +25,26 @@ namespace PDF_Office.ViewModels.HomePanel.PDFTools
 {
     public class QuickToolsContentViewModel : BindableBase
     {
+        #region 文案
+
+        private string T_title;
+
+        public string T_Title
+        {
+            get { return T_title; }
+            set
+            {
+                SetProperty(ref T_title, value);
+            }
+        }
+
+
+        private void InitString()
+        {
+            T_Title = App.HomePageLoader.GetString("HomeTool_Title");
+        }
+
+        #endregion
         #region 属性
         /// <summary>
         /// 扩展/收缩
@@ -70,7 +90,7 @@ namespace PDF_Office.ViewModels.HomePanel.PDFTools
 
             InitVariable();
             InitCommand();
-            
+            InitString();
         }
 
         #region 初始化和绑定

+ 5 - 5
PDF Office/ViewModels/HomePanel/RecentFiles/RecentFilesContentViewModel.cs

@@ -82,11 +82,11 @@ namespace PDF_Office.ViewModels.HomePanel.RecentFiles
 
         private void InitString()
         {
-            T_Title = App.MainPageLoader.GetString("HomeList_Title");
-            T_MenuShow = App.MainPageLoader.GetString("HomeList_MenuShow");
-            T_MenuRemove = App.MainPageLoader.GetString("HomeList_MenuRemove");
-            T_NoFilesTitle = App.MainPageLoader.GetString("HomeList_NoFilesTitle");
-            T_NoFilesContent = App.MainPageLoader.GetString("HomeList_NoFilesContent");
+            T_Title = App.HomePageLoader.GetString("HomeList_Title");
+            T_MenuShow = App.HomePageLoader.GetString("HomeList_MenuShow");
+            T_MenuRemove = App.HomePageLoader.GetString("HomeList_MenuRemove");
+            T_NoFilesTitle = App.HomePageLoader.GetString("HomeList_NoFilesTitle");
+            T_NoFilesContent = App.HomePageLoader.GetString("HomeList_NoFilesContent");
         }
 
         #endregion

+ 3 - 4
PDF Office/ViewModels/PropertyPanel/AnnotPanel/LinkAnnotPropertyViewModel.cs

@@ -770,7 +770,6 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
                         //viewContentViewModel.LinkAnnotTipVisibility = Visibility.Collapsed;
                         viewContentViewModel.TipVisible = Visibility.Collapsed;
 
-                       
                         //没有选择注释工具、也不是右键添加注释
                         //在阅读页,选择注释后,点击按钮
                         //需要设置相关参数
@@ -779,11 +778,11 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
                             pdfViewer.SetMouseMode(MouseModes.PanTool);
                             propertyPanel.IsLocationLink = false;
                         }
-                        await System.Threading.Tasks.Task.Delay(5);
+                        //await System.Threading.Tasks.Task.Delay(5);
                         pdfViewer.GoToPage(historyPageIndex);
 
-                        //await System.Threading.Tasks.Task.Delay(5);
-                        SelectAnnotation();
+                        await System.Threading.Tasks.Task.Delay(5);
+                        pdfViewer.SelectAnnotation(LinkAnnotArgs.PageIndex, LinkAnnotArgs.AnnotIndex);
 
                         BtnLocationIsChecked = false;
                         //}

+ 21 - 0
PDF Office/ViewModels/PropertyPanel/ViewModular/ReadViewContentViewModel.cs

@@ -17,6 +17,26 @@ namespace PDF_Office.ViewModels.PropertyPanel.ViewModular
 {
     public class ReadViewContentViewModel : BindableBase, INavigationAware
     {
+        #region 文案
+
+        private string T_ESCreadMode;
+
+        public string T_ESCReadMode
+        {
+            get { return T_ESCreadMode; }
+            set
+            {
+                SetProperty(ref T_ESCreadMode, value);
+            }
+        }
+
+
+        private void InitString()
+        {
+            T_ESCReadMode = App.MainPageLoader.GetString("GlobalTip_ESCReadMode");
+        }
+
+        #endregion
         public string ReadRegionName { get; set; }
         public string ReadModeRegionName { get; set; }
 
@@ -117,6 +137,7 @@ namespace PDF_Office.ViewModels.PropertyPanel.ViewModular
             ReadModeRegionName = RegionNames.ReadModePageRegionName;
             ReadModeContentVisibility = Visibility.Visible;
             RectangleReadModeVisibility = Visibility.Collapsed;
+            InitString();
         }
 
         public bool IsNavigationTarget(NavigationContext navigationContext)

+ 133 - 1
PDF Office/ViewModels/PropertyPanel/ViewModular/ViewModularContentViewModel.cs

@@ -23,6 +23,137 @@ namespace PDF_Office.ViewModels.PropertyPanel.ViewModular
 {
     public class ViewModularContentViewModel : BindableBase, INavigationAware
     {
+
+        #region 文案
+        private string T_title;
+
+        public string T_Title
+        {
+            get { return T_title; }
+            set
+            {
+                SetProperty(ref T_title, value);
+            }
+        }
+
+        private string T_modeTitle;
+
+        public string T_ModeTitle
+        {
+            get { return T_modeTitle; }
+            set
+            {
+                SetProperty(ref T_modeTitle, value);
+            }
+        }
+
+        private string T_single;
+
+        public string T_Single
+        {
+            get { return T_single; }
+            set
+            {
+                SetProperty(ref T_single, value);
+            }
+        }
+
+        private string T_two;
+
+        public string T_Two
+        {
+            get { return T_two; }
+            set
+            {
+                SetProperty(ref T_two, value);
+            }
+        }
+
+        private string T_book;
+
+        public string T_Book
+        {
+            get { return T_book; }
+            set
+            {
+                SetProperty(ref T_book, value);
+            }
+        }
+
+        private string T_read;
+
+        public string T_Read
+        {
+            get { return T_read; }
+            set
+            {
+                SetProperty(ref T_read, value);
+            }
+        }
+
+        private string T_full;
+
+        public string T_Full
+        {
+            get { return T_full; }
+            set
+            {
+                SetProperty(ref T_full, value);
+            }
+        }
+
+        private string T_continuousScroll;
+
+        public string T_ContinuousScroll
+        {
+            get { return T_continuousScroll; }
+            set
+            {
+                SetProperty(ref T_continuousScroll, value);
+            }
+        }
+
+        private string T_pageBreak;
+
+        public string T_PageBreak
+        {
+            get { return T_pageBreak; }
+            set
+            {
+                SetProperty(ref T_pageBreak, value);
+            }
+        }
+
+        private string T_rotateTitle;
+
+        public string T_RotateTitle
+        {
+            get { return T_rotateTitle; }
+            set
+            {
+                SetProperty(ref T_rotateTitle, value);
+            }
+        }
+
+
+
+        private void InitString()
+        {
+            T_Title = App.MainPageLoader.GetString("ViewProperties_Title");
+            T_ModeTitle = App.MainPageLoader.GetString("ViewProperties_Mode");
+            T_Single = App.MainPageLoader.GetString("ViewProperties_Single");
+            T_Two = App.MainPageLoader.GetString("ViewProperties_Two");
+            T_Book = App.MainPageLoader.GetString("ViewProperties_Book");
+            T_Read = App.MainPageLoader.GetString("ViewProperties_Read");
+            T_Full = App.MainPageLoader.GetString("ViewProperties_Full");
+            T_ContinuousScroll = App.MainPageLoader.GetString("ViewProperties_ContinuousScroll");
+            T_PageBreak = App.MainPageLoader.GetString("ViewProperties_PageBreak");
+            T_RotateTitle = App.MainPageLoader.GetString("ViewProperties_RotateTitle");
+        }
+
+
+        #endregion
+
         private IRegionManager region;
 
         private IDialogService dialogs;
@@ -146,6 +277,7 @@ namespace PDF_Office.ViewModels.PropertyPanel.ViewModular
 
         public ViewModularContentViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
+            InitString();
             region = regionManager;
             dialogs = dialogService;
             //未显示时无法注册上Region名称,所以需要短暂显示
@@ -353,7 +485,7 @@ namespace PDF_Office.ViewModels.PropertyPanel.ViewModular
                 {
                     case "VerticalSplit":
                         ViewContentViewModel.EnterSplitMode(EventAggregators.SplitMode.Vertical);
-                        OpenFileInfo.LastSplitMode= ComPDFKitViewer.SplitMode.Vertical;
+                        OpenFileInfo.LastSplitMode = ComPDFKitViewer.SplitMode.Vertical;
                         break;
 
                     case "HorizontalSplit":

+ 11 - 1
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

@@ -237,7 +237,11 @@ namespace PDF_Office.ViewModels.Tools
                 case AnnotArgsType.AnnotLink:
                     //viewContentViewModel.IsCreateLink = false;
                     //e.IsAnnotCreateReset= true;
-                    propertyPanel.IsAddLink = false;
+                    if (btnLinkIsChecked == false)
+                    {
+                        propertyPanel.IsAddLink = false;
+                    }
+
                     GetLink(e.AnnotItemsList, e);
                     break;
 
@@ -809,6 +813,12 @@ namespace PDF_Office.ViewModels.Tools
                             break;
                     }
                 }
+                //空白处 右键菜单 添加注释   为单次添加,不连续添加
+                if (IsNoSelectMenu)
+                {
+                    IsNoSelectMenu = false;
+                    PDFViewer.SetMouseMode(MouseModes.PanTool);
+                }
             }
         }
 

+ 77 - 1
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Function.cs

@@ -945,6 +945,81 @@ namespace PDF_Office.ViewModels.Tools
 
         #region 菜单
 
+
+
+        /// <summary>
+        /// 空白处-右键菜单-添加注释
+        /// </summary>
+        /// <param name="sender"></param>
+        private void AddAnnotation_Click(object sender)
+        {
+            if (sender is MenuItem menuItem)
+            {
+                AnnotHandlerEventArgs annotHandler = null;
+                string str = menuItem.Tag.ToString();
+                viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+                propertyPanel.IsAddLink = false;
+                propertyPanel.IsLocationLink = false;
+                if (str == AddAnnotType.AnnotFreehand.ToString())
+                {
+                    annotHandler = GetFreehand();
+                }
+                if (str == AddAnnotType.AnnotFreeText.ToString())
+                {
+                    annotHandler = GetFreetext();
+                }
+                if (str == AddAnnotType.AnnotSticky.ToString())
+                {
+                    annotHandler = GetStickyNote();
+                }
+                if (str == AddAnnotType.AnnotSquare.ToString())
+                {
+                    annotHandler = GetRect();
+                }
+                if (str == AddAnnotType.AnnotCircle.ToString())
+                {
+                    annotHandler = GetCircle();
+                }
+                if (str == AddAnnotType.AnnotArrow.ToString())
+                {
+                    annotHandler = GetArrowLine("Arrow");
+                }
+                if (str == AddAnnotType.AnnotLine.ToString())
+                {
+                    annotHandler = GetArrowLine("Line");
+                }
+                if (str == AddAnnotType.AnnotLink.ToString())
+                {
+                    propertyPanel.IsAddLink = true;
+                    annotHandler = GetLink();
+                }
+                if (str == AddAnnotType.AnnotStamp.ToString())
+                {
+                    annotHandler = GetStamp();
+                }
+                if (str == AddAnnotType.AnnotAutograph.ToString())
+                {
+                    annotHandler = GetSignature();
+                }
+                if (annotHandler != null)
+                {
+                    annotHandler.Author = Settings.Default.AppProperties.Description.Author;
+                    PDFViewer.SetMouseMode(MouseModes.AnnotCreate);
+                    PDFViewer.SetToolParam(annotHandler);
+                    //是否展开右侧面板 =>否(链接、图章、签名除外)
+                    ShowPropertyPanel(false);
+                    if (str == AddAnnotType.AnnotLink.ToString()
+                        || str == AddAnnotType.AnnotStamp.ToString()
+                        || str == AddAnnotType.AnnotAutograph.ToString()
+                        )
+                    {
+                        ShowPropertyPanel(true);
+                    }
+                    IsNoSelectMenu = true;
+                }
+            }
+        }
+
         /// <summary>
         /// 选择文本、图片,右键菜单
         /// </summary>
@@ -1002,7 +1077,8 @@ namespace PDF_Office.ViewModels.Tools
 
                     case "StickyNote"://便签
                         StickyAnnotArgs stickyAnnotArgs = (StickyAnnotArgs)GetStickyNote();
-                        stickyAnnotArgs.ClientRect = annotCommand.TextRect;
+                        //stickyAnnotArgs.ClientRect = annotCommand.TextRect;
+                        stickyAnnotArgs.ClientRect = new Rect(annotCommand.TextRect.X, annotCommand.TextRect.Y - annotCommand.TextRect.Height, annotCommand.TextRect.Width, annotCommand.TextRect.Height);
                         stickyAnnotArgs.StickyNote = annotCommand.Text;
                         PDFViewer.CreatePageAnnot(annotCommand.PageIndex, stickyAnnotArgs);
                         break;

+ 11 - 11
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Layout.cs

@@ -312,7 +312,7 @@ namespace PDF_Office.ViewModels.Tools
                 separator = SetSeparator();
                 popMenu.Items.Add(separator);
 
-                SetSelectTextOrImageMenuItem("导出图片...", "ExportPicture", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_ExtractImage"), "ExportPicture", annotCommand, out menuItem);
                 popMenu.Items.Add(menuItem);
             }
             else if (annotCommand.CommandTarget == TargetType.Annot)
@@ -320,43 +320,43 @@ namespace PDF_Office.ViewModels.Tools
                 separator = SetSeparator();
                 popMenu.Items.Add(separator);
 
-                SetSelectTextOrImageMenuItem("高亮", "HighLight", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Highlight"), "HighLight", annotCommand, out menuItem);
                 popMenu.Items.Add(menuItem);
 
-                SetSelectTextOrImageMenuItem("下划线", "UnderLine", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Underline"), "UnderLine", annotCommand, out menuItem);
                 popMenu.Items.Add(menuItem);
 
-                SetSelectTextOrImageMenuItem("删除线", "Strikeout", annotCommand, out menuItem);
+                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Strikethrough"), "Strikeout", annotCommand, out menuItem);
                 popMenu.Items.Add(menuItem);
             }
             separator = SetSeparator();
             popMenu.Items.Add(separator);
 
-            SetSelectTextOrImageMenuItem("文本", "Freetext", annotCommand, out menuItem);
+            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Text"), "Freetext", annotCommand, out menuItem);
             popMenu.Items.Add(menuItem);
 
-            SetSelectTextOrImageMenuItem("便签", "StickyNote", annotCommand, out menuItem);
+            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Note"), "StickyNote", annotCommand, out menuItem);
             popMenu.Items.Add(menuItem);
 
             separator = SetSeparator();
             popMenu.Items.Add(separator);
 
-            SetSelectTextOrImageMenuItem("矩形", "Rect", annotCommand, out menuItem);
+            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Rectangle"), "Rect", annotCommand, out menuItem);
             popMenu.Items.Add(menuItem);
 
-            SetSelectTextOrImageMenuItem("椭圆形", "Circle", annotCommand, out menuItem);
+            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Oval"), "Circle", annotCommand, out menuItem);
             popMenu.Items.Add(menuItem);
 
-            SetSelectTextOrImageMenuItem("直线", "Line", annotCommand, out menuItem);
+            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_StraightLine"), "Line", annotCommand, out menuItem);
             popMenu.Items.Add(menuItem);
 
             separator = SetSeparator();
             popMenu.Items.Add(separator);
 
-            SetSelectTextOrImageMenuItem("添加链接", "Link", annotCommand, out menuItem);
+            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_AddLink"), "Link", annotCommand, out menuItem);
             popMenu.Items.Add(menuItem);
 
-            SetSelectTextOrImageMenuItem("添加大纲", "OutLine", annotCommand, out menuItem);
+            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_AddOutline"), "OutLine", annotCommand, out menuItem);
             popMenu.Items.Add(menuItem);
 
             return popMenu;

+ 1 - 0
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Properties.cs

@@ -272,6 +272,7 @@ namespace PDF_Office.ViewModels.Tools
         //private bool isHiddenAnnot = true;
         private bool isAddBookMark = true;
 
+        private bool IsNoSelectMenu = false;
         private bool isRightMenuAddAnnot = false;
 
         private PopMenu HightAnnotPopMenu;

+ 0 - 76
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -219,83 +219,7 @@ namespace PDF_Office.ViewModels.Tools
             }
         }
 
-        /// <summary>
-        /// 空白处-右键菜单-添加注释
-        /// </summary>
-        /// <param name="sender"></param>
-        private void AddAnnotation_Click(object sender)
-        {
-            if (sender is MenuItem menuItem)
-            {
-                AnnotHandlerEventArgs annotHandler = null;
-                string str = menuItem.Tag.ToString();
-                viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
-                propertyPanel.IsAddLink = false;
-                propertyPanel.IsLocationLink = false;
-                if (str == AddAnnotType.AnnotFreehand.ToString())
-                {
-                    annotHandler = GetFreehand();
-                }
-                if (str == AddAnnotType.AnnotFreeText.ToString())
-                {
-                    annotHandler = GetFreetext();
-                }
-                if (str == AddAnnotType.AnnotSticky.ToString())
-                {
-                    annotHandler = GetStickyNote();
-                }
-                if (str == AddAnnotType.AnnotSquare.ToString())
-                {
-                    annotHandler = GetRect();
-                }
-                if (str == AddAnnotType.AnnotCircle.ToString())
-                {
-                    annotHandler = GetCircle();
-                }
-                if (str == AddAnnotType.AnnotArrow.ToString())
-                {
-                    annotHandler = GetArrowLine("Arrow");
-                }
-                if (str == AddAnnotType.AnnotLine.ToString())
-                {
-                    annotHandler = GetArrowLine("Line");
-                }
-                if (str == AddAnnotType.AnnotLink.ToString())
-                {
-                    propertyPanel.IsAddLink = true;
-                    annotHandler = GetLink();
-                }
-                if (str == AddAnnotType.AnnotStamp.ToString())
-                {
-                    annotHandler = GetStamp();
-                }
-                if (str == AddAnnotType.AnnotAutograph.ToString())
-                {
-                    annotHandler = GetSignature();
-                }
-                if (annotHandler != null)
-                {
-                    annotHandler.Author = Settings.Default.AppProperties.Description.Author;
-                    PDFViewer.SetMouseMode(MouseModes.AnnotCreate);
-                    PDFViewer.SetToolParam(annotHandler);
-                    ShowPropertyPanel(true);
-
-                    #region 设计重新调整,阅读页空白处,右键菜单,添加链接需要显示,其他和pro mac一样的效果,不显示属性栏
-
-                    //isRightMenuAddAnnot = true;
-                    //if (str != AddAnnotType.AnnotLink.ToString())
-                    //{
-                    //    ShowPropertyPanel(false);
-                    //}
-                    //else
-                    //{
-                    //    ShowPropertyPanel(true);
-                    //}
 
-                    #endregion 设计重新调整,阅读页空白处,右键菜单,添加链接需要显示,其他和pro mac一样的效果,不显示属性栏
-                }
-            }
-        }
 
         #endregion Command实现
 

+ 1 - 1
PDF Office/Views/Dialog/ConverterDialogs/ConverterExcelDialog.xaml

@@ -55,7 +55,7 @@
                             </StackPanel>
                         </StackPanel>
                         <StackPanel Orientation="Vertical"  Margin="0,18,0,0">
-                            <StackPanel Orientation="Vertical">
+                            <StackPanel Orientation="Vertical" Visibility="Collapsed">
                                 <TextBlock Text="Text Recognition Settings:" HorizontalAlignment="Left"  Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
                                 <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0" >
                                     <TextBlock Text="Recognize text if needed"/>

+ 2 - 2
PDF Office/Views/Dialog/ConverterDialogs/ConverterHTMLDialog.xaml

@@ -28,7 +28,7 @@
                 </Grid>
                 <Grid Grid.Column="1">
                     <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
-                        <StackPanel Orientation="Vertical">
+                        <StackPanel Orientation="Vertical" Visibility="Collapsed">
                             <TextBlock Text="HTML Recognition Settings" HorizontalAlignment="Left"  Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
                             <CheckBox Name="OCRCheckBox"  Margin="0,8,0,0" Padding="8,0,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}">
                                 <TextBlock Text="Recognize text if needed"/>
@@ -41,7 +41,7 @@
                                 <ComboBoxItem Content="Korean"/>
                             </ComboBox>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical" Margin="0,18,0,0" >
+                        <StackPanel Orientation="Vertical" Margin="0,0,0,0" >
                             <TextBlock Text="Page Range" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
                             <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" Loaded="PageRangeComboBox_Loaded">
                                 <i:Interaction.Triggers>

+ 2 - 2
PDF Office/Views/Dialog/ConverterDialogs/ConverterPPTDialog.xaml

@@ -28,7 +28,7 @@
                 </Grid>
                 <Grid Grid.Column="1">
                     <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
-                        <StackPanel Orientation="Vertical">
+                        <StackPanel Orientation="Vertical" Visibility="Collapsed">
                             <TextBlock Text="PPT Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
                             <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0">
                                 <TextBlock Text="Recognize text if needed"/>
@@ -41,7 +41,7 @@
                                 <ComboBoxItem Content="Korean"/>
                             </ComboBox>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical" Margin="0,18,0,0">
+                        <StackPanel Orientation="Vertical" Margin="0,0,0,0">
                             <TextBlock Text="Page Range" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
                             <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
                                 <i:Interaction.Triggers>

+ 2 - 2
PDF Office/Views/Dialog/ConverterDialogs/ConverterRTFDialog.xaml

@@ -28,7 +28,7 @@
                 </Grid>
                 <Grid Grid.Column="1">
                     <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
-                        <StackPanel Orientation="Vertical">
+                        <StackPanel Orientation="Vertical" Visibility="Collapsed">
                             <TextBlock Text="RTF Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
                             <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0">
                                 <TextBlock Text="Recognize text if needed"/>
@@ -41,7 +41,7 @@
                                 <ComboBoxItem Content="Korean"/>
                             </ComboBox>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical" Margin="0,18,0,0">
+                        <StackPanel Orientation="Vertical" Margin="0,0,0,0">
                             <TextBlock Text="Page Range" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
                             <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
                                 <i:Interaction.Triggers>

+ 2 - 2
PDF Office/Views/Dialog/ConverterDialogs/ConverterTextDialog.xaml

@@ -28,7 +28,7 @@
                 </Grid>
                 <Grid Grid.Column="1">
                     <StackPanel Orientation="Vertical"  Margin="16,2,0,0">
-                        <StackPanel Orientation="Vertical">
+                        <StackPanel Orientation="Vertical" Visibility="Collapsed">
                             <TextBlock Text="Text Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
                             <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0" >
                                 <TextBlock Text="Recognize text if needed"/>
@@ -41,7 +41,7 @@
                                 <ComboBoxItem Content="Korean"/>
                             </ComboBox>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical" Margin="0,18,0,0">
+                        <StackPanel Orientation="Vertical" Margin="0,0,0,0">
                             <TextBlock Text="Page Range" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
                             <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="228" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
                                 <i:Interaction.Triggers>

+ 3 - 3
PDF Office/Views/Dialog/ConverterDialogs/ConverterWordDialog.xaml

@@ -31,18 +31,18 @@
                         <StackPanel Orientation="Vertical" HorizontalAlignment="Left">
                             <TextBlock Text="Layout Settings"  Style="{StaticResource PropertyHeaderLv2}" Height="20" HorizontalAlignment="Left"/>
                             <StackPanel Orientation="Vertical" Margin="0,8,0,0">
-                                <RadioButton Name="FlowingTextRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=FlowingTextRadioBtn,Path=Name}" IsEnabled="False"  Style="{StaticResource RadioButtonStyleText}"
+                                <RadioButton Name="FlowingTextRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=FlowingTextRadioBtn,Path=Name}" IsEnabled="False"  Style="{StaticResource RadioButtonStyleText}" Visibility="Collapsed"
                                 Padding="8,0,0,0">
                                     <TextBlock Text="Retain Flowing Text"/>
                                 </RadioButton>
-                                <RadioButton  Margin="0,8,0,0" Name="PageLayoutRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=PageLayoutRadioBtn,Path=Name}" IsChecked="True"  Style="{StaticResource RadioButtonStyleText}"
+                                <RadioButton  Margin="0,0,0,0" Name="PageLayoutRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=PageLayoutRadioBtn,Path=Name}" IsChecked="True"  Style="{StaticResource RadioButtonStyleText}"
                                 Padding="8,0,0,0">
                                     <TextBlock Text="Retain Page Layout"/>
                                 </RadioButton>
                             </StackPanel>
                         </StackPanel>
                         <StackPanel Orientation="Vertical"  Margin="0,16,0,0">
-                            <StackPanel Orientation="Vertical">
+                            <StackPanel Orientation="Vertical" Visibility="Collapsed">
                                 <TextBlock Text="Text Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
                                 <CheckBox Name="OCRCheckBox"  Margin="0,8,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0">
                                     <TextBlock Text="Recognize text if needed"/>

+ 1 - 1
PDF Office/Views/HomePanel/PDFTools/QuickToolsContent.xaml

@@ -64,7 +64,7 @@
             FontSize="20"
             FontWeight="SemiBold"
             LineHeight="28"
-            Text="Quick Tools" />
+            Text="{Binding T_Title}" />
 
 
         <StackPanel

+ 1 - 1
PDF Office/Views/PropertyPanel/ViewModular/ReadViewContent.xaml

@@ -34,7 +34,7 @@
                 x:Name="PressEscTip"
                 Padding="11"
                 Foreground="#FFFFFFFF"
-                Text="Enter reading mode, you can press ESC to exit"
+                Text="{Binding T_ESCReadMode}"
                 TextAlignment="Center" />
         </Border>
 

+ 10 - 10
PDF Office/Views/PropertyPanel/ViewModular/ViewModularContent.xaml

@@ -37,13 +37,13 @@
                 FontSize="14"
                 FontWeight="SemiBold"
                 Foreground="{StaticResource color.sys.text.neutral.lv1}"
-                Text="视图" />
+                Text="{Binding T_Title}" />
             <TextBlock
                 Name="txtDisplayMode"
                 Margin="16,16,0,14"
                 FontSize="12"
                 Foreground="{StaticResource color.sys.text.neutral.lv2}"
-                Text="显示模式" />
+                Text="{Binding T_ModeTitle}" />
 
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -76,7 +76,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Style="{StaticResource ViewMode_txtContext}"
-                    Text="单页" />
+                    Text="{Binding T_Single}" />
                 <RadioButton
                     Name="RBtnTwoPage"
                     Grid.Column="1"
@@ -100,7 +100,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Style="{StaticResource ViewMode_txtContext}"
-                    Text="双页" />
+                    Text="{Binding T_Two}" />
                 <RadioButton
                     Name="RBtnBookMode"
                     Grid.Column="2"
@@ -124,7 +124,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Style="{StaticResource ViewMode_txtContext}"
-                    Text="书本模式" />
+                    Text="{Binding T_Book}" />
             </Grid>
             <Grid Margin="0,8">
                 <Grid.ColumnDefinitions>
@@ -158,7 +158,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Style="{StaticResource ViewMode_txtContext}"
-                    Text="阅读模式" />
+                    Text="{Binding T_Read}" />
 
                 <RadioButton
                     Name="RBtnFullScreen"
@@ -182,7 +182,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Style="{StaticResource ViewMode_txtContext}"
-                    Text="全屏" />
+                    Text="{Binding T_Full}" />
             </Grid>
             <!--<Separator
             Width="248"
@@ -196,7 +196,7 @@
                 Margin="17,16,0,6"
                 VerticalContentAlignment="Center"
                 Command="{Binding ContinueCommand}"
-                Content="连续滚动"
+                Content="{Binding T_ContinuousScroll}"
                 FontFamily="Segoe UI"
                 FontSize="14"
                 IsChecked="{Binding IsContinue}" />
@@ -205,7 +205,7 @@
                 Margin="17,6,0,6"
                 VerticalContentAlignment="Center"
                 Command="{Binding PagesBreakCommand}"
-                Content="分页符"
+                Content="{Binding T_PageBreak}"
                 FontFamily="Segoe UI"
                 FontSize="14"
                 IsChecked="{Binding IsPagesBreak}" />
@@ -340,7 +340,7 @@
                 Margin="16,26,0,14"
                 FontSize="12"
                 Foreground="{StaticResource color.sys.text.neutral.lv2}"
-                Text="旋转" />
+                Text="{Binding T_RotateTitle}" />
             <StackPanel Margin="15,0,0,0" Orientation="Horizontal">
                 <Button
                     x:Name="btnRotateRight"

+ 2 - 1
PDF Office/Views/TipContent/ReadModelTip.xaml

@@ -5,6 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:PDF_Office.Views.TipContent"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:mainpage="clr-namespace:PDF_Office.Strings.MainPage"
     xmlns:prism="http://prismlibrary.com/"
     d:DesignHeight="450"
     d:DesignWidth="800"
@@ -21,7 +22,7 @@
                 x:Name="ReadModelTip1"
                 Padding="11"
                 Foreground="#FFFFFFFF"
-                Text="Exit reading mode"
+                Text="{x:Static mainpage:MainPage.GlobalTip_ExitReadMode}"
                 TextAlignment="Center" />
         </Border>
     </Grid>